Resolve conflicts

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>

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,9 +91,18 @@ export default {
     noData: 'Sense dades',
     confirm: 'Confirmar',
     delete: 'Esborrar',
-    emptyList: 'Llista buida',
-    modify: 'Modificar',
     confirmDelete: 'Estàs segur que vols esborrar la línia?',
+    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',
+    modify: 'Modificar',
     // Image related translations
     'Cant lock cache': 'No es pot bloquejar la memòria cau',
     'Bad file format': 'Format de fitxer no reconegut',

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',
@@ -118,6 +127,14 @@ export default {
     save: 'Save',
     cancel: 'Cancel',
     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',
     modify: 'Modify',
     // Image related translations
     'Cant lock cache': 'The cache could not be blocked',

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',
@@ -83,8 +92,17 @@ export default {
     confirm: 'Confirmer',
     delete: 'Effacer',
     emptyList: 'Vider la liste',
-    modify: 'Modifier',
     confirmDelete: 'Voulez-vous vraiment supprimer la ligne?',
+    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',
+    modify: 'Modifier',
     // Image related translations
     'Cant lock cache': "Le cache n'a pas pu être verrouillé",
     'Bad file format': 'Format de fichier non reconnu',

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',
@@ -80,9 +89,18 @@ export default {
     noData: 'Sem dados',
     confirm: 'Confirme',
     delete: 'Eliminar',
-    emptyList: 'Lista vazia',
-    modify: 'Modificar',
     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',
+    modify: 'Modificar',
     // Image related translations
     'Cant lock cache': 'O cache não pôde ser bloqueado',
     'Bad file format': 'Formato de arquivo inválido',

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 () => {

src/pages/Account/AccountConfig.vue

@@ -109,7 +109,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>

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,25 @@ async function onLogin() {
                         />
                     </template>
                 </QInput>
-                <div class="text-center">
+                <div class="row justify-between text-center">
                     <QCheckbox
                         v-model="remember"
                         :label="$t('remindMe')"
                         dense
+                        class="col"
+                    />
+                    <QSelect
+                        v-model="selectedLocaleValue"
+                        :options="userStore.localeOptions"
+                        :label="t('language')"
+                        option-value="lang"
+                        dense
+                        borderless
+                        emit-value
+                        map-options
+                        options-dense
+                        class="col-4"
                     />
-                    <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>
                 </div>
             </div>
             <div class="justify-center">
@@ -177,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>

src/stores/user.js

@@ -1,5 +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: () => {
@@ -11,20 +16,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,
+        userLocaleOption: state =>
+            state.localeOptions?.find(l => l.value === state?.user?.lang)
     },
 
     actions: {
+        async init() {
+            await this.fetchUser();
+            await this.supplantInit();
+            this.updateSiteLocale();
+        },
+
         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 +61,7 @@ export const useUserStore = defineStore('user', {
                 name: user
             });
         },
+
         async logout() {
             if (this.token != null) {
                 try {
@@ -54,7 +76,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 +105,19 @@ export const useUserStore = defineStore('user', {
             await api.post('Accounts/logout');
             this.getToken();
             await this.fetchUser();
+        },
+
+        updateSiteLocale(locale = null) {
+            i18n.global.locale.value =
+                locale || this.userLocaleOption.lang || 'en-US';
+        },
+
+        async updateUserLang(lang) {
+            if (!this.user || this.user.lang === lang) return;
+
+            this.user.lang = lang;
+            this.updateSiteLocale();
+            notify(t('dataSaved'), 'positive');
         }
     }
 });