Fixed merge

src/views/LoginView.vue

@@ -8,7 +8,7 @@
                     <v-row align="center" justify="center">
                         <!-- Header -->
                         <v-col cols="8" lg="8" md="10" sm="10" xs="10" style=" align-items: center; ">
-                            <img class="login-picture" src="../../../images/loginpage/loginhutopy.png">
+                            <img class="login-picture" src="../../images/loginpage/loginhutopy.png">
                         </v-col>
 
                         <!-- Connexion-objects -->
@@ -58,7 +58,7 @@
         <div class="sm:hidden flex flex-col items-center justify-start"
             style="background-color: #f4f4f4; height: 100vh;">
             <img style="margin-top: 10%;  width: 350px;  box-shadow: 0 4px 6px rgba(0, 0, 0, .5); border-radius: 25px; "
-                src="../../../images/loginpage/loginhutopy.png">
+                src="../../images/loginpage/loginhutopy.png">
 
             <h1 class="h1-connexion">Connexion</h1>
             <h2 class="h2-connexion">Comment souhaitez-vous
@@ -96,29 +96,24 @@
 
 
 <script setup>
-import { useClient } from '@/plugins/clientPlugin';
-import { useAuthStore } from '@/plugins/store/authStore';
-import { ref } from 'vue';
-import { useRouter } from 'vue-router';
+import FooterLayout from '@/layouts/FooterLayout.vue';
+import {auth} from '@/stores/auth.js';
+import {ref} from 'vue';
+import {useRouter} from 'vue-router';
+import {useClient} from "@/plugins/api.js";
 
-const authStore = useAuthStore();
-const client = useClient();
+const api = useClient()
+
+const store = auth();
 const router = useRouter()
 
 let user = ref({});
 let errorSnackBar = ref(false);
 
-const goHome = () => {
-    router.push('/');
-
-}
-
-
-
 async function login() {
     try {
-        await authStore.login(client, user.value.email, user.value.password)
-        router.push('/');
+      await store.login(api, user.value.email, user.value.password)
+      router.push('/');
     } catch (error) {
         errorSnackBar.value = true;
     }
@@ -205,17 +200,11 @@ async function login() {
         margin-bottom: 5%;
     }
 
-
     .h2pasinscrit {
         margin-bottom: 5%;
         font-size: 1.1em;
     }
 
-    .headermarginleft {
-        margin-left: 4%;
-    }
-
-
     .label-mail-password {
         margin-bottom: -3%;
         width: 425px;
@@ -223,7 +212,6 @@ async function login() {
 
     }
 
-
     .btnhome {
 
         font-size: 1em;
@@ -243,12 +231,6 @@ async function login() {
     .inscriptionbtn {
         transform: scale(.8);
     }
-
-
-
-
-
-
 }
 
 @media (min-width: 769px) and (max-width: 1280px) {
@@ -273,11 +255,6 @@ async function login() {
 
     }
 
-
-    .headermarginleft {
-        margin-left: 4%;
-    }
-
     .inscriptionbtn {
         transform: scale(.8);
     }
@@ -296,10 +273,6 @@ async function login() {
         justify-content: center;
 
     }
-
-
-
-
 }
 
 @media (min-width: 1279px) and (max-width: 1920px) {
@@ -320,29 +293,17 @@ async function login() {
         font-size: 1.3em;
     }
 
-
-    .h2-pasinscrit {
-        margin-bottom: -10%;
-
-    }
-
     .label-mail-password {
         margin-bottom: -10%;
         margin-top: -4%;
 
     }
 
-
     .inscriptionbtn {
         transform: scale(.6);
         margin-top: -5%;
     }
 
-
-    .headermarginleft {
-        margin-left: 0%;
-    }
-
     .login-picture {
         width: auto;
         border-radius: 30px;
@@ -350,12 +311,6 @@ async function login() {
         margin-left: -5%;
 
     }
-
-
-
-
-
-
 }
 
 @media (min-width: 1921px) {
@@ -381,22 +336,11 @@ async function login() {
         width: auto;
     }
 
-    .insriptionbutton {
-        font-size: 1.2em;
-
-    }
-
-    .headermarginleft {
-        margin-left: 0%;
-
-    }
-
     .connexion-container {
         margin-left: -7%;
 
     }
 
-
     .login-picture {
         width: auto;
         border-radius: 30px;
@@ -426,15 +370,6 @@ async function login() {
         width: auto;
     }
 
-    .insriptionbutton {
-        font-size: 1.2em
-    }
-
-    .headermarginleft {
-        margin-left: 1%;
-
-    }
-
     .inscriptionbtn {
         transform: scale(1);
     }
@@ -450,7 +385,5 @@ async function login() {
         box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.5);
         margin-left: -5%;
     }
-
-
 }
-</style>
+</style>