On AddressDetails: Merge branch 'feature/AddressDetails' of https://gitea.verdnatura.es/wbuezas/hedera-web-mindshore into feature/AddressDetails

src/boot/i18n.js

@@ -4,7 +4,7 @@ import messages from 'src/i18n';
 
 const i18n = createI18n({
     locale: navigator.language || navigator.userLanguage,
-    fallbackLocale: 'en',
+    fallbackLocale: 'en-US',
     globalInjection: true,
     missingWarn: false,
     fallbackWarn: false,
@@ -17,7 +17,6 @@ const i18n = createI18n({
 export default boot(({ app }) => {
     // Set i18n instance on app
     app.use(i18n);
-    window.i18n = i18n.global;
 });
 
 export { i18n };

src/i18n/es-ES/index.js

@@ -72,6 +72,15 @@ export default {
     items: 'Artículos',
     config: 'Configuración',
     user: 'Usuario',
+    password: 'Contraseña',
+    remindMe: 'Recuérdame',
+    logInAsGuest: 'Entrar como invitado',
+    logIn: 'Iniciar sesión',
+    loginMail: 'info@verdnatura.es',
+    loginPhone: '+34 963 242 100',
+    haveForgottenPassword: '¿Has olvidado tu contraseña?',
+    notACustomerYet: '¿Todavía no eres cliente?',
+    signUp: 'Registrarme',
     addresses: 'Direcciones',
     addressEdit: 'Editar dirección',
     dataSaved: 'Datos guardados',

src/pages/Account/AddressList.vue

@@ -16,10 +16,8 @@ const addresses = ref([]);
 const defaultAddress = ref(null);
 const clientId = ref(null);
 
-const goToAddressDetails = (id = 0) => {
+const goToAddressDetails = (id = 0) =>
-    console.log('asd');
     router.push({ name: 'AddressDetails', params: { id } });
-};
 
 const getDefaultAddress = async () => {
     try {

src/pages/Login/LoginView.vue

@@ -1,3 +1,38 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { userStore } 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 user = userStore();
+const route = useRoute();
+const router = useRouter();
+const email = ref(null);
+const password = ref(null);
+const remember = ref(false);
+const showPwd = ref(false);
+
+onMounted(() => {
+    if (route.query.emailConfirmed !== undefined) {
+        notify({
+            message: t('emailConfirmedSuccessfully'),
+            type: 'positive'
+        });
+    }
+    if (route.params.email) {
+        email.value = route.params.email;
+        password.value.focus();
+    }
+});
+async function onLogin() {
+    await user.login(email.value, password.value, remember.value);
+    router.push('/');
+}
+</script>
+
 <template>
     <div class="main">
         <div class="header">
@@ -10,9 +45,8 @@
                 <QInput v-model="email" :label="$t('user')" autofocus />
                 <QInput
                     v-model="password"
-                    ref="password"
                     :label="$t('password')"
-                    :type="showPwd ? 'password' : 'text'"
+                    :type="!showPwd ? 'password' : 'text'"
                 >
                     <template v-slot:append>
                         <QIcon
@@ -69,7 +103,11 @@
                 </a>
             </p>
             <p class="contact">
-                {{ $t('loginPhone') }} · {{ $t('loginMail') }}
+                <a :href="`tel:${$t('loginPhone')}`">
+                    {{ $t('loginPhone') }}
+                </a>
+                ·
+                <a :href="`mailto:${$t('loginMail')}`">{{ $t('loginMail') }}</a>
             </p>
         </div>
     </div>
@@ -121,44 +159,6 @@ a {
 }
 </style>
 
-<script>
-import { userStore } from 'stores/user';
-
-export default {
-    name: 'VnLogin',
-
-    data() {
-        return {
-            user: userStore(),
-            email: '',
-            password: '',
-            remember: false,
-            showPwd: true
-        };
-    },
-
-    mounted() {
-        if (this.$route.query.emailConfirmed !== undefined) {
-            this.$q.notify({
-                message: this.$t('emailConfirmedSuccessfully'),
-                type: 'positive'
-            });
-        }
-        if (this.$route.params.email) {
-            this.email = this.$route.params.email;
-            this.$refs.password.focus();
-        }
-    },
-
-    methods: {
-        async onLogin() {
-            await this.user.login(this.email, this.password, this.remember);
-            this.$router.push('/');
-        }
-    }
-};
-</script>
-
 <i18n lang="yaml">
 en-US:
     user: User

src/router/routes.js

@@ -6,7 +6,7 @@ const routes = [
             {
                 name: 'login',
                 path: '/login/:email?',
-                component: () => import('pages/Login/Login.vue')
+                component: () => import('pages/Login/LoginView.vue')
             },
             {
                 name: 'rememberPassword',