Fix: Merge conflicts

src/views/LoginView.vue

@@ -110,22 +110,14 @@ 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)
+        await store.login(api, user.value.email, user.value.password)
         router.push('/');
     } catch (error) {
         errorSnackBar.value = true;
     }
 }
-
 </script>
 
 <style scoped>

src/views/main/ContactView.vue

@@ -154,6 +154,26 @@
   </div>
 </template>
 
+<script>
+export default {
+  data() {
+    return {
+      first_name: '',
+      last_name: '',
+      email: '',
+      message: '',
+      social_media: '',
+      phone_number: ''
+    }
+  },
+  methods: {
+    /*submit() {
+      this.$emit('submit', this.email)
+    }*/
+  }
+}
+</script>
+
 
 <script setup>
 import FooterLayout from '@/layouts/FooterLayout.vue';

src/views/main/HomeView.vue

@@ -1,7 +1,6 @@
 <template>
   <v-app style="background-color: #F4F4F4;">
 
-
     <div style="background-color: #F4F4F4;">
 
       <!--PC -->
@@ -247,7 +246,6 @@
 
                 </v-col>
 
-
                 <v-col>
                   <router-link :to="{ name: 'creatorfolio' }">
                     <img src="../../../images/guillaume.jpg" alt="Profile Image" class="profile-image">
@@ -259,11 +257,7 @@
                       Inscription
                     </v-btn>
                   </RouterLink>
-
-
                 </v-col>
-
-
               </v-row>
 
 
@@ -405,26 +399,22 @@
   </v-app>
 </template>
 
-<script async setup>
+<script setup>
 import DefaultLayout from '@/layouts/DefaultLayout.vue';
 import FooterLayout from '@/layouts/FooterLayout.vue';
 import {useClient} from "@/plugins/api.js";
 import {ref} from "vue";
 import {useRouter} from "vue-router";
 
+const api = useClient()
 const router = useRouter()
-const client = useClient();
+const itemList = ref([]);
+const errorNoAccessSnackBar = ref(false);
 
-let itemList = ref([]);
+const callBackend = async () => {
-let errorNoAccessSnackBar = ref(false);
-
-async function callBackend() {
   try {
-    const response = await client.get('/api/TodoItems?ListId=1&PageNumber=1&PageSize=10');
+    const response = await api.get('/api/TodoItems?ListId=1&PageNumber=1&PageSize=10');
-    const responseItems = response.data.items;
+    itemList.value = response.data.items;
-    const orderedResponseItems = responseItems.sort((a, b) => a.id - b.id);
-    itemList.value = orderedResponseItems
-
   } catch (error) {
     errorNoAccessSnackBar.value = true;
   }
@@ -433,8 +423,6 @@ async function callBackend() {
 const goToLoginPage = () => {
   router.push('/login');
 }
-
-
 </script>
 
 <style src="../../cssstyle/index.css"></style>