From 2758dcf2c8d75f4c9b85e55394779676cda9fdfe Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 11 Sep 2024 14:46:45 -0300
Subject: [PATCH 1/4] WIP

---
 src/App.vue                   |  7 ++++-
 src/i18n/ca-ES/index.js       | 21 ++++++++++++-
 src/i18n/en-US/index.js       | 19 +++++++++++-
 src/i18n/fr-FR/index.js       | 22 +++++++++++++-
 src/i18n/pt-PT/index.js       | 22 +++++++++++++-
 src/layouts/MainLayout.vue    |  4 +--
 src/pages/Login/LoginView.vue | 55 ++++++++++++++++++++---------------
 src/stores/user.js            | 39 +++++++++++++++++++++++--
 8 files changed, 155 insertions(+), 34 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 8b15cff2..1e865e99 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,9 +1,14 @@
 <script setup>
 import { useAppStore } from 'stores/app';
+import { useUserStore } from 'stores/user';
 import { onBeforeMount } from 'vue';
 const appStore = useAppStore();
+const userStore = useUserStore();
 
-onBeforeMount(() => appStore.init());
+onBeforeMount(async () => {
+    await userStore.init();
+    await appStore.init();
+});
 </script>
 
 <template>
diff --git a/src/i18n/ca-ES/index.js b/src/i18n/ca-ES/index.js
index 694fe1a1..ddb8e3f8 100644
--- a/src/i18n/ca-ES/index.js
+++ b/src/i18n/ca-ES/index.js
@@ -1,4 +1,13 @@
 export default {
+    language: 'Idioma',
+    langs: {
+        en: 'Anglès',
+        es: 'Espanyol',
+        ca: 'Català',
+        fr: 'Francès',
+        mn: 'Rus',
+        pt: 'Portuguès'
+    },
     date: {
         days: [
             'Diumenge',
@@ -82,5 +91,15 @@ export default {
     confirm: 'Confirmar',
     delete: 'Esborrar',
     confirmDelete: 'Estàs segur que vols esborrar la línia?',
-    emptyList: 'Llista buida'
+    emptyList: 'Llista buida',
+
+    logInAsGuest: `Accedir com a convidat`,
+    haveForgottenPassword: '¿Has oblidat la teva contrasenya?',
+    signUp: 'Registrar-me',
+    notACustomerYet: `Encara no ets client?`,
+    loginPhone: '+34 963 242 100',
+    loginMail: "{'info'}{'@'}{'verdnatura.es'}",
+    remindMe: "Recorda'm",
+    user: 'Usuari',
+    password: 'Contrasenya'
 };
diff --git a/src/i18n/en-US/index.js b/src/i18n/en-US/index.js
index 8709c5f2..ca758322 100644
--- a/src/i18n/en-US/index.js
+++ b/src/i18n/en-US/index.js
@@ -12,6 +12,15 @@ export default {
     today: 'Today',
     yesterday: 'Yesterday',
     tomorrow: 'Tomorrow',
+    language: 'Language',
+    langs: {
+        en: 'English',
+        es: 'Spanish',
+        ca: 'Catalan',
+        fr: 'French',
+        mn: 'Russian',
+        pt: 'Portuguese'
+    },
     date: {
         days: [
             'Sunday',
@@ -116,5 +125,13 @@ export default {
     dataSaved: 'Data saved',
     save: 'Save',
     cancel: 'Cancel',
-    of: 'of'
+    of: 'of',
+    loginAsGuest: 'Login as guest',
+    haveForgottenPassword: 'Have you forgotten your password?',
+    signUp: 'Sign up',
+    notACustomerYet: 'Not a customer yet?',
+    loginPhone: '+34 963 242 100',
+    loginMail: "{'info'}{'@'}{'verdnatura.es'}",
+    remindMe: 'Remember me',
+    password: 'Password'
 };
diff --git a/src/i18n/fr-FR/index.js b/src/i18n/fr-FR/index.js
index 7b3f09f8..a093fc8f 100644
--- a/src/i18n/fr-FR/index.js
+++ b/src/i18n/fr-FR/index.js
@@ -1,4 +1,13 @@
 export default {
+    language: 'Langue',
+    langs: {
+        en: 'Anglais',
+        es: 'Espagnol',
+        ca: 'Catalan',
+        fr: 'Français',
+        mn: 'Russe',
+        pt: 'Portugais'
+    },
     date: {
         days: [
             'Dimanche',
@@ -81,5 +90,16 @@ export default {
     noData: 'Aucune donnée',
     confirm: 'Confirmer',
     delete: 'Effacer',
-    confirmDelete: 'Voulez-vous vraiment supprimer la ligne?'
+    confirmDelete: 'Voulez-vous vraiment supprimer la ligne?',
+    emptyList: 'Liste vide',
+
+    logInAsGuest: `Entrez en tant qu'invité`,
+    haveForgottenPassword: 'Avez-vous oublié votre mot de passe?',
+    signUp: `S'inscrire`,
+    notACustomerYet: `Pas encore client?`,
+    loginPhone: '+34 963 242 100',
+    loginMail: "{'info'}{'@'}{'verdnatura.es'}",
+    remindMe: `Rappelle-moi`,
+    user: 'Utilisateur',
+    password: 'Mot de passe'
 };
diff --git a/src/i18n/pt-PT/index.js b/src/i18n/pt-PT/index.js
index fe16ce9c..547f9853 100644
--- a/src/i18n/pt-PT/index.js
+++ b/src/i18n/pt-PT/index.js
@@ -1,4 +1,13 @@
 export default {
+    language: 'Língua',
+    langs: {
+        en: 'Inglês',
+        es: 'Espanhol',
+        ca: 'Catalão',
+        fr: 'Francês',
+        mn: 'Russo',
+        pt: 'Português'
+    },
     date: {
         days: [
             'Domingo',
@@ -79,5 +88,16 @@ export default {
     noData: 'Sem dados',
     confirm: 'Confirme',
     delete: 'Eliminar',
-    confirmDelete: 'Tens certeza que queres eliminar esta linha?'
+    confirmDelete: 'Tens certeza que queres eliminar esta linha?',
+    emptyList: 'Lista vazia',
+
+    logInAsGuest: 'Entrar como convidado',
+    haveForgottenPassword: 'Esqueceu a senha?',
+    signUp: 'Registar',
+    notACustomerYet: 'Ainda não é cliente?',
+    loginPhone: '+34 963 242 100',
+    loginMail: "{'info'}{'@'}{'verdnatura.es'}",
+    remindMe: 'Lembrar-me',
+    user: 'Utilizador',
+    password: 'Senha'
 };
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index 7117c32f..b137e175 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -22,11 +22,9 @@ const toggleLeftDrawer = () => {
 };
 
 onMounted(async () => {
-    appStore.isHeaderMounted = true;
-    await userStore.fetchUser();
     await appStore.loadConfig();
-    await userStore.supplantInit();
     await appStore.getMenuLinks();
+    appStore.isHeaderMounted = true;
 });
 
 const logout = async () => {
diff --git a/src/pages/Login/LoginView.vue b/src/pages/Login/LoginView.vue
index 612c8971..6035366d 100644
--- a/src/pages/Login/LoginView.vue
+++ b/src/pages/Login/LoginView.vue
@@ -1,12 +1,15 @@
 <script setup>
+import { onMounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
+
 import { useUserStore } from 'stores/user';
-import { onMounted, ref } from 'vue';
 import useNotify from 'src/composables/useNotify.js';
 import { useRouter, useRoute } from 'vue-router';
-const { notify } = useNotify();
 
-const t = useI18n();
+const { notify } = useNotify();
+const { t } = useI18n();
+const { locale } = useI18n({ useScope: 'global' });
+
 const userStore = useUserStore();
 const route = useRoute();
 const router = useRouter();
@@ -15,7 +18,17 @@ const password = ref(null);
 const remember = ref(false);
 const showPwd = ref(false);
 
-const langs = ['en', 'es', 'ca', 'fr', 'mn', 'pt'];
+const selectedLocaleValue = computed({
+    get() {
+        return userStore.localeOptions.find(
+            option => option.lang === locale.value
+        ).value;
+    },
+    set(value) {
+        locale.value = value;
+    }
+});
+
 onMounted(() => {
     if (route.query.emailConfirmed !== undefined) {
         notify({
@@ -30,7 +43,9 @@ onMounted(() => {
 });
 async function onLogin() {
     await userStore.login(email.value, password.value, remember.value);
-    router.push('/');
+    await userStore.fetchUser();
+    await userStore.updateUserLang(selectedLocaleValue.value);
+    await router.push('/');
 }
 </script>
 
@@ -57,29 +72,23 @@ async function onLogin() {
                         />
                     </template>
                 </QInput>
-                <div class="text-center">
+                <div class="row justify-between text-center">
                     <QCheckbox
                         v-model="remember"
                         :label="$t('remindMe')"
                         dense
                     />
-                    <QBtn
-                        id="switchLanguage"
-                        :label="$t('language')"
-                        icon="translate"
-                        color="primary"
-                        size="sm"
-                        flat
-                        rounded
-                    >
-                        <QMenu auto-close>
-                            <QList dense v-for="lang in langs" :key="lang">
-                                <QItem disabled v-ripple clickable>
-                                    {{ $t(`langs.${lang}`) }}
-                                </QItem>
-                            </QList>
-                        </QMenu>
-                    </QBtn>
+                    <QSelect
+                        v-model="selectedLocaleValue"
+                        :options="userStore.localeOptions"
+                        :label="t('language')"
+                        option-value="lang"
+                        dense
+                        borderless
+                        emit-value
+                        map-options
+                        options-dense
+                    />
                 </div>
             </div>
             <div class="justify-center">
diff --git a/src/stores/user.js b/src/stores/user.js
index c7df4d12..a446a199 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -1,5 +1,8 @@
 import { defineStore } from 'pinia';
 import { api, jApi } from 'boot/axios';
+import { i18n } from 'src/boot/i18n';
+
+const { t } = i18n.global;
 
 export const useUserStore = defineStore('user', {
     state: () => {
@@ -11,20 +14,36 @@ export const useUserStore = defineStore('user', {
             token,
             isGuest: false,
             user: null,
-            supplantedUser: null
+            supplantedUser: null,
+            localeOptions: [
+                { label: t('langs.en'), lang: 'en-US', value: 'en' },
+                { label: t('langs.es'), lang: 'es-ES', value: 'es' },
+                { label: t('langs.ca'), lang: 'ca-ES', value: 'ca' },
+                { label: t('langs.fr'), lang: 'fr-FR', value: 'fr' },
+                { label: t('langs.pt'), lang: 'pt-PT', value: 'pt' }
+            ]
         };
     },
 
     getters: {
-        loggedIn: state => state.token != null
+        loggedIn: state => state.token != null,
+        userLang: state =>
+            state.localeOptions?.find(l => l.value === state?.user?.lang)?.lang
     },
 
     actions: {
+        async init() {
+            await this.fetchUser();
+            await this.supplantInit();
+            i18n.global.locale.value = this.userLang || 'en-US';
+        },
+
         async getToken() {
             this.token =
                 sessionStorage.getItem('vnToken') ||
                 localStorage.getItem('vnToken');
         },
+
         async login(user, password, remember) {
             const params = { user, password };
             const res = await api.post('Accounts/login', params);
@@ -40,6 +59,7 @@ export const useUserStore = defineStore('user', {
                 name: user
             });
         },
+
         async logout() {
             if (this.token != null) {
                 try {
@@ -54,7 +74,7 @@ export const useUserStore = defineStore('user', {
         async fetchUser(userType = 'user') {
             try {
                 const userData = await jApi.getObject(
-                    'SELECT id, nickname, name FROM account.myUser'
+                    'SELECT id, nickname, name, lang FROM account.myUser'
                 );
                 this.$patch({ [userType]: userData });
             } catch (error) {
@@ -83,6 +103,19 @@ export const useUserStore = defineStore('user', {
             await api.post('Accounts/logout');
             this.getToken();
             await this.fetchUser();
+        },
+
+        async updateUserLang(lang) {
+            console.log('lang to update: ', lang);
+            if (!this.user || this.user.lang === lang) return;
+            await jApi.execQuery(
+                `START TRANSACTION;
+                UPDATE account.myUser SET lang = #lang WHERE (id = #id);
+                SELECT lang FROM account.myUser WHERE (id = #id);
+                COMMIT;`,
+                { id: this.user.id, lang }
+            );
+            this.user.lang = lang;
         }
     }
 });

From f1a8fd27100e4979eb3b0147fc5abfe63c866794 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 13 Sep 2024 21:42:40 -0300
Subject: [PATCH 2/4] Integrate update config language dropdown

---
 src/pages/Account/AccountConfig.vue |  4 +++-
 src/stores/user.js                  | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/pages/Account/AccountConfig.vue b/src/pages/Account/AccountConfig.vue
index 7f1694ae..5f22f0fb 100644
--- a/src/pages/Account/AccountConfig.vue
+++ b/src/pages/Account/AccountConfig.vue
@@ -99,7 +99,9 @@ onMounted(() => fetchLanguagesSql());
                         option-label="name"
                         option-value="code"
                         :options="langOptions"
-                        @update:model-value="vnFormRef.submit()"
+                        @update:model-value="
+                            userStore.updateUserLang(data.lang)
+                        "
                     />
                 </template>
                 <template #extraForm>
diff --git a/src/stores/user.js b/src/stores/user.js
index a446a199..d905c116 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -1,8 +1,10 @@
 import { defineStore } from 'pinia';
 import { api, jApi } from 'boot/axios';
 import { i18n } from 'src/boot/i18n';
+import useNotify from 'src/composables/useNotify.js';
 
 const { t } = i18n.global;
+const { notify } = useNotify();
 
 export const useUserStore = defineStore('user', {
     state: () => {
@@ -27,15 +29,15 @@ export const useUserStore = defineStore('user', {
 
     getters: {
         loggedIn: state => state.token != null,
-        userLang: state =>
-            state.localeOptions?.find(l => l.value === state?.user?.lang)?.lang
+        userLocaleOption: state =>
+            state.localeOptions?.find(l => l.value === state?.user?.lang)
     },
 
     actions: {
         async init() {
             await this.fetchUser();
             await this.supplantInit();
-            i18n.global.locale.value = this.userLang || 'en-US';
+            this.updateSiteLocale();
         },
 
         async getToken() {
@@ -105,8 +107,12 @@ export const useUserStore = defineStore('user', {
             await this.fetchUser();
         },
 
+        updateSiteLocale(locale = null) {
+            i18n.global.locale.value =
+                locale || this.userLocaleOption.lang || 'en-US';
+        },
+
         async updateUserLang(lang) {
-            console.log('lang to update: ', lang);
             if (!this.user || this.user.lang === lang) return;
             await jApi.execQuery(
                 `START TRANSACTION;
@@ -116,6 +122,8 @@ export const useUserStore = defineStore('user', {
                 { id: this.user.id, lang }
             );
             this.user.lang = lang;
+            this.updateSiteLocale();
+            notify(t('dataSaved'), 'positive');
         }
     }
 });

From 8ffe9a6a96cc4adb687384cb95d4f33d2531b88d Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 16 Sep 2024 08:31:26 -0300
Subject: [PATCH 3/4] Adjust lang selector size

---
 src/pages/Login/LoginView.vue | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/pages/Login/LoginView.vue b/src/pages/Login/LoginView.vue
index 6035366d..dc159e94 100644
--- a/src/pages/Login/LoginView.vue
+++ b/src/pages/Login/LoginView.vue
@@ -77,6 +77,7 @@ async function onLogin() {
                         v-model="remember"
                         :label="$t('remindMe')"
                         dense
+                        class="col"
                     />
                     <QSelect
                         v-model="selectedLocaleValue"
@@ -88,6 +89,7 @@ async function onLogin() {
                         emit-value
                         map-options
                         options-dense
+                        class="col-4"
                     />
                 </div>
             </div>
@@ -186,28 +188,3 @@ a {
     }
 }
 </style>
-
-<i18n lang="yaml">
-en-US:
-    user: User
-    password: Password
-    remindMe: Remind me
-    logInAsGuest: Log in as guest
-    logIn: Log in
-    loginMail: infoverdnatura.es
-    loginPhone: +34 607 562 391
-    haveForgottenPassword: Have you forgotten your password?
-    notACustomerYet: Not a customer yet?
-    signUp: Register
-es-ES:
-    user: Usuario
-    password: Contraseña
-    remindMe: Recuérdame
-    logInAsGuest: Entrar como invitado
-    logIn: Iniciar sesión
-    loginMail: infoverdnatura.es
-    loginPhone: +34 963 242 100
-    haveForgottenPassword: ¿Has olvidado tu contraseña?
-    notACustomerYet: ¿Todavía no eres cliente?
-    signUp: Registrarme
-</i18n>

From f4fea5e90458e15f3d5ecf4c1c018f27176f4967 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 17 Sep 2024 09:50:25 +0200
Subject: [PATCH 4/4] feat: remove update in BD userLang

---
 src/stores/user.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/stores/user.js b/src/stores/user.js
index d905c116..fe662e86 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -114,13 +114,7 @@ export const useUserStore = defineStore('user', {
 
         async updateUserLang(lang) {
             if (!this.user || this.user.lang === lang) return;
-            await jApi.execQuery(
-                `START TRANSACTION;
-                UPDATE account.myUser SET lang = #lang WHERE (id = #id);
-                SELECT lang FROM account.myUser WHERE (id = #id);
-                COMMIT;`,
-                { id: this.user.id, lang }
-            );
+
             this.user.lang = lang;
             this.updateSiteLocale();
             notify(t('dataSaved'), 'positive');