Merged PR 87: UpdateCurrentUser into Main

src/App.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-app>
+  <v-app v-if="isUserLoaded">
     <div class="m-0 flex flex-column h-screen">
       <Header @toggle-sidebar="toggleSidebar" class="fixed w-full z-50 top-0 p-2"></Header>
       <div class="flex flex-row relative">
@@ -27,20 +27,30 @@
   </v-app>
 </template>
 
-<script setup>
+<script async setup>
 import Header from "@/views/main/Header.vue";
 import Footer from "@/views/main/Footer.vue";
 import SideBar from "@/views/main/SideBar.vue";
-import {ref, onMounted, onUnmounted} from 'vue';
+import {ref, onMounted, onUnmounted, onBeforeMount} from 'vue';
-import StripePayment from "@/views/StripePayment.vue";
 import {eventBus} from '@/eventBus.js';
+import {useUserStore} from "@/stores/user.js";
+import {useClient} from "@/plugins/api.js";
 
 const hideSideBar = ref(false);
+const isUserLoaded = ref(false);
 const showPopup = ref(false);
 const popup = ref(null);
 const popupButton = ref(null);
 let closeSidebarTimer = null;
 
+let client = useClient();
+let userStore = useUserStore();
+
+onBeforeMount(async () => {
+  await userStore.setCurrentUser(client);
+  isUserLoaded.value = true;
+});
+
 const toggleSidebar = () => {
   hideSideBar.value = !hideSideBar.value;
 };

src/models/myUserModel.js

@@ -1,4 +1,7 @@
 import UserTransactionsModel from "@/models/userTransactionsModel.js";
+import SocialNetworksModel from "@/models/socialNetworksModel.js";
+import ProfileColorsModel from "@/models/profileColorsModel.js";
+import StoredDataUrlsModel from "@/models/storedDataUrlsModel.js";
 
 export default class MyUserModel
 {
@@ -6,6 +9,18 @@ export default class MyUserModel
     firstName = "";
     lastName = "";
     userName = "";
+    occupation = "";
+    email = "";
+    phoneNumber = "";
+    birthDate = "";
+    country = "";
+    city = "";
+    address = "";
+    about = "";
+    description = "";
+    socialNetworks = new SocialNetworksModel();
+    profileColors = new ProfileColorsModel();
+    storedDataUrlsModel = new StoredDataUrlsModel();
     totalBalance = "";
     userTransactions = [];
 
@@ -21,4 +36,11 @@ export default class MyUserModel
 
         return userModel;
     }
+    
+    static getDefaultUser(){
+        const defaultUser = new MyUserModel();
+        defaultUser.userName = "Anonymous"
+        
+        return defaultUser;
+    }
 }

src/models/profileColorsModel.js

@@ -0,0 +1,11 @@
+export default class ProfileColorsModel
+{
+    bannerTop = "";
+    bannerBottom = "";
+    accent = "";
+    menu = "";
+
+    static createFromApiResult(apiResult){
+        return Object.assign(new ProfileColorsModel(), apiResult)
+    }
+}

src/models/socialNetworksModel.js

@@ -0,0 +1,15 @@
+export default class SocialNetworksModel
+{
+    facebookUrl = "";
+    instagramUrl = "";
+    xUrl = "";
+    linkedInUrl = "";
+    tikTokUrl = "";
+    youtubeUrl = "";
+    redditUrl = "";
+    yourWebsiteUrl = "";
+
+    static createFromApiResult(apiResult){
+        return Object.assign(new SocialNetworksModel(), apiResult)
+    }
+}

src/models/storedDataUrlsModel.js

@@ -0,0 +1,10 @@
+export default class StoredDataUrlsModel
+{
+    bannerPictureUrl = "";
+    profilePictureUrl = "";
+    websiteIconUrl = "";
+
+    static createFromApiResult(apiResult){
+        return Object.assign(new StoredDataUrlsModel(), apiResult)
+    }
+}

src/stores/user.js

