diff --git a/README.md b/README.md index ffa251dc..c5032e41 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,12 @@ Hedera is the main web page for Verdnatura. Required dependencies. - PHP >= 7.0 -- Node.js >= 18.0 +- Node.js >= 8.0 Launch application for development. ``` -$ quasar dev +$ npm run dev ``` Launch project backend. diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue index dab32500..24b82017 100644 --- a/src/components/common/VnSelect.vue +++ b/src/components/common/VnSelect.vue @@ -162,10 +162,7 @@ async function filterHandler(val, update) { :rules="$attrs.required ? [requiredFieldRule] : null" virtual-scroll-slice-size="options.length" > - diff --git a/src/i18n/ca-ES/index.js b/src/i18n/ca-ES/index.js index 0a3d7b1a..20b088cf 100644 --- a/src/i18n/ca-ES/index.js +++ b/src/i18n/ca-ES/index.js @@ -49,7 +49,7 @@ export default { ] }, of: 'de', - + startOrder: 'Començar comanda', // Sections titles titles: { Home: 'Inici', diff --git a/src/i18n/en-US/index.js b/src/i18n/en-US/index.js index b18d90cc..e68add91 100644 --- a/src/i18n/en-US/index.js +++ b/src/i18n/en-US/index.js @@ -2,16 +2,6 @@ // so you can safely delete all default props below export default { - failed: 'Action failed', - success: 'Action was successful', - internalServerError: 'Internal server error', - somethingWentWrong: 'Something went wrong', - loginFailed: 'Login failed', - authenticationRequired: 'Authentication required', - notFound: 'Not found', - today: 'Today', - yesterday: 'Yesterday', - tomorrow: 'Tomorrow', language: 'Language', langs: { en: 'English', @@ -61,7 +51,17 @@ export default { 'Dec' ] }, - + startOrder: 'Start order', + failed: 'Action failed', + success: 'Action was successful', + internalServerError: 'Internal server error', + somethingWentWrong: 'Something went wrong', + loginFailed: 'Login failed', + authenticationRequired: 'Authentication required', + notFound: 'Not found', + today: 'Today', + yesterday: 'Yesterday', + tomorrow: 'Tomorrow', // Sections titles titles: { Home: 'Home', diff --git a/src/i18n/es-ES/index.js b/src/i18n/es-ES/index.js index dda8dab9..b30f3ed4 100644 --- a/src/i18n/es-ES/index.js +++ b/src/i18n/es-ES/index.js @@ -1,14 +1,4 @@ export default { - failed: 'Acción fallida', - success: 'Acción exitosa', - internalServerError: 'Error interno del servidor', - somethingWentWrong: 'Algo salió mal', - loginFailed: 'Usuario o contraseña incorrectos', - authenticationRequired: 'Autenticación requerida', - notFound: 'No encontrado', - today: 'Hoy', - yesterday: 'Ayer', - tomorrow: 'Mañana', language: 'Idioma', langs: { en: 'Inglés', @@ -58,6 +48,16 @@ export default { 'Dic' ] }, + failed: 'Acción fallida', + success: 'Acción exitosa', + internalServerError: 'Error interno del servidor', + somethingWentWrong: 'Algo salió mal', + loginFailed: 'Usuario o contraseña incorrectos', + authenticationRequired: 'Autenticación requerida', + notFound: 'No encontrado', + today: 'Hoy', + yesterday: 'Ayer', + tomorrow: 'Mañana', // Sections titles titles: { @@ -128,7 +128,6 @@ export default { delete: 'Borrar', confirmDelete: '¿Estás seguro de que quieres borrar la línea?', emptyList: 'Lista vacía', - orders: 'Pedidos', order: 'Pedido pendiente', ticket: 'Pedido', @@ -149,6 +148,7 @@ export default { remindMe: 'Recuérdame', logInAsGuest: 'Entrar como invitado', logIn: 'Iniciar sesión', + logOut: 'Cerrar sesión', loginMail: "{'info'}{'@'}{'verdnatura.es'}", loginPhone: '+34 963 242 100', haveForgottenPassword: '¿Has olvidado tu contraseña?', @@ -161,6 +161,7 @@ export default { cancel: 'Cancelar', of: 'de', modify: 'Modificar', + startOrder: 'Empezar pedido', shoppingCart: 'Cesta de la compra', available: 'Disponible', minQuantity: 'Cantidad mínima', diff --git a/src/i18n/fr-FR/index.js b/src/i18n/fr-FR/index.js index 56a5742e..4ad3ec06 100644 --- a/src/i18n/fr-FR/index.js +++ b/src/i18n/fr-FR/index.js @@ -49,7 +49,7 @@ export default { ] }, of: 'de', - + startOrder: 'Lancer commande', // Sections titles titles: { Home: 'Accueil', diff --git a/src/i18n/pt-PT/index.js b/src/i18n/pt-PT/index.js index f49db9f4..7a193eb7 100644 --- a/src/i18n/pt-PT/index.js +++ b/src/i18n/pt-PT/index.js @@ -49,6 +49,7 @@ export default { ] }, of: 'de', + startOrder: 'Comece uma encomenda', // Sections titles titles: { Home: 'Início', diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index 8a84f6a7..26093e6b 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -97,7 +97,9 @@ const logoutSupplantedUser = async () => { alt="_Exit" @click="logout()" data-testid="logoutButton" - /> + > + {{ $t('logOut') }} +
+ > + {{ $t('startOrder') }}
@@ -62,16 +63,3 @@ export default { } }; - - -en-US: - startOrder: Start order -es-ES: - startOrder: Empezar pedido -ca-ES: - startOrder: Començar comanda -fr-FR: - startOrder: Lancer commande -pt-PT: - startOrder: Comece uma encomenda - diff --git a/src/pages/Cms/HomeView.vue b/src/pages/Cms/HomeView.vue index b368a15f..8bc5e166 100644 --- a/src/pages/Cms/HomeView.vue +++ b/src/pages/Cms/HomeView.vue @@ -20,16 +20,9 @@ onMounted(async () => await fetchData()); diff --git a/src/pages/Ecomerce/OrdersView.vue b/src/pages/Ecomerce/OrdersView.vue index 97450c71..c3787f50 100644 --- a/src/pages/Ecomerce/OrdersView.vue +++ b/src/pages/Ecomerce/OrdersView.vue @@ -118,8 +118,9 @@ const onConfirmPay = async () => { icon="add_shopping_cart" color="accent" :to="{ name: 'catalog' }" - :title="t('startOrder')" - /> + > + {{ t('startOrder') }}