From 382378e867dfec13eb5d831210cfcfb9c8825f27 Mon Sep 17 00:00:00 2001 From: wbuezas Date: Thu, 25 Jul 2024 11:39:25 -0300 Subject: [PATCH 1/3] Agencies packages --- src/css/app.scss | 37 +++++----- src/pages/Agencies/PackagesView.vue | 108 ++++++++++++++++++++++++++++ src/router/routes.js | 5 ++ 3 files changed, 133 insertions(+), 17 deletions(-) create mode 100644 src/pages/Agencies/PackagesView.vue diff --git a/src/css/app.scss b/src/css/app.scss index 3a0a70e0..cd75f1c3 100644 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -1,35 +1,38 @@ // app global css in SCSS form @font-face { - font-family: Poppins; - src: url(./poppins.ttf) format('truetype'); + font-family: Poppins; + src: url(./poppins.ttf) format('truetype'); } @font-face { - font-family: 'Open Sans'; - src: url(./opensans.ttf) format('truetype'); + font-family: 'Open Sans'; + src: url(./opensans.ttf) format('truetype'); } @mixin mobile { - @media screen and (max-width: 960px) { - @content; - } + @media screen and (max-width: 960px) { + @content; + } } body { - font-family: 'Poppins', 'Verdana', 'Sans'; - background-color: #fafafa; + font-family: 'Poppins', 'Verdana', 'Sans'; + background-color: #fafafa; } a.link { - text-decoration: none; - color: #6a1; + text-decoration: none; + color: #6a1; - &:hover { - text-decoration: underline; - } + &:hover { + text-decoration: underline; + } } .q-card { - border-radius: 7px; - box-shadow: 0 0 3px rgba(0, 0, 0, 0.1); + border-radius: 0.6em !important; + box-shadow: 0 0 3px rgba(0, 0, 0, 0.1); +} +.q-table__container { + border-radius: 0.6em !important; } .q-page-sticky.fixed-bottom-right { - margin: 18px; + margin: 18px; } diff --git a/src/pages/Agencies/PackagesView.vue b/src/pages/Agencies/PackagesView.vue new file mode 100644 index 00000000..d9af6e7f --- /dev/null +++ b/src/pages/Agencies/PackagesView.vue @@ -0,0 +1,108 @@ + + + + + + + +en-US: + agency: Agency + bundles: Bundles + expeditions: Exps. + prevision: Prev. +es-ES: + agency: Agencia + bundles: Bultos + expeditions: Exps. + prevision: Prev. +ca-ES: + agency: Agència + bundles: Paquets + expeditions: Exps. + prevision: Prev. +fr-FR: + agency: Agence + bundles: Cartons + expeditions: Exps. + prevision: Prev. +pt-PT: + agency: Agência + bundles: Bultos + expeditions: Exps. + prevision: Prev. + diff --git a/src/router/routes.js b/src/router/routes.js index 809027d6..556b1d35 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -54,6 +54,11 @@ const routes = [ path: '/ecomerce/catalog/:category?/:type?', component: () => import('pages/Ecomerce/Catalog.vue') }, + { + name: 'packages', + path: '/agencies/packages', + component: () => import('src/pages/Agencies/PackagesView.vue') + }, { name: 'Account', path: '/account/conf', -- 2.40.1 From 34a0d93ecec9ea4389f5eb2b2c91c32167642979 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 26 Jul 2024 21:55:42 +0200 Subject: [PATCH 2/3] fix: email i18n --- src/i18n/es-ES/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/es-ES/index.js b/src/i18n/es-ES/index.js index a3e09121..e8d1cdf6 100644 --- a/src/i18n/es-ES/index.js +++ b/src/i18n/es-ES/index.js @@ -76,7 +76,7 @@ export default { remindMe: 'Recuérdame', logInAsGuest: 'Entrar como invitado', logIn: 'Iniciar sesión', - loginMail: 'info@verdnatura.es', + loginMail: "{'info'}{'@'}{'verdnatura.es'}", loginPhone: '+34 963 242 100', haveForgottenPassword: '¿Has olvidado tu contraseña?', notACustomerYet: '¿Todavía no eres cliente?', -- 2.40.1 From e067f5f7bd4dc8a64971ec679657beed771e3425 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 26 Jul 2024 22:05:01 +0200 Subject: [PATCH 3/3] feat: langs button --- src/i18n/es-ES/index.js | 9 +++++++++ src/pages/Login/LoginView.vue | 26 +++++++++++++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/i18n/es-ES/index.js b/src/i18n/es-ES/index.js index e8d1cdf6..de9734c3 100644 --- a/src/i18n/es-ES/index.js +++ b/src/i18n/es-ES/index.js @@ -12,6 +12,15 @@ export default { today: 'Hoy', yesterday: 'Ayer', tomorrow: 'Mañana', + language: 'Idioma', + langs: { + en: 'Inglés', + es: 'Español', + ca: 'Catalán', + fr: 'Francés', + mn: 'Ruso', + pt: 'Portugés' + }, date: { days: [ 'Domingo', diff --git a/src/pages/Login/LoginView.vue b/src/pages/Login/LoginView.vue index 13fd981e..4211db3a 100644 --- a/src/pages/Login/LoginView.vue +++ b/src/pages/Login/LoginView.vue @@ -15,6 +15,7 @@ const password = ref(null); const remember = ref(false); const showPwd = ref(false); +const langs = ['en', 'es', 'ca', 'fr', 'mn', 'pt']; onMounted(() => { if (route.query.emailConfirmed !== undefined) { notify({ @@ -56,12 +57,31 @@ async function onLogin() { /> - + /> + + + + {{ $t(`langs.${lang}`) }} + + + +