From 4f0d432176a8c73a2ebbc0a4cae5466ec8dfd7b8 Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Mon, 6 Nov 2023 12:42:10 +0100
Subject: [PATCH] family profile image upload API added

---
 src/components/FamilyAcc/FamilyManageTabs.jsx | 19 +++++++------------
 src/components/FamilyAcc/FamilyTable.jsx      | 14 +++++++++-----
 src/components/FamilyAcc/index.jsx            |  9 +++++----
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/components/FamilyAcc/FamilyManageTabs.jsx b/src/components/FamilyAcc/FamilyManageTabs.jsx
index 4779f30..2287516 100644
--- a/src/components/FamilyAcc/FamilyManageTabs.jsx
+++ b/src/components/FamilyAcc/FamilyManageTabs.jsx
@@ -33,7 +33,7 @@ export default function FamilyManageTabs({
     loading: false,
     data: null,
   };
-
+console.log('accountDetails',accountDetails)
   // State for family details, tasks, waitlist, and pending
   const [details, setDetails] = useState({
     familyDetails: { ...initialDetailState },
@@ -69,7 +69,7 @@ export default function FamilyManageTabs({
   let [uploadStatus, setUploadStatus] = useState({loading: false, status: false, message:''}) // HOLDS STATE FOR UPLOAD PROFILE PICTURE STATUS
 
   // State for profile image
-  const [profileImg, setProfileImg] = useState(profile);
+  const [profileImg, setProfileImg] = useState(accountDetails.image ? accountDetails.image : profile);
 
   // Ref for profile image input
   const profileImgInput = useRef(null);
@@ -118,15 +118,9 @@ export default function FamilyManageTabs({
     let acceptedFormat = ["jpeg", "jpg", "png", "bmp", "gif"] // ARRAY OF SUPPORTED FORMATS
     let uploadedFile = e.target.files[0] //UPLOADED FILE
 
-    if(!acceptedFormat.includes(uploadedFile?.type?.split("/")[1]?.toLowerCase())){ //CHECKING FOR CORRECT UPLOAD FORMAT
-      let msg = 'Please select '
-      for(let i=0; i<=acceptedFormat.length-1; i++){
-        if(i == acceptedFormat.length-1){
-          msg+=`or ${acceptedFormat[i]}`
-        }else{
-          msg+=`${acceptedFormat[i]}, `
-        }
-      }
+    const fileFormat = uploadedFile?.type?.split("/")[1]?.toLowerCase();
+    if(!acceptedFormat.includes(fileFormat)){ //CHECKING FOR CORRECT UPLOAD FORMAT
+      const msg = `Please select ${acceptedFormat.slice(0, -1).join(', ')} or ${acceptedFormat.slice(-1)}`;
       setUploadStatus({loading: false, status: false, message:msg})
       return setTimeout(()=>{
         profileImgInput.current.value = '' // clear the input
@@ -146,12 +140,13 @@ export default function FamilyManageTabs({
       const imgReader = new FileReader();
       imgReader.onload = (event) => {
         let reqData = { // PAYLOAD FOR API CALL
+          family_uid: accountDetails?.family_uid,
           file_name: uploadedFile?.name,
           file_size: uploadedFile?.size,
           file_type: uploadedFile?.type?.split("/")[0]?.toLowerCase(),
           file_data: event?.target?.result,
           msg_type: 'FILE',
-          action: 11300
+          action: 111305
         }
         setUploadStatus({loading: true, status: false, message:'Loading...'})
         apiCall.sendFiles(reqData).then(res=>{
diff --git a/src/components/FamilyAcc/FamilyTable.jsx b/src/components/FamilyAcc/FamilyTable.jsx
index 29835cb..35a94ef 100644
--- a/src/components/FamilyAcc/FamilyTable.jsx
+++ b/src/components/FamilyAcc/FamilyTable.jsx
@@ -19,6 +19,7 @@ export default function FamilyTable({
   familyList,
   loader,
   popUpHandler,
+  imageServer
 }) {
   const navigate = useNavigate();
   const [currentPage, setCurrentPage] = useState(0);
@@ -54,12 +55,14 @@ export default function FamilyTable({
     banner,
     enable_traking,
     profile_picture,
+    imageServer
   }) => {
     // Check for valid dates
     const addedDate = added ? added.split(" ")[0] : "N/A";
     const loginDate = last_login ? formatDateString(last_login) : "N/A";
     const key = `family-${family_uid}`; // Assign a unique key
-
+    const image = localStorage.getItem('session_token') ? `${imageServer}${localStorage.getItem('session_token')}/family/${family_uid}` : ''
+    
     const trackingStatus =
       enable_traking === "0"
         ? "Stopped"
@@ -76,8 +79,8 @@ export default function FamilyTable({
           <div className="flex space-x-2 items-center w-full">
             <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1]">
               <img
-                src={profile_picture}
-                // src={profile_picture || localImgLoad(`images/icons/${banner}`)}
+                // src={profile_picture}
+                src={image || profile_picture || localImgLoad(`images/icons/${banner}`)}
                 alt={`Avatar of ${firstname} ${lastname}`}
                 className="w-full h-full"
               />
@@ -133,6 +136,7 @@ export default function FamilyTable({
                 task_count,
                 family_uid,
                 banner,
+                image
               })
             }
             type="button"
@@ -182,7 +186,7 @@ export default function FamilyTable({
                 </thead>
                 <tbody className="h-full">
                   {currentFamilyList?.map((familyMember, index) => {
-                    return <FamilyRow key={index} {...familyMember} />;
+                    return <FamilyRow key={index} {...familyMember} imageServer={imageServer} />;
                   })}
                 </tbody>
               </table>
@@ -213,7 +217,7 @@ export default function FamilyTable({
       <PaginatedList
         onClick={handlePagination}
         prev={currentPage == 0}
-        next={currentPage + itemsPerPage >= familyList.length}
+        next={currentPage + itemsPerPage >= familyList?.length}
         data={familyList}
         start={indexOfFirstItem}
         stop={indexOfLastItem}
diff --git a/src/components/FamilyAcc/index.jsx b/src/components/FamilyAcc/index.jsx
index 9c73585..22d9d7d 100644
--- a/src/components/FamilyAcc/index.jsx
+++ b/src/components/FamilyAcc/index.jsx
@@ -17,7 +17,7 @@ export default function FamilyAcc() {
   // State to store the selected year and month
   const [selectedYear, setSelectedYear] = useState("");
   const [selectedMonth, setSelectedMonth] = useState("");
-  const [familyList, setFamilyList] = useState([]);
+  const [familyList, setFamilyList] = useState({});
   const [loader, setLoader] = useState(false);
   const [popUp, setPopUp] = useState(false);
   const [listReload, setListReload] = useState(false);
@@ -115,8 +115,8 @@ export default function FamilyAcc() {
       const res = await apiCall.familyListings(reqData);
       const { data } = res;
       if (data?.internal_return >= 0 && data?.status === "OK") {
-        const { result_list } = data;
-        setFamilyList(result_list);
+        const { result_list, session_image_server } = data;
+        setFamilyList({result_list, session_image_server});
         setLoader(false);
       } else {
         return;
@@ -172,9 +172,10 @@ export default function FamilyAcc() {
           </div>
           <Suspense fallback={<LoadingSpinner color="sky-blue" size="16" />}>
             <FamilyTable
-              familyList={familyList}
+              familyList={familyList?.result_list}
               loader={loader}
               popUpHandler={popUpHandler}
+              imageServer={familyList?.session_image_server}
             />
           </Suspense>
         </div>