From 431f554e00a54bac667222107cf3af2d12e2d992 Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Wed, 18 Oct 2023 08:35:01 -0400
Subject: [PATCH 01/26] deploy

---
 client/.gitignore    | 1 +
 client/firebase.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/.gitignore b/client/.gitignore
index f70f6e9e..da66d4d7 100644
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -30,3 +30,4 @@ yarn-error.log*
 # firebase
 **/.firebase
 /.firebaserc
+/firebase.json
diff --git a/client/firebase.json b/client/firebase.json
index 78a08cb7..f6682b2a 100644
--- a/client/firebase.json
+++ b/client/firebase.json
@@ -1,6 +1,6 @@
 {
   "hosting": {
-    "site": "sofan-app",
+    "site": "staging-sofan-app",
     "public": "build",
     "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
     "rewrites": [

From 29a848a1651baea4aa73c4e558b4c571c71acf34 Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Sun, 22 Oct 2023 20:11:45 -0400
Subject: [PATCH 02/26] real time fix

---
 client/src/Pages/Home/Home.js | 83 +++++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 29 deletions(-)

diff --git a/client/src/Pages/Home/Home.js b/client/src/Pages/Home/Home.js
index db31d771..717fcdfd 100644
--- a/client/src/Pages/Home/Home.js
+++ b/client/src/Pages/Home/Home.js
@@ -160,8 +160,8 @@ function Home({
   const [isUserFanArray, setIsUserFanArray] = useState([]);
   useEffect(() => {
     // Désactiver le scroll au chargement
-      window.scrollTo(0, 0);
-      // Réactiver le scroll
+    window.scrollTo(0, 0);
+    // Réactiver le scroll
   }, []);
   useEffect(() => {
     // console.log("Hello");
@@ -169,7 +169,7 @@ function Home({
     // console.log(loggedInUser);
     if (
       dataPost &&
-      loggedInUser 
+      loggedInUser
       // && (loggedInUser?.metamask || loggedInUser?.web3auth)
     ) {
       // 1 for loop de data post
@@ -255,7 +255,7 @@ function Home({
         // console.log(tempIsUserFanArray);
         setIsUserFanArray(tempIsUserFanArray);
       };
-console.log("appel de la fontion feedDataFrom")
+      console.log("appel de la fontion feedDataFrom");
       feedDataFromAlchemyAndFirebase();
 
       // if (loggedInUser.metamask) {
@@ -272,30 +272,35 @@ console.log("appel de la fontion feedDataFrom")
     }
   }, [dataPost, loggedInUser]);
 
-  const getCommentCount = async (postId) => {
+  const getCommentCount = (postId) => {
     const commentsRef = collection(db, `feed_post/${postId}/post_comments`);
     const q = query(commentsRef, where("status", "==", true));
-
-    const querySnapshot = await getDocs(q);
-    const commentCount = querySnapshot.size;
-
-    setCommentCounts((prevState) => ({ ...prevState, [postId]: commentCount }));
+  
+    // Real-time listener for comments
+    const unsubscribe = onSnapshot(q, (querySnapshot) => {
+      const commentCount = querySnapshot.size;
+      setCommentCounts((prevState) => ({ ...prevState, [postId]: commentCount }));
+    });
+  
+    // Save this unsubscribe somewhere so you can call it when you don't need it anymore.
+    return unsubscribe;
   };
+  
 
   useEffect(() => {
     const fetchData = async () => {
       setIsLoading(true);
-
+  
       const userIdToFind = loggedInUser?.id;
       const usersRef = collection(db, "users");
       const q1 = query(usersRef, where("account_type", "==", "athlete"));
-
+  
       const querySnapshot1 = await getDocs(q1);
       const foundAthletes = [];
       for (let doc of querySnapshot1.docs) {
         const athleteId = doc.id;
         const userData = doc.data();
-
+  
         // Accéder à la collection athlete_data pour l'athlète spécifique
         const athleteDataRef = collection(
           db,
@@ -303,7 +308,7 @@ console.log("appel de la fontion feedDataFrom")
           athleteId,
           "athlete_data"
         );
-
+  
         // Récupérer le document
         const athleteDataSnapshot = await getDocs(athleteDataRef);
         athleteDataSnapshot.forEach((doc) => {
@@ -324,32 +329,52 @@ console.log("appel de la fontion feedDataFrom")
         });
       }
       setAthletesFollowing(foundAthletes);
-
+  
+      const unsubscribes = []; // To keep track of all unsubscribe functions for comments
+  
       const feedPostCollectionRef = collection(db, "feed_post");
       const q2 = query(
         feedPostCollectionRef,
         where("status", "==", true),
         orderBy("createdAt", "desc")
       );
-
-      const querySnapshot2 = await getDocs(q2);
-      const feedData = [];
-      querySnapshot2.forEach((doc) => {
-        feedData.push({ ...doc.data(), id: doc.id, isDropdownClicked: false });
-      });
-      setPostData(feedData);
-      setIsLoading(false);
-      feedData.forEach((post) => {
-        getCommentCount(post.id);
+  
+      // Real-time listener for feed posts
+      const unsubscribePosts = onSnapshot(q2, (querySnapshot) => {
+        const feedData = [];
+        querySnapshot.forEach((doc) => {
+          feedData.push({
+            ...doc.data(),
+            id: doc.id,
+            isDropdownClicked: false,
+          });
+        });
+        setPostData(feedData);
+        setIsLoading(false);
+  
+        unsubscribes.forEach(unsub => unsub()); // Unsubscribe previous comment listeners
+        unsubscribes.length = 0; // Reset unsubscribe array
+  
+        feedData.forEach((post) => {
+          const unsubscribeComments = getCommentCount(post.id);
+          unsubscribes.push(unsubscribeComments);
+        });
       });
+  
+      return () => {
+        unsubscribePosts(); // Cleanup: unsubscribe from real-time posts listener
+        unsubscribes.forEach(unsub => unsub()); // Cleanup: unsubscribe from all real-time comment listeners
+      };
     };
-
+  
     fetchData();
-
+  
+    // Cleanup could also go here if needed for other async operations
     return () => {
-      // Cleanup code here if needed
+      // ...
     };
-  }, [loggedInUser]);
+  }, [loggedInUser]); // or whatever dependency array makes sense here
+  
   // retrouver les athlete supportés
 
   const handleDropdownPostFeedClick = useCallback(

From f399cbc488a0c732ebf92bb961c9190addb97082 Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Sun, 22 Oct 2023 20:46:52 -0400
Subject: [PATCH 03/26] Schedule post

---
 .../src/Components/CreationPostPoll/CreationPostPoll.js  | 9 +++++++--
 .../src/Components/CreationPostPoll/PostPoll/PostPoll.js | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/src/Components/CreationPostPoll/CreationPostPoll.js b/client/src/Components/CreationPostPoll/CreationPostPoll.js
index ac3867ac..f7b4375c 100644
--- a/client/src/Components/CreationPostPoll/CreationPostPoll.js
+++ b/client/src/Components/CreationPostPoll/CreationPostPoll.js
@@ -25,7 +25,8 @@ const CreationPostPoll = ({ userId }) => {
   const [text, setText] = useState("");
   const [loadingPublishPost, setLoadingPublishPost] = useState(false);
   const [validationPublishPost, setValidationPublishPost] = useState(false);
-
+  const [dateTimeValue, setDateTimeValue] = useState();
+  console.log(dateTimeValue);
   const [pollData, setPollData] = useState({
     choices: [
       { id: 1, text: "" },
@@ -103,6 +104,7 @@ const CreationPostPoll = ({ userId }) => {
           pollData,
           likes: [],
           status: true,
+          ...(dateTimeValue && { publish_timestamp: dateTimeValue })
         };
       } else {
         const postType = "poll";
@@ -116,6 +118,7 @@ const CreationPostPoll = ({ userId }) => {
           pollData,
           likes: [],
           status: true,
+          ...(dateTimeValue && { publish_timestamp: dateTimeValue })
         };
       }
 
@@ -124,7 +127,8 @@ const CreationPostPoll = ({ userId }) => {
       try {
         // Upload the post object to Firestore
         // const postRef = collection(db, "scheduled_posts");
-        const postRef = collection(db, "feed_post");
+        const collectionName = dateTimeValue ? "scheduled_posts" : "feed_post";
+        const postRef = collection(db, collectionName);
         let postUid;
         await addDoc(postRef, post).then((snapshot) => {
           postUid = snapshot.id;
@@ -275,6 +279,7 @@ const CreationPostPoll = ({ userId }) => {
             handleTextChange={handleTextChange}
             pollData={pollData}
             setPollData={setPollData}
+            setDateTimeValue={setDateTimeValue}
           />
         ) : loadingPublishPost ? (
           <>
diff --git a/client/src/Components/CreationPostPoll/PostPoll/PostPoll.js b/client/src/Components/CreationPostPoll/PostPoll/PostPoll.js
index 497b2c89..c33a42ae 100644
--- a/client/src/Components/CreationPostPoll/PostPoll/PostPoll.js
+++ b/client/src/Components/CreationPostPoll/PostPoll/PostPoll.js
@@ -18,10 +18,10 @@ const PostPoll = ({
   handleTextChange,
   pollData,
   setPollData,
+  setDateTimeValue,
 }) => {
   const [addOption, setAddOption] = useState(0);
   const [selectedDate, setSelectedDate] = useState(new Date());
-  const [dateTimeValue, setDateTimeValue] = useState();
   const [isProgrammedPostClicked, setIsProgrammedPostClicked] = useState();
   const ref = useRef();
   const handleAddPictureClick = () => {

From f2c63cba3a39b9dbc522415bc7001968bbbfc6a8 Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Mon, 23 Oct 2023 00:05:00 -0400
Subject: [PATCH 04/26] Update banner & avatar backend ready, Bio Update Done

---
 .../PopUpEditProfile/PopUpEditProfile.js      | 253 +++++++++++-------
 1 file changed, 158 insertions(+), 95 deletions(-)

diff --git a/client/src/Components/PopUpEditProfile/PopUpEditProfile.js b/client/src/Components/PopUpEditProfile/PopUpEditProfile.js
index 48059ac8..10b32a79 100644
--- a/client/src/Components/PopUpEditProfile/PopUpEditProfile.js
+++ b/client/src/Components/PopUpEditProfile/PopUpEditProfile.js
@@ -2,27 +2,28 @@ import React, { useState, useRef, useEffect, useCallback } from "react";
 import Modal from "../Modal/Modal";
 import Cropper from "react-easy-crop";
 import { getCroppedImg } from "../LoginSignupPopUp/SetupProfile/CanvasUtils";
-// import {
-//   db,
-//   storage,
-//   ref,
-//   uploadBytes,
-//   getDownloadURL,
-// } from "../../Configs/firebase";
-// import {
-//   collection,
-//   addDoc,
-//   updateDoc,
-//   query,
-//   where,
-//   getDocs,
-// } from "firebase/firestore";
+import {
+  db,
+  storage,
+  ref,
+  uploadBytes,
+  getDownloadURL,
+} from "../../Configs/firebase";
+import {
+  collection,
+  addDoc,
+  updateDoc,
+  query,
+  where,
+  getDocs,
+} from "firebase/firestore";
 import previousArrow from "../../Assets/Image/arrow-previous.svg";
 import Img from "../../Assets/Image/img.svg";
 import "./PopUpEditProfile.css";
 import greenCross from "../../Assets/Image/greencross-offers.svg";
 import redCross from "../../Assets/Image/redcross-offers.svg";
 import LoadingAnimation from "../LoadingAnimation/LoadingAnimation";
+import { ImageUrlToFile } from "../../Utils/fileFunctions";
 // import LoadingAnimation from "../LoadingEllipsisAnimation/LoadingAnimation";
 
 // afficher les infos de la bdd en provenance de la page user/athlete + J'ai mis en commentaire les mêmes fonctions liés au backend que dans signup garde ce que tu as à garder et supprime le reste
@@ -54,6 +55,8 @@ const PopUpEditProfile = ({
   const [croppedAreaPixels, setCroppedAreaPixels] = useState();
   const [croppedBanner, setCroppedBanner] = useState();
   const [croppedAvatar, setCroppedAvatar] = useState();
+  const [retrievedBanner, setRetrievedBanner] = useState();
+  const [retrievedAvatar, setRetrievedAvatar] = useState();
   const [loadingEditProfile, setLoadingEditProfile] = useState();
   const [validationEditProfile, setValidationEditProfile] = useState();
   const [errorEditProfile, setErrorEditProfile] = useState(false);
@@ -83,91 +86,116 @@ const PopUpEditProfile = ({
     setCurrentlyCroppingAvatar(false);
     setCurrentlyCroppingBanner(false);
   }
-  // const updateBannerPath = async (uid, path) => {
-  //   try {
-  //     const q = query(collection(db, "users"), where("id", "==", uid));
-  //     const querySnapshot = await getDocs(q);
+  const handleBannerUpload = async (file, croppedImage) => {
+    if (file && file.type.substr(0, 5) === "image") {
+      try {
+        let newFile = await ImageUrlToFile(croppedImage, file.name);
+        // Upload the file to Firebase Storage
+        const createdAt = new Date();
+        const imagePath = `user_profile/banners/sofan_user_#${
+          allUserInfo.id
+        }#_banner_${createdAt.getTime()}_${file.name}`;
+        const imageRef = ref(storage, imagePath);
+        uploadBytes(imageRef, newFile).then(() => {
+          getDownloadURL(ref(storage, imagePath)).then((url) => {
+            updateBannerPath(allUserInfo.id, url);
+          });
+          console.log("Uploaded a blob or file!");
+        });
 
-  //     if (!querySnapshot.empty) {
-  //       querySnapshot.forEach((doc) => {
-  //         const userRef = doc.ref;
-  //         const updatedData = { profile_banner: path };
+        console.log("Image uploaded successfully!");
+      } catch (error) {
+        console.error("Error uploading image:", error);
+      }
+      setBanner(file);
+    } else {
+      console.log("File is not an image.");
+    }
+  };
 
-  //         updateDoc(userRef, updatedData)
-  //           .then(() => {
-  //             console.log("Banner path updated successfully!");
-  //           })
-  //           .catch((error) => {
-  //             console.error("Error updating banner path:", error);
-  //           });
-  //       });
-  //     } else {
-  //       console.log("No user found");
-  //     }
-  //   } catch (err) {
-  //     console.error(err);
-  //     throw err;
-  //   }
-  // };
+  const handleAvatarUpload = async (file, croppedImage) => {
+    // Access the selected file(s) using fileInputRef.current.files
+    // Process the files as needed
+    if (file && file.type.substr(0, 5) === "image") {
+      try {
+        let newFile = await ImageUrlToFile(croppedImage, file.name);
+        const createdAt = new Date();
+        const imagePath = `user_profile/avatars/sofan_user_#${
+          allUserInfo.id
+        }#_avatar_${createdAt.getTime()}_${file.name}`;
+        const imageRef = ref(storage, imagePath);
+        uploadBytes(imageRef, newFile).then(() => {
+          getDownloadURL(ref(storage, imagePath)).then((url) => {
+            updateAvatarPath(allUserInfo.id, url);
+          });
+          console.log("Uploaded a blob or file!");
+        });
 
-  // const updateAvatarPath = async (uid, path) => {
-  //   try {
-  //     const q = query(collection(db, "users"), where("id", "==", uid));
-  //     const querySnapshot = await getDocs(q);
+        console.log("Image uploaded successfully!");
+      } catch (error) {
+        console.error("Error uploading image:", error);
+      }
+      setProfile(file);
+    } else {
+      console.log("profile is not an image.");
+    }
+  };
 
-  //     if (!querySnapshot.empty) {
-  //       querySnapshot.forEach((doc) => {
-  //         const userRef = doc.ref;
-  //         const updatedData = { profile_avatar: path };
+  const updateBannerPath = async (uid, path) => {
+    try {
+      const q = query(collection(db, "users"), where("id", "==", uid));
+      const querySnapshot = await getDocs(q);
 
-  //         updateDoc(userRef, updatedData)
-  //           .then(() => {
-  //             console.log("Avatar path updated successfully!");
-  //           })
-  //           .catch((error) => {
-  //             console.error("Error updating Avatar path:", error);
-  //           });
-  //       });
-  //     } else {
-  //       console.log("No user found");
-  //     }
-  //   } catch (err) {
-  //     console.error(err);
-  //     throw err;
-  //   }
-  // };
+      if (!querySnapshot.empty) {
+        querySnapshot.forEach((doc) => {
+          const userRef = doc.ref;
+          const updatedData = { profile_banner: path };
 
-  const handleBannerUpload = async (event) => {
-    const file = event.target.files[0];
-    console.log(file);
-    if (file && file.type.substr(0, 5) === "image") {
-      // //const imagePath = file.name ? `user_profile/banners/`
-      // try {
-      //   // Upload the file to Firebase Storage
-      //   //shajeed
-      //   const createdAt = new Date();
-      //   const imagePath = `user_profile/banners/sofan_user_#${
-      //     allUserInfo.id
-      //   }#_banner_${createdAt.getTime()}_${file.name}`;
-      //   const imageRef = ref(storage, imagePath);
-      //   uploadBytes(imageRef, file).then(() => {
-      //     getDownloadURL(ref(storage, imagePath)).then((url) => {
-      //       updateBannerPath(allUserInfo.id, url);
-      //     });
-      //     console.log("Uploaded a blob or file!");
-      //   });
+          updateDoc(userRef, updatedData)
+            .then(() => {
+              console.log("Banner path updated successfully!");
+            })
+            .catch((error) => {
+              console.error("Error updating banner path:", error);
+            });
+        });
+      } else {
+        console.log("No user found");
+      }
+    } catch (err) {
+      console.error(err);
+      throw err;
+    }
+  };
 
-      //   // TODO: Save the image URL to Firestore or perform any additional actions
+  const updateAvatarPath = async (uid, path) => {
+    try {
+      const q = query(collection(db, "users"), where("id", "==", uid));
+      const querySnapshot = await getDocs(q);
 
-      //   console.log("Image uploaded successfully!");
-      // } catch (error) {
-      //   console.error("Error uploading image:", error);
-      // }
-      setBanner(file);
-    } else {
-      console.log("File is not an image.");
+      if (!querySnapshot.empty) {
+        querySnapshot.forEach((doc) => {
+          const userRef = doc.ref;
+          const updatedData = { profile_avatar: path };
+
+          updateDoc(userRef, updatedData)
+            .then(() => {
+              console.log("Avatar path updated successfully!");
+            })
+            .catch((error) => {
+              console.error("Error updating Avatar path:", error);
+            });
+        });
+      } else {
+        console.log("No user found");
+      }
+    } catch (err) {
+      console.error(err);
+      throw err;
     }
   };
+
+  
   // console.log(allUserInfo);
   const handleProfileImageInputChange = () => {
     // Access the selected file(s) using fileInputRef.current.files
@@ -258,8 +286,43 @@ const PopUpEditProfile = ({
     }
   }, [previewProfile, croppedAreaPixels]);
 
-  function handleSaveProfile() {
+  async function handleSaveProfile() {
     setLoadingEditProfile(true);
+    try {
+      handleBannerUpload(retrievedBanner, croppedBanner);
+      handleAvatarUpload(retrievedAvatar, croppedAvatar);
+    } catch (err) {
+      console.error("Upload Image error Line 790: ", err);
+    }
+
+    try {
+      const q = query(
+        collection(db, "users"),
+        where("id", "==", allUserInfo.id)
+      );
+      const querySnapshot = await getDocs(q);
+
+      if (!querySnapshot.empty) {
+        querySnapshot.forEach((doc) => {
+          const userRef = doc.ref;
+          const updatedData = { bio: bioText ? bioText : "" };
+
+          updateDoc(userRef, updatedData)
+            .then(() => {
+              console.log("Bio updated successfully!");
+            })
+            .catch((error) => {
+              console.error("Error updating Bio:", error);
+            });
+        });
+      } else {
+        console.log("No user found");
+      }
+    } catch (err) {
+      console.error(err);
+      throw err;
+    }
+
   }
   useEffect(() => {
     if (loadingEditProfile === true) {
@@ -359,7 +422,7 @@ const PopUpEditProfile = ({
                 // classes={{containerClassName : "popup-edit-profile-cursor-container", mediaClassName: "", cropAreaClassName: ""}}
               />
             </div>
-            <div className="popup-edit-profile-cropeasy-input-and-button-container">
+            <div className="controls-setup-profile popup-edit-profile-cropeasy-input-and-button-container">
               <input
                 type="range"
                 value={zoom}
@@ -426,7 +489,7 @@ const PopUpEditProfile = ({
               <input
                 type="file"
                 accept="image/*"
-                onChange={handleBannerUpload}
+                onChange={(e) => setRetrievedBanner(e.target.files[0])}
                 style={{ display: "none" }}
                 id="image-upload"
               />
@@ -458,7 +521,7 @@ const PopUpEditProfile = ({
               <label
                 htmlFor="profile-pic-upload"
                 className="popup-edit-profile-profile-pic-add-button"
-                // onClick={handleDisplayPreview}
+                //onClick={handleDisplayPreview}
               >
                 <img src={Img} alt="BOUTON LOGO IMAGE AJOUTER BANNIERE" />
                 <input
@@ -468,7 +531,7 @@ const PopUpEditProfile = ({
                   accept="image/*"
                   style={{ display: "none" }}
                   multiple={false}
-                  onChange={handleProfileImageInputChange}
+                  onChange={(e) => setRetrievedAvatar(e.target.files[0])}
                 />
               </label>
             </div>

From e9d32347241b139f1a38bc0c8a202df87e0264f2 Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Mon, 23 Oct 2023 03:52:29 -0400
Subject: [PATCH 05/26] BIG UPDATE: Utility Claim or Disclaim

Front End and Back End
---
 client/src/App.js                             |   2 +-
 .../LaunchpadCollectionLiveUtilities.js       |  14 +-
 client/src/Components/Modal/Modal.js          |  67 ++++---
 .../NftCollectionHeader.js                    |   2 +-
 .../UtilitiesComponent/UtilitiesComponent.css | 104 ++++++-----
 .../UtilitiesComponent/UtilitiesComponent.js  | 172 ++++++++++++++----
 .../UtilityClaimPopUp/UtilityClaimModal.css   |  43 +++++
 .../UtilityClaimPopUp/UtilityClaimModal.js    |  71 ++++++++
 .../LaunchpadCollectionLive.js                |  18 +-
 client/src/Pages/NftSingle/NftSingle.js       |   2 +-
 10 files changed, 362 insertions(+), 133 deletions(-)
 create mode 100644 client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.css
 create mode 100644 client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js

diff --git a/client/src/App.js b/client/src/App.js
index f1f34220..c1cd1247 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -616,7 +616,7 @@ function App() {
                   />
                   <Route path="*" element={<ErrorPage />} />
                   <Route
-                    path="/collectionlive/:id/:collectionAddressurl"
+                    path="/collectionlive/:athleteId/:collectionAddress"
                     element={
                       <LaunchpadCollectionLive isLogged={loggedInUser} />
                     }
diff --git a/client/src/Components/LaunchpadCollectionLiveUtilities/LaunchpadCollectionLiveUtilities.js b/client/src/Components/LaunchpadCollectionLiveUtilities/LaunchpadCollectionLiveUtilities.js
index 52a661da..77ead9fb 100644
--- a/client/src/Components/LaunchpadCollectionLiveUtilities/LaunchpadCollectionLiveUtilities.js
+++ b/client/src/Components/LaunchpadCollectionLiveUtilities/LaunchpadCollectionLiveUtilities.js
@@ -2,7 +2,8 @@ import React from "react";
 import UtilitiesComponent from "../UtilitiesComponent/UtilitiesComponent";
 import "./LaunchpadCollectionLiveUtilities.css";
 import { v4 as uuidv4 } from "uuid";
-function LaunchpadCollectionLiveUtilities({ utilitiesArray }) {
+function LaunchpadCollectionLiveUtilities({ utilitiesArray, loggedInUser }) {
+  
   return (
     <section className="launchpad-collection-live-utilities-container">
       <div className="launchpad-collection-live-utilities-title">Utilité</div>
@@ -10,10 +11,13 @@ function LaunchpadCollectionLiveUtilities({ utilitiesArray }) {
         utilitiesArray.map((utility) => (
           <UtilitiesComponent
             key={uuidv4()}
-            utilitiesTitle={utility?.title}
-            utilitiesStatus={utility?.claimed_status}
-            utilitiesDescription={utility?.description}
-            utilitiesDate={utility?.date ? new Date(utility.date.seconds * 1000).toDateString() : 'N/A'}
+            utility={utility}
+            loggedInUser={loggedInUser.isLogged}
+            unilityId={utility.id}
+            utilityTitle={utility?.title}
+            utilityStatus={utility?.claimed_status}
+            utilityDescription={utility?.description}
+            utilityDate={utility?.date ? new Date(utility.date.seconds * 1000).toDateString() : 'N/A'}
             launchpadCollectionLiveUtilities={true}
           />
         ))
diff --git a/client/src/Components/Modal/Modal.js b/client/src/Components/Modal/Modal.js
index 6d46c3b5..85d0aa0d 100644
--- a/client/src/Components/Modal/Modal.js
+++ b/client/src/Components/Modal/Modal.js
@@ -1,49 +1,56 @@
-import React, {useState ,useEffect} from "react";
+import React, { useState, useEffect } from "react";
 import "./Modal.css";
 import CrossBlack from "../../Assets/Image/cross.svg";
 import CrossWhite from "../../Assets/Image/cross_white.svg";
 // import { disableBodyScroll, enableBodyScroll, pixelScrolledAthleteProfilePage } from 'scroll-lock';
 const Modal = (props) => {
-    // Need top pass setState and style
-    // setState is the function link to the state that render the Modal Component
-    // style is an object to position the cross with top, bottom, left and right
-    // by default the cross is black. To make it white pass a prop named color and write "white"
-    // If you want to lock scroll when clicked add document.querySelector('body').classList.add('scroll-lock') to your handle HTML Element that triggers the modal to pop
+  // Need top pass setState and style
+  // setState is the function link to the state that render the Modal Component
+  // style is an object to position the cross with top, bottom, left and right
+  // by default the cross is black. To make it white pass a prop named color and write "white"
+  // If you want to lock scroll when clicked add document.querySelector('body').classList.add('scroll-lock') to your handle HTML Element that triggers the modal to pop
   const handleModalClick = (e) => {
     if (
       e.target.id === "modal-component" ||
-      e.target.id === "modal-component-cross" || e.target.id === "custom-close-button"
+      e.target.id === "modal-component-cross" ||
+      e.target.id === "custom-close-button"
     ) {
-        if(props.setState){
-      props.setState(false);
-        }
-        if(props.setState2){
-          props.setState2(false)
-        }
-        if(props.setState3){
-          props.setState3(false)
-        }
-        if(props.setState4){
-          props.setState4(false)
-        }
-        // retirer le scroll lock lorsque le modal n'est plus la
-        document.querySelector("body").classList.remove("scroll-lock");
-    } 
+      if (props.setState) {
+        props.setState(false);
+      }
+      if (props.setState2) {
+        props.setState2(false);
+      }
+      if (props.setState3) {
+        props.setState3(false);
+      }
+      if (props.setState4) {
+        props.setState4(false);
+      }
+      // retirer le scroll lock lorsque le modal n'est plus la
+      document.querySelector("body").classList.remove("scroll-lock");
+    }
   };
   useEffect(() => {
-    document.querySelector('body').classList.add('scroll-lock');
-  }, [])
+    document.querySelector("body").classList.add("scroll-lock");
+  }, []);
   // console.log(props.isPostClicked)
   return (
-    <div id="modal-component" 
-    style={{marginTop: props.dynamicPositionPopUpMargin}}
-    onMouseDown={handleModalClick}
-    onClick={props.handleSignupPopupDisplay}
+    <div
+      id="modal-component"
+      style={{ marginTop: props.dynamicPositionPopUpMargin }}
+      onMouseDown={handleModalClick}
+      onClick={props.handleSignupPopupDisplay}
     >
       <div className="modal-component-wrap">
-        <img id="modal-component-cross" src={props.color ? CrossWhite : CrossBlack} alt="cross" style={props.style} />
+        <img
+          id="modal-component-cross"
+          src={props.color ? CrossWhite : CrossBlack}
+          alt="cross"
+          style={props.style}
+        />
         {props.children}
-        </div>
+      </div>
     </div>
   );
 };
diff --git a/client/src/Components/NftCollectionHeader/NftCollectionHeader.js b/client/src/Components/NftCollectionHeader/NftCollectionHeader.js
index 91ab768f..7381e080 100644
--- a/client/src/Components/NftCollectionHeader/NftCollectionHeader.js
+++ b/client/src/Components/NftCollectionHeader/NftCollectionHeader.js
@@ -70,7 +70,7 @@ function NftCollectionHeader({
   let ethBidPriceConverted = (nftBidEth * ethPrice).toLocaleString("fr-FR", {
     maximumFractionDigits: 2,
   });
-  console.log(currentOwnerInfo);
+  //console.log(currentOwnerInfo);
   return (
     <section className="nft-collection-header-container">
       <div className="nft-collection-header-picture">
diff --git a/client/src/Components/UtilitiesComponent/UtilitiesComponent.css b/client/src/Components/UtilitiesComponent/UtilitiesComponent.css
index c1855249..cf7bc627 100644
--- a/client/src/Components/UtilitiesComponent/UtilitiesComponent.css
+++ b/client/src/Components/UtilitiesComponent/UtilitiesComponent.css
@@ -1,5 +1,5 @@
-.nft-collection-overview-utilities-one-container{
-    width: 100%;
+.nft-collection-overview-utilities-one-container {
+  width: 100%;
   height: 185px;
   display: flex;
   justify-content: center;
@@ -8,21 +8,27 @@
   border-radius: 10px;
   /* background-color: brown; */
   margin-bottom: 20px;
+  transition: 0.5s;
 }
-.nft-collection-overview-utilities-one-container:first-child{
-margin-top: 20px !important;
-}
-.nft-collection-overview-utilities-one-container:last-child{
-margin-bottom: 0;
+
+.nft-collection-overview-utilities-one-container:hover {
+  cursor: pointer;
+  box-shadow: 0px 0px 12px #f6d463;
 }
-.nft-collection-overview-utilities-one-wrap{
-    width: 574.64px;
-    height: 125px;
-    display: flex;
-    flex-direction: column;
-    /* align-items: center; */
-    /* background-color: darkolivegreen; */
 
+.nft-collection-overview-utilities-one-container:first-child {
+  margin-top: 20px !important;
+}
+.nft-collection-overview-utilities-one-container:last-child {
+  margin-bottom: 0;
+}
+.nft-collection-overview-utilities-one-wrap {
+  width: 574.64px;
+  height: 125px;
+  display: flex;
+  flex-direction: column;
+  /* align-items: center; */
+  /* background-color: darkolivegreen; */
 }
 .nft-collection-overview-utilities-one-header {
   height: 24px;
@@ -56,7 +62,7 @@ margin-bottom: 0;
   font-size: 20px;
 }
 .nft-collection-overview-one-header-status {
-    width: auto;
+  width: auto;
   max-width: 170px !important;
   height: 17px;
   display: flex;
@@ -69,42 +75,42 @@ margin-bottom: 0;
   padding: 1px;
 }
 .nft-collectin-overview-one-header-status-color-available {
-    width: 5px;
-    height: 5px;
-    border-radius: 50%;
-    margin: 3px;
-    margin-right: 4px;
-    background: #85D87E;
+  width: 5px;
+  height: 5px;
+  border-radius: 50%;
+  margin: 3px;
+  margin-right: 4px;
+  background: #85d87e;
 }
 .nft-collectin-overview-one-header-status-color-unavailable {
-    width: 5px;
-    height: 5px;
-    border-radius: 50%;
-    margin: 3px;
-    margin-right: 4px;
-    background: #EE4D4D;
+  width: 5px;
+  height: 5px;
+  border-radius: 50%;
+  margin: 3px;
+  margin-right: 4px;
+  background: #ee4d4d;
+}
+.nft-collection-overview-one-header-status-text {
+  max-width: 109px;
+  height: 14px;
+  padding-right: 5px;
+  font-size: 12px;
+  font-family: "britanica-heavy";
 }
-.nft-collection-overview-one-header-status-text{
-    max-width: 109px;
-    height: 14px;
-    padding-right: 5px;
-    font-size: 12px;
-    font-family: "britanica-heavy";
+.nft-collection-overview-utilities-one-description {
+  max-width: 542px;
+  height: 57px;
+  max-height: 57px;
+  margin-top: 10px;
+  margin-left: 32.64px;
+  /* background-color: mediumvioletred; */
+  text-align: justify;
 }
-.nft-collection-overview-utilities-one-description{
-    max-width: 542px;
-    height: 57px;
-    max-height: 57px;
-    margin-top: 10px;
-    margin-left:32.64px ;
-    /* background-color: mediumvioletred; */
-    text-align: justify;
+.nft-collection-overview-utilities-one-date {
+  max-width: 495px;
+  max-height: 14px;
+  margin-top: 20px;
+  margin-left: 32.64px;
+  font-family: "britanica-black";
+  /* background-color: lime; */
 }
-.nft-collection-overview-utilities-one-date{
-    max-width: 495px;
-    max-height: 14px;
-    margin-top: 20px;
-    margin-left:32.64px ;
-    font-family: "britanica-black";
-    /* background-color: lime; */
-}
\ No newline at end of file
diff --git a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
index a4a1531f..28cf867d 100644
--- a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
+++ b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
@@ -1,68 +1,160 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useMemo } from "react";
 import meetingsLogo from "../../Assets/Image/meetings-logo.svg";
 import liveLogo from "../../Assets/Image/live-logo.svg";
 import merchLogo from "../../Assets/Image/merch-logo.svg";
+import { useParams } from "react-router-dom";
+import Modal from "../Modal/Modal";
 import "./UtilitiesComponent.css";
+import UtilityClaimModal from "./UtilityClaimPopUp/UtilityClaimModal";
+import { db } from "../../Configs/firebase";
+import {
+  doc,
+  getDoc,
+  updateDoc,
+  getDocs,
+  query,
+  where,
+  collection,
+  deleteField,
+} from "firebase/firestore";
+
 
 function UtilitiesComponent({
-  utilitiesTitle,
-  utilitiesStatus,
-  utilitiesDescription,
-  utilitiesDate,
+  utility,
+  loggedInUser,
+  unilityId,
+  utilityTitle,
+  utilityStatus,
+  utilityDescription,
+  utilityDate,
   launchpadCollectionLiveUtilities,
 }) {
   const [status, setStatus] = useState();
+  const [isUtiliyClicked, setIsUtiliyClicked] = useState(false);
+  const { collectionAddress } = useParams();
+
   function displayStatusColor() {
-    if (utilitiesStatus === "Disponible") {
+    if (utilityStatus === "Disponible") {
       setStatus(true);
-    } else if (utilitiesStatus === "Indisponible") {
+    } else if (utilityStatus === "Indisponible") {
       setStatus(false);
     }
   }
 
-  //   console.log(utilitiesStatus)
+  //   console.log(utilityStatus)
   useEffect(() => {
     const test = () => displayStatusColor();
     test();
   }, []);
+
+  const handleClaimClick = async (e) => {
+    e.preventDefault();
+    //console.log(utility.id, "claimed by", loggedInUser.display_name);
+  
+    // Query to find the document with the specific collectionAddress field
+    const querySnapshot = await getDocs(query(collection(db, 'nft_collections'), where('collection_address', '==', collectionAddress)));
+    
+    if (querySnapshot.empty) {
+      console.error("No matching documents.");
+      return;
+    }
+    
+    let docId;
+    querySnapshot.forEach(documentSnapshot => {
+      docId = documentSnapshot.id;
+    });
+  
+    // Now that we have the docId, we can update the sub-collection
+    const utilityDocRef = doc(db, "nft_collections", docId, "utilities", utility.id);
+  
+    // Fetch the document to check if it exists
+    const docSnap = await getDoc(utilityDocRef);
+  
+    if (docSnap.exists()) {
+      try {
+        if (utility.claimed_status && utility.claimed_user_id === loggedInUser.id) {
+          // Disclaim the utility if it is already claimed by the logged-in user
+          await updateDoc(utilityDocRef, {
+            claimed_status: false,
+            claimed_user_id: deleteField()
+          });
+          console.log("Utility disclaimed successfully!");
+        } else {
+          // Claim the utility
+          await updateDoc(utilityDocRef, {
+            claimed_status: true,
+            claimed_user_id: loggedInUser.id
+          });
+          console.log("Utility claimed successfully!");
+        }
+      } catch (err) {
+        console.error("Error updating document: ", err);
+      }
+    } else {
+      console.error("No such document to update!");
+    }
+  
+    setIsUtiliyClicked(false);
+  };  
+
+  const modalStyle = useMemo(() => ({ top: "20px", right: "20px" }), []);
+
   // console.log(status);
   return (
-    <div className="nft-collection-overview-utilities-one-container">
-      <div className="nft-collection-overview-utilities-one-wrap">
-        <div className="nft-collection-overview-utilities-one-header">
-          <div className="nft-collection-overview-one-header-logo">
-            <img src={meetingsLogo} alt="logo contrepartie rencontre fan" />
+    <>
+      <div
+        onClick={() => setIsUtiliyClicked(true)}
+        className="nft-collection-overview-utilities-one-container"
+      >
+        <div className="nft-collection-overview-utilities-one-wrap">
+          <div className="nft-collection-overview-utilities-one-header">
+            <div className="nft-collection-overview-one-header-logo">
+              <img src={meetingsLogo} alt="logo contrepartie rencontre fan" />
+            </div>
+            <div className="nft-collection-overview-one-header-title">
+              {utilityTitle}
+            </div>
+            {launchpadCollectionLiveUtilities ? (
+              <></>
+            ) : (
+              <>
+                <div className="nft-collection-overview-one-header-status">
+                  <div
+                    className={
+                      status
+                        ? "nft-collectin-overview-one-header-status-color-available"
+                        : "nft-collectin-overview-one-header-status-color-unavailable"
+                    }
+                  ></div>
+                  <div className="nft-collection-overview-one-header-status-text">
+                    {utilityStatus}
+                  </div>
+                </div>
+              </>
+            )}
           </div>
-          <div className="nft-collection-overview-one-header-title">
-            {utilitiesTitle}
+          <div className="nft-collection-overview-utilities-one-description">
+            {utilityDescription}
+          </div>
+          <div className="nft-collection-overview-utilities-one-date">
+            Date de l'utilité: {utilityDate}{" "}
+            <span style={{ color: "red", marginLeft: 10 }}>
+              {utility.claimed_status ? "Réclamé" : ""}
+            </span>
           </div>
-          {launchpadCollectionLiveUtilities ? (
-            <></>
-          ) : (
-            <>
-              <div className="nft-collection-overview-one-header-status">
-                <div
-                  className={
-                    status
-                      ? "nft-collectin-overview-one-header-status-color-available"
-                      : "nft-collectin-overview-one-header-status-color-unavailable"
-                  }
-                ></div>
-                <div className="nft-collection-overview-one-header-status-text">
-                  {utilitiesStatus}
-                </div>
-              </div>
-            </>
-          )}
-        </div>
-        <div className="nft-collection-overview-utilities-one-description">
-          {utilitiesDescription}
-        </div>
-        <div className="nft-collection-overview-utilities-one-date">
-          Date de l'utilité: {utilitiesDate}
         </div>
       </div>
-    </div>
+      {isUtiliyClicked && (
+        <Modal style={modalStyle} setState={setIsUtiliyClicked}>
+          <UtilityClaimModal
+            utility={utility}
+            loggedInUser={loggedInUser}
+            isUtiliyClicked={isUtiliyClicked}
+            handleClaimClick={handleClaimClick}
+          />
+        </Modal>
+      )}
+    </>
   );
 }
 
diff --git a/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.css b/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.css
new file mode 100644
index 00000000..53b31a59
--- /dev/null
+++ b/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.css
@@ -0,0 +1,43 @@
+.utility-pop-up-container {
+  width: 400px;
+  box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.1);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  /* justify-content: center; */
+  position: relative;
+  background-color: white;
+  border-radius: 20px;
+  padding: 20px;
+}
+
+.utility-pop-up-title {
+  font-family: "Britanica-Heavy";
+  font-style: normal;
+  font-weight: 400;
+  font-size: 25px;
+  line-height: 30px;
+}
+
+.utility-info-data {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.utility-info-header {
+    margin: 10px;
+}
+
+.utility-info-header img {
+    width: 20px;
+    margin-right: 10px;
+}
+
+.utility-info-title {
+    font-family: "Britanica-Heavy";
+  font-style: normal;
+  font-weight: 400;
+  font-size: 19px;
+  line-height: 30px;
+}
diff --git a/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js b/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js
new file mode 100644
index 00000000..808fac73
--- /dev/null
+++ b/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js
@@ -0,0 +1,71 @@
+import React, { useState, useEffect } from "react";
+import "./UtilityClaimModal.css";
+import meetingsLogo from "../../../Assets/Image/meetings-logo.svg";
+import Button from "../../Button/Button";
+
+function UtilityClaimModal({
+  isUtiliyClicked,
+  utility,
+  loggedInUser,
+  handleClaimClick,
+}) {
+  return (
+    <div className="utility-pop-up-container">
+      <span
+        className="utility-pop-up-title"
+        style={utility.claimed_status ? { color: "red" } : {}}
+      >
+        {utility.claimed_status ? "Utilité déjå reclamé" : "Réclamer l'Uilité"}
+      </span>
+      <div className="utility-info-data">
+        <div className="utility-info-header">
+          <img src={meetingsLogo} alt="logo contrepartie rencontre fan" />
+          <span className="utility-info-title">{utility?.title}</span>
+        </div>
+        <p className="utility-info-description">{utility?.description}</p>
+        <div className="nft-collection-overview-utilities-one-date">
+          Date de l'utilité:{" "}
+          {utility?.date
+            ? new Date(utility.date.seconds * 1000).toDateString()
+            : "N/A"}
+        </div>
+        {!utility.claimed_status && (
+          <Button
+            text={"Réclamer"}
+            style={ClaimButtonStyle.inlineStyle}
+            onClick={handleClaimClick}
+          />
+        )}
+        {
+          // If the utility is claimed and the logged-in user is the one who claimed it, show the "Disclaim" button
+          utility.claimed_status &&
+            loggedInUser &&
+            utility.claimed_user_id === loggedInUser.id && (
+              <Button
+                text={"Rétroclamer"}
+                style={ClaimButtonStyle.inlineStyle}
+                onClick={handleClaimClick}
+              />
+            )
+        }
+      </div>
+    </div>
+  );
+}
+
+const ClaimButtonStyle = {
+  inlineStyle: {
+    backgroundColor: "#F6D463",
+    border: "transparent",
+    borderRadius: "10px",
+    width: "284px",
+    minHeight: "54px",
+    fontFamily: "Britanica-Heavy",
+    fontSize: "20px",
+    marginTop: 15,
+  },
+  customMediaQueries:
+    "@media (max-width: 950px) { .button-component { max-width: 250px; }}@media (max-width: 900px) {.button-component {max-width: 220px; } } @media (max-width: 860px){.button-component {max-width: 200px;}}@media (max-width: 840px){.button-component {max-width: 183px;}}",
+};
+
+export default UtilityClaimModal;
diff --git a/client/src/Pages/LaunchpadCollectionLive/LaunchpadCollectionLive.js b/client/src/Pages/LaunchpadCollectionLive/LaunchpadCollectionLive.js
index 6b604c34..cdacdbed 100644
--- a/client/src/Pages/LaunchpadCollectionLive/LaunchpadCollectionLive.js
+++ b/client/src/Pages/LaunchpadCollectionLive/LaunchpadCollectionLive.js
@@ -70,12 +70,14 @@ function LaunchpadCollectionLive(isLogged) {
     setContractAddress,
   } = useEth();
   const location = useLocation();
-  const segments = location.pathname.split("/");
-  const athleteId = segments[2];
-  const collectionAddress = segments[3];
+  // const segments = location.pathname.split("/");
+  // const athleteId = segments[2];
+  // const collectionAddress = segments[3];
   const loggedInUserInfo = useUserCollection();
   const [crossmintPayLoadLocalStorage, setCrossmintPayLoadLocalStorage] =
     useState(null);
+  const { athleteId, collectionAddress } = useParams();
+  
 
   useEffect(() => {
     window.addEventListener(
@@ -215,7 +217,6 @@ function LaunchpadCollectionLive(isLogged) {
 
   // ----------------------- Shajeed -------------------------
 
-  const { collectionAddressurl } = useParams();
 
   useEffect(() => {
     const q = query(
@@ -230,7 +231,10 @@ function LaunchpadCollectionLive(isLogged) {
         const unsub = onSnapshot(
           collection(db, "nft_collections", docId, "utilities"),
           (snapshot) => {
-            const utilitiesData = snapshot.docs.map((doc) => doc.data());
+            const utilitiesData = snapshot.docs.map((doc) => ({
+              id: doc.id, // include the id here
+              ...doc.data()
+            }));
             setUtilities(utilitiesData);
           }
         );
@@ -331,6 +335,8 @@ function LaunchpadCollectionLive(isLogged) {
     setIsMintButtonClicked(true);
   }
 
+  
+
   const [isMintingProcessBegan, setIsMintingProcessBegan] = useState(false);
   const [mintingProcessStatus, setMintingProcessStatus] = useState(true);
   const [
@@ -578,7 +584,7 @@ function LaunchpadCollectionLive(isLogged) {
         />
         <div className="launchpad-collection-live-page-left-container">
           {crossmintPayLoadLocalStorage ? "sqhdddddddddddsqdhhhhhhhhh" : ""}
-          <LaunchpadCollectionLiveUtilities utilitiesArray={utilities} />
+          <LaunchpadCollectionLiveUtilities utilitiesArray={utilities} loggedInUser={isLogged} />
           <div className="launchpad-collection-live-page-more-about-collection-container">
             <LaunchpadCollectionLiveMoreAboutCollection
               knowMoreAboutCollection={
diff --git a/client/src/Pages/NftSingle/NftSingle.js b/client/src/Pages/NftSingle/NftSingle.js
index ba5d327d..34a14312 100644
--- a/client/src/Pages/NftSingle/NftSingle.js
+++ b/client/src/Pages/NftSingle/NftSingle.js
@@ -285,7 +285,7 @@ const NftSingle = () => {
   // }, []);
 
   // retirer le scroll lock lorsque le modal n'est plus la
-  document.querySelector("body").classList.remove("scroll-lock");
+  //document.querySelector("body").classList.remove("scroll-lock");
 
   //
   function handleClickSubMenuButton(e) {

From a6de3b018595fa31363cea141f0edc2e7280ffd5 Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Mon, 23 Oct 2023 04:00:44 -0400
Subject: [PATCH 06/26] Timestamp fix post feed

---
 client/src/Components/CreationPostPoll/CreationPostPoll.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/Components/CreationPostPoll/CreationPostPoll.js b/client/src/Components/CreationPostPoll/CreationPostPoll.js
index f7b4375c..dcf2fce0 100644
--- a/client/src/Components/CreationPostPoll/CreationPostPoll.js
+++ b/client/src/Components/CreationPostPoll/CreationPostPoll.js
@@ -11,7 +11,7 @@ import {
   uploadBytes,
   getDownloadURL,
 } from "../../Configs/firebase";
-import { collection, addDoc, getDoc, doc, updateDoc } from "firebase/firestore";
+import { collection, addDoc, getDoc, doc, updateDoc, Timestamp } from "firebase/firestore";
 
 const CreationPostPoll = ({ userId }) => {
   const [file, setFile] = useState(null);
@@ -104,7 +104,7 @@ const CreationPostPoll = ({ userId }) => {
           pollData,
           likes: [],
           status: true,
-          ...(dateTimeValue && { publish_timestamp: dateTimeValue })
+          ...(dateTimeValue && { publish_timestamp: Timestamp.fromMillis(dateTimeValue * 1000) })
         };
       } else {
         const postType = "poll";
@@ -118,7 +118,7 @@ const CreationPostPoll = ({ userId }) => {
           pollData,
           likes: [],
           status: true,
-          ...(dateTimeValue && { publish_timestamp: dateTimeValue })
+          ...(dateTimeValue && { publish_timestamp: Timestamp.fromMillis(dateTimeValue * 1000) })
         };
       }
 

From 2d99d6391bb01a82c040d066dcc9ba7e01d9fdf3 Mon Sep 17 00:00:00 2001
From: JW Rami <rami@jwcorp.fr>
Date: Wed, 25 Oct 2023 02:05:18 +0200
Subject: [PATCH 07/26] fix modal utility claim modal

---
 .../UtilitiesComponent/UtilitiesComponent.js  | 49 +++++++++++++------
 1 file changed, 33 insertions(+), 16 deletions(-)

diff --git a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
index 28cf867d..e8a854d3 100644
--- a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
+++ b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
@@ -18,7 +18,6 @@ import {
   deleteField,
 } from "firebase/firestore";
 
-
 function UtilitiesComponent({
   utility,
   loggedInUser,
@@ -50,40 +49,54 @@ function UtilitiesComponent({
   const handleClaimClick = async (e) => {
     e.preventDefault();
     //console.log(utility.id, "claimed by", loggedInUser.display_name);
-  
+
     // Query to find the document with the specific collectionAddress field
-    const querySnapshot = await getDocs(query(collection(db, 'nft_collections'), where('collection_address', '==', collectionAddress)));
-    
+    const querySnapshot = await getDocs(
+      query(
+        collection(db, "nft_collections"),
+        where("collection_address", "==", collectionAddress)
+      )
+    );
+
     if (querySnapshot.empty) {
       console.error("No matching documents.");
       return;
     }
-    
+
     let docId;
-    querySnapshot.forEach(documentSnapshot => {
+    querySnapshot.forEach((documentSnapshot) => {
       docId = documentSnapshot.id;
     });
-  
+
     // Now that we have the docId, we can update the sub-collection
-    const utilityDocRef = doc(db, "nft_collections", docId, "utilities", utility.id);
-  
+    const utilityDocRef = doc(
+      db,
+      "nft_collections",
+      docId,
+      "utilities",
+      utility.id
+    );
+
     // Fetch the document to check if it exists
     const docSnap = await getDoc(utilityDocRef);
-  
+
     if (docSnap.exists()) {
       try {
-        if (utility.claimed_status && utility.claimed_user_id === loggedInUser.id) {
+        if (
+          utility.claimed_status &&
+          utility.claimed_user_id === loggedInUser.id
+        ) {
           // Disclaim the utility if it is already claimed by the logged-in user
           await updateDoc(utilityDocRef, {
             claimed_status: false,
-            claimed_user_id: deleteField()
+            claimed_user_id: deleteField(),
           });
           console.log("Utility disclaimed successfully!");
         } else {
           // Claim the utility
           await updateDoc(utilityDocRef, {
             claimed_status: true,
-            claimed_user_id: loggedInUser.id
+            claimed_user_id: loggedInUser.id,
           });
           console.log("Utility claimed successfully!");
         }
@@ -93,9 +106,9 @@ function UtilitiesComponent({
     } else {
       console.error("No such document to update!");
     }
-  
+
     setIsUtiliyClicked(false);
-  };  
+  };
 
   const modalStyle = useMemo(() => ({ top: "20px", right: "20px" }), []);
 
@@ -145,7 +158,11 @@ function UtilitiesComponent({
         </div>
       </div>
       {isUtiliyClicked && (
-        <Modal style={modalStyle} setState={setIsUtiliyClicked}>
+        <Modal
+          style={modalStyle}
+          setState={setIsUtiliyClicked}
+          dynamicPositionPopUpMargin={`${window.scrollY}px`}
+        >
           <UtilityClaimModal
             utility={utility}
             loggedInUser={loggedInUser}

From cc03984e7885e6efcca4988751ccc1070566b3d7 Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Tue, 24 Oct 2023 20:51:58 -0400
Subject: [PATCH 08/26] Update Avatar & Banner Upload

---
 .../PopUpEditProfile/PopUpEditProfile.js      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/src/Components/PopUpEditProfile/PopUpEditProfile.js b/client/src/Components/PopUpEditProfile/PopUpEditProfile.js
index 10b32a79..d932889e 100644
--- a/client/src/Components/PopUpEditProfile/PopUpEditProfile.js
+++ b/client/src/Components/PopUpEditProfile/PopUpEditProfile.js
@@ -65,23 +65,23 @@ const PopUpEditProfile = ({
     setIsProfileEditPopupHasModifications,
   ] = useState(false);
   useEffect(() => {
-    if (!banner) return;
+    if (!retrievedBanner) return;
     // setCurrentlyCropping(true);
-    let tmp = URL.createObjectURL(banner);
+    let tmp = URL.createObjectURL(retrievedBanner);
     setPreviewBanner(tmp);
     setCurrentlyCroppingBanner(true);
-    URL.revokeObjectURL(banner);
-    setBanner();
-  }, [banner]);
+    URL.revokeObjectURL(retrievedBanner);
+    setRetrievedBanner();
+  }, [retrievedBanner]);
   // tambouriner le crop easy
   useEffect(() => {
-    if (!profile) return;
-    let tmp = URL.createObjectURL(profile);
+    if (!retrievedAvatar) return;
+    let tmp = URL.createObjectURL(retrievedAvatar);
     setPreviewProfile(tmp);
     setCurrentlyCroppingAvatar(true);
-    URL.revokeObjectURL(profile);
-    setProfile();
-  }, [profile]);
+    URL.revokeObjectURL(retrievedAvatar);
+    setRetrievedAvatar();
+  }, [retrievedAvatar]);
   function handlePreviousStepCroppClick() {
     setCurrentlyCroppingAvatar(false);
     setCurrentlyCroppingBanner(false);

From f76b1f6b6ef0654079e65f3f0d16b5bd0068cd9a Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Tue, 24 Oct 2023 21:01:11 -0400
Subject: [PATCH 09/26] Fix Update Banner & Avatar

---
 client/src/Components/PopUpEditProfile/PopUpEditProfile.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/src/Components/PopUpEditProfile/PopUpEditProfile.js b/client/src/Components/PopUpEditProfile/PopUpEditProfile.js
index d932889e..53638783 100644
--- a/client/src/Components/PopUpEditProfile/PopUpEditProfile.js
+++ b/client/src/Components/PopUpEditProfile/PopUpEditProfile.js
@@ -64,6 +64,7 @@ const PopUpEditProfile = ({
     isProfileEditPopupHasModifications,
     setIsProfileEditPopupHasModifications,
   ] = useState(false);
+  
   useEffect(() => {
     if (!retrievedBanner) return;
     // setCurrentlyCropping(true);
@@ -71,7 +72,6 @@ const PopUpEditProfile = ({
     setPreviewBanner(tmp);
     setCurrentlyCroppingBanner(true);
     URL.revokeObjectURL(retrievedBanner);
-    setRetrievedBanner();
   }, [retrievedBanner]);
   // tambouriner le crop easy
   useEffect(() => {
@@ -80,13 +80,14 @@ const PopUpEditProfile = ({
     setPreviewProfile(tmp);
     setCurrentlyCroppingAvatar(true);
     URL.revokeObjectURL(retrievedAvatar);
-    setRetrievedAvatar();
   }, [retrievedAvatar]);
+
   function handlePreviousStepCroppClick() {
     setCurrentlyCroppingAvatar(false);
     setCurrentlyCroppingBanner(false);
   }
   const handleBannerUpload = async (file, croppedImage) => {
+    console.log(file);
     if (file && file.type.substr(0, 5) === "image") {
       try {
         let newFile = await ImageUrlToFile(croppedImage, file.name);

From 9cfcaf8c23a0cb6a628f100bd18ddfa585d8bc10 Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Wed, 25 Oct 2023 19:23:55 -0400
Subject: [PATCH 10/26] Utility Update

---
 .../UtilitiesComponent/UtilitiesComponent.js  |  18 ++-
 .../UtilityClaimPopUp/UtilityClaimModal.js    | 118 ++++++++++++------
 2 files changed, 94 insertions(+), 42 deletions(-)

diff --git a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
index e8a854d3..142a8ce9 100644
--- a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
+++ b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
@@ -31,6 +31,10 @@ function UtilitiesComponent({
   const [status, setStatus] = useState();
   const [isUtiliyClicked, setIsUtiliyClicked] = useState(false);
   const { collectionAddress } = useParams();
+  // A changer pour un nft holder de l'athleth
+  const [isloggedUserNftHolder, setIsloggedUserNftHolder] = useState(true);
+  const [isClaimConfirmed, setIsClaimConfirmed] = useState(false);
+
 
   function displayStatusColor() {
     if (utilityStatus === "Disponible") {
@@ -106,8 +110,8 @@ function UtilitiesComponent({
     } else {
       console.error("No such document to update!");
     }
-
-    setIsUtiliyClicked(false);
+    setIsClaimConfirmed(true);
+    //setIsUtiliyClicked(false);
   };
 
   const modalStyle = useMemo(() => ({ top: "20px", right: "20px" }), []);
@@ -152,7 +156,11 @@ function UtilitiesComponent({
           <div className="nft-collection-overview-utilities-one-date">
             Date de l'utilité: {utilityDate}{" "}
             <span style={{ color: "red", marginLeft: 10 }}>
-              {utility.claimed_status ? "Réclamé" : ""}
+              {utility.claimed_status &&
+              utility.claimed_user_id &&
+              utility.claimed_user_id === loggedInUser.id
+                ? "Réclamé"
+                : ""}
             </span>
           </div>
         </div>
@@ -168,6 +176,10 @@ function UtilitiesComponent({
             loggedInUser={loggedInUser}
             isUtiliyClicked={isUtiliyClicked}
             handleClaimClick={handleClaimClick}
+            isloggedUserNftHolder={isloggedUserNftHolder}
+            setIsloggedUserNftHolder={setIsloggedUserNftHolder}
+            setIsClaimConfirmed={setIsClaimConfirmed}
+            isClaimConfirmed={isClaimConfirmed}
           />
         </Modal>
       )}
diff --git a/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js b/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js
index 808fac73..2bb5c431 100644
--- a/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js
+++ b/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js
@@ -1,55 +1,95 @@
-import React, { useState, useEffect } from "react";
+import React from "react";
 import "./UtilityClaimModal.css";
 import meetingsLogo from "../../../Assets/Image/meetings-logo.svg";
 import Button from "../../Button/Button";
+import validationLogo from "../../../Assets/Image/greencross-offers.svg";
 
 function UtilityClaimModal({
   isUtiliyClicked,
   utility,
   loggedInUser,
   handleClaimClick,
+  isloggedUserNftHolder,
+  setIsloggedUserNftHolder,
+  isClaimConfirmed,
 }) {
   return (
-    <div className="utility-pop-up-container">
-      <span
-        className="utility-pop-up-title"
-        style={utility.claimed_status ? { color: "red" } : {}}
-      >
-        {utility.claimed_status ? "Utilité déjå reclamé" : "Réclamer l'Uilité"}
-      </span>
-      <div className="utility-info-data">
-        <div className="utility-info-header">
-          <img src={meetingsLogo} alt="logo contrepartie rencontre fan" />
-          <span className="utility-info-title">{utility?.title}</span>
+    <>
+      {!isClaimConfirmed ? (
+        <div className="utility-pop-up-container">
+          <span
+            className="utility-pop-up-title"
+            style={
+              utility.claimed_status &&
+              utility.claimed_user_id === loggedInUser.id
+                ? { color: "red" }
+                : {}
+            }
+          >
+            {utility.claimed_status &&
+            utility.claimed_user_id === loggedInUser.id
+              ? "Utilité déjà réclamée"
+              : "Réclamer l'Utilité"}
+          </span>
+
+          <div className="utility-info-data">
+            <div className="utility-info-header">
+              <img src={meetingsLogo} alt="logo contrepartie rencontre fan" />
+              <span className="utility-info-title">{utility?.title}</span>
+            </div>
+            <p className="utility-info-description">{utility?.description}</p>
+            <div className="nft-collection-overview-utilities-one-date">
+              Date de l'utilité:{" "}
+              {utility?.date
+                ? new Date(utility.date.seconds * 1000).toDateString()
+                : "N/A"}
+            </div>
+            {
+              // If isloggedUserNftHolder is true, the user is logged in, and the utility is not claimed by the logged-in user
+              isloggedUserNftHolder &&
+              loggedInUser &&
+              !(
+                utility.claimed_status &&
+                utility.claimed_user_id === loggedInUser.id
+              ) ? (
+                <Button
+                  text={"Réclamer"}
+                  style={ClaimButtonStyle.inlineStyle}
+                  onClick={handleClaimClick}
+                />
+              ) : (
+                // If isloggedUserNftHolder is false or the user is not logged in, show the error message
+                (!isloggedUserNftHolder || !loggedInUser) && (
+                  <p
+                    style={{
+                      color: "red",
+                      fontWeight: "bold",
+                      textAlign: "center",
+                      border: "1px solid red",
+                      borderRadius: "5px",
+                      padding: "10px",
+                      marginTop: "20px",
+                    }}
+                  >
+                    Achetez un NFT ou une collection NFT pour réclamer cette
+                    utilité
+                  </p>
+                )
+              )
+            }
+          </div>
         </div>
-        <p className="utility-info-description">{utility?.description}</p>
-        <div className="nft-collection-overview-utilities-one-date">
-          Date de l'utilité:{" "}
-          {utility?.date
-            ? new Date(utility.date.seconds * 1000).toDateString()
-            : "N/A"}
+      ) : (
+        <div className="utility-pop-up-container">
+          <div>
+            <img src={validationLogo} alt="" />
+          </div>
+          <span className="utility-pop-up-title">
+            Utilié Reclamer en success
+          </span>
         </div>
-        {!utility.claimed_status && (
-          <Button
-            text={"Réclamer"}
-            style={ClaimButtonStyle.inlineStyle}
-            onClick={handleClaimClick}
-          />
-        )}
-        {
-          // If the utility is claimed and the logged-in user is the one who claimed it, show the "Disclaim" button
-          utility.claimed_status &&
-            loggedInUser &&
-            utility.claimed_user_id === loggedInUser.id && (
-              <Button
-                text={"Rétroclamer"}
-                style={ClaimButtonStyle.inlineStyle}
-                onClick={handleClaimClick}
-              />
-            )
-        }
-      </div>
-    </div>
+      )}
+    </>
   );
 }
 

From be8bbe47ab19d4b2209e2f1ecd4a31852ce58d71 Mon Sep 17 00:00:00 2001
From: JWMatheo <matmatvallone8@gmail.com>
Date: Sun, 29 Oct 2023 15:09:46 +0100
Subject: [PATCH 11/26] fix minor bug

---
 .../UtilitiesComponent/UtilitiesComponent.js         |  7 +++----
 .../LaunchpadCollectionLive.js                       | 12 +++++-------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
index 142a8ce9..d3a715ba 100644
--- a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
+++ b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
@@ -35,7 +35,6 @@ function UtilitiesComponent({
   const [isloggedUserNftHolder, setIsloggedUserNftHolder] = useState(true);
   const [isClaimConfirmed, setIsClaimConfirmed] = useState(false);
 
-
   function displayStatusColor() {
     if (utilityStatus === "Disponible") {
       setStatus(true);
@@ -156,9 +155,9 @@ function UtilitiesComponent({
           <div className="nft-collection-overview-utilities-one-date">
             Date de l'utilité: {utilityDate}{" "}
             <span style={{ color: "red", marginLeft: 10 }}>
-              {utility.claimed_status &&
-              utility.claimed_user_id &&
-              utility.claimed_user_id === loggedInUser.id
+              {utility?.claimed_status &&
+              utility?.claimed_user_id &&
+              utility?.claimed_user_id === loggedInUser.id
                 ? "Réclamé"
                 : ""}
             </span>
diff --git a/client/src/Pages/LaunchpadCollectionLive/LaunchpadCollectionLive.js b/client/src/Pages/LaunchpadCollectionLive/LaunchpadCollectionLive.js
index cdacdbed..8044b340 100644
--- a/client/src/Pages/LaunchpadCollectionLive/LaunchpadCollectionLive.js
+++ b/client/src/Pages/LaunchpadCollectionLive/LaunchpadCollectionLive.js
@@ -77,7 +77,6 @@ function LaunchpadCollectionLive(isLogged) {
   const [crossmintPayLoadLocalStorage, setCrossmintPayLoadLocalStorage] =
     useState(null);
   const { athleteId, collectionAddress } = useParams();
-  
 
   useEffect(() => {
     window.addEventListener(
@@ -217,7 +216,6 @@ function LaunchpadCollectionLive(isLogged) {
 
   // ----------------------- Shajeed -------------------------
 
-
   useEffect(() => {
     const q = query(
       collection(db, "nft_collections"),
@@ -233,7 +231,7 @@ function LaunchpadCollectionLive(isLogged) {
           (snapshot) => {
             const utilitiesData = snapshot.docs.map((doc) => ({
               id: doc.id, // include the id here
-              ...doc.data()
+              ...doc.data(),
             }));
             setUtilities(utilitiesData);
           }
@@ -335,8 +333,6 @@ function LaunchpadCollectionLive(isLogged) {
     setIsMintButtonClicked(true);
   }
 
-  
-
   const [isMintingProcessBegan, setIsMintingProcessBegan] = useState(false);
   const [mintingProcessStatus, setMintingProcessStatus] = useState(true);
   const [
@@ -583,8 +579,10 @@ function LaunchpadCollectionLive(isLogged) {
           nftCollectionMaxItems={nftCollectionMaxItems}
         />
         <div className="launchpad-collection-live-page-left-container">
-          {crossmintPayLoadLocalStorage ? "sqhdddddddddddsqdhhhhhhhhh" : ""}
-          <LaunchpadCollectionLiveUtilities utilitiesArray={utilities} loggedInUser={isLogged} />
+          <LaunchpadCollectionLiveUtilities
+            utilitiesArray={utilities}
+            loggedInUser={isLogged}
+          />
           <div className="launchpad-collection-live-page-more-about-collection-container">
             <LaunchpadCollectionLiveMoreAboutCollection
               knowMoreAboutCollection={

From ba3241b6811293726239e88cf7751d40f815b3c6 Mon Sep 17 00:00:00 2001
From: Ra <rami@jwcorp.fr>
Date: Wed, 8 Nov 2023 16:51:45 +0100
Subject: [PATCH 12/26] click on media to display the fullpage post

---
 .../PostsComponents/PostsFeed/PostsFeed.css     | 17 +++++++++--------
 .../PostsComponents/PostsFeed/PostsFeed.js      | 11 +++++++----
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/client/src/Components/PostsComponents/PostsFeed/PostsFeed.css b/client/src/Components/PostsComponents/PostsFeed/PostsFeed.css
index f95a1f41..f9f4b1b8 100644
--- a/client/src/Components/PostsComponents/PostsFeed/PostsFeed.css
+++ b/client/src/Components/PostsComponents/PostsFeed/PostsFeed.css
@@ -25,7 +25,7 @@
   overflow-y: visible;
   /* background-color: yellow; */
 }
-.publication-content::-webkit-scrollbar{
+.publication-content::-webkit-scrollbar {
   display: none;
 }
 /* check HeadOfPost.css for the fullpagepost version */
@@ -46,6 +46,7 @@
   display: flex;
   justify-content: center;
   align-items: center;
+  cursor: pointer;
 }
 .publication-media img {
   max-width: 100%;
@@ -65,21 +66,21 @@
   width: 96%;
   display: flex;
   position: relative;
-  left:1%;
+  left: 1%;
 }
 .show-comments-button-publication a {
   color: black;
   text-decoration: none;
 }
 
-.show-comments-button-publication:active{
+.show-comments-button-publication:active {
   color: white;
 }
 .show-comments-button-publication:hover {
   text-decoration: underline;
   cursor: pointer;
 }
-.publish-comments-button-container-publication button{
+.publish-comments-button-container-publication button {
   border: none;
   background: none;
   padding: 0;
@@ -91,11 +92,11 @@
   padding-left: 10px;
   padding-right: 10px;
 }
-.publish-comments-button-container-publication button:hover{
+.publish-comments-button-container-publication button:hover {
   background-color: #00000015;
   /* background-color: #f7c520 !important; */
-    transition-duration: 300ms !important;
-    border-radius: 20px;
+  transition-duration: 300ms !important;
+  border-radius: 20px;
 }
 .line-separation-comments-publication {
   border: 0.29829px solid rgba(0, 0, 0, 0.2);
@@ -105,4 +106,4 @@
   .line-separation-comments-publication-container {
     height: 25px;
   }
-}
\ No newline at end of file
+}
diff --git a/client/src/Components/PostsComponents/PostsFeed/PostsFeed.js b/client/src/Components/PostsComponents/PostsFeed/PostsFeed.js
index db21fb7d..29fdb0b2 100644
--- a/client/src/Components/PostsComponents/PostsFeed/PostsFeed.js
+++ b/client/src/Components/PostsComponents/PostsFeed/PostsFeed.js
@@ -129,8 +129,8 @@ function PostsFeed({
       <div
         style={
           athleteProfilePageStyling
-            ? { marginBottom: "18px" }
-            : { marginTop: "60px" }
+            ? { marginBottom: "18px"}
+            : { marginTop: "60px"}
         }
         className="publication-container"
       >
@@ -187,9 +187,12 @@ function PostsFeed({
           />
           {displayVote()}
           {/* Backend here */}
-          <div className="publication-media">
+          <div
+            className="publication-media"
+            onClick={() => setIsPostClicked(true)}
+          >
             {/* <img src={attanasioBateau} alt="utilisateur" /> */}
-            {postPicture && <img src={postPicture} alt="" />}
+            {postPicture && <img src={postPicture} alt="post media" />}
           </div>
           {/* Backend here */}
           <MemoLikesCommentsCounter

From ff1486de857b7d3ff81c3d43db078ee616224bfc Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Fri, 24 Nov 2023 03:38:54 -0500
Subject: [PATCH 13/26] email fix unfinished

---
 client/functions/index.js |    6 +-
 client/package-lock.json  | 1392 ++++++++++++++++++++++++++++++++++++-
 client/package.json       |    1 +
 3 files changed, 1386 insertions(+), 13 deletions(-)

diff --git a/client/functions/index.js b/client/functions/index.js
index eeeb3757..6642a56f 100644
--- a/client/functions/index.js
+++ b/client/functions/index.js
@@ -1,6 +1,6 @@
 const functions = require("firebase-functions/v1");
-const cors = require('cors')({ origin: ['http://localhost:3000', 'https://www.sofan.app', 'https://staging.sofan.app'] });
-//.const cors = require('cors')({ origin: true });
+//const cors = require('cors')({ origin: ['http://localhost:3000', 'https://www.sofan.app', 'https://staging.sofan.app'] });
+const cors = require('cors')({ origin: true });
 
 // // Create and deploy your first functions
 // // https://firebase.google.com/docs/functions/get-started
@@ -22,6 +22,8 @@ const transporter = nodemailer.createTransport({
 // functions.logger.log(functions.config().email.user);
 
 exports.sendVerificationEmail = functions.https.onRequest((req, res) => {
+   // Return 204 for OPTIONS method (preflight request)
+  
   cors(req, res, async () => {
     if (req.method !== "POST") {
       return res.status(405).send("Method Not Allowed");
diff --git a/client/package-lock.json b/client/package-lock.json
index 8a516b44..8dc57554 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -24,6 +24,7 @@
         "date-fns": "^2.30.0",
         "env-cmd": "^10.1.0",
         "firebase": "^9.22.1",
+        "firebase-functions": "^4.5.0",
         "libphonenumber-js": "^1.10.28",
         "opensea-js": "^4.0.24",
         "react": "^18.2.0",
@@ -3867,6 +3868,18 @@
         "@ethersproject/strings": "^5.7.0"
       }
     },
+    "node_modules/@fastify/busboy": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-1.2.1.tgz",
+      "integrity": "sha512-7PQA7EH43S0CxcOa9OeAnaeA0oQ+e/DHNPZwSQM9CQHW76jle5+OvLdibRp/Aafs9KXbLhxyjOTkRjWUbQEd3Q==",
+      "peer": true,
+      "dependencies": {
+        "text-decoding": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/@firebase/analytics": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.0.tgz",
@@ -4585,6 +4598,131 @@
       "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.10.1.tgz",
       "integrity": "sha512-Dq5rYfEpdeel0bLVN+nfD1VWmzCkK+pJbSjIawGE+RY4+NIJqhbUDDQjvV0NUK84fMfwxvtFoCtEe70HfZjFcw=="
     },
+    "node_modules/@google-cloud/firestore": {
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-6.8.0.tgz",
+      "integrity": "sha512-JRpk06SmZXLGz0pNx1x7yU3YhkUXheKgH5hbDZ4kMsdhtfV5qPLJLRI4wv69K0cZorIk+zTMOwptue7hizo0eA==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "functional-red-black-tree": "^1.0.1",
+        "google-gax": "^3.5.7",
+        "protobufjs": "^7.2.5"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@google-cloud/firestore/node_modules/long": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@google-cloud/firestore/node_modules/protobufjs": {
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz",
+      "integrity": "sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==",
+      "hasInstallScript": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.2",
+        "@protobufjs/base64": "^1.1.2",
+        "@protobufjs/codegen": "^2.0.4",
+        "@protobufjs/eventemitter": "^1.1.0",
+        "@protobufjs/fetch": "^1.1.0",
+        "@protobufjs/float": "^1.0.2",
+        "@protobufjs/inquire": "^1.1.0",
+        "@protobufjs/path": "^1.1.2",
+        "@protobufjs/pool": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.0",
+        "@types/node": ">=13.7.0",
+        "long": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@google-cloud/paginator": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.7.tgz",
+      "integrity": "sha512-jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "arrify": "^2.0.0",
+        "extend": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@google-cloud/projectify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-3.0.0.tgz",
+      "integrity": "sha512-HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@google-cloud/promisify": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-3.0.1.tgz",
+      "integrity": "sha512-z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@google-cloud/storage": {
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-6.12.0.tgz",
+      "integrity": "sha512-78nNAY7iiZ4O/BouWMWTD/oSF2YtYgYB3GZirn0To6eBOugjXVoK+GXgUXOl+HlqbAOyHxAVXOlsj3snfbQ1dw==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@google-cloud/paginator": "^3.0.7",
+        "@google-cloud/projectify": "^3.0.0",
+        "@google-cloud/promisify": "^3.0.0",
+        "abort-controller": "^3.0.0",
+        "async-retry": "^1.3.3",
+        "compressible": "^2.0.12",
+        "duplexify": "^4.0.0",
+        "ent": "^2.2.0",
+        "extend": "^3.0.2",
+        "fast-xml-parser": "^4.2.2",
+        "gaxios": "^5.0.0",
+        "google-auth-library": "^8.0.1",
+        "mime": "^3.0.0",
+        "mime-types": "^2.0.8",
+        "p-limit": "^3.0.1",
+        "retry-request": "^5.0.0",
+        "teeny-request": "^8.0.0",
+        "uuid": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@google-cloud/storage/node_modules/mime": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
+      "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/@grpc/grpc-js": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.7.3.tgz",
@@ -5539,6 +5677,19 @@
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
       "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
     },
+    "node_modules/@jsdoc/salty": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.5.tgz",
+      "integrity": "sha512-TfRP53RqunNe2HBobVBJ0VLhK1HbfvBYeTC1ahnN64PWvyYyGebmMiPkuwvD9fpw2ZbkoPb8Q7mwy0aR8Z9rvw==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "lodash": "^4.17.21"
+      },
+      "engines": {
+        "node": ">=v12.0.0"
+      }
+    },
     "node_modules/@leichtgewicht/ip-codec": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
@@ -7077,6 +7228,14 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/cors": {
+      "version": "2.8.15",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.15.tgz",
+      "integrity": "sha512-n91JxbNLD8eQIuXDIChAN1tCKNWCEgpceU9b7ZMbFA+P+Q4yIeh80jizFLEvolRPc1ES0VdwFlGv+kJTSirogw==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/debug": {
       "version": "4.1.8",
       "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.8.tgz",
@@ -7130,6 +7289,17 @@
         "@types/send": "*"
       }
     },
+    "node_modules/@types/glob": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/minimatch": "^5.1.2",
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/graceful-fs": {
       "version": "4.1.6",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz",
@@ -7230,6 +7400,15 @@
       "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
       "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
     },
+    "node_modules/@types/jsonwebtoken": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.4.tgz",
+      "integrity": "sha512-8UYapdmR0QlxgvJmyE8lP7guxD0UGVMfknsdtCFZh4ovShdBl3iOI4zdvqBHrB/IS+xUj3PSx73Qkey1fhWz+g==",
+      "peer": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/keyv": {
       "version": "3.1.4",
       "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
@@ -7238,16 +7417,48 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/linkify-it": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.4.tgz",
+      "integrity": "sha512-hPpIeeHb/2UuCw06kSNAOVWgehBLXEo0/fUs0mw3W2qhqX89PI2yvok83MnuctYGCPrabGIoi0fFso4DQ+sNUQ==",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/@types/long": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",
       "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="
     },
+    "node_modules/@types/markdown-it": {
+      "version": "12.2.3",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz",
+      "integrity": "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/linkify-it": "*",
+        "@types/mdurl": "*"
+      }
+    },
+    "node_modules/@types/mdurl": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.4.tgz",
+      "integrity": "sha512-ARVxjAEX5TARFRzpDRVC6cEk0hUIXCCwaMhz8y7S1/PxU6zZS1UMjyobz7q4w/D/R552r4++EhwmXK1N2rAy0A==",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/@types/mime": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
       "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
     },
+    "node_modules/@types/minimatch": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
+      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/@types/ms": {
       "version": "0.7.31",
       "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
@@ -7343,6 +7554,17 @@
       "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
       "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
     },
+    "node_modules/@types/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@types/glob": "*",
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/scheduler": {
       "version": "0.16.3",
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
@@ -9066,6 +9288,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/arrify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
@@ -9160,6 +9392,16 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
       "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
     },
+    "node_modules/async-retry": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz",
+      "integrity": "sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "retry": "0.13.1"
+      }
+    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -9966,6 +10208,12 @@
         "ieee754": "^1.2.1"
       }
     },
+    "node_modules/buffer-equal-constant-time": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+      "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
+      "peer": true
+    },
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
@@ -10166,6 +10414,19 @@
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="
     },
+    "node_modules/catharsis": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz",
+      "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "lodash": "^4.17.15"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -11763,6 +12024,15 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "node_modules/ecdsa-sig-formatter": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+      "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+      "peer": true,
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -11921,6 +12191,13 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/ent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+      "integrity": "sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/entities": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
@@ -13755,6 +14032,36 @@
       "resolved": "https://registry.npmjs.org/fast-stable-stringify/-/fast-stable-stringify-1.0.0.tgz",
       "integrity": "sha512-wpYMUmFu5f00Sm0cj2pfivpmawLZ0NKdviQ4w9zJeR8JVtOpOxHmLaJuj0vxvGqMJQWyP/COUkF75/57OKyRag=="
     },
+    "node_modules/fast-text-encoding": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz",
+      "integrity": "sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/fast-xml-parser": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.2.tgz",
+      "integrity": "sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/naturalintelligence"
+        }
+      ],
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "strnum": "^1.0.5"
+      },
+      "bin": {
+        "fxparser": "src/cli/cli.js"
+      }
+    },
     "node_modules/fastq": {
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
@@ -13987,6 +14294,102 @@
         "@firebase/util": "1.9.3"
       }
     },
+    "node_modules/firebase-admin": {
+      "version": "11.11.0",
+      "resolved": "https://registry.npmjs.org/firebase-admin/-/firebase-admin-11.11.0.tgz",
+      "integrity": "sha512-lp784gXFAJgUEtjSdYNZGTWZqltqjBkoaPSQhDKnmWXJP/MCbWdiDY1hsdkl/6O4O4KFovTjUDLu26sojwdQvw==",
+      "peer": true,
+      "dependencies": {
+        "@fastify/busboy": "^1.2.1",
+        "@firebase/database-compat": "^0.3.4",
+        "@firebase/database-types": "^0.10.4",
+        "@types/node": ">=12.12.47",
+        "jsonwebtoken": "^9.0.0",
+        "jwks-rsa": "^3.0.1",
+        "node-forge": "^1.3.1",
+        "uuid": "^9.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "optionalDependencies": {
+        "@google-cloud/firestore": "^6.6.0",
+        "@google-cloud/storage": "^6.9.5"
+      }
+    },
+    "node_modules/firebase-admin/node_modules/uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "peer": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/firebase-functions": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-4.5.0.tgz",
+      "integrity": "sha512-y6HsasHtGLfXCp3Pfrz+JA19lO9hSzYiNxFDIDMffrfcsG7UbXzv0zfi2ASadMVRoDCaox5ppZBa1QJxZbctPQ==",
+      "dependencies": {
+        "@types/cors": "^2.8.5",
+        "@types/express": "4.17.3",
+        "cors": "^2.8.5",
+        "express": "^4.17.1",
+        "node-fetch": "^2.6.7",
+        "protobufjs": "^7.2.2"
+      },
+      "bin": {
+        "firebase-functions": "lib/bin/firebase-functions.js"
+      },
+      "engines": {
+        "node": ">=14.10.0"
+      },
+      "peerDependencies": {
+        "firebase-admin": "^10.0.0 || ^11.0.0"
+      }
+    },
+    "node_modules/firebase-functions/node_modules/@types/express": {
+      "version": "4.17.3",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz",
+      "integrity": "sha512-I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==",
+      "dependencies": {
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "*",
+        "@types/serve-static": "*"
+      }
+    },
+    "node_modules/firebase-functions/node_modules/long": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="
+    },
+    "node_modules/firebase-functions/node_modules/protobufjs": {
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz",
+      "integrity": "sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.2",
+        "@protobufjs/base64": "^1.1.2",
+        "@protobufjs/codegen": "^2.0.4",
+        "@protobufjs/eventemitter": "^1.1.0",
+        "@protobufjs/fetch": "^1.1.0",
+        "@protobufjs/float": "^1.0.2",
+        "@protobufjs/inquire": "^1.1.0",
+        "@protobufjs/path": "^1.1.2",
+        "@protobufjs/pool": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.0",
+        "@types/node": ">=13.7.0",
+        "long": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/flat-cache": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
@@ -14289,12 +14692,42 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+    "node_modules/gaxios": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-5.1.3.tgz",
+      "integrity": "sha512-95hVgBRgEIRQQQHIbnxBXeHbW4TqFk4ZDJW7wmVtvYar72FdhRIo1UGOLS2eRAKCPEdPBWu+M7+A33D9CdX9rA==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "extend": "^3.0.2",
+        "https-proxy-agent": "^5.0.0",
+        "is-stream": "^2.0.0",
+        "node-fetch": "^2.6.9"
+      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=12"
+      }
+    },
+    "node_modules/gcp-metadata": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.3.0.tgz",
+      "integrity": "sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "gaxios": "^5.0.0",
+        "json-bigint": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
     "node_modules/get-caller-file": {
@@ -14486,6 +14919,373 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/google-auth-library": {
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-8.9.0.tgz",
+      "integrity": "sha512-f7aQCJODJFmYWN6PeNKzgvy9LI2tYmXnzpNDHEjG5sDNPgGb2FXQyTBnXeSH+PAtpKESFD+LmHw3Ox3mN7e1Fg==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "arrify": "^2.0.0",
+        "base64-js": "^1.3.0",
+        "ecdsa-sig-formatter": "^1.0.11",
+        "fast-text-encoding": "^1.0.0",
+        "gaxios": "^5.0.0",
+        "gcp-metadata": "^5.3.0",
+        "gtoken": "^6.1.0",
+        "jws": "^4.0.0",
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/google-auth-library/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/google-auth-library/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/google-gax": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-3.6.1.tgz",
+      "integrity": "sha512-g/lcUjGcB6DSw2HxgEmCDOrI/CByOwqRvsuUvNalHUK2iPPPlmAIpbMbl62u0YufGMr8zgE3JL7th6dCb1Ry+w==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@grpc/grpc-js": "~1.8.0",
+        "@grpc/proto-loader": "^0.7.0",
+        "@types/long": "^4.0.0",
+        "@types/rimraf": "^3.0.2",
+        "abort-controller": "^3.0.0",
+        "duplexify": "^4.0.0",
+        "fast-text-encoding": "^1.0.3",
+        "google-auth-library": "^8.0.2",
+        "is-stream-ended": "^0.1.4",
+        "node-fetch": "^2.6.1",
+        "object-hash": "^3.0.0",
+        "proto3-json-serializer": "^1.0.0",
+        "protobufjs": "7.2.4",
+        "protobufjs-cli": "1.1.1",
+        "retry-request": "^5.0.0"
+      },
+      "bin": {
+        "compileProtos": "build/tools/compileProtos.js",
+        "minifyProtoJson": "build/tools/minify.js"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/google-gax/node_modules/@grpc/grpc-js": {
+      "version": "1.8.21",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.21.tgz",
+      "integrity": "sha512-KeyQeZpxeEBSqFVTi3q2K7PiPXmgBfECc4updA1ejCLjYmoAlvvM3ZMp5ztTDUCUQmoY3CpDxvchjO1+rFkoHg==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@grpc/proto-loader": "^0.7.0",
+        "@types/node": ">=12.12.47"
+      },
+      "engines": {
+        "node": "^8.13.0 || >=10.10.0"
+      }
+    },
+    "node_modules/google-gax/node_modules/@grpc/proto-loader": {
+      "version": "0.7.10",
+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.10.tgz",
+      "integrity": "sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "lodash.camelcase": "^4.3.0",
+        "long": "^5.0.0",
+        "protobufjs": "^7.2.4",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/google-gax/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/google-gax/node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/google-gax/node_modules/escodegen": {
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
+      "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=4.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/google-gax/node_modules/escodegen/node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/google-gax/node_modules/glob": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/google-gax/node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/google-gax/node_modules/long": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/google-gax/node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/google-gax/node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/google-gax/node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/google-gax/node_modules/protobufjs": {
+      "version": "7.2.4",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz",
+      "integrity": "sha512-AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ==",
+      "hasInstallScript": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.2",
+        "@protobufjs/base64": "^1.1.2",
+        "@protobufjs/codegen": "^2.0.4",
+        "@protobufjs/eventemitter": "^1.1.0",
+        "@protobufjs/fetch": "^1.1.0",
+        "@protobufjs/float": "^1.0.2",
+        "@protobufjs/inquire": "^1.1.0",
+        "@protobufjs/path": "^1.1.2",
+        "@protobufjs/pool": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.0",
+        "@types/node": ">=13.7.0",
+        "long": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/google-gax/node_modules/protobufjs-cli": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/protobufjs-cli/-/protobufjs-cli-1.1.1.tgz",
+      "integrity": "sha512-VPWMgIcRNyQwWUv8OLPyGQ/0lQY/QTQAVN5fh+XzfDwsVw1FZ2L3DM/bcBf8WPiRz2tNpaov9lPZfNcmNo6LXA==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "escodegen": "^1.13.0",
+        "espree": "^9.0.0",
+        "estraverse": "^5.1.0",
+        "glob": "^8.0.0",
+        "jsdoc": "^4.0.0",
+        "minimist": "^1.2.0",
+        "semver": "^7.1.2",
+        "tmp": "^0.2.1",
+        "uglify-js": "^3.7.7"
+      },
+      "bin": {
+        "pbjs": "bin/pbjs",
+        "pbts": "bin/pbts"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "protobufjs": "^7.0.0"
+      }
+    },
+    "node_modules/google-gax/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/google-gax/node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/google-gax/node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/google-gax/node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/google-p12-pem": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-4.0.1.tgz",
+      "integrity": "sha512-WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "node-forge": "^1.3.1"
+      },
+      "bin": {
+        "gp12-pem": "build/src/bin/gp12-pem.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/gopd": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
@@ -14533,6 +15333,21 @@
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag=="
     },
+    "node_modules/gtoken": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-6.1.2.tgz",
+      "integrity": "sha512-4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "gaxios": "^5.0.1",
+        "google-p12-pem": "^4.0.0",
+        "jws": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/gzip-size": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
@@ -15590,6 +16405,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-stream-ended": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz",
+      "integrity": "sha512-xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw==",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/is-string": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
@@ -17728,6 +18550,15 @@
         "jiti": "bin/jiti.js"
       }
     },
+    "node_modules/jose": {
+      "version": "4.15.4",
+      "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.4.tgz",
+      "integrity": "sha512-W+oqK4H+r5sITxfxpSU+MMdr/YSWGvgZMQDIsNoBDGGy4i7GBPTtvFKibQzW06n3U3TqHjhvBJsirShsEJ6eeQ==",
+      "peer": true,
+      "funding": {
+        "url": "https://github.com/sponsors/panva"
+      }
+    },
     "node_modules/js-base64": {
       "version": "3.7.5",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.5.tgz",
@@ -17755,11 +18586,74 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/js2xmlparser": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz",
+      "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "xmlcreate": "^2.0.4"
+      }
+    },
     "node_modules/jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="
     },
+    "node_modules/jsdoc": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.2.tgz",
+      "integrity": "sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@babel/parser": "^7.20.15",
+        "@jsdoc/salty": "^0.2.1",
+        "@types/markdown-it": "^12.2.3",
+        "bluebird": "^3.7.2",
+        "catharsis": "^0.9.0",
+        "escape-string-regexp": "^2.0.0",
+        "js2xmlparser": "^4.0.2",
+        "klaw": "^3.0.0",
+        "markdown-it": "^12.3.2",
+        "markdown-it-anchor": "^8.4.1",
+        "marked": "^4.0.10",
+        "mkdirp": "^1.0.4",
+        "requizzle": "^0.2.3",
+        "strip-json-comments": "^3.1.0",
+        "underscore": "~1.13.2"
+      },
+      "bin": {
+        "jsdoc": "jsdoc.js"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/jsdoc/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jsdoc/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/jsdom": {
       "version": "16.7.0",
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
@@ -17840,6 +18734,16 @@
         "node": ">=4"
       }
     },
+    "node_modules/json-bigint": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
+      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "bignumber.js": "^9.0.0"
+      }
+    },
     "node_modules/json-buffer": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
@@ -17950,14 +18854,57 @@
       "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
       "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
       "dependencies": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      },
-      "bin": {
-        "JSONStream": "bin.js"
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      },
+      "bin": {
+        "JSONStream": "bin.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/jsonwebtoken": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz",
+      "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==",
+      "peer": true,
+      "dependencies": {
+        "jws": "^3.2.2",
+        "lodash.includes": "^4.3.0",
+        "lodash.isboolean": "^3.0.3",
+        "lodash.isinteger": "^4.0.4",
+        "lodash.isnumber": "^3.0.3",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.isstring": "^4.0.1",
+        "lodash.once": "^4.0.0",
+        "ms": "^2.1.1",
+        "semver": "^7.5.4"
       },
       "engines": {
-        "node": "*"
+        "node": ">=12",
+        "npm": ">=6"
+      }
+    },
+    "node_modules/jsonwebtoken/node_modules/jwa": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+      "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+      "peer": true,
+      "dependencies": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jsonwebtoken/node_modules/jws": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+      "peer": true,
+      "dependencies": {
+        "jwa": "^1.4.1",
+        "safe-buffer": "^5.0.1"
       }
     },
     "node_modules/jsprim": {
@@ -18140,6 +19087,46 @@
         "node": ">=4.0"
       }
     },
+    "node_modules/jwa": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
+      "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "buffer-equal-constant-time": "1.0.1",
+        "ecdsa-sig-formatter": "1.0.11",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/jwks-rsa": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-3.1.0.tgz",
+      "integrity": "sha512-v7nqlfezb9YfHHzYII3ef2a2j1XnGeSE/bK3WfumaYCqONAIstJbrEGapz4kadScZzEt7zYCN7bucj8C0Mv/Rg==",
+      "peer": true,
+      "dependencies": {
+        "@types/express": "^4.17.17",
+        "@types/jsonwebtoken": "^9.0.2",
+        "debug": "^4.3.4",
+        "jose": "^4.14.6",
+        "limiter": "^1.1.5",
+        "lru-memoizer": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/jws": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
+      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "jwa": "^2.0.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
     "node_modules/jwt-decode": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz",
@@ -18180,6 +19167,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/klaw": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz",
+      "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
     "node_modules/kleur": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -18425,11 +19422,27 @@
         "node": ">=10"
       }
     },
+    "node_modules/limiter": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz",
+      "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==",
+      "peer": true
+    },
     "node_modules/lines-and-columns": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
+    "node_modules/linkify-it": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "uc.micro": "^1.0.1"
+      }
+    },
     "node_modules/loader-runner": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -18475,16 +19488,58 @@
       "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
       "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="
     },
+    "node_modules/lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
+      "peer": true
+    },
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
+    "node_modules/lodash.includes": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
+      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==",
+      "peer": true
+    },
+    "node_modules/lodash.isboolean": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
+      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==",
+      "peer": true
+    },
     "node_modules/lodash.isequal": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
     },
+    "node_modules/lodash.isinteger": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
+      "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==",
+      "peer": true
+    },
+    "node_modules/lodash.isnumber": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
+      "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==",
+      "peer": true
+    },
+    "node_modules/lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+      "peer": true
+    },
+    "node_modules/lodash.isstring": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
+      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==",
+      "peer": true
+    },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -18495,6 +19550,12 @@
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
     },
+    "node_modules/lodash.once": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
+      "peer": true
+    },
     "node_modules/lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
@@ -18570,6 +19631,32 @@
         "yallist": "^3.0.2"
       }
     },
+    "node_modules/lru-memoizer": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.2.0.tgz",
+      "integrity": "sha512-QfOZ6jNkxCcM/BkIPnFsqDhtrazLRsghi9mBwFAzol5GCvj4EkFT899Za3+QwikCg5sRX8JstioBDwOxEyzaNw==",
+      "peer": true,
+      "dependencies": {
+        "lodash.clonedeep": "^4.5.0",
+        "lru-cache": "~4.0.0"
+      }
+    },
+    "node_modules/lru-memoizer/node_modules/lru-cache": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz",
+      "integrity": "sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==",
+      "peer": true,
+      "dependencies": {
+        "pseudomap": "^1.0.1",
+        "yallist": "^2.0.0"
+      }
+    },
+    "node_modules/lru-memoizer/node_modules/yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
+      "peer": true
+    },
     "node_modules/ltgt": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz",
@@ -18621,6 +19708,64 @@
         "tmpl": "1.0.5"
       }
     },
+    "node_modules/markdown-it": {
+      "version": "12.3.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
+      }
+    },
+    "node_modules/markdown-it-anchor": {
+      "version": "8.6.7",
+      "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz",
+      "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==",
+      "optional": true,
+      "peer": true,
+      "peerDependencies": {
+        "@types/markdown-it": "*",
+        "markdown-it": "*"
+      }
+    },
+    "node_modules/markdown-it/node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/markdown-it/node_modules/entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "optional": true,
+      "peer": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/marked": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
+      "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/md5.js": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
@@ -18636,6 +19781,13 @@
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
       "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="
     },
+    "node_modules/mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -21406,6 +22558,51 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
+    "node_modules/proto3-json-serializer": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-1.1.1.tgz",
+      "integrity": "sha512-AwAuY4g9nxx0u52DnSMkqqgyLHaW/XaPLtaAo3y/ZCfeaQB/g4YDH4kb8Wc/mWzWvu0YjOznVnfn373MVZZrgw==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "protobufjs": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/proto3-json-serializer/node_modules/long": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/proto3-json-serializer/node_modules/protobufjs": {
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz",
+      "integrity": "sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==",
+      "hasInstallScript": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.2",
+        "@protobufjs/base64": "^1.1.2",
+        "@protobufjs/codegen": "^2.0.4",
+        "@protobufjs/eventemitter": "^1.1.0",
+        "@protobufjs/fetch": "^1.1.0",
+        "@protobufjs/float": "^1.0.2",
+        "@protobufjs/inquire": "^1.1.0",
+        "@protobufjs/path": "^1.1.2",
+        "@protobufjs/pool": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.0",
+        "@types/node": ">=13.7.0",
+        "long": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/protobufjs": {
       "version": "6.11.3",
       "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz",
@@ -21448,6 +22645,12 @@
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
       "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw=="
     },
+    "node_modules/pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==",
+      "peer": true
+    },
     "node_modules/psl": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
@@ -22286,6 +23489,16 @@
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
       "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
     },
+    "node_modules/requizzle": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz",
+      "integrity": "sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "lodash": "^4.17.21"
+      }
+    },
     "node_modules/resolve": {
       "version": "1.22.2",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz",
@@ -22417,6 +23630,20 @@
         "node": ">= 4"
       }
     },
+    "node_modules/retry-request": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-5.0.2.tgz",
+      "integrity": "sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "extend": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -23350,6 +24577,16 @@
         "readable-stream": "^3.5.0"
       }
     },
+    "node_modules/stream-events": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz",
+      "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "stubs": "^3.0.0"
+      }
+    },
     "node_modules/stream-http": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz",
@@ -23560,6 +24797,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/strnum": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
+      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/stubs": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
+      "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/sturdy-websocket": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/sturdy-websocket/-/sturdy-websocket-0.2.1.tgz",
@@ -24035,6 +25286,62 @@
         "node": ">=4.5"
       }
     },
+    "node_modules/teeny-request": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-8.0.3.tgz",
+      "integrity": "sha512-jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "node-fetch": "^2.6.1",
+        "stream-events": "^1.0.5",
+        "uuid": "^9.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/teeny-request/node_modules/@tootallnate/once": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/teeny-request/node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/teeny-request/node_modules/uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/temp-dir": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
@@ -24154,6 +25461,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/text-decoding": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/text-decoding/-/text-decoding-1.0.0.tgz",
+      "integrity": "sha512-/0TJD42KDnVwKmDK6jj3xP7E2MG7SHAOG4tyTgyUCRPdHwvkquYNLEQltmdMa3owq3TkddCVcTsoctJI8VQNKA==",
+      "peer": true
+    },
     "node_modules/text-encoding-utf-8": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz",
@@ -24236,6 +25549,19 @@
       "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
       "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
     },
+    "node_modules/tmp": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "rimraf": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8.17.0"
+      }
+    },
     "node_modules/tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
@@ -24538,6 +25864,26 @@
         "node": "*"
       }
     },
+    "node_modules/uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/uglify-js": {
+      "version": "3.17.4",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
+      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/uint8arrays": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-3.1.1.tgz",
@@ -24579,6 +25925,13 @@
         "react": ">=15.0.0"
       }
     },
+    "node_modules/underscore": {
+      "version": "1.13.6",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz",
+      "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/unfetch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-3.1.2.tgz",
@@ -25831,6 +27184,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/workbox-background-sync": {
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.6.0.tgz",
@@ -26309,6 +27672,13 @@
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
     },
+    "node_modules/xmlcreate": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz",
+      "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/xmlhttprequest": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
diff --git a/client/package.json b/client/package.json
index 0e8ba624..01219f44 100644
--- a/client/package.json
+++ b/client/package.json
@@ -19,6 +19,7 @@
     "date-fns": "^2.30.0",
     "env-cmd": "^10.1.0",
     "firebase": "^9.22.1",
+    "firebase-functions": "^4.5.0",
     "libphonenumber-js": "^1.10.28",
     "opensea-js": "^4.0.24",
     "react": "^18.2.0",

From eff4bd12a71c6e1c31f947a0eec59acdf19d5dd6 Mon Sep 17 00:00:00 2001
From: Ra <rami@jwcorp.fr>
Date: Fri, 24 Nov 2023 19:14:16 +0100
Subject: [PATCH 14/26] input font + some clean up

Co-Authored-By: JWMatheo <88055282+JWMatheo@users.noreply.github.com>
---
 .../AddCommentInput/AddCommentInput.js        |  1 +
 client/src/Pages/Home/Home.js                 | 20 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/client/src/Components/PostsComponents/AddCommentInput/AddCommentInput.js b/client/src/Components/PostsComponents/AddCommentInput/AddCommentInput.js
index b3a77aab..bac330e6 100644
--- a/client/src/Components/PostsComponents/AddCommentInput/AddCommentInput.js
+++ b/client/src/Components/PostsComponents/AddCommentInput/AddCommentInput.js
@@ -117,6 +117,7 @@ function AddCommentInput({
         </div>
         <textarea
           ref={textareaRef}
+          style={{fontFamily:"britanica-regular"}}
           placeholder="Publiez un commentaire..."
           className={
             isMediaQueriesFullPagePostDisabled
diff --git a/client/src/Pages/Home/Home.js b/client/src/Pages/Home/Home.js
index 717fcdfd..c450ee66 100644
--- a/client/src/Pages/Home/Home.js
+++ b/client/src/Pages/Home/Home.js
@@ -240,13 +240,13 @@ function Home({
 
           let judgement;
           if (isUserFan === false && dataPost[i]?.visibility === false) {
-            console.log("pas fan et post privé");
+            // console.log("pas fan et post privé");
             judgement = true;
           } else if (isUserFan === true && dataPost[i]?.visibility === false) {
-            console.log("Fan et post privé");
+            // console.log("Fan et post privé");
             judgement = false;
           } else if (dataPost[i]?.visibility === true) {
-            console.log("post public");
+            // console.log("post public");
             judgement = false;
           }
 
@@ -255,7 +255,7 @@ function Home({
         // console.log(tempIsUserFanArray);
         setIsUserFanArray(tempIsUserFanArray);
       };
-      console.log("appel de la fontion feedDataFrom");
+      // console.log("appel de la fontion feedDataFrom");
       feedDataFromAlchemyAndFirebase();
 
       // if (loggedInUser.metamask) {
@@ -384,8 +384,8 @@ function Home({
           e.currentTarget.id === dataPost[i].id &&
           dataPost[i].isDropdownClicked === false
         ) {
-          console.log(e.currentTarget.id);
-          console.log(dataPost[i].id);
+          // console.log(e.currentTarget.id);
+          // console.log(dataPost[i].id);
           const newData = [...dataPost];
           newData[i].isDropdownClicked = true;
           setPostData(newData);
@@ -427,7 +427,7 @@ function Home({
   // console.log(isLogged)
   function handleClickCopyPostLink(postId) {
     navigator.clipboard.writeText(`https://staging.sofan.app/post/${postId}`);
-    console.log(postId);
+    // console.log(postId);
     setIsCopyPostLinkClicked(true);
     // const timeOutAnimationCopyClicked =
     setTimeout(() => {
@@ -491,7 +491,7 @@ function Home({
             contractAddresses: arraySofanCollection,
           }
         );
-        console.log("nftsFromOwner --> ", nftsFromOwner);
+        // console.log("nftsFromOwner --> ", nftsFromOwner);
         let athletesSupportingArray = [];
         for (let i = 0; i < nftsFromOwner.ownedNfts.length; i++) {
           const elementFromAlchemy = nftsFromOwner.ownedNfts[i];
@@ -551,8 +551,6 @@ function Home({
       getNftsForOwner();
     }
   }, [isLogged, alchemy]);
-  // console.log("nftsFromOwner --> ",nftsFromOwner, "athletesSupportingData --> ",athletesSupportingData)
-  // console.log(athletesSupportingData);
   useEffect(() => {
     const handleResize = () => {
       setWindowWidth(window.innerWidth);
@@ -565,8 +563,6 @@ function Home({
     };
   }, []);
 
-  // useMemo
-  // console.log(athletesFollowing)
   const modalStyle = useMemo(() => ({ top: "24px", right: "20px" }), []);
   return (
     <>

From 28513c83c4d006d762224a272ae60a7a869292c1 Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Mon, 11 Dec 2023 16:43:31 -0500
Subject: [PATCH 15/26] single nft  utility uodate

---
 .../generateClaimUtilityEmailHTML.js          |  0
 client/src/App.js                             |  2 +-
 .../NftCollectionOverview.js                  | 17 ++++--
 .../UtilitiesComponent/UtilitiesComponent.js  | 25 +++++++--
 .../UtilityClaimPopUp/UtilityClaimModal.js    |  4 +-
 client/src/Pages/NftSingle/NftSingle.js       | 55 +++++++++++++++++--
 6 files changed, 85 insertions(+), 18 deletions(-)
 create mode 100644 client/functions/generateClaimUtilityEmailHTML.js

diff --git a/client/functions/generateClaimUtilityEmailHTML.js b/client/functions/generateClaimUtilityEmailHTML.js
new file mode 100644
index 00000000..e69de29b
diff --git a/client/src/App.js b/client/src/App.js
index c1cd1247..6afc1b78 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -598,7 +598,7 @@ function App() {
                   />
                   <Route
                     path="/nftsingle/:contractAddress/:nftId"
-                    element={<NftSingle />}
+                    element={<NftSingle isLogged={loggedInUser} />}
                   />
                   <Route path="signupathlete" element={<SignUpAthletePage />} />
                   <Route path="/settings" element={<SettingsPage />} />
diff --git a/client/src/Components/NftCollectionOverview/NftCollectionOverview.js b/client/src/Components/NftCollectionOverview/NftCollectionOverview.js
index 64487fd5..dc424a79 100644
--- a/client/src/Components/NftCollectionOverview/NftCollectionOverview.js
+++ b/client/src/Components/NftCollectionOverview/NftCollectionOverview.js
@@ -10,18 +10,25 @@ function NftCollectionOverview({
   knowMoreAboutCollection,
   latestBidsArray,
   ethPrice,
+  loggedInUser
 }) {
+
+  console.log(loggedInUser);
   return (
     <section className="nft-collection-overview-container">
       <div className="nft-collection-overview-utilities-container">
         <div className="nft-collection-overview-utilities-title">Utilités</div>
-        {utilitiesArray.map((element) => (
+        {utilitiesArray.map((utility) => (
           <UtilitiesComponent
             key={uuidv4()}
-            utilitiesTitle={element.title}
-            utilitiesStatus={element.status}
-            utilitiesDescription={element.description}
-            utilitiesDate={element.date}
+            utility={utility}
+            loggedInUser={loggedInUser}
+            unilityId={utility?.id}
+            utilityTitle={utility?.title}
+            utilityStatus={utility?.claimed_status}
+            utilityDescription={utility?.description}
+            utilityDate={utility?.date ? new Date(utility.date.seconds * 1000).toDateString() : 'N/A'}
+            launchpadCollectionLiveUtilities={true}
           />
         ))}
       </div>
diff --git a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
index d3a715ba..f6f4c637 100644
--- a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
+++ b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
@@ -2,7 +2,7 @@ import React, { useState, useEffect, useMemo } from "react";
 import meetingsLogo from "../../Assets/Image/meetings-logo.svg";
 import liveLogo from "../../Assets/Image/live-logo.svg";
 import merchLogo from "../../Assets/Image/merch-logo.svg";
-import { useParams } from "react-router-dom";
+import { useLocation, useParams } from "react-router-dom";
 import Modal from "../Modal/Modal";
 import "./UtilitiesComponent.css";
 import UtilityClaimModal from "./UtilityClaimPopUp/UtilityClaimModal";
@@ -31,6 +31,13 @@ function UtilitiesComponent({
   const [status, setStatus] = useState();
   const [isUtiliyClicked, setIsUtiliyClicked] = useState(false);
   const { collectionAddress } = useParams();
+
+  // Fetch url info
+  const location = useLocation();
+  const segments = location.pathname.split("/");
+  const pageName = segments[1];
+
+
   // A changer pour un nft holder de l'athleth
   const [isloggedUserNftHolder, setIsloggedUserNftHolder] = useState(true);
   const [isClaimConfirmed, setIsClaimConfirmed] = useState(false);
@@ -43,6 +50,8 @@ function UtilitiesComponent({
     }
   }
 
+  console.log(utilityStatus);
+
   //   console.log(utilityStatus)
   useEffect(() => {
     const test = () => displayStatusColor();
@@ -87,7 +96,7 @@ function UtilitiesComponent({
       try {
         if (
           utility.claimed_status &&
-          utility.claimed_user_id === loggedInUser.id
+          utility.claimed_user_id === loggedInUser?.id
         ) {
           // Disclaim the utility if it is already claimed by the logged-in user
           await updateDoc(utilityDocRef, {
@@ -99,7 +108,7 @@ function UtilitiesComponent({
           // Claim the utility
           await updateDoc(utilityDocRef, {
             claimed_status: true,
-            claimed_user_id: loggedInUser.id,
+            claimed_user_id: loggedInUser?.id,
           });
           console.log("Utility claimed successfully!");
         }
@@ -113,13 +122,19 @@ function UtilitiesComponent({
     //setIsUtiliyClicked(false);
   };
 
+  const handleCheckNFTPageType = () => {
+    if (pageName === "nftsingle") {
+      setIsUtiliyClicked(true);
+    }
+  }
+
   const modalStyle = useMemo(() => ({ top: "20px", right: "20px" }), []);
 
   // console.log(status);
   return (
     <>
       <div
-        onClick={() => setIsUtiliyClicked(true)}
+        onClick={handleCheckNFTPageType}
         className="nft-collection-overview-utilities-one-container"
       >
         <div className="nft-collection-overview-utilities-one-wrap">
@@ -157,7 +172,7 @@ function UtilitiesComponent({
             <span style={{ color: "red", marginLeft: 10 }}>
               {utility?.claimed_status &&
               utility?.claimed_user_id &&
-              utility?.claimed_user_id === loggedInUser.id
+              utility?.claimed_user_id === loggedInUser?.id
                 ? "Réclamé"
                 : ""}
             </span>
diff --git a/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js b/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js
index 2bb5c431..dbc6a4bf 100644
--- a/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js
+++ b/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js
@@ -21,13 +21,13 @@ function UtilityClaimModal({
             className="utility-pop-up-title"
             style={
               utility.claimed_status &&
-              utility.claimed_user_id === loggedInUser.id
+              utility.claimed_user_id === loggedInUser?.id
                 ? { color: "red" }
                 : {}
             }
           >
             {utility.claimed_status &&
-            utility.claimed_user_id === loggedInUser.id
+            utility.claimed_user_id === loggedInUser?.id
               ? "Utilité déjà réclamée"
               : "Réclamer l'Utilité"}
           </span>
diff --git a/client/src/Pages/NftSingle/NftSingle.js b/client/src/Pages/NftSingle/NftSingle.js
index 34a14312..421b9620 100644
--- a/client/src/Pages/NftSingle/NftSingle.js
+++ b/client/src/Pages/NftSingle/NftSingle.js
@@ -19,13 +19,13 @@ import useEth from "../../contexts/EthContext/useEth";
 import PopUpAddFundToWallet from "../../Components/PopUpAddFundToWallet/PopUpAddFundToWallet";
 import { formatCurrentBalance } from "../../Utils/formatCurrentBalance";
 import { useLocation } from "react-router-dom";
-import { collection, getDocs, query, where } from "firebase/firestore";
+import { collection, getDocs, query, where, onSnapshot } from "firebase/firestore";
 import { db } from "../../Configs/firebase";
 import Web3 from "web3";
 import { concatStringFromTo } from "../../Utils/concatString";
 import { removeDuplicatesFromArray } from "../../Utils/removeDuplicatesFromArray";
 import useToggleNetwork from "../../contexts/ToggleNetwork/useToggleNetwork";
-const NftSingle = () => {
+const NftSingle = ({ isLogged }) => {
   // functionnal states
   const [isSubMenuClicked, setIsSubMenuClicked] = useState([
     true,
@@ -70,6 +70,13 @@ const NftSingle = () => {
   const [displayPopUpAddFundToWallet, setDisplayPopUpAddFundToWallet] =
     useState();
   const [currentBalance, setCurrentBalance] = useState(null);
+
+  // --------------- Shajeed -----------------------
+
+  const [utilities, setUtilities] = useState([]);
+
+  // -----------------------------------------------
+
   const [
     currentNftCollectionInfoFromBackend,
     setCurrentNftCollectionInfoFromBackend,
@@ -174,6 +181,41 @@ const NftSingle = () => {
     setNftIdApi(nftsFromContract?.tokenId);
   }
 
+
+ // ----------------------- Shajeed -------------------------
+
+ useEffect(() => {
+  const q = query(
+    collection(db, "nft_collections"),
+    where("collection_address", "==", collectionAddress)
+  );
+
+  getDocs(q).then((querySnapshot) => {
+    const docData = querySnapshot.docs[0];
+    if (docData) {
+      const docId = docData.id;
+      const unsub = onSnapshot(
+        collection(db, "nft_collections", docId, "utilities"),
+        (snapshot) => {
+          const utilitiesData = snapshot.docs.map((doc) => ({
+            id: doc.id, // include the id here
+            ...doc.data(),
+          }));
+          setUtilities(utilitiesData);
+        }
+      );
+
+      return () => {
+        unsub();
+      };
+    }
+  });
+}, [collectionAddress]);
+
+// ---------------------------------------------------------
+
+
+
   useEffect(() => {
     if (alchemy) {
       getCurrentOwnerInfo();
@@ -884,6 +926,7 @@ const NftSingle = () => {
 
     // Call blockchain si c'est bon alors setIsListed(true) sinon false
   };
+
   const handleListClosed = () => {
     setIsListed(false);
     setIsListClicked(false);
@@ -1132,9 +1175,11 @@ const NftSingle = () => {
           </div>
           {isSubMenuClicked[0] && (
             <NftCollectionOverview
-              utilitiesArray={
-                dataSinglePageNftCollection.overviewData[0].utilities
-              }
+              // utilitiesArray={
+              //   dataSinglePageNftCollection.overviewData[0].utilities
+              // }
+              utilitiesArray={utilities}
+              loggedInUser={isLogged}
               knowMoreAboutCollection={
                 currentNftCollectionInfoFromBackend?.know_more_collection
               }

From e4acd3ee2d9db40160564b1fe7dab6e920ea4cb6 Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Sat, 6 Jan 2024 19:59:30 -0500
Subject: [PATCH 16/26] Claimed Utility Doc Created

---
 .../NftCollectionOverview.js                  |  8 ++--
 .../UtilitiesComponent/UtilitiesComponent.js  | 42 ++++++++++++++++---
 client/src/Pages/NftSingle/NftSingle.js       |  1 +
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/client/src/Components/NftCollectionOverview/NftCollectionOverview.js b/client/src/Components/NftCollectionOverview/NftCollectionOverview.js
index dc424a79..b734a73e 100644
--- a/client/src/Components/NftCollectionOverview/NftCollectionOverview.js
+++ b/client/src/Components/NftCollectionOverview/NftCollectionOverview.js
@@ -10,10 +10,11 @@ function NftCollectionOverview({
   knowMoreAboutCollection,
   latestBidsArray,
   ethPrice,
-  loggedInUser
+  loggedInUser,
+  currentAthleteCollectionCreator
 }) {
 
-  console.log(loggedInUser);
+  console.log(currentAthleteCollectionCreator);
   return (
     <section className="nft-collection-overview-container">
       <div className="nft-collection-overview-utilities-container">
@@ -23,12 +24,13 @@ function NftCollectionOverview({
             key={uuidv4()}
             utility={utility}
             loggedInUser={loggedInUser}
-            unilityId={utility?.id}
+            utilityId={utility?.id}
             utilityTitle={utility?.title}
             utilityStatus={utility?.claimed_status}
             utilityDescription={utility?.description}
             utilityDate={utility?.date ? new Date(utility.date.seconds * 1000).toDateString() : 'N/A'}
             launchpadCollectionLiveUtilities={true}
+            collectionOwner={currentAthleteCollectionCreator}
           />
         ))}
       </div>
diff --git a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
index f6f4c637..5877f399 100644
--- a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
+++ b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
@@ -16,27 +16,30 @@ import {
   where,
   collection,
   deleteField,
+  addDoc,
+  Timestamp
 } from "firebase/firestore";
 
 function UtilitiesComponent({
   utility,
   loggedInUser,
-  unilityId,
+  utilityId,
   utilityTitle,
   utilityStatus,
   utilityDescription,
   utilityDate,
   launchpadCollectionLiveUtilities,
+  collectionOwner,
 }) {
   const [status, setStatus] = useState();
   const [isUtiliyClicked, setIsUtiliyClicked] = useState(false);
-  const { collectionAddress } = useParams();
+  const { contractAddress } = useParams();
 
   // Fetch url info
   const location = useLocation();
   const segments = location.pathname.split("/");
   const pageName = segments[1];
-
+  const nftId = segments[3];
 
   // A changer pour un nft holder de l'athleth
   const [isloggedUserNftHolder, setIsloggedUserNftHolder] = useState(true);
@@ -62,11 +65,11 @@ function UtilitiesComponent({
     e.preventDefault();
     //console.log(utility.id, "claimed by", loggedInUser.display_name);
 
-    // Query to find the document with the specific collectionAddress field
+    // Query to find the document with the specific contractAddress field
     const querySnapshot = await getDocs(
       query(
         collection(db, "nft_collections"),
-        where("collection_address", "==", collectionAddress)
+        where("collection_address", "==", contractAddress)
       )
     );
 
@@ -118,6 +121,33 @@ function UtilitiesComponent({
     } else {
       console.error("No such document to update!");
     }
+
+    // add in claimed Utiliy COllection
+    // This goes after the existing logic for claiming or disclaiming utilities.
+    // Ensure this runs only if the loggedInUser is present and a utility has been claimed or updated.
+    if (loggedInUser && docSnap.exists()) {
+      // Prepare the new document data
+      const newClaimedNFTUtility = {
+        athlete_email: collectionOwner.email, // from provided variable mappings
+        claimed_user_email: loggedInUser.email, // from provided variable mappings
+        nft_collection_address: contractAddress, // from provided variable mappings
+        nft_id: nftId, // from provided variable mappings
+        utility_id: utilityId, // from provided variable mappings
+        claimed_date: Timestamp.now(), // current date and time
+      };
+
+      try {
+        // Add the new document to 'claimed_nft_utility' collection
+        await addDoc(
+          collection(db, "claimed_nft_utility"),
+          newClaimedNFTUtility
+        );
+        console.log("New utility claim recorded in claimed_nft_utility.");
+      } catch (err) {
+        console.error("Error creating document in claimed_nft_utility: ", err);
+      }
+    }
+
     setIsClaimConfirmed(true);
     //setIsUtiliyClicked(false);
   };
@@ -126,7 +156,7 @@ function UtilitiesComponent({
     if (pageName === "nftsingle") {
       setIsUtiliyClicked(true);
     }
-  }
+  };
 
   const modalStyle = useMemo(() => ({ top: "20px", right: "20px" }), []);
 
diff --git a/client/src/Pages/NftSingle/NftSingle.js b/client/src/Pages/NftSingle/NftSingle.js
index 421b9620..b3e8bb43 100644
--- a/client/src/Pages/NftSingle/NftSingle.js
+++ b/client/src/Pages/NftSingle/NftSingle.js
@@ -1187,6 +1187,7 @@ const NftSingle = ({ isLogged }) => {
               //   dataSinglePageNftCollection.overviewData[0].latestBids
               // }
               ethPrice={ethPrice}
+              currentAthleteCollectionCreator={currentAthleteCollectionCreator}
             />
           )}
           {/* {isSubMenuClicked[1] && (

From c06626a2071d182e0f0b23fa2f313f2ce1e3360e Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Sat, 6 Jan 2024 23:29:13 -0500
Subject: [PATCH 17/26] send mail utilisateur

Created the email of user confirmation of NFT claiming utility
---
 .DS_Store                                     | Bin 6148 -> 6148 bytes
 .../generateAthleteClaimUtilityEmailHTML.js   |  49 ++++++++
 .../generateClaimUtilityEmailHTML.js          |   0
 .../generateUserClaimUtilityEmailHTML.js      |  54 +++++++++
 .../generateVerificationCodeEmailHTML.js      |   2 +-
 client/functions/generateWelcomeEmailHTML.js  |   4 +-
 client/functions/index.js                     | 106 ++++++++++++-----
 .../NftCollectionOverview.js                  |   4 +-
 .../UtilitiesComponent/UtilitiesComponent.js  | 110 +++++++++++++++---
 .../UtilityClaimPopUp/UtilityClaimModal.js    |  28 ++---
 client/src/Pages/NftSingle/NftSingle.js       |   3 +
 emailtest.html                                |  32 +++++
 12 files changed, 329 insertions(+), 63 deletions(-)
 create mode 100644 client/functions/generateAthleteClaimUtilityEmailHTML.js
 delete mode 100644 client/functions/generateClaimUtilityEmailHTML.js
 create mode 100644 client/functions/generateUserClaimUtilityEmailHTML.js
 create mode 100644 emailtest.html

diff --git a/.DS_Store b/.DS_Store
index 77f6190755fca2ad8703541b30ea3f8890bd0d07..181bd8ece781f99c960113849ecf560d9dd17df8 100644
GIT binary patch
delta 78
zcmZoMXfc=|#>B!ku~2NHo+2aH#(>?7iv?Ji7`Zm{FljP!rlk}oC*|koFm6_5KFPG1
gor9kPsCqLa%Xj9<{34DVj0_A+3_!3sLSzjy00U?d^#A|>

delta 68
zcmZoMXfc=|#>B)qu~2NHo+2aX#(>?7jGUW!STq?o`?2n1+Snk;w3(fQp9837vmnQJ
W=E?jbjvNd?z{tSBvN=Lz4Kn~oh!0%=

diff --git a/client/functions/generateAthleteClaimUtilityEmailHTML.js b/client/functions/generateAthleteClaimUtilityEmailHTML.js
new file mode 100644
index 00000000..fff20205
--- /dev/null
+++ b/client/functions/generateAthleteClaimUtilityEmailHTML.js
@@ -0,0 +1,49 @@
+const generateAthleteClaimUtilityEmailHTML = ({
+    athleteName,
+    userName,
+    nftId,
+    collectionName,
+    title,
+    description,
+    claimed_date,
+  }) => {
+    return `
+      <!DOCTYPE html>
+      <html lang="fr">
+      <head>
+        <meta charset="utf-8"/>
+        <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
+        <title>Notification de Réclamation NFT</title>
+      </head>
+      <body style="background-color: white; color: #333; font-family: Arial, sans-serif; padding: 20px;">
+        <div style="max-width: 500px; margin: 0 auto; padding: 20px; background-color: #f6f6f6; border-radius: 5px;">
+          <div style="text-align: center; margin-bottom: 20px;">
+            <img src="https://firebasestorage.googleapis.com/v0/b/sofan-app.appspot.com/o/sofanlogo.svg?alt=media&token=00ba642b-8d9e-4010-b831-19413e0a2dea" alt="Sofan Logo" style="width: 150px;"/>
+          </div>
+          <div style="margin: 20px 0; font-size: 18px;">
+            Bonjour ${athleteName},
+            <br><br>
+            Nous tenons à vous informer qu'un utilisateur a récemment réclamé une utilité de votre collection NFT. Voici les détails :
+            <ul>
+              <li>Utilisateur: ${userName}</li>
+              <li>ID de NFT: ${nftId}</li>
+              <li>Collection NFT: ${collectionName}</li>
+              <li>Date de réclamation: ${claimed_date}</li>
+            </ul>
+          </div>
+          <div style="margin-top: 20px; padding: 10px; border: 1px solid #ddd; border-radius: 8px; background-color: #f9f9f9;">
+              <h3 style="color: #333;">Détails de l'Utilité</h3>
+              <p><strong>Titre:</strong> ${title}</p>
+              <p><strong>Description:</strong> ${description}</p>
+          </div>
+          <div style="text-align: center; color: #888; font-size: 14px; margin-top: 20px;">
+            Si vous avez des questions ou besoin d'assistance, n'hésitez pas à nous contacter à <a href="mailto:support@sofan.com" style="color: blue;">support@sofan.com</a>.
+          </div>
+        </div>
+      </body>
+      </html>
+    `;
+  };
+  
+  module.exports = generateAthleteClaimUtilityEmailHTML;
+  
\ No newline at end of file
diff --git a/client/functions/generateClaimUtilityEmailHTML.js b/client/functions/generateClaimUtilityEmailHTML.js
deleted file mode 100644
index e69de29b..00000000
diff --git a/client/functions/generateUserClaimUtilityEmailHTML.js b/client/functions/generateUserClaimUtilityEmailHTML.js
new file mode 100644
index 00000000..221673f5
--- /dev/null
+++ b/client/functions/generateUserClaimUtilityEmailHTML.js
@@ -0,0 +1,54 @@
+const generateUserClaimUtilityEmailHTML = ({
+  display_name,
+  nftId,
+  athleteName,
+  claimed_date,
+  collectionName,
+  title,
+  description,
+  utility_date,
+}) => {
+
+  return `
+    <!DOCTYPE html>
+    <html lang="fr">
+    <head>
+      <meta charset="utf-8"/>
+      <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
+      <title>Confirmation de Réclamation NFT</title>
+    </head>
+    <body style="background-color: white; color: #333; font-family: Arial, sans-serif; padding: 20px;">
+      <div style="max-width: 500px; margin: 0 auto; padding: 20px; background-color: #f6f6f6; border-radius: 5px;">
+        <div style="text-align: center; margin-bottom: 20px;">
+          <img src="https://firebasestorage.googleapis.com/v0/b/sofan-app.appspot.com/o/sofanlogo.svg?alt=media&token=00ba642b-8d9e-4010-b831-19413e0a2dea" alt="Sofan Logo" style="width: 150px;"/>
+        </div>
+        <div style="margin: 20px 0; font-size: 18px;">
+          Bonjour ${display_name},
+          <br><br>
+          Nous sommes heureux de vous confirmer que vous avez réussi à réclamer une utilité NFT pour ${collectionName}.
+          <br><br>
+          Détails de l'utilité réclamée:
+          <ul>
+            <li>ID de NFT: ${nftId}</li>
+            <li>Nom de l'athlète: ${athleteName}</li>
+            <li>Date de réclamation: ${claimed_date}</li>
+          </ul>
+          <div style="margin-top: 20px; padding: 10px; border: 1px solid #ddd; border-radius: 8px; background-color: #f9f9f9;">
+            <h3 style="color: #333;">Détails de l'Utilité</h3>
+            <p><strong>Titre:</strong> ${title}</p>
+            <p><strong>Description:</strong> ${description}</p>
+            <p><strong>Date de l'Utilité:</strong> ${utility_date}</p>
+          </div>
+          Vous pouvez vérifier l'état de votre utilité NFT à tout moment dans votre tableau de bord utilisateur.
+        </div>
+        <a href="https://sofan.app" style="display: block; width: 200px; margin: 20px auto; padding: 10px; background-color: #f6d463; color: white; text-align: center; border-radius: 5px; text-decoration: none; font-weight: bold;">Voir Mon Profile</a>
+        <div style="text-align: center; color: #888; font-size: 14px; margin-top: 20px;">
+          Si vous avez des questions ou besoin d'assistance, n'hésitez pas à nous contacter à <a href="mailto:contact@sofan.app" style="color: blue;">contact@sofan.app</a>.
+        </div>
+      </div>
+    </body>
+    </html>
+  `;
+};
+
+module.exports = generateUserClaimUtilityEmailHTML;
diff --git a/client/functions/generateVerificationCodeEmailHTML.js b/client/functions/generateVerificationCodeEmailHTML.js
index 9cff565a..668c70aa 100644
--- a/client/functions/generateVerificationCodeEmailHTML.js
+++ b/client/functions/generateVerificationCodeEmailHTML.js
@@ -29,7 +29,7 @@ const generateVerificationCodeEmailHTML = ({ code }) => {
             <p>Préparez-vous à vivre une expérience unique.</p>
           </div>
           <div style="${footerStyle}">
-            <p>Si vous avez besoin d'aide, n'hésitez pas à contacter notre équipe de support dédiée à <a href="mailto:support@sofan.com">support@sofan.app</a>.</p>
+            <p>Si vous avez besoin d'aide, n'hésitez pas à contacter notre équipe de support dédiée à <a href="mailto:contact@sofan.app">contact@sofan.app</a>.</p>
             <p>Merci d'avoir choisi Sofan! Nous sommes impatients de vous servir.</p>
           </div>
         </div>
diff --git a/client/functions/generateWelcomeEmailHTML.js b/client/functions/generateWelcomeEmailHTML.js
index 5cd558d9..4d4e14f2 100644
--- a/client/functions/generateWelcomeEmailHTML.js
+++ b/client/functions/generateWelcomeEmailHTML.js
@@ -28,8 +28,8 @@ const generateWelcomeEmailHTML = () => {
    </a>
    <div style="text-align: center; color: #888; font-size: 14px; margin-top: 20px;">
     Si vous avez des questions sur les sports, les athlètes ou les NFTs, n'hésitez pas à nous contacter à
-    <a href="mailto:support@sofan.com" style="color: blue;">
-     support@sofan.com
+    <a href="mailto:contact@sofan.app" style="color: blue;">
+     contact@sofan.app
     </a>
    </div>
   </div>
diff --git a/client/functions/index.js b/client/functions/index.js
index 6642a56f..d7fbd630 100644
--- a/client/functions/index.js
+++ b/client/functions/index.js
@@ -1,6 +1,6 @@
 const functions = require("firebase-functions/v1");
 //const cors = require('cors')({ origin: ['http://localhost:3000', 'https://www.sofan.app', 'https://staging.sofan.app'] });
-const cors = require('cors')({ origin: true });
+const cors = require("cors")({ origin: true });
 
 // // Create and deploy your first functions
 // // https://firebase.google.com/docs/functions/get-started
@@ -8,6 +8,7 @@ const cors = require('cors')({ origin: true });
 const nodemailer = require("nodemailer");
 const generateVerificationCodeEmailHTML = require("./generateVerificationCodeEmailHTML");
 const generateWelcomeEmailHTML = require("./generateWelcomeEmailHTML");
+const generateUserClaimUtilityEmailHTML = require("./generateUserClaimUtilityEmailHTML");
 
 const transporter = nodemailer.createTransport({
   host: "mail.gandi.net",
@@ -22,8 +23,8 @@ const transporter = nodemailer.createTransport({
 // functions.logger.log(functions.config().email.user);
 
 exports.sendVerificationEmail = functions.https.onRequest((req, res) => {
-   // Return 204 for OPTIONS method (preflight request)
-  
+  // Return 204 for OPTIONS method (preflight request)
+
   cors(req, res, async () => {
     if (req.method !== "POST") {
       return res.status(405).send("Method Not Allowed");
@@ -52,7 +53,6 @@ exports.sendVerificationEmail = functions.https.onRequest((req, res) => {
   });
 });
 
-
 exports.sendWelcomeEmail = functions.https.onRequest((req, res) => {
   cors(req, res, async () => {
     if (req.method !== "POST") {
@@ -79,41 +79,87 @@ exports.sendWelcomeEmail = functions.https.onRequest((req, res) => {
   });
 });
 
+exports.sendUserClaimUtilityEmail = functions.https.onRequest((req, res) => {
+  cors(req, res, async () => {
+    if (req.method !== "POST") {
+      return res.status(405).send("Method Not Allowed");
+    }
+
+    const {
+      email,
+      display_name,
+      nftId,
+      athleteName,
+      claimed_date,
+      collectionName,
+      title,
+      description,
+      utility_date,
+    } = req.body;
+    const htmlContent = generateUserClaimUtilityEmailHTML({
+      display_name,
+      nftId,
+      athleteName,
+      claimed_date,
+      collectionName,
+      title,
+      description,
+      utility_date,
+    });
 
+    const mailOptions = {
+      from: `"Sofan" <${functions.config().email.user}>`, // Make sure the sender address is verified in your email service provider
+      to: email,
+      subject: "Confirmation de votre réclamation Utilité d'NFT - Sofan",
+      html: htmlContent,
+    };
 
-const admin = require('firebase-admin');
+    try {
+      await transporter.sendMail(mailOptions);
+      functions.logger.log("Email sent successfully");
+      res.send({ success: "Email sent successfully" }); // Send success response
+    } catch (err) {
+      functions.logger.error("Error sending email:", err);
+      res.status(500).send({ error: "Error sending email", details: err }); // Send error details
+    }
+  });
+});
+
+const admin = require("firebase-admin");
 //const functions = require('firebase-functions');
 admin.initializeApp();
 
-exports.scheduledPublish = functions.pubsub.schedule('every 60 minutes').onRun(async (context) => {
-  const now = admin.firestore.Timestamp.now();
-  const scheduledPostsRef = admin.firestore().collection('scheduled_posts');
-  const feedPostsRef = admin.firestore().collection('feed_post');
-
-  console.log('Checking for scheduled posts to publish...');
+exports.scheduledPublish = functions.pubsub
+  .schedule("every 60 minutes")
+  .onRun(async (context) => {
+    const now = admin.firestore.Timestamp.now();
+    const scheduledPostsRef = admin.firestore().collection("scheduled_posts");
+    const feedPostsRef = admin.firestore().collection("feed_post");
 
-  const snapshot = await scheduledPostsRef.where('publish_timestamp', '<=', now).get();
+    console.log("Checking for scheduled posts to publish...");
 
-  if (snapshot.empty) {
-    console.log('No posts to publish.');
-    return null;
-  }
+    const snapshot = await scheduledPostsRef
+      .where("publish_timestamp", "<=", now)
+      .get();
 
-  const batch = admin.firestore().batch();
+    if (snapshot.empty) {
+      console.log("No posts to publish.");
+      return null;
+    }
 
-  snapshot.docs.forEach((doc) => {
-    const postData = doc.data();
-    postData.createdAt = now; // Update the createdAt value to the current timestamp
-    const newPostRef = feedPostsRef.doc();
-    
-    batch.set(newPostRef, postData);
-    batch.delete(doc.ref);
-  });
+    const batch = admin.firestore().batch();
 
-  return batch.commit().then(() => {
-    console.log('Posts published successfully!');
-    return null;
-  });
-});
+    snapshot.docs.forEach((doc) => {
+      const postData = doc.data();
+      postData.createdAt = now; // Update the createdAt value to the current timestamp
+      const newPostRef = feedPostsRef.doc();
 
+      batch.set(newPostRef, postData);
+      batch.delete(doc.ref);
+    });
 
+    return batch.commit().then(() => {
+      console.log("Posts published successfully!");
+      return null;
+    });
+  });
diff --git a/client/src/Components/NftCollectionOverview/NftCollectionOverview.js b/client/src/Components/NftCollectionOverview/NftCollectionOverview.js
index b734a73e..df14a3bf 100644
--- a/client/src/Components/NftCollectionOverview/NftCollectionOverview.js
+++ b/client/src/Components/NftCollectionOverview/NftCollectionOverview.js
@@ -11,7 +11,8 @@ function NftCollectionOverview({
   latestBidsArray,
   ethPrice,
   loggedInUser,
-  currentAthleteCollectionCreator
+  currentAthleteCollectionCreator,
+  collectionNameApi
 }) {
 
   console.log(currentAthleteCollectionCreator);
@@ -31,6 +32,7 @@ function NftCollectionOverview({
             utilityDate={utility?.date ? new Date(utility.date.seconds * 1000).toDateString() : 'N/A'}
             launchpadCollectionLiveUtilities={true}
             collectionOwner={currentAthleteCollectionCreator}
+            collectionNameApi={collectionNameApi}
           />
         ))}
       </div>
diff --git a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
index 5877f399..1c35ff44 100644
--- a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
+++ b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useMemo } from "react";
 import meetingsLogo from "../../Assets/Image/meetings-logo.svg";
-import liveLogo from "../../Assets/Image/live-logo.svg";
-import merchLogo from "../../Assets/Image/merch-logo.svg";
+//import liveLogo from "../../Assets/Image/live-logo.svg";
+//import merchLogo from "../../Assets/Image/merch-logo.svg";
 import { useLocation, useParams } from "react-router-dom";
 import Modal from "../Modal/Modal";
 import "./UtilitiesComponent.css";
@@ -17,7 +17,7 @@ import {
   collection,
   deleteField,
   addDoc,
-  Timestamp
+  Timestamp,
 } from "firebase/firestore";
 
 function UtilitiesComponent({
@@ -30,12 +30,14 @@ function UtilitiesComponent({
   utilityDate,
   launchpadCollectionLiveUtilities,
   collectionOwner,
+  collectionNameApi,
 }) {
   const [status, setStatus] = useState();
   const [isUtiliyClicked, setIsUtiliyClicked] = useState(false);
   const { contractAddress } = useParams();
+  const [isUtilityClaimed, setIsUtilityClaimed] = useState(false); // Fetch url info
+  const [claimedUserEmail, setClaimedUserEmail] = useState(null);
 
-  // Fetch url info
   const location = useLocation();
   const segments = location.pathname.split("/");
   const pageName = segments[1];
@@ -53,13 +55,13 @@ function UtilitiesComponent({
     }
   }
 
-  console.log(utilityStatus);
+
 
   //   console.log(utilityStatus)
   useEffect(() => {
     const test = () => displayStatusColor();
     test();
-  }, []);
+  });
 
   const handleClaimClick = async (e) => {
     e.preventDefault();
@@ -102,10 +104,10 @@ function UtilitiesComponent({
           utility.claimed_user_id === loggedInUser?.id
         ) {
           // Disclaim the utility if it is already claimed by the logged-in user
-          await updateDoc(utilityDocRef, {
-            claimed_status: false,
-            claimed_user_id: deleteField(),
-          });
+          // await updateDoc(utilityDocRef, {
+          //   claimed_status: false,
+          //   claimed_user_id: deleteField(),
+          // });
           console.log("Utility disclaimed successfully!");
         } else {
           // Claim the utility
@@ -115,6 +117,59 @@ function UtilitiesComponent({
           });
           console.log("Utility claimed successfully!");
         }
+
+        // Now, send the email
+        const sendEmail = async () => {
+          const claimedDate = new Date(); // Or the date you get from the claim
+          const formatter = new Intl.DateTimeFormat("fr-FR", {
+            year: "numeric",
+            month: "long",
+            day: "2-digit",
+          });
+          const formatter2 = new Intl.DateTimeFormat('fr-FR', {
+            weekday: 'long',
+            year: 'numeric',
+            month: 'long',
+            day: '2-digit'
+          });
+          const formattedDate = formatter.format(claimedDate);
+          const formattedUtilityDate = formatter2.format(new Date(utilityDate));
+
+          const functionUrl =
+            "https://us-central1-sofan-app.cloudfunctions.net/sendUserClaimUtilityEmail";
+          const emailData = {
+            email: loggedInUser.email, // assuming this is the user's email
+            display_name: loggedInUser?.displayName, // or however you get the user's display name
+            nftId: nftId,
+            athleteName: collectionOwner?.display_name, // Replace with actual data
+            claimed_date: formattedDate, // or format claimed_date as needed
+            collectionName: collectionNameApi,
+            title: utilityTitle,
+            description: utilityDescription,
+            utility_date: formattedUtilityDate,
+          };
+
+          try {
+            const response = await fetch(functionUrl, {
+              method: "POST",
+              headers: {
+                "Content-Type": "application/json",
+              },
+              body: JSON.stringify(emailData),
+            });
+
+            if (response.ok) {
+              console.log("Email sent successfully!");
+            } else {
+              console.error("Failed to send email", await response.text());
+            }
+          } catch (error) {
+            console.error("Error sending email:", error);
+          }
+        };
+
+        // Call the sendEmail function
+        sendEmail();
       } catch (err) {
         console.error("Error updating document: ", err);
       }
@@ -134,6 +189,7 @@ function UtilitiesComponent({
         nft_id: nftId, // from provided variable mappings
         utility_id: utilityId, // from provided variable mappings
         claimed_date: Timestamp.now(), // current date and time
+        claimed_status: true,
       };
 
       try {
@@ -152,6 +208,32 @@ function UtilitiesComponent({
     //setIsUtiliyClicked(false);
   };
 
+  useEffect(() => {
+    if (pageName === "nftsingle") {
+      const checkIfUtilityIsClaimed = async () => {
+        const q = query(
+          collection(db, "claimed_nft_utility"),
+          where("nft_id", "==", nftId),
+          where("nft_collection_address", "==", contractAddress),
+          where("utility_id", "==", utilityId)
+        );
+        const querySnapshot = await getDocs(q);
+
+        if (!querySnapshot.empty) {
+          // Assuming there's only one document that matches the criteria
+          const docData = querySnapshot.docs[0].data();
+          setIsUtilityClaimed(true);
+          setClaimedUserEmail(docData.claimed_user_email); // Set the claimed user's email
+        } else {
+          setIsUtilityClaimed(false);
+          setClaimedUserEmail(null); // Reset if no document is found
+        }
+      };
+
+      checkIfUtilityIsClaimed();
+    }
+  }, [pageName, nftId, contractAddress, utilityId]); // Dependencies
+
   const handleCheckNFTPageType = () => {
     if (pageName === "nftsingle") {
       setIsUtiliyClicked(true);
@@ -200,11 +282,7 @@ function UtilitiesComponent({
           <div className="nft-collection-overview-utilities-one-date">
             Date de l'utilité: {utilityDate}{" "}
             <span style={{ color: "red", marginLeft: 10 }}>
-              {utility?.claimed_status &&
-              utility?.claimed_user_id &&
-              utility?.claimed_user_id === loggedInUser?.id
-                ? "Réclamé"
-                : ""}
+              {isUtilityClaimed ? "Réclamé" : ""}
             </span>
           </div>
         </div>
@@ -224,6 +302,8 @@ function UtilitiesComponent({
             setIsloggedUserNftHolder={setIsloggedUserNftHolder}
             setIsClaimConfirmed={setIsClaimConfirmed}
             isClaimConfirmed={isClaimConfirmed}
+            isUtilityClaimed={isUtilityClaimed}
+            claimedUserEmail={claimedUserEmail}
           />
         </Modal>
       )}
diff --git a/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js b/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js
index dbc6a4bf..7daea28f 100644
--- a/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js
+++ b/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js
@@ -12,24 +12,27 @@ function UtilityClaimModal({
   isloggedUserNftHolder,
   setIsloggedUserNftHolder,
   isClaimConfirmed,
+  isUtilityClaimed, // New prop added here
+  claimedUserEmail, // New prop: the email of the user who claimed the utility
 }) {
+  const isClaimedByLoggedInUser =
+    isUtilityClaimed && loggedInUser?.email === claimedUserEmail;
+
   return (
     <>
       {!isClaimConfirmed ? (
         <div className="utility-pop-up-container">
           <span
             className="utility-pop-up-title"
-            style={
-              utility.claimed_status &&
-              utility.claimed_user_id === loggedInUser?.id
-                ? { color: "red" }
-                : {}
-            }
+            style={{ color: isUtilityClaimed ? "red" : "inherit" }}
           >
-            {utility.claimed_status &&
-            utility.claimed_user_id === loggedInUser?.id
-              ? "Utilité déjà réclamée"
-              : "Réclamer l'Utilité"}
+            {
+              isClaimedByLoggedInUser
+                ? "Réclamé par vous" // If the logged-in user claimed the utility
+                : isUtilityClaimed
+                ? "Utilité déjà réclamée" // If some other user claimed the utility
+                : "Réclamer l'Utilité" // If the utility is not claimed
+            }
           </span>
 
           <div className="utility-info-data">
@@ -48,10 +51,7 @@ function UtilityClaimModal({
               // If isloggedUserNftHolder is true, the user is logged in, and the utility is not claimed by the logged-in user
               isloggedUserNftHolder &&
               loggedInUser &&
-              !(
-                utility.claimed_status &&
-                utility.claimed_user_id === loggedInUser.id
-              ) ? (
+              !isClaimedByLoggedInUser ? (
                 <Button
                   text={"Réclamer"}
                   style={ClaimButtonStyle.inlineStyle}
diff --git a/client/src/Pages/NftSingle/NftSingle.js b/client/src/Pages/NftSingle/NftSingle.js
index b3e8bb43..bbddcb37 100644
--- a/client/src/Pages/NftSingle/NftSingle.js
+++ b/client/src/Pages/NftSingle/NftSingle.js
@@ -1188,6 +1188,9 @@ const NftSingle = ({ isLogged }) => {
               // }
               ethPrice={ethPrice}
               currentAthleteCollectionCreator={currentAthleteCollectionCreator}
+              collectionNameApi={
+                currentNftCollectionInfoFromBackend?.collection_title
+              }
             />
           )}
           {/* {isSubMenuClicked[1] && (
diff --git a/emailtest.html b/emailtest.html
new file mode 100644
index 00000000..89eae864
--- /dev/null
+++ b/emailtest.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="fr">
+<head>
+  <meta charset="utf-8"/>
+  <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
+  <title>Confirmation de Réclamation NFT</title>
+</head>
+<body style="background-color: white; color: #333; font-family: Arial, sans-serif; padding: 20px;">
+  <div style="max-width: 500px; margin: 0 auto; padding: 20px; background-color: #f6f6f6; border-radius: 5px;">
+    <div style="text-align: center; margin-bottom: 20px;">
+      <img src="YOUR_LOGO_URL" alt="Sofan Logo" style="width: 150px;"/>
+    </div>
+    <div style="margin: 20px 0; font-size: 18px;">
+      Bonjour [User's Name],
+      <br><br>
+      Nous sommes heureux de vous confirmer que vous avez réussi à réclamer une utilité NFT pour [NFT Collection Name].
+      <br><br>
+      Détails de l'utilité réclamée:
+      <ul>
+        <li>ID de NFT: [NFT ID]</li>
+        <li>Nom de l'athlète: [Athlete Name]</li>
+        <li>Date de réclamation: [Claim Date]</li>
+      </ul>
+      Vous pouvez vérifier l'état de votre utilité NFT à tout moment dans votre tableau de bord utilisateur.
+    </div>
+    <a href="LINK_TO_USER_DASHBOARD" style="display: block; width: 200px; margin: 20px auto; padding: 10px; background-color: #f6d463; color: white; text-align: center; border-radius: 5px; text-decoration: none; font-weight: bold;">Voir Mon Profile</a>
+    <div style="text-align: center; color: #888; font-size: 14px; margin-top: 20px;">
+      Si vous avez des questions ou besoin d'assistance, n'hésitez pas à nous contacter à <a href="mailto:contact@sofan.app" style="color: blue;">contact@sofan.app</a>.
+    </div>
+  </div>
+</body>
+</html>

From 16d4be42424036f3181639e17b96ee15e791f7bc Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Sun, 7 Jan 2024 00:22:21 -0500
Subject: [PATCH 18/26] Athlete Confirmation Email.

Utility Claim Athlete Claim confirmation
---
 client/functions/index.js                     | 45 ++++++++++++
 .../NftCollectionOverview.js                  |  1 -
 .../UtilitiesComponent/UtilitiesComponent.js  | 71 +++++++++++++------
 3 files changed, 96 insertions(+), 21 deletions(-)

diff --git a/client/functions/index.js b/client/functions/index.js
index d7fbd630..c423ca0a 100644
--- a/client/functions/index.js
+++ b/client/functions/index.js
@@ -125,6 +125,51 @@ exports.sendUserClaimUtilityEmail = functions.https.onRequest((req, res) => {
   });
 });
 
+exports.sendAthleteClaimUtilityEmail = functions.https.onRequest((req, res) => {
+  cors(req, res, async () => {
+    if (req.method !== "POST") {
+      return res.status(405).send("Method Not Allowed");
+    }
+
+    const {
+      athleteEmail, // Ensure to include the athlete's email in the request
+      athleteName,
+      userName,
+      nftId,
+      collectionName,
+      title,
+      description,
+      claimed_date,
+    } = req.body;
+
+    const htmlContent = generateAthleteClaimUtilityEmailHTML({
+      athleteName,
+      userName,
+      nftId,
+      collectionName,
+      title,
+      description,
+      claimed_date,
+    });
+
+    const mailOptions = {
+      from: `"Sofan" <${functions.config().email.user}>`,
+      to: athleteEmail, // Send to the athlete's email
+      subject: "Notification: Un utilisateur a réclamé une utilité de votre collection NFT - Sofan",
+      html: htmlContent,
+    };
+
+    try {
+      await transporter.sendMail(mailOptions);
+      functions.logger.log("Email sent to athlete successfully");
+      res.send({ success: "Email sent to athlete successfully" });
+    } catch (err) {
+      functions.logger.error("Error sending email to athlete:", err);
+      res.status(500).send({ error: "Error sending email to athlete", details: err });
+    }
+  });
+});
+
 const admin = require("firebase-admin");
 //const functions = require('firebase-functions');
 admin.initializeApp();
diff --git a/client/src/Components/NftCollectionOverview/NftCollectionOverview.js b/client/src/Components/NftCollectionOverview/NftCollectionOverview.js
index df14a3bf..41626828 100644
--- a/client/src/Components/NftCollectionOverview/NftCollectionOverview.js
+++ b/client/src/Components/NftCollectionOverview/NftCollectionOverview.js
@@ -15,7 +15,6 @@ function NftCollectionOverview({
   collectionNameApi
 }) {
 
-  console.log(currentAthleteCollectionCreator);
   return (
     <section className="nft-collection-overview-container">
       <div className="nft-collection-overview-utilities-container">
diff --git a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
index 1c35ff44..0a0845a3 100644
--- a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
+++ b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
@@ -55,8 +55,6 @@ function UtilitiesComponent({
     }
   }
 
-
-
   //   console.log(utilityStatus)
   useEffect(() => {
     const test = () => displayStatusColor();
@@ -118,27 +116,27 @@ function UtilitiesComponent({
           console.log("Utility claimed successfully!");
         }
 
-        // Now, send the email
-        const sendEmail = async () => {
+        // Now, send the emails
+        const sendEmails = async () => {
           const claimedDate = new Date(); // Or the date you get from the claim
           const formatter = new Intl.DateTimeFormat("fr-FR", {
             year: "numeric",
             month: "long",
             day: "2-digit",
           });
-          const formatter2 = new Intl.DateTimeFormat('fr-FR', {
-            weekday: 'long',
-            year: 'numeric',
-            month: 'long',
-            day: '2-digit'
+          const formatter2 = new Intl.DateTimeFormat("fr-FR", {
+            weekday: "long",
+            year: "numeric",
+            month: "long",
+            day: "2-digit",
           });
           const formattedDate = formatter.format(claimedDate);
           const formattedUtilityDate = formatter2.format(new Date(utilityDate));
 
-          const functionUrl =
+          const userFunctionUrl =
             "https://us-central1-sofan-app.cloudfunctions.net/sendUserClaimUtilityEmail";
-          const emailData = {
-            email: loggedInUser.email, // assuming this is the user's email
+          const userEmailData = {
+            email: loggedInUser?.email, // assuming this is the user's email
             display_name: loggedInUser?.displayName, // or however you get the user's display name
             nftId: nftId,
             athleteName: collectionOwner?.display_name, // Replace with actual data
@@ -149,27 +147,60 @@ function UtilitiesComponent({
             utility_date: formattedUtilityDate,
           };
 
+          const athleteFunctionUrl =
+            "https://us-central1-sofan-app.cloudfunctions.net/sendAthleteClaimUtilityEmail";
+          const athleteEmailData = {
+            athleteEmail: collectionOwner?.email, // assuming this is the athlete's email
+            athleteName: collectionOwner?.displayName, // replace with actual data
+            userName: loggedInUser.displayName, // user who claimed the utility
+            nftId: nftId,
+            collectionName: collectionNameApi,
+            title: utilityTitle,
+            description: utilityDescription,
+            claimed_date: formattedDate,
+          };
+
           try {
-            const response = await fetch(functionUrl, {
+            // Send email to the user
+            const userResponse = await fetch(userFunctionUrl, {
               method: "POST",
               headers: {
                 "Content-Type": "application/json",
               },
-              body: JSON.stringify(emailData),
+              body: JSON.stringify(userEmailData),
             });
+            if (userResponse.ok) {
+              console.log("Email sent to user successfully!");
+            } else {
+              console.error(
+                "Failed to send email to user",
+                await userResponse.text()
+              );
+            }
 
-            if (response.ok) {
-              console.log("Email sent successfully!");
+            // Send email to the athlete
+            const athleteResponse = await fetch(athleteFunctionUrl, {
+              method: "POST",
+              headers: {
+                "Content-Type": "application/json",
+              },
+              body: JSON.stringify(athleteEmailData),
+            });
+            if (athleteResponse.ok) {
+              console.log("Email sent to athlete successfully!");
             } else {
-              console.error("Failed to send email", await response.text());
+              console.error(
+                "Failed to send email to athlete",
+                await athleteResponse.text()
+              );
             }
           } catch (error) {
-            console.error("Error sending email:", error);
+            console.error("Error sending emails:", error);
           }
         };
 
-        // Call the sendEmail function
-        sendEmail();
+        // Call the sendEmails function
+        sendEmails();
       } catch (err) {
         console.error("Error updating document: ", err);
       }

From 8aae65a78ec5d3257e891f75031a7b22f358c3a9 Mon Sep 17 00:00:00 2001
From: Ra <rami@jwcorp.fr>
Date: Mon, 15 Jan 2024 01:37:56 +0100
Subject: [PATCH 19/26] fix bug cloud functions + mail sending

Co-Authored-By: JWMatheo <88055282+JWMatheo@users.noreply.github.com>
Co-Authored-By: Shajeed <60440445+Sajistreo3@users.noreply.github.com>
---
 client/functions/index.js                           | 13 +++++++++----
 .../LoginSignupPopUp/ConnectWallet/ConnectWallet.js |  1 +
 .../UtilitiesComponent/UtilitiesComponent.js        | 12 +++++++-----
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/client/functions/index.js b/client/functions/index.js
index c423ca0a..d8e61c8f 100644
--- a/client/functions/index.js
+++ b/client/functions/index.js
@@ -9,6 +9,7 @@ const nodemailer = require("nodemailer");
 const generateVerificationCodeEmailHTML = require("./generateVerificationCodeEmailHTML");
 const generateWelcomeEmailHTML = require("./generateWelcomeEmailHTML");
 const generateUserClaimUtilityEmailHTML = require("./generateUserClaimUtilityEmailHTML");
+const generateAthleteClaimUtilityEmailHTML = require("./generateAthleteClaimUtilityEmailHTML");
 
 const transporter = nodemailer.createTransport({
   host: "mail.gandi.net",
@@ -41,11 +42,12 @@ exports.sendVerificationEmail = functions.https.onRequest((req, res) => {
       subject: "Sign Up Verification Code",
       html: htmlContent,
     };
-
+    console.log("console.log mail Option -->", mailOptions);
+    functions.logger.log("functions logger mail Option -->",mailOptions);
     try {
       await transporter.sendMail(mailOptions);
       functions.logger.log("Email sent successfully");
-      res.send({ success: "Email sent successfully" }); // Send success response
+      res.status(200).send({ success: "Email sent successfully" }); // Send success response
     } catch (err) {
       functions.logger.error("Error sending email:", err);
       res.status(500).send({ error: "Error sending email", details: err }); // Send error details
@@ -155,7 +157,8 @@ exports.sendAthleteClaimUtilityEmail = functions.https.onRequest((req, res) => {
     const mailOptions = {
       from: `"Sofan" <${functions.config().email.user}>`,
       to: athleteEmail, // Send to the athlete's email
-      subject: "Notification: Un utilisateur a réclamé une utilité de votre collection NFT - Sofan",
+      subject:
+        "Notification: Un utilisateur a réclamé une utilité de votre collection NFT - Sofan",
       html: htmlContent,
     };
 
@@ -165,7 +168,9 @@ exports.sendAthleteClaimUtilityEmail = functions.https.onRequest((req, res) => {
       res.send({ success: "Email sent to athlete successfully" });
     } catch (err) {
       functions.logger.error("Error sending email to athlete:", err);
-      res.status(500).send({ error: "Error sending email to athlete", details: err });
+      res
+        .status(500)
+        .send({ error: "Error sending email to athlete", details: err });
     }
   });
 });
diff --git a/client/src/Components/LoginSignupPopUp/ConnectWallet/ConnectWallet.js b/client/src/Components/LoginSignupPopUp/ConnectWallet/ConnectWallet.js
index 29c89b9c..39c7cfa0 100644
--- a/client/src/Components/LoginSignupPopUp/ConnectWallet/ConnectWallet.js
+++ b/client/src/Components/LoginSignupPopUp/ConnectWallet/ConnectWallet.js
@@ -82,6 +82,7 @@ function ConnectWallet({
       });
     } catch (error) {
       console.error(error);
+      setIsWeb3authConnectLoading(false);
     }
     setWeb3authProvider(web3authProvider);
 
diff --git a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
index 0a0845a3..2b9e2fac 100644
--- a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
+++ b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
@@ -46,7 +46,8 @@ function UtilitiesComponent({
   // A changer pour un nft holder de l'athleth
   const [isloggedUserNftHolder, setIsloggedUserNftHolder] = useState(true);
   const [isClaimConfirmed, setIsClaimConfirmed] = useState(false);
-
+  // console.log("loggedInUser --> ",loggedInUser)
+  // console.log("collectionOwner --> ",collectionOwner)
   function displayStatusColor() {
     if (utilityStatus === "Disponible") {
       setStatus(true);
@@ -137,7 +138,7 @@ function UtilitiesComponent({
             "https://us-central1-sofan-app.cloudfunctions.net/sendUserClaimUtilityEmail";
           const userEmailData = {
             email: loggedInUser?.email, // assuming this is the user's email
-            display_name: loggedInUser?.displayName, // or however you get the user's display name
+            display_name: loggedInUser?.display_name, // or however you get the user's display name
             nftId: nftId,
             athleteName: collectionOwner?.display_name, // Replace with actual data
             claimed_date: formattedDate, // or format claimed_date as needed
@@ -151,15 +152,15 @@ function UtilitiesComponent({
             "https://us-central1-sofan-app.cloudfunctions.net/sendAthleteClaimUtilityEmail";
           const athleteEmailData = {
             athleteEmail: collectionOwner?.email, // assuming this is the athlete's email
-            athleteName: collectionOwner?.displayName, // replace with actual data
-            userName: loggedInUser.displayName, // user who claimed the utility
+            athleteName: collectionOwner?.display_name, // replace with actual data
+            userName: loggedInUser.display_name, // user who claimed the utility
             nftId: nftId,
             collectionName: collectionNameApi,
             title: utilityTitle,
             description: utilityDescription,
             claimed_date: formattedDate,
           };
-
+          console.log(athleteEmailData);
           try {
             // Send email to the user
             const userResponse = await fetch(userFunctionUrl, {
@@ -186,6 +187,7 @@ function UtilitiesComponent({
               },
               body: JSON.stringify(athleteEmailData),
             });
+            console.log(athleteResponse);
             if (athleteResponse.ok) {
               console.log("Email sent to athlete successfully!");
             } else {

From 6a6320089ed39e41f90eea8d9498738b2118991c Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Sun, 14 Jan 2024 19:42:12 -0500
Subject: [PATCH 20/26] Message pour MAtheo

---
 client/src/Components/UtilitiesComponent/UtilitiesComponent.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
index 2b9e2fac..01899282 100644
--- a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
+++ b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
@@ -43,7 +43,7 @@ function UtilitiesComponent({
   const pageName = segments[1];
   const nftId = segments[3];
 
-  // A changer pour un nft holder de l'athleth
+  //TODO: A changer pour un nft holder de l'athleth 
   const [isloggedUserNftHolder, setIsloggedUserNftHolder] = useState(true);
   const [isClaimConfirmed, setIsClaimConfirmed] = useState(false);
   // console.log("loggedInUser --> ",loggedInUser)

From 652a64c8e298d2e19c34b603d6ba9e89fdf33c68 Mon Sep 17 00:00:00 2001
From: Ra <rami@jwcorp.fr>
Date: Mon, 15 Jan 2024 03:13:23 +0100
Subject: [PATCH 21/26] hotfix

---
 .../NftCollectionOverview.js                  |   4 +-
 .../UtilitiesComponent/UtilitiesComponent.js  |  21 ++-
 .../UtilityClaimPopUp/UtilityClaimModal.js    |   9 +-
 client/src/Pages/Home/Home.js                 | 154 +++++-------------
 client/src/Pages/NftSingle/NftSingle.js       |   1 +
 5 files changed, 67 insertions(+), 122 deletions(-)

diff --git a/client/src/Components/NftCollectionOverview/NftCollectionOverview.js b/client/src/Components/NftCollectionOverview/NftCollectionOverview.js
index 41626828..f1121d02 100644
--- a/client/src/Components/NftCollectionOverview/NftCollectionOverview.js
+++ b/client/src/Components/NftCollectionOverview/NftCollectionOverview.js
@@ -12,7 +12,8 @@ function NftCollectionOverview({
   ethPrice,
   loggedInUser,
   currentAthleteCollectionCreator,
-  collectionNameApi
+  collectionNameApi,
+  currentTokenIdOwner
 }) {
 
   return (
@@ -32,6 +33,7 @@ function NftCollectionOverview({
             launchpadCollectionLiveUtilities={true}
             collectionOwner={currentAthleteCollectionCreator}
             collectionNameApi={collectionNameApi}
+            currentTokenIdOwner={currentTokenIdOwner}
           />
         ))}
       </div>
diff --git a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
index 01899282..5b5d8708 100644
--- a/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
+++ b/client/src/Components/UtilitiesComponent/UtilitiesComponent.js
@@ -31,6 +31,7 @@ function UtilitiesComponent({
   launchpadCollectionLiveUtilities,
   collectionOwner,
   collectionNameApi,
+  currentTokenIdOwner,
 }) {
   const [status, setStatus] = useState();
   const [isUtiliyClicked, setIsUtiliyClicked] = useState(false);
@@ -43,7 +44,7 @@ function UtilitiesComponent({
   const pageName = segments[1];
   const nftId = segments[3];
 
-  //TODO: A changer pour un nft holder de l'athleth 
+  //TODO: A changer pour un nft holder de l'athleth
   const [isloggedUserNftHolder, setIsloggedUserNftHolder] = useState(true);
   const [isClaimConfirmed, setIsClaimConfirmed] = useState(false);
   // console.log("loggedInUser --> ",loggedInUser)
@@ -56,6 +57,7 @@ function UtilitiesComponent({
     }
   }
 
+  console.log("currentTokenIdOwner --> ", currentTokenIdOwner);
   //   console.log(utilityStatus)
   useEffect(() => {
     const test = () => displayStatusColor();
@@ -232,12 +234,12 @@ function UtilitiesComponent({
           newClaimedNFTUtility
         );
         console.log("New utility claim recorded in claimed_nft_utility.");
+        setIsClaimConfirmed(true);
       } catch (err) {
         console.error("Error creating document in claimed_nft_utility: ", err);
       }
     }
 
-    setIsClaimConfirmed(true);
     //setIsUtiliyClicked(false);
   };
 
@@ -265,14 +267,23 @@ function UtilitiesComponent({
 
       checkIfUtilityIsClaimed();
     }
-  }, [pageName, nftId, contractAddress, utilityId]); // Dependencies
+  }, [pageName, nftId, contractAddress, utilityId, isClaimConfirmed]);
 
   const handleCheckNFTPageType = () => {
     if (pageName === "nftsingle") {
       setIsUtiliyClicked(true);
     }
+    verifyUserIsHolder();
   };
-
+  function verifyUserIsHolder() {
+    if (currentTokenIdOwner?.id === loggedInUser?.id) {
+      // console.log("il est holder");
+      setIsloggedUserNftHolder(true);
+    } else {
+      // console.log("c'est un imposteur");
+      setIsloggedUserNftHolder(false);
+    }
+  }
   const modalStyle = useMemo(() => ({ top: "20px", right: "20px" }), []);
 
   // console.log(status);
@@ -332,7 +343,7 @@ function UtilitiesComponent({
             isUtiliyClicked={isUtiliyClicked}
             handleClaimClick={handleClaimClick}
             isloggedUserNftHolder={isloggedUserNftHolder}
-            setIsloggedUserNftHolder={setIsloggedUserNftHolder}
+            // setIsloggedUserNftHolder={setIsloggedUserNftHolder}
             setIsClaimConfirmed={setIsClaimConfirmed}
             isClaimConfirmed={isClaimConfirmed}
             isUtilityClaimed={isUtilityClaimed}
diff --git a/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js b/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js
index 7daea28f..f5e9fc9b 100644
--- a/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js
+++ b/client/src/Components/UtilitiesComponent/UtilityClaimPopUp/UtilityClaimModal.js
@@ -17,7 +17,6 @@ function UtilityClaimModal({
 }) {
   const isClaimedByLoggedInUser =
     isUtilityClaimed && loggedInUser?.email === claimedUserEmail;
-
   return (
     <>
       {!isClaimConfirmed ? (
@@ -28,10 +27,10 @@ function UtilityClaimModal({
           >
             {
               isClaimedByLoggedInUser
-                ? "Réclamé par vous" // If the logged-in user claimed the utility
+                ? "Déjà réclamé" // If the logged-in user claimed the utility
                 : isUtilityClaimed
                 ? "Utilité déjà réclamée" // If some other user claimed the utility
-                : "Réclamer l'Utilité" // If the utility is not claimed
+                : "Réclamer l'utilité" // If the utility is not claimed
             }
           </span>
 
@@ -71,7 +70,7 @@ function UtilityClaimModal({
                       marginTop: "20px",
                     }}
                   >
-                    Achetez un NFT ou une collection NFT pour réclamer cette
+                    Achetez un NFT de la collection pour réclamer cette
                     utilité
                   </p>
                 )
@@ -85,7 +84,7 @@ function UtilityClaimModal({
             <img src={validationLogo} alt="" />
           </div>
           <span className="utility-pop-up-title">
-            Utilié Reclamer en success
+          L'utilité a bien été réclamé ! Veuillez vérifier vos mails !
           </span>
         </div>
       )}
diff --git a/client/src/Pages/Home/Home.js b/client/src/Pages/Home/Home.js
index c450ee66..8c4faf36 100644
--- a/client/src/Pages/Home/Home.js
+++ b/client/src/Pages/Home/Home.js
@@ -198,10 +198,8 @@ function Home({
             querySnapshot.forEach((doc) => {
               const tempNftcollectionInfo = doc.data();
               tempAllAthleteCollection.push(tempNftcollectionInfo);
-              // console.log("Collection found");
             });
           } else {
-            // console.log("No collection found");
           }
 
           let currentUserWallet;
@@ -232,7 +230,6 @@ function Home({
             }
 
             if (balanceOf > 0) {
-              // console.log("balance of nft from user");
               isUserFan = true;
               break;
             }
@@ -255,52 +252,43 @@ function Home({
         // console.log(tempIsUserFanArray);
         setIsUserFanArray(tempIsUserFanArray);
       };
-      // console.log("appel de la fontion feedDataFrom");
       feedDataFromAlchemyAndFirebase();
 
-      // if (loggedInUser.metamask) {
-      //   const temp = loggedInUser.metamask.toLowerCase();
-      //   fansCounterApi.includes(temp) === true
-      //     ? setIsUserFan(true)
-      //     : setIsUserFan(false);
-      // } else if (loggedInUser.web3auth) {
-      //   const temp = loggedInUser.web3auth.toLowerCase();
-      //   fansCounterApi.includes(temp) === true
-      //     ? setIsUserFan(true)
-      //     : setIsUserFan(false);
-      // }
+      
     }
   }, [dataPost, loggedInUser]);
 
   const getCommentCount = (postId) => {
     const commentsRef = collection(db, `feed_post/${postId}/post_comments`);
     const q = query(commentsRef, where("status", "==", true));
-  
+
     // Real-time listener for comments
     const unsubscribe = onSnapshot(q, (querySnapshot) => {
       const commentCount = querySnapshot.size;
-      setCommentCounts((prevState) => ({ ...prevState, [postId]: commentCount }));
+      setCommentCounts((prevState) => ({
+        ...prevState,
+        [postId]: commentCount,
+      }));
     });
-  
+
     // Save this unsubscribe somewhere so you can call it when you don't need it anymore.
     return unsubscribe;
   };
-  
 
   useEffect(() => {
     const fetchData = async () => {
       setIsLoading(true);
-  
+
       const userIdToFind = loggedInUser?.id;
       const usersRef = collection(db, "users");
       const q1 = query(usersRef, where("account_type", "==", "athlete"));
-  
+
       const querySnapshot1 = await getDocs(q1);
       const foundAthletes = [];
       for (let doc of querySnapshot1.docs) {
         const athleteId = doc.id;
         const userData = doc.data();
-  
+
         // Accéder à la collection athlete_data pour l'athlète spécifique
         const athleteDataRef = collection(
           db,
@@ -308,7 +296,7 @@ function Home({
           athleteId,
           "athlete_data"
         );
-  
+
         // Récupérer le document
         const athleteDataSnapshot = await getDocs(athleteDataRef);
         athleteDataSnapshot.forEach((doc) => {
@@ -329,16 +317,16 @@ function Home({
         });
       }
       setAthletesFollowing(foundAthletes);
-  
+
       const unsubscribes = []; // To keep track of all unsubscribe functions for comments
-  
+
       const feedPostCollectionRef = collection(db, "feed_post");
       const q2 = query(
         feedPostCollectionRef,
         where("status", "==", true),
         orderBy("createdAt", "desc")
       );
-  
+
       // Real-time listener for feed posts
       const unsubscribePosts = onSnapshot(q2, (querySnapshot) => {
         const feedData = [];
@@ -351,30 +339,30 @@ function Home({
         });
         setPostData(feedData);
         setIsLoading(false);
-  
-        unsubscribes.forEach(unsub => unsub()); // Unsubscribe previous comment listeners
+
+        unsubscribes.forEach((unsub) => unsub()); // Unsubscribe previous comment listeners
         unsubscribes.length = 0; // Reset unsubscribe array
-  
+
         feedData.forEach((post) => {
           const unsubscribeComments = getCommentCount(post.id);
           unsubscribes.push(unsubscribeComments);
         });
       });
-  
+
       return () => {
         unsubscribePosts(); // Cleanup: unsubscribe from real-time posts listener
-        unsubscribes.forEach(unsub => unsub()); // Cleanup: unsubscribe from all real-time comment listeners
+        unsubscribes.forEach((unsub) => unsub()); // Cleanup: unsubscribe from all real-time comment listeners
       };
     };
-  
+
     fetchData();
-  
+
     // Cleanup could also go here if needed for other async operations
     return () => {
       // ...
     };
   }, [loggedInUser]); // or whatever dependency array makes sense here
-  
+
   // retrouver les athlete supportés
 
   const handleDropdownPostFeedClick = useCallback(
@@ -384,8 +372,6 @@ function Home({
           e.currentTarget.id === dataPost[i].id &&
           dataPost[i].isDropdownClicked === false
         ) {
-          // console.log(e.currentTarget.id);
-          // console.log(dataPost[i].id);
           const newData = [...dataPost];
           newData[i].isDropdownClicked = true;
           setPostData(newData);
@@ -399,7 +385,6 @@ function Home({
     setIsCreatePostButtonClicked(true);
   };
 
-  // console.log(isLogged?.account_type);
   useEffect(() => {
     async function getSuggestionsAthletes() {
       // Create a query against the collection
@@ -424,22 +409,16 @@ function Home({
     }
     getSuggestionsAthletes();
   }, []);
-  // console.log(isLogged)
   function handleClickCopyPostLink(postId) {
     navigator.clipboard.writeText(`https://staging.sofan.app/post/${postId}`);
-    // console.log(postId);
     setIsCopyPostLinkClicked(true);
-    // const timeOutAnimationCopyClicked =
     setTimeout(() => {
       setCopyPostAnimationHide(true);
     }, 5000);
-    // clearTimeout(timeOutAnimationCopyClicked);
-    // const timeOutHideCopyClicked =
     setTimeout(() => {
       setIsCopyPostLinkClicked(false);
       setCopyPostAnimationHide(false);
     }, 5700);
-    // clearTimeout(timeOutHideCopyClicked);
   }
   useEffect(() => {
     // get Nfts from Owner and Contracts
@@ -482,7 +461,6 @@ function Home({
         currentProfileWalletAddresses = isLogged.web3auth;
         setCurrentProfileUserWallet(isLogged.web3auth);
       }
-      // console.log(currentProfileWalletAddresses);
 
       try {
         const nftsFromOwner = await alchemy.nft.getNftsForOwner(
@@ -491,7 +469,6 @@ function Home({
             contractAddresses: arraySofanCollection,
           }
         );
-        // console.log("nftsFromOwner --> ", nftsFromOwner);
         let athletesSupportingArray = [];
         for (let i = 0; i < nftsFromOwner.ownedNfts.length; i++) {
           const elementFromAlchemy = nftsFromOwner.ownedNfts[i];
@@ -540,9 +517,7 @@ function Home({
           athletesSupportingArray
         );
         setAthletesSupportingData(uniqueAthleteSupportingArray);
-        // setAthletesSupportingData(athletesSupportingArray);
         setNftsFromOwner(nftsFromOwner?.ownedNfts);
-        // console.log("yess", nftsFromOwner);
       } catch (error) {
         console.error(error);
       }
@@ -564,80 +539,37 @@ function Home({
   }, []);
 
   const modalStyle = useMemo(() => ({ top: "24px", right: "20px" }), []);
+  const year = new Date().getFullYear();
   return (
     <>
       <section className="home-component">
-        {/* {isLogged?.account_type === "admin" ? <></>: <></>} */}
+        
         <div
           className="home-left-container"
-          style={
-            (() => {
-              if (
-                isLogged?.account_type === "admin" ||
-                isLogged?.account_type === "athlete"
-              ) {
-                if (windowWidth < 950) {
-                  return { height: "500px" };
-                } else {
-                  return { height: "726px", maxHeight: "726px" };
-                }
-              } else if (
-                athletesFollowing.length === 0 &&
-                athletesSupportingData.length === 0
-              ) {
-                return { height: "398px" };
+          style={(() => {
+            if (
+              isLogged?.account_type === "admin" ||
+              isLogged?.account_type === "athlete"
+            ) {
+              if (windowWidth < 950) {
+                return { height: "500px" };
               } else {
-                return { maxHeight: "580px" };
+                return { height: "726px", maxHeight: "726px" };
               }
-            })()
-            // isLogged?.account_type === "athlete"
-            //   ? windowWidth < 950
-            //     ? { height: "500px" }
-            //     : { height: "726px", maxHeight: "726px" }
-            //   : athletesFollowing.length === 0 &&
-            //     athletesSupportingData.length === 0
-            //   ? { height: "398px" }
-            //   : { maxHeight: "580px" }
-          }
+            } else if (
+              athletesFollowing.length === 0 &&
+              athletesSupportingData.length === 0
+            ) {
+              return { height: "398px" };
+            } else {
+              return { maxHeight: "580px" };
+            }
+          })()}
         >
           <div
             className="home-navlink-create-post-wrap"
-            style={
-              { height: "0px" }
-              // isLogged?.account_type === "athlete"
-              //   ? { height: "0px" }
-              //   : { height: "0px" }
-            }
+            style={{ height: "0px" }}
           >
-            {/* <div className="home-feedsidenavlink-wrap">
-              <FeedSideNavLink
-                href="/launchpad"
-                svg={World}
-                alt="world"
-                title="Découverte"
-                imgWidth="20px"
-                gap="11px"
-              />
-              <FeedSideNavLink
-                href="/"
-                svg={Star}
-                alt="world"
-                title="Abonnements"
-                imgWidth="22.83px"
-                gap="8.59px"
-              />
-            </div> */}
-            {/* {isLogged?.account_type === "athlete" && (
-              <Button
-                createPostButtonclassName="button-component-create-post"
-                style={CreatePostButtonStyle.inlineStyle}
-                customMediaQueries={CreatePostButtonStyle.customMediaQueries}
-                text="Créer une publication"
-                onClick={handleCreatePostClick}
-                hover="button-hover-props"
-                active="button-active-props"
-              />
-            )} */}
             {(() => {
               if (
                 isLogged?.account_type === "admin" ||
@@ -685,7 +617,7 @@ function Home({
             className="home-legals-mentions-container"
           >
             <a target="_blank" href="/mentions-legales">
-              © 2023 Sofan
+              © {year} Sofan
             </a>{" "}
             Tout droits réservés
           </div>
diff --git a/client/src/Pages/NftSingle/NftSingle.js b/client/src/Pages/NftSingle/NftSingle.js
index bbddcb37..953dad7b 100644
--- a/client/src/Pages/NftSingle/NftSingle.js
+++ b/client/src/Pages/NftSingle/NftSingle.js
@@ -1191,6 +1191,7 @@ const NftSingle = ({ isLogged }) => {
               collectionNameApi={
                 currentNftCollectionInfoFromBackend?.collection_title
               }
+              currentTokenIdOwner={currentTokenIdOwner}
             />
           )}
           {/* {isSubMenuClicked[1] && (

From 0dab41023408f7de1204630a5d926594435ad923 Mon Sep 17 00:00:00 2001
From: Ra <rami@jwcorp.fr>
Date: Mon, 15 Jan 2024 03:34:21 +0100
Subject: [PATCH 22/26] comment for poll shajeed task

---
 client/src/Components/PostsComponents/PollPost/PollPost.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/client/src/Components/PostsComponents/PollPost/PollPost.js b/client/src/Components/PostsComponents/PollPost/PollPost.js
index 8ecf27bc..fcc770af 100644
--- a/client/src/Components/PostsComponents/PollPost/PollPost.js
+++ b/client/src/Components/PostsComponents/PollPost/PollPost.js
@@ -87,6 +87,11 @@ const PollPost = ({
         choice3: false,
         choice4: false,
       });
+      // créer un tableau dans l'index 0 du tableau choices qui est déjà dans firebase
+      // dans firebase choices est un tableau avec 4 index.
+      // quand l'index est 0 par exemple alors on push l'id de l'utilisateur dans un tableau que l'on créer dans l'index 0 de choices
+      // shajeedpoll
+
     } else if (choiceNameEl.innerText === choiceName[1]) {
       setChoiceSelected({
         choice1: false,
@@ -176,6 +181,7 @@ const PollPost = ({
             <div className="ageofpost-and-timeleft-poll">
               <div>
                 {/* {pollTotalVote}  */}
+                {/* shajeedpoll */}
                 votes</div>
               <div>-</div>
               <div>

From 5aa1c91ef855815608d03c6e0de9af944bf54538 Mon Sep 17 00:00:00 2001
From: Ra <rami@jwcorp.fr>
Date: Mon, 15 Jan 2024 04:41:39 +0100
Subject: [PATCH 23/26] style: fix banner athlete profile

---
 .../AthleteProfileHeader/AthleteProfileHeader.css           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/src/Components/AthleteProfileHeader/AthleteProfileHeader.css b/client/src/Components/AthleteProfileHeader/AthleteProfileHeader.css
index 287f1bcd..bba84f38 100644
--- a/client/src/Components/AthleteProfileHeader/AthleteProfileHeader.css
+++ b/client/src/Components/AthleteProfileHeader/AthleteProfileHeader.css
@@ -7,8 +7,10 @@
 }
 .athleteprofileheader-bannerandprofilepicture-wrap {
   max-height: 300px;
-  max-width: 1246px;
+  width: 1246px;
+  max-width: 100%;
   position: relative;
+  /* background-color: red; */
 }
 .athleteprofileheader-bannerandprofilepicture-wrap > img {
   width: 100%;
@@ -217,7 +219,7 @@
 }
 .athleteprofileheader-content-container-button-wrap
   > button:nth-child(2):active {
- transform: scale(0.85);
+  transform: scale(0.85);
 }
 .athleteprofileheader-content-container-button-wrap > button:nth-child(4) {
   margin-left: 11px;

From c1c9a7838312c260941f78d5c54b33920970e96a Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Thu, 18 Jan 2024 22:42:35 -0500
Subject: [PATCH 24/26] update poll post try

---
 .../Components/FeedLaunchpad/FeedLaunchpad.js |  6 +-
 .../PostsComponents/PollPost/PollPost.js      | 65 +++++++++++++++----
 .../PostsComponents/PostsFeed/PostsFeed.js    |  3 +
 3 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/client/src/Components/FeedLaunchpad/FeedLaunchpad.js b/client/src/Components/FeedLaunchpad/FeedLaunchpad.js
index 2389e2bf..888e522e 100644
--- a/client/src/Components/FeedLaunchpad/FeedLaunchpad.js
+++ b/client/src/Components/FeedLaunchpad/FeedLaunchpad.js
@@ -24,9 +24,9 @@ const FeedLaunchpad = () => {
         return {
           // launchpad: feedLaunchpad,
           launch_date: feedLaunchpad.launch_date,
-          collection_avatar: nftCollectionsData.collection_avatar,
-          collection_title: nftCollectionsData.collection_title,
-          collection_address: nftCollectionsData.collection_address,
+          collection_avatar: nftCollectionsData?.collection_avatar,
+          collection_title: nftCollectionsData?.collection_title,
+          collection_address: nftCollectionsData?.collection_address,
           athlete_id: userData.id,
           display_name: userData.display_name,
           profile_avatar: userData.profile_avatar,
diff --git a/client/src/Components/PostsComponents/PollPost/PollPost.js b/client/src/Components/PostsComponents/PollPost/PollPost.js
index fcc770af..1345133a 100644
--- a/client/src/Components/PostsComponents/PollPost/PollPost.js
+++ b/client/src/Components/PostsComponents/PollPost/PollPost.js
@@ -6,9 +6,11 @@ import AddCommentInput from "../AddCommentInput/AddCommentInput";
 import checkMark from "../../../Assets/Image/checkmark.svg";
 import DropDownMenu from "../DropDownMenu/DropDownMenu";
 import ProgressBarPollPost from "./ProgressBarPollPost/ProgressBarPollPost";
+import { db } from "../../../Configs/firebase";
+import { updateDoc, doc, getDoc } from "firebase/firestore";
 import { Link } from "react-router-dom";
 
-const PollPost = ({
+function PollPost({
   choiceNumber,
   pollFirstChoice,
   pollSecondChoice,
@@ -22,7 +24,10 @@ const PollPost = ({
   pollSecondChoiceNumber,
   pollThirdChoiceNumber,
   pollFourthChoiceNumber,
-}) => {
+  loggedInUser,
+  postId,
+  polldata,
+}) {
   const [surveyResults, setSurveyResults] = useState([
     pollFirstChoiceNumber,
     pollSecondChoiceNumber,
@@ -77,9 +82,10 @@ const PollPost = ({
     choiceNumber4,
   ];
 
-  const showSurveyResult = (e) => {
+  const showSurveyResult = async (e) => {
     setIsVoted(true);
     const choiceNameEl = e.target.querySelector(".choice-name");
+    let choiceIndex;
     if (choiceNameEl.innerText === choiceName[0]) {
       setChoiceSelected({
         choice1: true,
@@ -87,11 +93,7 @@ const PollPost = ({
         choice3: false,
         choice4: false,
       });
-      // créer un tableau dans l'index 0 du tableau choices qui est déjà dans firebase
-      // dans firebase choices est un tableau avec 4 index.
-      // quand l'index est 0 par exemple alors on push l'id de l'utilisateur dans un tableau que l'on créer dans l'index 0 de choices
-      // shajeedpoll
-
+      choiceIndex = 0;
     } else if (choiceNameEl.innerText === choiceName[1]) {
       setChoiceSelected({
         choice1: false,
@@ -99,6 +101,7 @@ const PollPost = ({
         choice3: false,
         choice4: false,
       });
+      choiceIndex = 1;
     } else if (choiceNameEl.innerText === choiceName[2]) {
       setChoiceSelected({
         choice1: false,
@@ -106,6 +109,7 @@ const PollPost = ({
         choice3: true,
         choice4: false,
       });
+      choiceIndex = 2;
     } else if (choiceNameEl.innerText === choiceName[3]) {
       setChoiceSelected({
         choice1: false,
@@ -113,9 +117,46 @@ const PollPost = ({
         choice3: false,
         choice4: true,
       });
+      choiceIndex = 3;
+    }
+
+    // Firestore update
+    if (choiceIndex !== undefined) {
+      const feedPostRef = doc(db, "feed_post", postId);
+      try {
+        const docSnap = await getDoc(feedPostRef);
+
+        if (docSnap.exists()) {
+          let pollChoices = docSnap.data().pollData.choices;
+
+          // Initialize userIds array if it doesn't exist
+          if (!pollChoices[choiceIndex].userIds) {
+            pollChoices[choiceIndex].userIds = [];
+          }
+
+          // Add the loggedInUser's UID if not already included
+          if (!pollChoices[choiceIndex].userIds.includes(loggedInUser.id)) {
+            pollChoices[choiceIndex].userIds.push(loggedInUser.id);
+          }
+
+          await updateDoc(feedPostRef, {
+            "pollData.choices": pollChoices,
+          });
+
+          console.log("Poll data updated successfully!");
+        } else {
+          console.log("No such document!");
+        }
+      } catch (error) {
+        console.error("Error updating poll data: ", error);
+      }
     }
   };
 
+  const totalVotes = polldata?.choices.reduce((total, choice) => {
+    return total + (choice.userIds ? choice.userIds.length : 0);
+  }, 0);
+
   return (
     <section className="pollpost-container">
       <div className="pollpost-wrap">
@@ -180,10 +221,8 @@ const PollPost = ({
           <div className="ageofpost-poll-wrap">
             <div className="ageofpost-and-timeleft-poll">
               <div>
-                {/* {pollTotalVote}  */}
-                {/* shajeedpoll */}
-                votes</div>
-              <div>-</div>
+                votes: {totalVotes}
+              </div>
               <div>
                 {/* {pollDate}  */}
                 {/* {pollDateType} */}
@@ -195,5 +234,5 @@ const PollPost = ({
       </div>
     </section>
   );
-};
+}
 export default PollPost;
diff --git a/client/src/Components/PostsComponents/PostsFeed/PostsFeed.js b/client/src/Components/PostsComponents/PostsFeed/PostsFeed.js
index 29fdb0b2..2215fd3d 100644
--- a/client/src/Components/PostsComponents/PostsFeed/PostsFeed.js
+++ b/client/src/Components/PostsComponents/PostsFeed/PostsFeed.js
@@ -112,6 +112,9 @@ function PostsFeed({
           pollFourthChoiceNumber={pollFourthChoiceNumber}
           // pollDate={pollDate}
           pollDateType={pollDateType}
+          postId={id}
+          loggedInUser={loggedInUser}
+          polldata={polldata}
           // pollTotalVote={pollTotalVote}
         />
       );

From 82491bc5b9236c3f25db69dfc058b9a7e2d1fb0c Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Sun, 17 Mar 2024 22:53:52 -0400
Subject: [PATCH 25/26] New Staging

---
 client/functions/package-lock.json            |  8 ++---
 client/functions/package.json                 |  2 +-
 client/src/App.js                             |  3 +-
 client/src/Components/Footer/Footer.js        |  4 +--
 .../LaunchpadAllHeader/LaunchpadAllHeader.css | 32 +++++++++++++------
 .../LaunchpadAllLiveLaunchesTemplate.js       |  6 ++--
 client/src/Components/Modal/Modal.js          |  4 +++
 .../MoreAboutThisCollection.css               |  4 +--
 .../MoreAboutThisCollection.js                |  2 --
 .../NftCollectionMoreAboutAthlete.css         | 26 +++++++++++++--
 .../NftCollectionPageHeader.css               |  3 ++
 .../AthleteSuggestPopUp.js                    |  2 +-
 .../src/Pages/LaunchpadAll/LaunchpadAll.css   |  6 ++--
 client/src/Pages/LaunchpadAll/LaunchpadAll.js |  5 ++-
 14 files changed, 74 insertions(+), 33 deletions(-)

diff --git a/client/functions/package-lock.json b/client/functions/package-lock.json
index 9718fad6..b1890fc0 100644
--- a/client/functions/package-lock.json
+++ b/client/functions/package-lock.json
@@ -10,7 +10,7 @@
         "dotenv": "^16.3.1",
         "firebase-admin": "^11.5.0",
         "firebase-functions": "^4.2.0",
-        "nodemailer": "^6.9.4"
+        "nodemailer": "^6.9.12"
       },
       "devDependencies": {
         "firebase-functions-test": "^3.0.0"
@@ -4756,9 +4756,9 @@
       "peer": true
     },
     "node_modules/nodemailer": {
-      "version": "6.9.4",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.4.tgz",
-      "integrity": "sha512-CXjQvrQZV4+6X5wP6ZIgdehJamI63MFoYFGGPtHudWym9qaEHDNdPzaj5bfMCvxG1vhAileSWW90q7nL0N36mA==",
+      "version": "6.9.12",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.12.tgz",
+      "integrity": "sha512-pnLo7g37Br3jXbF0bl5DekBJihm2q+3bB3l2o/B060sWmb5l+VqeScAQCBqaQ+5ezRZFzW5SciZNGdRDEbq89w==",
       "engines": {
         "node": ">=6.0.0"
       }
diff --git a/client/functions/package.json b/client/functions/package.json
index c59dd8c1..b2e8fe5b 100644
--- a/client/functions/package.json
+++ b/client/functions/package.json
@@ -17,7 +17,7 @@
     "dotenv": "^16.3.1",
     "firebase-admin": "^11.5.0",
     "firebase-functions": "^4.2.0",
-    "nodemailer": "^6.9.4"
+    "nodemailer": "^6.9.12"
   },
   "devDependencies": {
     "firebase-functions-test": "^3.0.0"
diff --git a/client/src/App.js b/client/src/App.js
index 6afc1b78..94a3f3ff 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -272,6 +272,7 @@ function App() {
   console.log("re rendu");
   const [crossmintPayloadLocationdata, setCrossmintPayloadLocationdata] =
     useState(null);
+    const year = new Date().getFullYear();
   return (
     <UserContext.Provider
       value={{
@@ -430,7 +431,7 @@ function App() {
                           </div>
                           <div className="app-sofan-block-access-mentions-legales">
                             <a target="_blank" href="/mentions-legales">
-                              © 2023 Sofan
+                              © {year} Sofan
                             </a>{" "}
                             Tout droits réservés
                           </div>
diff --git a/client/src/Components/Footer/Footer.js b/client/src/Components/Footer/Footer.js
index 4c72f45c..37e10df7 100644
--- a/client/src/Components/Footer/Footer.js
+++ b/client/src/Components/Footer/Footer.js
@@ -8,13 +8,13 @@ const links = [
     { icon: InstagramLogo, url: 'https://www.instagram.com/sofan_app/' },
     { icon: LinkedInLogo, url: 'https://www.linkedin.com/company/sofan-app/' }
   ];
-
+  const year = new Date().getFullYear();
 function Footer() {
     return (
         <footer className='footer-container'>
             <SocialLinks links={links} />
             <div className='copyright-section'>
-                <p>&copy; 2023 Copyright: Sofan</p>
+                <p>&copy; {year} Copyright: Sofan</p>
             </div>
         </footer>
     );
diff --git a/client/src/Components/LaunchpadAllHeader/LaunchpadAllHeader.css b/client/src/Components/LaunchpadAllHeader/LaunchpadAllHeader.css
index 0955f6a1..6333282d 100644
--- a/client/src/Components/LaunchpadAllHeader/LaunchpadAllHeader.css
+++ b/client/src/Components/LaunchpadAllHeader/LaunchpadAllHeader.css
@@ -35,10 +35,10 @@
   flex-direction: column;
   align-items: flex-start;
 }
-.launchpadallheader-data-wrap-img-and-name{
+.launchpadallheader-data-wrap-img-and-name {
   text-decoration: none;
 }
-.launchpadallheader-data-wrap-img-and-name:hover{
+.launchpadallheader-data-wrap-img-and-name:hover {
   /* background-color: red; */
   background-color: #ddc3c385;
   transition-duration: 300ms !important;
@@ -47,10 +47,10 @@
   padding: 5px;
   text-decoration: underline;
   text-decoration-color: #fffcfc;
-  text-underline-offset: 4px; 
+  text-underline-offset: 4px;
 }
-.launchpadallheader-data-wrap-img-and-name:active{
-  transform: scale(0.80);
+.launchpadallheader-data-wrap-img-and-name:active {
+  transform: scale(0.8);
 }
 .launchpadallheader-data-wrap-img {
   background-color: white;
@@ -104,7 +104,21 @@
   font-size: 20px;
 }
 .launchpadallheader-data-wrap > button:active {
-transform: scale(0.80);
-/* transition: 300s; */
-transition-duration:300ms ;
-}
\ No newline at end of file
+  transform: scale(0.8);
+  /* transition: 300s; */
+  transition-duration: 300ms;
+}
+@media (max-width: 1300px) {
+  .launchpadallheader-component {
+    /* max-width: 90% !important; */
+    /* width: 100%; */
+  }
+  .launchpadallheader-component > img {
+    /* max-width: 80vw !important; */
+    /* width: 100%; */
+    /* background-color: blue; */
+    min-width: 95vw !important;
+    width: 100% !important;
+    max-width: 95vw !important;
+  }
+}
diff --git a/client/src/Components/LaunchpadAllLiveLaunches/LaunchpadAllLiveLaunchesTemplate/LaunchpadAllLiveLaunchesTemplate.js b/client/src/Components/LaunchpadAllLiveLaunches/LaunchpadAllLiveLaunchesTemplate/LaunchpadAllLiveLaunchesTemplate.js
index e1e325e7..4bd9aff5 100644
--- a/client/src/Components/LaunchpadAllLiveLaunches/LaunchpadAllLiveLaunchesTemplate/LaunchpadAllLiveLaunchesTemplate.js
+++ b/client/src/Components/LaunchpadAllLiveLaunches/LaunchpadAllLiveLaunchesTemplate/LaunchpadAllLiveLaunchesTemplate.js
@@ -125,7 +125,7 @@ const LaunchpadAllLiveLaunchesTemplate = ({
   }, []);
 
   function redirectTo() {
-    window.location.href = `/collectionlive/${launchpadlive.nftCollection.athlete_id}/${launchpadlive.nftCollection.collection_address}`;
+    window.location.href = `/collectionlive/${launchpadlive?.nftCollection?.athlete_id}/${launchpadlive.nftCollection?.collection_address}`;
   }
   return (
     <div
@@ -134,7 +134,7 @@ const LaunchpadAllLiveLaunchesTemplate = ({
       }`}
     >
       <Link
-        to={`/collectionlive/${launchpadlive.nftCollection.athlete_id}/${launchpadlive.nftCollection.collection_address}`}
+        to={`/collectionlive/${launchpadlive?.nftCollection?.athlete_id}/${launchpadlive.nftCollection?.collection_address}`}
         className="launchpadalllivelaunchestemplate-link"
       >
         <img
@@ -166,7 +166,7 @@ const LaunchpadAllLiveLaunchesTemplate = ({
             <Link
               onMouseDown={handleMouseDown}
               onMouseUp={handleMouseUp}
-              to={`/athleteprofile/${launchpadlive.nftCollection.athlete_id}`}
+              to={`/athleteprofile/${launchpadlive.nftCollection?.athlete_id}`}
               className="launchpadalllivelaunchestemplate-data-image-and-name"
             >
               <div
diff --git a/client/src/Components/Modal/Modal.js b/client/src/Components/Modal/Modal.js
index 85d0aa0d..0903d43e 100644
--- a/client/src/Components/Modal/Modal.js
+++ b/client/src/Components/Modal/Modal.js
@@ -1,4 +1,8 @@
+<<<<<<< Updated upstream
 import React, { useState, useEffect } from "react";
+=======
+import React, { useEffect } from "react";
+>>>>>>> Stashed changes
 import "./Modal.css";
 import CrossBlack from "../../Assets/Image/cross.svg";
 import CrossWhite from "../../Assets/Image/cross_white.svg";
diff --git a/client/src/Components/MoreAboutThisCollection/MoreAboutThisCollection.css b/client/src/Components/MoreAboutThisCollection/MoreAboutThisCollection.css
index 8f0ecb41..4d7cb52a 100644
--- a/client/src/Components/MoreAboutThisCollection/MoreAboutThisCollection.css
+++ b/client/src/Components/MoreAboutThisCollection/MoreAboutThisCollection.css
@@ -4,7 +4,7 @@
   display: flex;
   justify-content: space-between;
   flex-direction: column;
-  margin-top: 64px;
+  margin-top: 200px;
 }
 .nft-collection-overview-more-about-collection-title {
   max-width: 100%;
@@ -19,7 +19,7 @@
   width: 100%;
   height: 133px;
   display: flex;
-  align-items: center;
+  /* align-items: center; */
   /* background-color: violet; */
   text-align: justify;
   max-height: 133px;
diff --git a/client/src/Components/MoreAboutThisCollection/MoreAboutThisCollection.js b/client/src/Components/MoreAboutThisCollection/MoreAboutThisCollection.js
index 91e020fa..210da7f4 100644
--- a/client/src/Components/MoreAboutThisCollection/MoreAboutThisCollection.js
+++ b/client/src/Components/MoreAboutThisCollection/MoreAboutThisCollection.js
@@ -32,8 +32,6 @@ function MoreAboutThisCollection({
         }
       >
         {knowMoreAboutCollection}
-        {knowMoreAboutCollection}
-        {knowMoreAboutCollection}
       </div>
     </div>
   );
diff --git a/client/src/Components/NftCollectionMoreAboutAthlete/NftCollectionMoreAboutAthlete.css b/client/src/Components/NftCollectionMoreAboutAthlete/NftCollectionMoreAboutAthlete.css
index a9f07814..9486cb18 100644
--- a/client/src/Components/NftCollectionMoreAboutAthlete/NftCollectionMoreAboutAthlete.css
+++ b/client/src/Components/NftCollectionMoreAboutAthlete/NftCollectionMoreAboutAthlete.css
@@ -74,7 +74,7 @@
   height: 31px;
   position: absolute;
   left: 6.9591%;
-  bottom: 36.1064802%;
+  bottom: 17.1064802%;
   font-size: 19px;
   font-family: "britanica-heavy-expanded";
 }
@@ -82,7 +82,7 @@
   border: none;
   cursor: pointer;
   left: 6.9591%;
-  bottom: 26.1231%;
+  bottom: 10.1231%;
   position: absolute;
   width: 166px;
   height: 44px;
@@ -114,7 +114,29 @@
   }
   .nft-collection-more-about-athlete-description {
     bottom: 50.25623%;
+    height: 200px !important;
+    /* background-color: red; */
+    overflow-y: scroll;
   }
+
+/*  */
+.nft-collection-more-about-athlete-description::-webkit-scrollbar {
+  width: 6px; /* Set the width of the scrollbar */
+  border-radius: 10px;
+}
+.nft-collection-more-about-athlete-description::-webkit-track {
+  background: transparent; /* Set the track background */
+}
+.nft-collection-more-about-athlete-description::-webkit-scrollbar-thumb {
+  background-color: #888; /* Set the color of the scrollbar */
+  border-radius: 10px; /* Set the border-radius */
+}
+
+.nft-collection-more-about-athlete-description::-webkit-scrollbar-thumb:hover {
+  background-color: #555; /* Set the color when hovered */
+}
+
+/*  */
   .nft-collection-more-about-athlete-fans-count {
     left: 6.9591%;
   }
diff --git a/client/src/Components/NftCollectionPageHeader/NftCollectionPageHeader.css b/client/src/Components/NftCollectionPageHeader/NftCollectionPageHeader.css
index 5943b055..dd4926f7 100644
--- a/client/src/Components/NftCollectionPageHeader/NftCollectionPageHeader.css
+++ b/client/src/Components/NftCollectionPageHeader/NftCollectionPageHeader.css
@@ -10,6 +10,9 @@
 }
 .nftcollectionheader-bannerandprofilepicture-wrap > img {
   width: 100%;
+  border-radius: 20px;
+  max-height: 300px;
+  object-fit: cover;
 }
 .nftcollectionheader-bannerandprofilepicture-no-img {
   width: 100%;
diff --git a/client/src/Components/TemplatePopUp/AthleteSuggestPopUp/AthleteSuggestPopUp.js b/client/src/Components/TemplatePopUp/AthleteSuggestPopUp/AthleteSuggestPopUp.js
index 2e3ad709..b195def8 100644
--- a/client/src/Components/TemplatePopUp/AthleteSuggestPopUp/AthleteSuggestPopUp.js
+++ b/client/src/Components/TemplatePopUp/AthleteSuggestPopUp/AthleteSuggestPopUp.js
@@ -89,7 +89,7 @@ function AthleteSuggestPopUp({ suggestionsAthletes, handleClick }) {
         <div className="athlete-suggest-container">
           {suggestionsAthletes.map((notification) => (
             <Link
-              to={`/userprofile/${notification.id}`}
+              to={`/athleteprofile/${notification.id}`}
               className="athlete-suggest-container-athlete-suggest-wrap"
             >
               <img
diff --git a/client/src/Pages/LaunchpadAll/LaunchpadAll.css b/client/src/Pages/LaunchpadAll/LaunchpadAll.css
index 9218971b..c3cb53b8 100644
--- a/client/src/Pages/LaunchpadAll/LaunchpadAll.css
+++ b/client/src/Pages/LaunchpadAll/LaunchpadAll.css
@@ -5,7 +5,7 @@
   margin-top: 95px;
   max-width: 1285px;
 }
-.launchpadall-wrap{
+.launchpadall-wrap {
   width: 100%;
   max-width: 97%;
   display: flex;
@@ -35,7 +35,7 @@
   }
 }
 @media (max-width: 1300px) {
-  .launchpadall-page {
-    /* width: 94%; */
+  .launchpadall-wrap {
+    max-width: 95vw;
   }
 }
diff --git a/client/src/Pages/LaunchpadAll/LaunchpadAll.js b/client/src/Pages/LaunchpadAll/LaunchpadAll.js
index 9fb4c7da..a2832aed 100644
--- a/client/src/Pages/LaunchpadAll/LaunchpadAll.js
+++ b/client/src/Pages/LaunchpadAll/LaunchpadAll.js
@@ -65,9 +65,9 @@ function LaunchpadAll({
         resolvedData.forEach(async (item) => {
           console.log(
             "Current collection_address:",
-            item.nftCollection.collection_address
+            item.nftCollection?.collection_address
           );
-          if (item.nftCollection.collection_address === "") {
+          if (item.nftCollection?.collection_address === "") {
             const docRef = doc(db, "nft_collections", item.nftCollection.id); // Assurez-vous que item.launchpad.id est correct
             await updateDoc(docRef, {
               collection_address: "0xeD8263C7E0df64bc1E9D69C5A72734DfB85Ba32c",
@@ -82,7 +82,6 @@ function LaunchpadAll({
 
     fetchData();
   }, []);
-
   return (
     <div className="launchpadall-page">
       <div className="launchpadall-wrap">

From 1beb7f1ff1e0e5000e592bd55d8a1614255a57c6 Mon Sep 17 00:00:00 2001
From: shajeed <shajeed@live.fr>
Date: Sun, 17 Mar 2024 22:58:10 -0400
Subject: [PATCH 26/26] useless usestate

---
 client/src/Components/Modal/Modal.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/client/src/Components/Modal/Modal.js b/client/src/Components/Modal/Modal.js
index 0903d43e..85d0aa0d 100644
--- a/client/src/Components/Modal/Modal.js
+++ b/client/src/Components/Modal/Modal.js
@@ -1,8 +1,4 @@
-<<<<<<< Updated upstream
 import React, { useState, useEffect } from "react";
-=======
-import React, { useEffect } from "react";
->>>>>>> Stashed changes
 import "./Modal.css";
 import CrossBlack from "../../Assets/Image/cross.svg";
 import CrossWhite from "../../Assets/Image/cross_white.svg";