@@ -0,0 +1,27 @@
+import { ref } from 'vue'
+import { defineStore } from 'pinia'
+import MyUserModel from "@/models/myUserModel.js";
+
+export const useUserStore = defineStore('user', () => {
+    const user = ref({});
+
+    function getCurrentUser() {
+        return this.user.value;
+    }
+    async function setCurrentUser(client) {
+        try {
+            const myUser = await client.get("/api/GetMyUser");
+            this.user.value = MyUserModel.createFromApiResult(myUser.data);
+        } catch (e){
+            this.user.value = MyUserModel.getDefaultUser();
+            console.log("User not logged.")
+        }
+    }
+
+    async function updateCurrentUser(client, myUserModel) {
+        this.user.value = myUserModel;
+        await client.patch("/api/UpdateMyUser/profile", myUserModel)
+    }
+
+    return { user, getCurrentUser, setCurrentUser, updateCurrentUser }
+})

src/views/main/Aboutyou.vue

@@ -7,42 +7,42 @@
           <div class="flex justify-between items-center mb-2">
             <label class="text-lg">Prénom</label>
           </div>
-          <v-text-field v-model="firstName" label="Prénom" variant="outlined"></v-text-field>
+          <v-text-field v-model="user.firstName" label="Prénom" variant="outlined"></v-text-field>
         </div>
 
         <div>
           <div class="flex justify-between items-center mb-2">
             <label class="text-lg">Nom</label>
           </div>
-          <v-text-field v-model="lastName" label="Nom" variant="outlined"></v-text-field>
+          <v-text-field v-model="user.lastName" label="Nom" variant="outlined"></v-text-field>
         </div>
 
         <div>
           <div class="flex justify-between items-center mb-2">
             <label class="text-lg">Occupation</label>
           </div>
-          <v-text-field v-model="occupation" label="Occupation" variant="outlined"></v-text-field>
+          <v-text-field v-model="user.occupation" label="Occupation" variant="outlined"></v-text-field>
         </div>
 
         <div>
           <div class="flex justify-between items-center mb-2">
             <label class="text-lg">Courriel</label>
           </div>
-          <v-text-field v-model="email" label="Courriel" variant="outlined"></v-text-field>
+          <v-text-field disabled v-model="user.email" label="Courriel" variant="outlined"></v-text-field>
         </div>
 
         <div>
           <div class="flex justify-between items-center mb-2">
             <label class="text-lg">Téléphone</label>
           </div>
-          <v-text-field v-model="phone" label="Téléphone" variant="outlined"></v-text-field>
+          <v-text-field v-model="user.phoneNumber" label="Téléphone" variant="outlined"></v-text-field>
         </div>
 
         <div>
           <div class="flex justify-between items-center mb-2">
             <label class="text-lg">Date de naissance (JJ/MM/AAAA)</label>
           </div>
-          <v-text-field v-model="birthDate" label="Date de naissance" variant="outlined"
+          <v-text-field v-model="user.birthDate" label="Date de naissance" variant="outlined"
                         :rules="[dateRule]"></v-text-field>
         </div>
 
@@ -50,35 +50,35 @@
           <div class="flex justify-between items-center mb-2">
             <label class="text-lg">Pays</label>
           </div>
-          <v-text-field v-model="country" label="Pays" variant="outlined"></v-text-field>
+          <v-text-field v-model="user.country" label="Pays" variant="outlined"></v-text-field>
         </div>
 
         <div>
           <div class="flex justify-between items-center mb-2">
             <label class="text-lg">Ville</label>
           </div>
-          <v-text-field v-model="city" label="Ville" variant="outlined"></v-text-field>
+          <v-text-field v-model="user.city" label="Ville" variant="outlined"></v-text-field>
         </div>
 
         <div>
           <div class="flex justify-between items-center mb-2">
             <label class="text-lg">Adresse</label>
           </div>
-          <v-text-field v-model="address" label="Adresse" variant="outlined"></v-text-field>
+          <v-text-field v-model="user.address" label="Adresse" variant="outlined"></v-text-field>
         </div>
 
         <div>
           <div class="flex justify-between items-center mb-2">
             <label class="text-lg">Titre A propos</label>
           </div>
-          <v-text-field v-model="titre" label="Titre A propos" variant="outlined"></v-text-field>
+          <v-text-field v-model="user.about" label="Titre A propos" variant="outlined"></v-text-field>
         </div>
 
         <div>
           <div class="flex justify-between items-center mb-2">
             <label class="text-lg">Description</label>
           </div>
