Merge remote-tracking branch 'origin/main' into Homeview

src/views/main/CreatorFolio.vue

@@ -112,54 +112,22 @@
                   <v-img src="../../../images/hutopy.png" alt="Description de l'image"
                     style="height: 150px; width: 300px;" class="mx-auto" :elevation="10"></v-img>
                   <v-list dense class="main-background">
-                    <v-list-item-group>
+                    <v-list-item v-for="item in navigationItems">
-                      <router-link v-for="(item, index) in navigationItems" :key="index" :to="item.link">
+                      <router-link :to="item.link">
                         <v-btn text class="d-flex align-start align-center main-background" elevation="0"
                           outlined="false">
                           <v-icon left class="mr-4">{{ item.icon }}</v-icon>
                           {{ item.text }}
                         </v-btn>
                       </router-link>
-                    </v-list-item-group>
+                    </v-list-item>
-                  </v-list>
+                    <v-list-item>
-                </v-col>
-                <!-- Tools -->
-                <v-col cols="12" class="px-0">
-                  <v-list dense class="d-flex align-start align-center main-background">
-                    <v-list-item-group>
-                      <router-link v-for="(item, index) in tools" :key="index" :to="item.link">
-                        <v-btn text class="btn-custom" elevation="0" outlined="false">
-                          <v-icon left class="mr-4">{{ item.icon }}</v-icon>
-                          {{ item.text }}
-                        </v-btn>
-                      </router-link>
-                    </v-list-item-group>
-                  </v-list>
-                </v-col>
-                <!-- Log-out -->
-                <v-col cols="12" class="px-0 logout-button">
-                  <v-btn text class="d-flex align-start main-background align-center" elevation="0" outlined="false">
-                    <v-icon left class="mr-4">mdi-logout</v-icon>
-                    Déconnexion
-                  </v-btn>
-                </v-col>
-              </v-container>
-
-            </v-col>
-
-
-          </v-row>
-
-          <v-row style="height: 1400px;"></v-row>
-
-          <!-- Wallet -->
-          <v-row>
                       <v-dialog transition="dialog-top-transition" width="auto">
                         <template v-slot:activator="{ props: activatorProps }">
-                <v-btn v-bind="activatorProps" text class="text-left" block size="x-large"
+                          <v-btn v-bind="activatorProps" text class="d-flex align-start align-center main-background" elevation="0"
-                  style="margin-left: -20%; background-color: #f4f4f4; transform: scale(1.3);" elevation="0">
+                                 outlined="false">
-                  <v-icon color="black">mdi-wallet</v-icon>
+                            <v-icon left class="mr-4">mdi-wallet</v-icon>
-                  <div @click="isActive.value = false">PORTEFEUILLE</div>
+                            <p @click="isActive.value = false">Bourse</p>
                           </v-btn>
                         </template>
 
@@ -238,7 +206,24 @@
                           </v-card>
                         </template>
                       </v-dialog>
+                    </v-list-item>
+                  </v-list>
+                </v-col>
+
+                <!-- Log-out -->
+                <v-col cols="12" class="px-0 logout-button">
+                  <v-btn text class="d-flex align-start main-background align-center" elevation="0" outlined="false">
+                    <v-icon left class="mr-4">mdi-logout</v-icon>
+                    Déconnexion
+                  </v-btn>
+                </v-col>
+              </v-container>
+
+            </v-col>
+
+
           </v-row>
+          <v-row style="height: 1400px;"></v-row>
         </v-col>
 
       </v-col>
@@ -475,44 +460,31 @@
 import DefaultLayout from '@/layouts/DefaultLayout.vue';
 import FooterLayout from '@/layouts/FooterLayout.vue';
 import StripePayment from '../StripePayment.vue';
-</script>
 
-<script>
-export default {
-  data() {
-    return {
-      imageSrc: '../../../images/guillaimeaime3x.png',
-      profilePicture: '../../../images/guillaume.png',
-      name: 'Guillaume Mousseau',
-      title: 'Créateur de contenus',
-      facebookLink: 'www.facebook.com',
-      instagramLink: 'www.instagram.com',
-      xLink: 'x.com',
-      tiktokLink: 'tiktok.com',
-      drawer: false,
-      drawerbottom: false,
 
-      items: [
+let imageSrc = '../../../images/guillaimeaime3x.png';
-        { title: 'Item 1' },
+let profilePicture = '../../../images/guillaume.png';
-        { title: 'Item 2' },
+
-        { title: 'Item 3' },
+let name = 'Guillaume Mousseau'
-      ],
+let title = 'Créateur de contenus'
-      navigationItems: [
+let drawerbottom = false
+let navigationItems = [
     { icon: 'mdi-home', text: 'Accueil', link: 'home' },
     { icon: 'mdi-account-group', text: 'Amis', link: '/contact' },
     { icon: 'mdi-file-document-outline', text: 'Contenu', link: '/creatorfolio' }
-      ],
+];
-      tools: [
+let tools = [
   { icon: 'mdi-wallet', text: 'Bourse', link: '/portefeuille' },
-      ]
+]
-    };
+
-  },
+
-};
+let items = [
+  {icon: "icon", text: "text"},
+  {icon: "icon2", text: "text2"},
+]
+
 </script>
 
-
-
-
 <style scoped>
 .Hutopy-menu-sticky {
   position: sticky;

src/views/main/HomeView.vue

@@ -368,7 +368,7 @@
     </v-snackbar>
 
     <v-list style="background-color: #F4F4F4;" lines="one">
-      <v-list-item v-for=" item  in  itemList " :key="item" :title="item.id" :subtitle="item.title"></v-list-item>
+      <v-list-item v-for=" item  in  itemList " :key="item" :title="item.firstName" :subtitle="item.lastName"></v-list-item>
     </v-list>
     <FooterLayout></FooterLayout>
   </div>
@@ -392,10 +392,8 @@ let errorNoAccessSnackBar = ref(false);
 
 async function callBackend() {
   try {
-    const response = await client.get('/api/TodoItems?ListId=1&PageNumber=1&PageSize=10');
+    const response = await client.get('/api/JoinUs?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;