From 0f364ddec1d110c9c4c6a9aea2a0ba4e564e3f8c Mon Sep 17 00:00:00 2001
From: Kamigen <46357922+Edouard127@users.noreply.github.com>
Date: Sat, 30 Mar 2024 21:32:11 -0400
Subject: [PATCH] Merge conflicts

---
 src/views/LoginView.vue        | 26 +++++++++---------------
 src/views/main/ContactView.vue | 20 ++++++++++++++++++
 src/views/main/HomeView.vue    | 37 +++++++++++-----------------------
 3 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
index 701d1bf..46cca27 100644
--- a/src/views/LoginView.vue
+++ b/src/views/LoginView.vue
@@ -96,34 +96,28 @@
 
 
 <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 {authStore} from '@/plugins/store/authStore';
+import {ref} from 'vue';
+import {useRouter} from 'vue-router';
+import {useClient} from "@/plugins/clientPlugin.js";
 
-const authStore = useAuthStore();
-const client = useClient();
+const api = useClient()
+
+const store = authStore();
 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>
@@ -453,4 +447,4 @@ async function login() {
 
 
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/main/ContactView.vue b/src/views/main/ContactView.vue
index 77f82f6..9bf9dec 100644
--- a/src/views/main/ContactView.vue
+++ b/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';
diff --git a/src/views/main/HomeView.vue b/src/views/main/HomeView.vue
index d7e7f91..b982958 100644
--- a/src/views/main/HomeView.vue
+++ b/src/views/main/HomeView.vue
@@ -1,7 +1,6 @@
 <template>
   <v-app style="background-color: #F4F4F4;">
 
-
     <div style="background-color: #F4F4F4;">
 
       <!--PC -->
@@ -193,14 +192,14 @@
             <!-- Colonne de droite -->
             <v-col cols="3">
               <v-img src="../../../images/homepage/grinding.png"
-                style="margin-bottom: 4%; border-radius: 30px; width: 80 vw;"></v-img>
+                style="margin-bottom: 4%; border-radius: 30px; width: 80vw;"></v-img>
               <v-img src="../../../images/homepage/girlarmy.png" style="border-radius: 30px; min-width: 250px;"></v-img>
             </v-col>
             <v-col cols="3" style>
               <v-img src="../../../images/homepage/microphone.png"
                 style="margin-bottom: 4%; border-radius: 30px; min-width: 250px; max-height: auto; height: auto;"></v-img>
               <v-img src="../../../images/homepage/girlvr.png"
-                style="border-radius: 30px; min-width: 250pxpx; max-height: 350;"></v-img>
+                style="border-radius: 30px; min-width: 250px; max-height: 350px;"></v-img>
             </v-col>
           </v-row>
         </v-container>
@@ -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,27 +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/clientPlugin';
-import { ref } from 'vue';
-import { useRouter } from 'vue-router';
-
+import {useClient} from "@/plugins/clientPlugin.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([]);
-let errorNoAccessSnackBar = ref(false);
-
-async function callBackend() {
+const callBackend = async () => {
   try {
-    const response = await client.get('/api/TodoItems?ListId=1&PageNumber=1&PageSize=10');
-    const responseItems = response.data.items;
-    const orderedResponseItems = responseItems.sort((a, b) => a.id - b.id);
-    itemList.value = orderedResponseItems
-
+    const response = await api.get('/api/TodoItems?ListId=1&PageNumber=1&PageSize=10');
+    itemList.value = response.data.items;
   } catch (error) {
     errorNoAccessSnackBar.value = true;
   }
@@ -434,8 +423,6 @@ async function callBackend() {
 const goToLoginPage = () => {
   router.push('/login');
 }
-
-
 </script>
 
 <style src="../../cssstyle/index.css"></style>