-          <v-textarea v-model="description" label="Description" variant="outlined"></v-textarea>
+          <v-textarea v-model="user.description" label="Description" variant="outlined"></v-textarea>
         </div>
       </div>
     </div>
@@ -86,19 +86,12 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import { ref, defineProps } from 'vue';
+import MyUserModel from "@/models/myUserModel.js";
 
-const firstName = ref('');
+const props = defineProps({
-const lastName = ref('');
+  user: { type: MyUserModel },
-const occupation = ref('');
+});
-const email = ref('');
-const phone = ref('');
-const birthDate = ref('');
-const country = ref('');
-const city = ref('');
-const address = ref('');
-const titre = ref('');
-const description = ref('');
 
 const dateRule = value => {
   const datePattern = /^(0[1-9]|[12][0-9]|3[01])\/(0[1-9]|1[0-2])\/(19|20)\d{2}$/;

src/views/main/Header.vue

@@ -101,18 +101,17 @@
 </template>
 
 <script setup>
-import MyUserModel from "@/models/myUserModel.js";
-import {useClient} from "@/plugins/api.js";
 import {ref, onMounted, onBeforeUnmount} from "vue";
 import {eventBus} from '@/eventBus.js';
 import {useRouter} from 'vue-router';
+import {useUserStore} from "@/stores/user.js";
 
 const router = useRouter();
 const currentUserName = ref("Anonyme");
 const searchQuery = ref("");
 const showSearch = ref(false);
 let currentUser = null;
-const client = useClient();
+const userStore = useUserStore();
 
 const toggleSidebar = () => {
   eventBus.value.toggleSidebar();
@@ -151,15 +150,10 @@ const logout = () => {
   window.location.reload();
 };
 
-onMounted(async () => {
+onMounted( () => {
-  try {
+  currentUser = userStore.getCurrentUser();
-    const myUser = await client.get("/api/GetMyUser");
+  currentUserName.value = currentUser.userName;
-    const currentUserModel = MyUserModel.createFromApiResult(myUser.data);
+
-    currentUser = currentUserModel;
-    currentUserName.value = currentUserModel.userName;
-  } catch (error) {
-    console.log("User not logged");
-  }
   document.addEventListener('click', handleClickOutside);
 });
 

src/views/main/Profile.vue

@@ -2,32 +2,66 @@
   <div class="px-2">
     <div class="flex flex-col max-w-2xl mx-auto rounded-3xl shadow-2xl mt-2 mb-16">
 
-      <H1 class="text-center text-4xl bg-fuchsia-900 p-3 w-full rounded-t-3xl border-b-4 border-b-gray-200 font-sans text-white">
+      <h1 class="text-center text-4xl bg-fuchsia-900 p-3 w-full rounded-t-3xl border-b-4 border-b-gray-200 font-sans text-white">
         Personnaliser votre profil
-      </H1>
+      </h1>
       
-      <ProfileBanner></ProfileBanner>
+      <ProfileBanner :user="currentUser"></ProfileBanner>
-      <Aboutyou></Aboutyou>
+      <AboutYou :user="currentUser"></AboutYou>
-      <SocialLinks></SocialLinks>
+      <SocialLinks :social-networks="currentUser.socialNetworks"></SocialLinks>
 
       <div class="sticky inset-x-0 bottom-0 flex justify-center px-4 pb-4">
         <div class="flex space-x-2">
-          <v-btn class="save-btn" @click="saveAll">Enregistrer</v-btn>
+          <v-btn class="save-btn" @click="saveForm">Enregistrer</v-btn>
-          <router-link :to="`/${currentUserName}`">
+          <router-link :to="`/${currentUser.userName}`">
             <v-btn class="save-btn">Retour</v-btn>
           </router-link>
           
         </div>
       </div>
+
+      <v-snackbar v-model="snackbar" :timeout="1000">
+        Sauvegarde
+
+        <template v-slot:actions>
+          <v-btn color="green" variant="text" @click="snackbar = false">
+            Fermer
+          </v-btn>
+        </template>
+      </v-snackbar>
+      
     </div>
   </div>
 </template>
 
 <script async setup>
-import Aboutyou from "@/views/main/Aboutyou.vue";
+import AboutYou from "@/views/main/Aboutyou.vue";
 import SocialLinks from "@/views/main/SocialLinks.vue";
 import ProfileBanner from "@/views/main/ProfileBanner.vue";
-import DonationPopup from "@/views/main/DonationPopup.vue";
+import {onBeforeMount, ref} from "vue";
+import {useUserStore} from "@/stores/user.js";
+import MyUserModel from "@/models/myUserModel.js";
+import {useClient} from "@/plugins/api.js";
+
+const userStore = useUserStore();
+const client = useClient();
+
+const currentUser = ref(MyUserModel)
+const snackbar = ref(false);
+
+onBeforeMount( () => {
+  try {
+    currentUser.value = userStore.getCurrentUser();
+  } catch(error) {
+    console.log("User not logged")
+  }
+})
+
+async function saveForm(){
+  snackbar.value = true;
+  await userStore.updateCurrentUser(client, currentUser.value);
+}
+
 </script>
 
 

src/views/main/ProfileBanner.vue

@@ -1,28 +1,28 @@
 <template>
   <div>
     <div>
-      <div class="px-5 py-2 bg-fuchsia-800 text-white" :style="{ backgroundColor: accent2Color }" >
+      <div class="px-5 py-2 bg-fuchsia-800 text-white" :style="{ backgroundColor: user.profileColors.menu }" >
         <div class="flex justify-center text-2xl">Photo de couverture</div>
       </div>
       <div>
-        <div :style="{ backgroundColor: topColor }" class="flex h-4"></div>
+        <div :style="{ backgroundColor: user.profileColors.bannerTop }" class="flex h-4"></div>
         <img :src="bannerImageUrl" alt="Banner Image" class="w-full object-cover">
-        <div :style="{ backgroundColor: bottomColor }" class="h-4">
+        <div :style="{ backgroundColor: user.profileColors.bannerBottom }" class="h-4">
 
         </div>
         <div>
           <div class="space-x-4 flex justify-center py-2">
             <v-btn @click="openColorPicker('top')"
-                   :style="{ backgroundColor: topColor, color: getTextColor(topColor) }">Haut
+                   :style="{ backgroundColor: user.profileColors.bannerTop, color: getTextColor(user.profileColors.bannerTop) }">Haut
             </v-btn>
             <v-btn @click="openColorPicker('bottom')"
-                   :style="{ backgroundColor: bottomColor, color: getTextColor(bottomColor) }">Bas
+                   :style="{ backgroundColor: user.profileColors.bannerBottom, color: getTextColor(user.profileColors.bannerBottom) }">Bas
             </v-btn>
             <v-btn @click="openColorPicker('accent')"
-                   :style="{ backgroundColor: accentColor, color: getTextColor(accentColor) }">Accent1
+                   :style="{ backgroundColor: user.profileColors.accent, color: getTextColor(user.profileColors.accent) }">Accent1
             </v-btn>
-            <v-btn @click="openColorPicker('accent2')"
+            <v-btn @click="openColorPicker('menu')"
-                   :style="{ backgroundColor: accent2Color, color: getTextColor(accent2Color) }">Menu
+                   :style="{ backgroundColor: user.profileColors.menu, color: getTextColor(user.profileColors.menu) }">Menu
             </v-btn>
           </div>
         </div>
@@ -41,7 +41,7 @@
       </div>
       <div class="flex justify-center  py-4">
         <img :src="profilePictureUrl"
-             :style="{ borderColor: accentColor, borderWidth: '3px', borderStyle: 'solid' }"
+             :style="{ borderColor: user.profileColors.accent, borderWidth: '3px', borderStyle: 'solid' }"
              class="rounded-full max-w-48 max-w-48"
              alt="Profile Image">
       </div>
@@ -67,105 +67,73 @@
   </div>
 </template>
 
-<script>
+<script setup>
-import {ref} from 'vue';
+  import { ref, defineProps } from 'vue';
+  import MyUserModel from "@/models/myUserModel.js";
 
-export default {
+  const props = defineProps({
-  props: {
+  initialBannerImageUrl: { type: String, default: '/images/usersmedia/HutopyProfile/banners/banner01.png' },
-    initialTopColor: {type: String, default: '#6B0065'},
+  initialProfilePictureUrl: { type: String, default: '/images/usersmedia/HutopyProfile/profilepictures/profileHutopyProfile01.png' },
-    initialBottomColor: {type: String, default: '#A30E79'},
+  user: { type: MyUserModel },
-    initialAccentColor: {type: String, default: '#282286'},
+});
-    initialAccent2Color: {type: String, default: '#A526B6'},
+  
-    initialBannerImageUrl: {type: String, default: '/images/usersmedia/HutopyProfile/banners/banner01.png'},
+  const bannerImageUrl = ref(props.initialBannerImageUrl);
-    initialProfilePictureUrl: {
+  const profilePictureUrl = ref(props.initialProfilePictureUrl);
-      type: String,
-      default: '/images/usersmedia/HutopyProfile/profilepictures/profileHutopyProfile01.png'
-    },
-  },
-  setup(props) {
-    const topColor = ref(props.initialTopColor);
-    const bottomColor = ref(props.initialBottomColor);
-    const accentColor = ref(props.initialAccentColor);
-    const accent2Color = ref(props.initialAccent2Color);
 
-    const bannerImageUrl = ref(props.initialBannerImageUrl);
+  const bannerImage = ref(null);
-    const profilePictureUrl = ref(props.initialProfilePictureUrl);
+  const profilePicture = ref(null);
 
-    const bannerImage = ref(null);
+  const showColorPicker = ref(false);
-    const profilePicture = ref(null);
+  const selectedColor = ref('#F4F4F4');
+  const colorTarget = ref('');
 
-    const showColorPicker = ref(false);
+  const onBannerFileChange = (event) => {
-    const selectedColor = ref('#F4F4F4');
+  const file = event.target.files[0];
-    const colorTarget = ref('');
+  if (file) {
+  const reader = new FileReader();
+  reader.onload = (e) => {
+  bannerImageUrl.value = e.target.result;
+};
+  reader.readAsDataURL(file);
+}
+};
 
-    const onBannerFileChange = (event) => {
+  const onProfileFileChange = (event) => {
-      const file = event.target.files[0];
+  const file = event.target.files[0];
-      if (file) {
+  if (file) {
-        const reader = new FileReader();
+  const reader = new FileReader();
-        reader.onload = (e) => {
+  reader.onload = (e) => {
-          bannerImageUrl.value = e.target.result;
+  profilePictureUrl.value = e.target.result;
-        };
+};
-        reader.readAsDataURL(file);
+  reader.readAsDataURL(file);
-      }
+}
-    };
+};
 
-    const onProfileFileChange = (event) => {
+  const openColorPicker = (target) => {
-      const file = event.target.files[0];
+  colorTarget.value = target;
-      if (file) {
+  showColorPicker.value = true;
-        const reader = new FileReader();
+};
-        reader.onload = (e) => {
-          profilePictureUrl.value = e.target.result;
-        };
-        reader.readAsDataURL(file);
-      }
-    };
 
-    const openColorPicker = (target) => {
+  const applyColor = () => {
-      colorTarget.value = target;
+  if (colorTarget.value === 'top') {
-      showColorPicker.value = true;
+    props.user.profileColors.bannerTop = selectedColor.value;
-    };
+} else if (colorTarget.value === 'bottom') {
+    props.user.profileColors.bannerBottom = selectedColor.value;
+} else if (colorTarget.value === 'accent') {
+    props.user.profileColors.accent = selectedColor.value;
+} else if (colorTarget.value === 'menu') {
+    props.user.profileColors.menu = selectedColor.value;
+}
+  showColorPicker.value = false;
+};
 
-    const applyColor = () => {
+  const getTextColor = (bgColor) => {
-      if (colorTarget.value === 'top') {
+  // Simple function to determine if the text should be white or black based on the background color
-        topColor.value = selectedColor.value;
+  const color = bgColor.replace('#', '');
-      } else if (colorTarget.value === 'bottom') {
+  const r = parseInt(color.substr(0, 2), 16);
-        bottomColor.value = selectedColor.value;
+  const g = parseInt(color.substr(2, 2), 16);
-      } else if (colorTarget.value === 'accent') {
+  const b = parseInt(color.substr(4, 2), 16);
-        accentColor.value = selectedColor.value;
+  const brightness = (r * 299 + g * 587 + b * 114) / 1000;
-      } else if (colorTarget.value === 'accent2') {
+  return brightness > 155 ? '#000' : '#fff';
-        accent2Color.value = selectedColor.value; // Appliquer la nouvelle couleur
-      }
-      showColorPicker.value = false;
-    };
-
-    const getTextColor = (bgColor) => {
-      // Simple function to determine if the text should be white or black based on the background color
-      const color = bgColor.replace('#', '');
-      const r = parseInt(color.substr(0, 2), 16);
-      const g = parseInt(color.substr(2, 2), 16);
-      const b = parseInt(color.substr(4, 2), 16);
-      const brightness = (r * 299 + g * 587 + b * 114) / 1000;
-      return brightness > 155 ? '#000' : '#fff';
-    };
-
-    return {
-      topColor,
-      bottomColor,
-      accentColor,
-      accent2Color,
-      bannerImageUrl,
-      profilePictureUrl,
-      bannerImage,
-      profilePicture,
-      showColorPicker,
-      selectedColor,
-      colorTarget,
-      onBannerFileChange,
-      onProfileFileChange,
-      openColorPicker,
-      applyColor,
-      getTextColor,
-    };
-  },
 };
 </script>

src/views/main/SocialLinks.vue

@@ -22,15 +22,19 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import {defineProps, ref} from 'vue';
+
+const props = defineProps({
+  socialNetworks: { type: Object },
+});
 
 const socialNetworks = ref([
-  { label: 'Instagram', field: 'instagram', value: '' },
+  { label: 'Instagram', field: 'instagram', value: props.socialNetworks.instagramUrl },
-  { label: 'TikTok', field: 'tiktok', value: '' },
+  { label: 'TikTok', field: 'tiktok', value: props.socialNetworks.tikTokUrl },
-  { label: 'Facebook', field: 'facebook', value: '' },
+  { label: 'Facebook', field: 'facebook', value: props.socialNetworks.facebookUrl },
-  { label: 'X', field: 'X', value: '' },
+  { label: 'X', field: 'X', value: props.socialNetworks.xUrl },
-  { label: 'LinkedIn', field: 'linkedin', value: '' },
+  { label: 'LinkedIn', field: 'linkedin', value: props.socialNetworks.linkedInUrl },
-  { label: 'Site Web', field: 'website', value: '' }
+  { label: 'Site Web', field: 'website', value: props.socialNetworks.yourWebsiteUrl }
 ]);
 
 const iconUrl = ref('');

src/views/main/Wallet.vue

@@ -44,16 +44,16 @@
   </v-container>
 </template>
 
-<script setup>
+<script async setup>
 import { onBeforeMount, ref, computed } from 'vue';
 import { useRouter } from 'vue-router';
-import { useClient } from "@/plugins/api.js";
+import {useUserStore} from "@/stores/user.js";
 
-const client = useClient();
+const userStore = useUserStore();
 const router = useRouter();
 
 const userTransactions = ref([]);
-const totalBalance = ref(0);
+const totalBalance = ref("");
 const isModalOpen = ref(false);
 
 const formattedTransactions = computed(() => {
@@ -72,11 +72,17 @@ const formattedBalance = computed(() => {
 
 const transactionCount = computed(() => userTransactions.value.length);
 
-onBeforeMount(async () => {
+onBeforeMount( () => {
   try {
-    const myUser = await client.get("/api/GetMyUser");
+    const myUser = userStore.getCurrentUser();
-    userTransactions.value = myUser.data.userTransactions;
+
-    totalBalance.value = myUser.data.totalBalance;
+    userTransactions.value = myUser.userTransactions;
+    totalBalance.value = myUser.totalBalance;
+    
+    console.log(userTransactions.value);
+    console.log(totalBalance.value);
+    console.log(formattedTransactions);
+    console.log(formattedBalance);
   } catch (error) {
     navigateToHome();
   }