Added Picture path

src/components/FamilyAcc/FamilyManageTabs.jsx

@@ -92,6 +92,26 @@ console.log('accountDetails',accountDetails)
    * Checks if the selected file exceeds the maximum file size limit and displays an alert if it does.
    * If the file is within the size limit, it reads the file using the FileReader API and sets the profile image state with the result.
    */
+  // const profileImgChangeHandler = (e) => {
+  //   const MAX_FILE_SIZE = 5 * 1024 * 1024; // 5MB
+
+  //   const file = e.target.files[0];
+  //   if (file && file.size > MAX_FILE_SIZE) {
+  //     alert("File size exceeds the limit.");
+  //     return;
+  //   }
+
+  //   if (file) {
+  //     const imgReader = new FileReader();
+  //     imgReader.onload = () => {
+  //       const imageDataUrl = imgReader.result;
+
+  //       // Set the profile image
+  //       setProfileImg(imageDataUrl);
+  //     };
+  //     imgReader.readAsDataURL(file);
+  //   }
+  // };
 
   const profileImgChangeHandler = (e) => {
     setUploadStatus({loading: false, status: false, message:''})
@@ -119,15 +139,14 @@ console.log('accountDetails',accountDetails)
     if (e.target.value !== "") {
       const imgReader = new FileReader();
       imgReader.onload = (event) => {
-        let base64Img = imgReader.result.split(",")[1];
         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: base64Img,
+          file_data: event?.target?.result,
           msg_type: 'FILE',
-          action: 11305
+          action: 111305
         }
         setUploadStatus({loading: true, status: false, message:'Loading...'})
         apiCall.sendFiles(reqData).then(res=>{

src/components/FamilyAcc/Tabs/ProfileInfo.jsx

@@ -7,7 +7,6 @@ export default function ProfileInfo({
   profileImgChangeHandler,
   browseProfileImg,
   accountDetails,
-  uploadStatus
 }) {
   // console.log(accountDetails.banner)
   return (
@@ -53,11 +52,6 @@ export default function ProfileInfo({
           </div>
         </div>
       </div>
-      {/* DISPLAYS PROFILE UPLOADING STATUS */}
-      <div className="w-full">
-        {uploadStatus.message && !uploadStatus.loading && <p className={`text-center ${uploadStatus.status ? 'text-green-500':'text-red-500'}`}>{uploadStatus.message}</p>}
-        {uploadStatus.loading && <p className="text-center">{uploadStatus.message}</p>}
-      </div>
       <div className="flex flex-col justify-center gap-3 items-center">
         <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
           {accountDetails?.firstname}

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, session_image_server } = data;
+        const { result_list } = data;
-        setFamilyList({result_list, session_image_server});
+        setFamilyList(result_list);
         setLoader(false);
       } else {
         return;
@@ -172,10 +172,9 @@ export default function FamilyAcc() {
           </div>
           <Suspense fallback={<LoadingSpinner color="sky-blue" size="16" />}>
             <FamilyTable
-              familyList={familyList?.result_list}
+              familyList={familyList}
               loader={loader}
               popUpHandler={popUpHandler}
-              imageServer={familyList?.session_image_server}
             />
           </Suspense>
         </div>

src/components/Settings/Tabs/PersonalInfoTab.jsx

@@ -137,17 +137,15 @@ export default function PersonalInfoTab({
     if (e.target.value !== "") {
       const imgReader = new FileReader();
       imgReader.onload = (event) => {
-        let base64Img = imgReader.result.split(",")[1];
         let reqData = {
           // PAYLOAD FOR API CALL
           file_name: uploadedFile?.name,
           file_size: uploadedFile?.size,
           file_type: uploadedFile?.type?.split("/")[0]?.toLowerCase(),
-          file_data: base64Img,
+          file_data: event?.target?.result,
           msg_type: "FILE",
           action: 11300,
         };
-        
         setUploadStatus({
           loading: true,
           status: false,

src/components/jobPopout/EditJobPopout.jsx

@@ -1,6 +1,6 @@
 import { Field, Form, Formik } from "formik";
 import React, { useCallback, useMemo, useState } from "react";
-import { useDispatch, useSelector } from "react-redux";
+import { useDispatch } from "react-redux";
 import { useNavigate } from "react-router-dom";
 import * as Yup from "yup";
 import usersService from "../../services/UsersService";
@@ -51,12 +51,18 @@ const EditJobPopOut = ({
   categories,
 }) => {
   const dispatch = useDispatch();
-  const { userDetails } = useSelector((state) => state.userDetails);
 
-  const uploadedImage = localStorage.getItem('session_token') ? `${userDetails.session_image_server}${localStorage.getItem('session_token')}/jobs/${details?.job_uid}` : ''
+  const [taskImage, setTaskImage] = useState('')
-  const [taskImage, setTaskImage] = useState(uploadedImage)
 
-  let [uploadStatus, setUploadStatus] = useState({loading: false, status: false, message:''}) // HOLDS STATE FOR UPLOAD PROFILE PICTURE STATUS
+  const changeTaskImage = (e) => {
+    if (e.target.value !== "") {
+      const imgReader = new FileReader();
+      imgReader.onload = (event) => {
+        setTaskImage(event.target.result);
+      };
+      imgReader.readAsDataURL(e.target.files[0]);
+    }
+  }
 
   let [requestStatus, setRequestStatus] = useState({
     loading: false,
@@ -111,61 +117,6 @@ const EditJobPopOut = ({
     [jobApi, navigate, onClose, details]
   );
 
-  const taskImgChangeHandler = (e) => {
-    setUploadStatus({loading: false, status: false, message:''})
-    let acceptedFormat = ["jpeg", "jpg", "png", "bmp", "gif"] // ARRAY OF SUPPORTED FORMATS
-    let uploadedFile = e.target.files[0] //UPLOADED FILE
-
-    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
-        setUploadStatus({loading: false, status: false, message:''})
-      },5000)
-    }
-
-    if(uploadedFile.size > 5*1048576){ // CHECKING FOR CORRECT FILE SIZE
-      setUploadStatus({loading: false, status: false, message:'File must not exceed 5MB'})
-      return setTimeout(()=>{
-        // profileImgInput.current.value = '' // clear the input
-        setUploadStatus({loading: false, status: false, message:''})
-      },5000)
-    }
-
-    if (e.target.value !== "") {
-      const imgReader = new FileReader();
-      imgReader.onload = (event) => {
-        let base64Img = imgReader.result.split(",")[1];
-        let reqData = { // PAYLOAD FOR API CALL
-          job_uid: details?.job_uid,
-          file_name: uploadedFile?.name,
-          file_size: uploadedFile?.size,
-          file_type: uploadedFile?.type?.split("/")[0]?.toLowerCase(),
-          file_data: base64Img,
-          msg_type: 'FILE',
-          action: 11303
-        }
-        setUploadStatus({loading: true, status: false, message:'Loading...'})
-        jobApi.sendFiles(reqData).then(res=>{
-          if(res.status != 200 || res.data.internal_return < 0){
-            return setUploadStatus({loading: false, status: false, message: 'Something went wrong, try again'})
-          }
-          setUploadStatus({loading: false, status: true, message: 'Uploaded successfully'})
-          setTaskImage(event.target.result);
-        }).catch(error=>{
-          setUploadStatus({loading: false, status: false, message: 'Network error, try again'})
-        }).finally(()=>{
-          setTimeout(()=>{
-            setUploadStatus({loading: false, status: false, message: ''})
-          },5000)
-        })
-      };
-      imgReader.readAsDataURL(e.target.files[0]);
-    }
-  };
-
   return (
     <ModalCom action={onClose} situation={situation} className="edit-popup">
       <div className="logout-modal-wrapper lg:w-[600px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
@@ -348,7 +299,7 @@ const EditJobPopOut = ({
                           className="hidden" 
                           type="file" 
                           accept="image/*" 
-                          onChange={taskImgChangeHandler}
+                          onChange={changeTaskImage}
                         />
                         {taskImage ?
                         <div className="w-full absolute -top-5">
@@ -426,12 +377,6 @@ const EditJobPopOut = ({
                     ))}
                   {/* End of error or success display */}
 
-                   {/* DISPLAYS TASK IMAGE UPLOADING STATUS */}
-                    <div className="w-full">
-                      {uploadStatus.message && !uploadStatus.loading && <p className={`text-center ${uploadStatus.status ? 'text-green-500':'text-red-500'}`}>{uploadStatus.message}</p>}
-                      {uploadStatus.loading && <p className="text-center">{uploadStatus.message}</p>}
-                    </div>
-
                   <div className="w-full border-t border-light-purple dark:border-[#5356fb29]  flex justify-end items-center">
                     <div className="flex items-center space-x-4 mr-2 mt-2">
                       {requestStatus.loading ? (
@@ -441,7 +386,6 @@ const EditJobPopOut = ({
                           type="submit"
                           className="w-[120px] h-[40px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
                           // className='w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white'
-                          disabled={requestStatus.loading || uploadStatus.loading}
                         >
                           Save
                         </button>

src/services/UsersService.js

@@ -19,16 +19,6 @@ class usersService {
     return this.postAuxEnd("/completesignuplink", reqData);
   }
 
-  assignJobTask(reqData) {
-    var postData = {
-      uid: localStorage.getItem("uid"),
-      member_id: localStorage.getItem("member_id"),
-      sessionid: localStorage.getItem("session_token"),
-      ...reqData,
-    };
-    return this.postAuxEnd("/assigntask", postData);
-  }
-
   // FUNCTION TO GET USER CURRENT TASK DUE TIME
   getHomeDate() {
     var postData = {
@@ -40,12 +30,12 @@ class usersService {
     return this.postAuxEnd("/dashdata", postData);
   }
 
-  getRecentActivities() {
+  getRecentActivities(){
     var postData = {
       uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-      action: 11202,
+      action: 11202
     };
     return this.postAuxEnd("/recentactivities", postData);
   }
@@ -378,7 +368,7 @@ class usersService {
       page: 0,
       offset: 0,
       limit: 100,
-      allstatus: 0,
+      allstatus: 0
     };
     return this.postAuxEnd("/activetaskslist", postData);
   }
@@ -608,7 +598,7 @@ class usersService {
       sessionid: localStorage.getItem("session_token"),
       page: 0,
       limit: 100,
-      ...reqdata,
+      ...reqdata
     };
     return this.postAuxEnd("/familyupdate", postData);
   }
@@ -792,17 +782,6 @@ class usersService {
     return this.postAuxEnd("/pendingjobsendtome", postData);
   }
 
-  pendingCancelOffer(reqData) {
-    var postData = {
-      uid: localStorage.getItem("uid"),
-      member_id: localStorage.getItem("member_id"),
-      sessionid: localStorage.getItem("session_token"),
-      action: 13043,
-      ...reqData,
-    };
-    return this.postAuxEnd("/pendingjobcancel", postData);
-  }
-
   // FUNCTION TO GET ACTIVE JOB MESSAGE LIST
   activeJobMesList(reqData) {
     var postData = {
@@ -838,11 +817,11 @@ class usersService {
       action: 14010,
       ...reqData,
     };
-    
     const formData = new FormData();
     for (let data in postData) {
       formData.append(data, postData[data]);
     }
+    //  return this.postAuxEnd("/uploads", formData);
 
     return this.postAuxEnd("/uploads", postData);
   }
@@ -1099,51 +1078,52 @@ class usersService {
     return this.postAuxEnd("/blogdata", postData);
   }
 
-  // FUNCTION TO CANCEL TASK OR SEND REMINDER BY FAMILY MEMBER
-  suggestStatus(reqData) {
-    var postData = {
-      uid: localStorage.getItem("uid"),
-      member_id: localStorage.getItem("member_id"),
-      sessionid: localStorage.getItem("session_token"),
-      action: 22026,
-      ...reqData,
-    };
-    return this.postAuxEnd("/suggeststatus", postData);
-  }
 
-  // FUNCTION TO GET FAMILY WALLET
+    // FUNCTION TO CANCEL TASK OR SEND REMINDER BY FAMILY MEMBER
-  getFamilyWallet(reqData) {
+    suggestStatus(reqData) {
-    var postData = {
+      var postData = {
-      uid: localStorage.getItem("uid"),
+        uid: localStorage.getItem("uid"),
-      member_id: localStorage.getItem("member_id"),
+        member_id: localStorage.getItem("member_id"),
-      sessionid: localStorage.getItem("session_token"),
+        sessionid: localStorage.getItem("session_token"),
-      action: 22012,
+        action: 22026,
-      ...reqData,
+        ...reqData,
-    };
+      };
-    return this.postAuxEnd("/familywallet", postData);
+      return this.postAuxEnd("/suggeststatus", postData);
-  }
+    }
 
-  // FUNCTION TO START FAMILY TRANSFER
+    // FUNCTION TO GET FAMILY WALLET
-  familyTransferStart(reqData) {
+    getFamilyWallet(reqData) {
-    var postData = {
+      var postData = {
-      uid: localStorage.getItem("uid"),
+        uid: localStorage.getItem("uid"),
-      member_id: localStorage.getItem("member_id"),
+        member_id: localStorage.getItem("member_id"),
-      sessionid: localStorage.getItem("session_token"),
+        sessionid: localStorage.getItem("session_token"),
-      ...reqData,
+        action: 22012,
-    };
+        ...reqData,
-    return this.postAuxEnd("/familytransferstart", postData);
+      };
-  }
+      return this.postAuxEnd("/familywallet", postData);
+    }
   
-  // FUNCTION TO PERFORM FAMILY TRANSFER
+    // FUNCTION TO START FAMILY TRANSFER
-  familyTransfer(reqData) {
+    familyTransferStart(reqData) {
-    var postData = {
+      var postData = {
-      uid: localStorage.getItem("uid"),
+        uid: localStorage.getItem("uid"),
-      member_id: localStorage.getItem("member_id"),
+        member_id: localStorage.getItem("member_id"),
-      sessionid: localStorage.getItem("session_token"),
+        sessionid: localStorage.getItem("session_token"),
-      ...reqData,
+        ...reqData,
-    };
+      };
-    return this.postAuxEnd("/familytransfer", postData);
+      return this.postAuxEnd("/familytransferstart", postData);
-  }
+    }
+
+    // FUNCTION TO PERFORM FAMILY TRANSFER
+    familyTransfer(reqData) {
+      var postData = {
+        uid: localStorage.getItem("uid"),
+        member_id: localStorage.getItem("member_id"),
+        sessionid: localStorage.getItem("session_token"),
+        ...reqData,
+      };
+      return this.postAuxEnd("/familytransfer", postData);
+    }
 
   /*
     - 20:27:30.118 FLOG_MAX [757411]: 	REQ_STRING(username)
@@ -1257,10 +1237,6 @@ class usersService {
         console.log(response);
         // res = response;
         console.log("~~~~~~~ Toks2 POST ~~~~~~~~");
-        if (response.data.internal_return == "-9999") {
-          localStorage.clear();
-          window.location.href = `/login?sessionExpired=true`;
-        }
         return response;
       })
       .catch((error) => {