width adjusted

.env

@@ -18,6 +18,7 @@ REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
 REACT_APP_SESSION_EXPIRE_MINUTES=300000
+REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000
 
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000

.env.development

@@ -18,6 +18,7 @@ REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
 REACT_APP_SESSION_EXPIRE_MINUTES=300000
+REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000
 
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000

.env.production

@@ -18,6 +18,7 @@ REACT_APP_USERS_ENDPOINT="https://apigate.orion.g1.wrenchboard.com/svs/user"
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
 REACT_APP_SESSION_EXPIRE_MINUTES=300000
+REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000
 
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000

src/components/FamilyAcc/FamilyManage.jsx

@@ -1,6 +1,6 @@
 import React, { useState } from "react";
 import Layout from "../Partials/Layout";
-import FamilyManageTabs from "./FamilyManageTabs";
+import FamilyManageTabs from "./Tabs/FamilyManageTabs";
 import { useLocation } from "react-router-dom";
 
 export default function FamilyManage() {

src/components/FamilyAcc/FamilyTasks.jsx

@@ -1,127 +0,0 @@
-import React, { useState } from "react";
-import dataImage1 from "../../assets/images/data-table-user-1.png";
-import dataImage2 from "../../assets/images/data-table-user-2.png";
-import dataImage3 from "../../assets/images/data-table-user-3.png";
-import dataImage4 from "../../assets/images/data-table-user-4.png";
-import SelectBox from "../Helpers/SelectBox";
-
-import PaginatedList from "../Pagination/PaginatedList";
-import { handlePagingFunc } from "../Pagination/HandlePagination";
-
-export default function FamilyTasks({ className }) {
-    const filterCategories = ["All Categories", "Explore", "Featured"];
-    const [selectedCategory, setCategory] = useState(filterCategories[0]);
-
-    let data = ['1', '2', '3', '4', '5', '6'] // to be replaced later by result from API CALL
-
-    const [currentPage, setCurrentPage] = useState(0);
-    const indexOfFirstItem = Number(currentPage);
-    const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
-    const currentTask = data.slice(indexOfFirstItem, indexOfLastItem);
-
-    const handlePagination = (e) => {
-        handlePagingFunc(e,setCurrentPage)
-    }
-
-    return (
-        <div
-            className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow ${
-                className || ""
-            }`}
-        >
-            {data.length &&
-                <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
-                    <table className="table-auto w-full text-sm text-left text-gray-500 dark:text-gray-400">
-                        <tbody>
-                        <tr className="text-base text-thin-light-gray border-b default-border-b dark:border-[#5356fb29] ottom ">
-                            <td className="py-4">All Product</td>
-                            <td className="py-4 text-center">Value</td>
-                            <td className="py-4 text-center">USD</td>
-                            <td className="py-4 text-right">Status</td>
-                        </tr>
-                        {
-                            currentTask.map((item,index)=>(
-                                <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-                                    <td className=" py-4">
-                                    <div className="flex space-x-2 items-center">
-                                    <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                                    <img
-                                    src={dataImage3}
-                                    alt="data"
-                                    className="w-full h-full"
-                                    />
-                                    </div>
-                                    <div className="flex flex-col">
-                                    <h1 className="font-bold text-xl text-dark-gray dark:text-white">
-                                    Mullican Computer Joy
-                                    </h1>
-                                    <span className="text-sm text-thin-light-gray">
-                                    Owned by <span className="text-purple">Xoeyam</span>
-                                    </span>
-                                    </div>
-                                    </div>
-                                    </td>
-                                    <td className="text-center py-4 px-2">
-                                    <div className="flex space-x-1 items-center justify-center">
-
-                                        <span className="text-base text-dark-gray dark:text-white font-medium">
-                                        7473 ETH
-                                        </span>
-                                    </div>
-                                    </td>
-                                    <td className="text-center py-4 px-2">
-                                    <div className="flex space-x-1 items-center justify-center">
-                                    <span>
-                                    <svg
-                                    width="16"
-                                    height="16"
-                                    viewBox="0 0 16 16"
-                                    fill="none"
-                                    xmlns="http://www.w3.org/2000/svg"
-                                    >
-                                    <path
-                                    d="M7.55225 0C7.8457 0 8.13914 0 8.43205 0C8.44829 0.026534 8.47537 0.0151623 8.49756 0.0162453C9.28966 0.0649812 10.0606 0.220936 10.8013 0.505229C12.7699 1.26172 14.2323 2.58354 15.183 4.46638C15.5999 5.29218 15.8506 6.16997 15.9561 7.08891C15.9691 7.201 15.9621 7.3158 16 7.42465C16 7.80858 16 8.19251 16 8.57698C15.9778 8.5916 15.9854 8.61543 15.9838 8.63546C15.9475 9.10387 15.8744 9.56686 15.7515 10.0206C15.1787 12.1342 13.9524 13.7603 12.0818 14.8942C11.1516 15.4579 10.1397 15.8002 9.06064 15.941C8.89497 15.9626 8.72875 15.98 8.56308 15.9995C8.17217 15.9995 7.78127 15.9995 7.39036 16C7.3752 15.9789 7.35138 15.9865 7.33135 15.9848C6.96752 15.9545 6.60639 15.9009 6.25068 15.8197C4.77639 15.4829 3.48998 14.793 2.4131 13.7311C0.998917 12.3372 0.204656 10.6461 0.0270709 8.66687C0.0205739 8.59431 0.033568 8.51904 0 8.44972C0 8.15081 0 7.85244 0 7.55352C0.0265295 7.53403 0.0151597 7.50479 0.016784 7.47988C0.0730915 6.64162 0.251218 5.83044 0.564158 5.05066C1.10179 3.71043 1.93774 2.59058 3.07634 1.70142C4.33839 0.715876 5.77098 0.159745 7.36762 0.0270755C7.4288 0.0216604 7.49432 0.0341151 7.55225 0ZM7.24635 9.86252C7.24635 10.2383 7.24526 10.6147 7.24743 10.9905C7.24797 11.0457 7.23389 11.0679 7.17596 11.0593C7.09691 11.0479 7.01678 11.0446 6.93774 11.0338C6.26746 10.9461 5.63563 10.7371 5.03952 10.4192C5.00379 10.4002 4.97834 10.3802 4.9621 10.4425C4.81375 11.0176 4.66324 11.5926 4.51164 12.1666C4.50027 12.2094 4.51272 12.2278 4.54954 12.2473C4.66486 12.3096 4.78235 12.3665 4.90309 12.4152C5.5961 12.6968 6.31998 12.8408 7.06497 12.8842C7.14131 12.8885 7.16134 12.9112 7.1608 12.9865C7.15701 13.4159 7.16026 13.8453 7.15809 14.2747C7.15755 14.3397 7.17488 14.3619 7.2431 14.3614C7.69085 14.3581 8.13914 14.3576 8.5869 14.3614C8.66432 14.3619 8.67731 14.3359 8.67731 14.2666C8.67461 13.8026 8.67677 13.3385 8.67461 12.8744C8.67407 12.8089 8.68544 12.7786 8.76015 12.765C9.09962 12.7049 9.4288 12.6058 9.74228 12.4607C10.3498 12.1802 10.8408 11.7703 11.1603 11.1724C11.4288 10.6699 11.51 10.1327 11.4618 9.56957C11.4158 9.03239 11.2366 8.55207 10.8787 8.14431C10.5506 7.77121 10.1402 7.51129 9.69843 7.29522C9.39145 7.14523 9.07363 7.02284 8.75041 6.91129C8.7098 6.89721 8.67407 6.88693 8.67407 6.82736C8.67623 6.14993 8.67569 5.4725 8.67461 4.79507C8.67461 4.75121 8.68489 4.73117 8.73308 4.73767C8.87547 4.75717 9.01895 4.77016 9.16134 4.79236C9.634 4.86493 10.0796 5.02467 10.5116 5.22395C10.5717 5.25157 10.5945 5.24886 10.6123 5.17684C10.7434 4.6467 10.8771 4.1171 11.0162 3.58913C11.0379 3.5079 11.0244 3.47541 10.948 3.44076C10.2799 3.13751 9.57282 3.01025 8.8457 2.97614C8.78018 2.97289 8.76123 2.95556 8.76178 2.88896C8.76503 2.50232 8.76232 2.11568 8.76448 1.72904C8.76503 1.66785 8.75041 1.64727 8.68489 1.64727C8.23173 1.64998 7.77802 1.64998 7.32485 1.64727C7.26151 1.64673 7.24418 1.66406 7.24418 1.72742C7.24689 2.1433 7.24256 2.55972 7.24797 2.9756C7.24905 3.06116 7.2209 3.08661 7.14239 3.10285C6.73579 3.18679 6.34651 3.32271 5.98646 3.53281C5.20628 3.98822 4.72117 4.64724 4.61938 5.5586C4.51597 6.48837 4.83812 7.2427 5.57661 7.81778C6.05739 8.19251 6.60639 8.43781 7.1738 8.64683C7.2274 8.66633 7.24743 8.68907 7.24689 8.7481C7.24472 9.12066 7.24635 9.49159 7.24635 9.86252Z"
-                                    fill="#59BE59"
-                                    />
-                                    <path
-                                    d="M7.2452 9.86252C7.2452 9.49158 7.24358 9.12119 7.24683 8.75026C7.24737 8.69123 7.22734 8.66903 7.17374 8.64899C6.60687 8.43997 6.05787 8.19467 5.57655 7.81994C4.8386 7.24486 4.51591 6.49053 4.61933 5.56076C4.72057 4.6494 5.20568 3.99092 5.98641 3.53497C6.34645 3.32486 6.73519 3.18894 7.14233 3.10501C7.22084 3.08876 7.24899 3.06277 7.24791 2.97775C7.2425 2.56187 7.24683 2.14545 7.24412 1.72957C7.24358 1.66621 7.2609 1.64888 7.32479 1.64943C7.77796 1.65213 8.23167 1.65213 8.68483 1.64943C8.7498 1.64888 8.76442 1.66946 8.76442 1.73119C8.76171 2.11783 8.76496 2.50447 8.76171 2.89111C8.76117 2.95717 8.78012 2.97504 8.84563 2.97829C9.57276 3.01295 10.2793 3.13966 10.948 3.44291C11.0243 3.47757 11.0373 3.51006 11.0162 3.59128C10.877 4.11926 10.7433 4.64885 10.6123 5.17899C10.5944 5.25156 10.5717 5.25372 10.5116 5.2261C10.079 5.02683 9.63394 4.86708 9.16128 4.79452C9.01889 4.77286 8.87595 4.75932 8.73302 4.73983C8.68483 4.73333 8.67455 4.75337 8.67455 4.79723C8.67563 5.47466 8.67617 6.15209 8.674 6.82952C8.674 6.88908 8.70974 6.89937 8.75034 6.91345C9.07303 7.02446 9.39138 7.14684 9.69837 7.29738C10.1396 7.51344 10.5506 7.77283 10.8787 8.14647C11.2365 8.55369 11.4157 9.03455 11.4618 9.57173C11.51 10.1349 11.4287 10.6726 11.1602 11.1746C10.8408 11.7724 10.3497 12.1818 9.74222 12.4629C9.42874 12.608 9.09956 12.7071 8.76009 12.7672C8.68483 12.7802 8.674 12.811 8.67455 12.8766C8.67671 13.3406 8.67455 13.8047 8.67725 14.2688C8.67779 14.3381 8.66426 14.3646 8.58684 14.3636C8.13908 14.3598 7.69079 14.3608 7.24304 14.3636C7.17536 14.3641 7.15803 14.3424 7.15803 14.2769C7.1602 13.8475 7.15695 13.4181 7.16074 12.9887C7.16128 12.9128 7.14179 12.8906 7.06491 12.8863C6.31992 12.843 5.59658 12.699 4.90303 12.4174C4.78229 12.3681 4.66426 12.3112 4.54948 12.2495C4.51321 12.23 4.50075 12.2116 4.51158 12.1688C4.66318 11.5943 4.81369 11.0197 4.96204 10.4446C4.97829 10.3824 5.00373 10.4024 5.03947 10.4214C5.63557 10.7387 6.2674 10.9477 6.93768 11.036C7.01672 11.0463 7.09685 11.0501 7.1759 11.0614C7.23383 11.0695 7.24737 11.0479 7.24737 10.9927C7.24412 10.6147 7.2452 10.2383 7.2452 9.86252ZM8.68537 9.36325C8.67942 9.37245 8.67455 9.37678 8.67455 9.38112C8.674 9.83978 8.67401 10.2984 8.67292 10.7571C8.67292 10.8177 8.70216 10.7928 8.72598 10.7755C8.82452 10.7046 8.90736 10.619 8.96691 10.5123C9.17698 10.1333 9.05679 9.63725 8.68537 9.36325ZM7.23871 6.11147C7.23871 5.75354 7.23871 5.40589 7.23871 5.05174C6.92522 5.33982 6.92522 5.77249 7.23871 6.11147Z"
-                                    fill="#FEFEFE"
-                                    />
-                                    <path
-                                    d="M8.68433 9.36328C9.05574 9.63729 9.17539 10.1333 8.96586 10.5118C8.90631 10.619 8.82347 10.7046 8.72493 10.775C8.70111 10.7918 8.67188 10.8172 8.67188 10.7566C8.67242 10.2979 8.67296 9.83927 8.6735 9.38061C8.67404 9.37682 8.67891 9.37249 8.68433 9.36328Z"
-                                    fill="#59BE59"
-                                    />
-                                    <path
-                                    d="M7.23882 6.11149C6.92533 5.77305 6.92587 5.33984 7.23882 5.05176C7.23882 5.40591 7.23882 5.75355 7.23882 6.11149Z"
-                                    fill="#59BE59"
-                                    />
-                                    </svg>
-                                    </span>
-                                    <span className="text-base text-dark-gray dark:text-white font-medium">
-                                    6392.99$
-                                    </span>
-                                    </div>
-                                    </td>
-                                    <td className="text-right py-4 px-2">
-                                    <button
-                                    type="button"
-                                    className="text-sm text-white bg-purple px-2.5 py-1.5 rounded-full"
-                                    >
-                                    Active
-                                    </button>
-                                    </td>
-                                </tr>
-                            ))
-                        }
-
-                        </tbody>
-                    </table>
-
-                    {/* PAGINATION BUTTON */}
-                    <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= data.length ? true : false} data={data} start={indexOfFirstItem} stop={indexOfLastItem} />
-                    {/* END OF PAGINATION BUTTON */}
-                </div>
-            }
-        </div>
-    );
-}

src/components/FamilyAcc/Tabs/FamilyManageTabs.jsx

@@ -1,18 +1,18 @@
 import React, {
+  Suspense,
+  forwardRef,
   useCallback,
   useEffect,
   useMemo,
   useRef,
   useState,
-  forwardRef,
-  Suspense,
 } from "react";
-import LoadingSpinner from "../Spinners/LoadingSpinner";
-import profile from "../../assets/images/profile-info-profile.png";
-import usersService from "../../services/UsersService";
-import FamilyTasks from "./FamilyTasks";
 import QRCode from "react-qr-code";
 import { useReactToPrint } from "react-to-print";
+import usersService from "../../../services/UsersService";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import profile from "../../../assets/images/profile-info-profile.png";
+import FamilyTasks from "./FamilyTasks";
 
 export default function FamilyManageTabs({
   className,
@@ -20,7 +20,16 @@ export default function FamilyManageTabs({
   listReload,
   loader,
 }) {
-  const [familyDetails, setFamilyDetails] = useState(null);
+  const [details, setDetails] = useState({
+    familyDetails: {
+      loading: false,
+      data: null,
+    },
+    familyTasks: {
+      loading: false,
+      data: null,
+    },
+  });
   const [errMsg, setErrMsg] = useState("");
   // List of tabs
   const tabs = [
@@ -57,26 +66,46 @@ export default function FamilyManageTabs({
       imgReader.readAsDataURL(e.target.files[0]);
     }
   };
+
   //   Api call
   const apiCall = useMemo(() => new usersService(), []);
   // function for manage family
-  const familyManageHandler = useCallback(async () => {
+  const manageFamily = useCallback(async () => {
     try {
+      setDetails({
+        familyDetails: { loading: true },
+        familyTasks: { loading: true },
+      });
       let { family_uid } = accountDetails;
       let reqData = { family_uid };
-      let res = await apiCall.ManageFamily(reqData);
-      let { data } = await res;
-      if (data?.internal_return < 0) return;
-      setFamilyDetails(data);
+
+      const familyRes = await apiCall.ManageFamily(reqData);
+      const familyData = familyRes.data;
+
+      const tasksRes = await apiCall.ManageTasks(reqData);
+      const tasksData = tasksRes.data;
+
+      // checking the internal return
+      if (familyData?.internal_return < 0 || tasksData?.internal_return < 0)
+        return;
+
+      setDetails({
+        familyDetails: { loading: false, data: familyData },
+        familyTasks: { loading: false, data: tasksData },
+      });
     } catch (error) {
+      setDetails({
+        familyDetails: { loading: false },
+        familyTasks: { loading: false },
+      });
       setErrMsg("An error occurred");
       throw new Error(error);
     }
   }, [apiCall, accountDetails]);
 
   useEffect(() => {
-    familyManageHandler();
-  }, [tab]);
+    manageFamily();
+  }, [tab, manageFamily]);
 
   const accountRef = useRef();
   // to handle printing
@@ -132,16 +161,21 @@ export default function FamilyManageTabs({
                       <div
                         className={`${
                           tab === name ? "block" : "hidden"
-                        } h-full p-4 border border-[#dbd9d9]`}
+                        } h-full p-4 border border-[#dbd9d9] relative overflow-y-auto`}
                         key={id}
                       >
                         {name === "Tasks" && (
-                          <FamilyTasks className={className} loader={loader} />
+                          <FamilyTasks
+                            className={className}
+                            loader={details.familyTasks.loading}
+                            familyData={details.familyTasks.data}
+                          />
                         )}
                         {name === "Account" && (
                           <Account
-                            familyDetails={familyDetails}
+                            familyData={details.familyDetails.data}
                             myRef={accountRef}
+                            loader={details.familyDetails.loading}
                             handlePrint={useHandlePrint}
                           />
                         )}
@@ -220,7 +254,7 @@ function ProfileInfo({
   );
 }
 
-const Account = forwardRef(({ familyDetails, myRef, handlePrint }) => {
+const Account = forwardRef(({ familyData, myRef, handlePrint }, ref) => {
   return (
     <div
       className="w-full lg:min-h-[500px] h-full flex flex-col items-center justify-center"
@@ -232,15 +266,13 @@ const Account = forwardRef(({ familyDetails, myRef, handlePrint }) => {
             <h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
               Username:{" "}
               <span className="ml-2 normal-case">
-                {familyDetails?.username
-                  ? familyDetails?.username
-                  : "please wait..."}
+                {familyData?.username ? familyData?.username : "please wait..."}
               </span>
             </h2>
             <h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
               Pin:{" "}
               <span className="ml-2 normal-case">
-                {familyDetails?.pin ? familyDetails?.pin : "please wait..."}
+                {familyData?.pin ? familyData?.pin : "please wait..."}
               </span>
             </h2>
           </div>

src/components/FamilyAcc/Tabs/FamilyTasks.jsx

@@ -0,0 +1,137 @@
+import React, { useState } from "react";
+import dataImage2 from "../../../assets/images/data-table-user-2.png";
+
+import { handlePagingFunc } from "../../Pagination/HandlePagination";
+import PaginatedList from "../../Pagination/PaginatedList";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+
+export default function FamilyTasks({ familyData, className, loader }) {
+  const filterCategories = ["All Categories", "Explore", "Featured"];
+  const [selectedCategory, setCategory] = useState(filterCategories[0]);
+
+  let data = ["1", "2", "3", "4", "5", "6"]; // to be replaced later by result from API CALL
+
+  const [currentPage, setCurrentPage] = useState(0);
+  const indexOfFirstItem = Number(currentPage);
+  const indexOfLastItem =
+    Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const currentTask = familyData?.result_list.slice(
+    indexOfFirstItem,
+    indexOfLastItem
+  );
+
+  const handlePagination = (e) => {
+    handlePagingFunc(e, setCurrentPage);
+  };
+
+  return (
+    <div
+      className={`update-table w-full bg-white dark:bg-dark-white h-full lg:min-h-[450px] overflow-hidden rounded-2xl section-shadow ${
+        className || ""
+      }`}
+    >
+      {loader ? (
+        <div className="w-full h-full flex justify-center items-center lg:min-h-[470px]">
+          <LoadingSpinner size={16} color="sky-blue" />
+        </div>
+      ) : (
+        <>
+          {" "}
+          {familyData && familyData?.result_list && (
+            <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
+              <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+                <tbody>
+                  {
+                    <>
+                      {familyData &&
+                        familyData?.result_list &&
+                        familyData.result_list.length > 0 &&
+                        currentTask.map((value, index) => (
+                          <tr
+                            key={index}
+                            className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50"
+                          >
+                            <td className=" py-4">
+                              <div className="flex space-x-2 items-center w-full">
+                                <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] max-w-[60px] min-w-[60px]">
+                                  <img
+                                    src={dataImage2}
+                                    alt="data"
+                                    className="w-full h-full"
+                                  />
+                                </div>
+                                <div className="flex flex-col flex-[0.9]">
+                                  <h1 className="font-bold text-xl text-dark-gray dark:text-white">
+                                    {value.title}
+                                  </h1>
+                                  <div>{value.description}</div>
+                                  <span className="text-sm text-thin-light-gray">
+                                    Price:{" "}
+                                    <span className="text-purple">
+                                      {value.price * 0.01}
+                                    </span>
+                                  </span>
+                                  <span className="text-sm text-thin-light-gray">
+                                    Duration:{" "}
+                                    <span className="text-purple">
+                                      {" "}
+                                      {value.timeline_days} day(s)
+                                    </span>
+                                  </span>
+                                  <span className="text-sm text-thin-light-gray">
+                                    Expire:{" "}
+                                    <span className="text-purple">
+                                      {" "}
+                                      {value.expire}
+                                    </span>
+                                  </span>
+                                  <span className="text-sm text-thin-light-gray">
+                                    Send to:{" "}
+                                    <span className="text-purple">
+                                      {" "}
+                                      {value.job_to}
+                                    </span>
+                                  </span>
+                                </div>
+                              </div>
+                            </td>
+
+                            <td className="text-right py-4 px-2">
+                              <button
+                                type="button"
+                                onClick={() => {
+                                  // setJobPopout({ show: true, data: value });
+                                }}
+                                className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                              >
+                                View
+                              </button>
+                            </td>
+                          </tr>
+                        ))}
+                    </>
+                  }
+                </tbody>
+              </table>
+              {/* PAGINATION BUTTON */}
+              <PaginatedList
+                onClick={handlePagination}
+                prev={currentPage == 0 ? true : false}
+                next={
+                  currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
+                  familyData?.result_list.length
+                    ? true
+                    : false
+                }
+                data={familyData?.result_list}
+                start={indexOfFirstItem}
+                stop={indexOfLastItem}
+              />
+              {/* END OF PAGINATION BUTTON */}
+            </div>
+          )}
+        </>
+      )}
+    </div>
+  );
+}

src/components/MyActiveJobs/ActiveJobMessage.jsx

@@ -31,7 +31,13 @@ export default function ActiveJobMessage({ activeJobMesList }) {
         <tbody>
             {currentActiveJobMesList.map((item, index) => (
             <tr key={index} className='text-slate-500'>
-                <td className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></td>
+                <td>
+                    <div className="msg_box">
+                        <div className="msg_header">{item.msg_date} {item.msg_firstname}</div>
+                        <span className="p-2" dangerouslySetInnerHTML={{__html: item.message}}></span>
+                    </div>
+
+                </td>
             </tr>
             ))}
         </tbody>

src/components/MyActiveJobs/ActiveJobs.jsx

@@ -29,6 +29,10 @@ function ActiveJobs(props) {
   // FUNCTION TO HANDLE FILE UPlOAD CHANGE
   const handleFileChange = ({target:{files}}) => {
     setRequestStatus({loading: false, status: false, message: ''}) // State to determine error state
+   
+    if(!files[0]) { // IF NO FILE SELECTED RETURN
+      return
+    }
     if(files[0].size > Number(process.env.REACT_APP_MAX_FILE_SIZE)){
       setRequestStatus({loading: false, status: false, message: 'File must be <= 1mb'})
       setTimeout(()=>{
@@ -90,12 +94,66 @@ function ActiveJobs(props) {
     })
   }
 
+   // FUNCTION TO SEND FILES
+   const sendFile = async () => {
+     setRequestStatus({loading: true, status: false, message: ''})
+
+     if(!filesToSend.length){ // checks if file to send is empty
+      setRequestStatus({loading: false, status: false, message: 'No File(s) selected'})
+      return setTimeout(()=>{
+        setRequestStatus({loading: false, status: false, message: ''})
+      }, 5000)
+    }
+    // let reqData = new FormData()
+    
+    // for(let files of filesToSend){
+    //   reqData.append(files.name, files)
+    // }
+    // let reqData={file_size: filesToSend[0].size, file_type: 'image/png', file_data: filesToSend[0], msg_type: 'FILE', contract:props.details.contract}
+    
+    // for(let files of filesToSend){
+    //   reqData[files.name] = files
+    // }
+
+    const fileToBase64 = async () =>{
+      try {
+        const base64String = await convertFileToBase64(filesToSend[0]);
+        return base64String;
+      } catch (error) {
+        return false;
+      }
+    }
+
+    if(await !fileToBase64()){
+      return
+    }
+
+    let reqData={file_name: filesToSend[0].name, file_size: filesToSend[0].size, file_type: 'image/png', file_data: await fileToBase64(), msg_type: 'FILE', contract:props.details.contract}
+
+  console.log(reqData)
+    ApiCall.sendFiles(reqData).then((res)=>{
+      if(res.status != 200 || res.data.internal_return < 0){
+        setRequestStatus({loading: false, status: false, message: 'Files(s) could not be sent, try again later'})
+        return
+      }
+      setRequestStatus({loading: false, status: true, message: 'File(s) Uploaded Successfully'})
+      props.reloadActiveJobList(prev => !prev) // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
+      setFilesToSend([]) // SETS FILES TO SEND TO SEND BACK TO EMPTY ARRAY
+    }).catch(error => {
+      setRequestStatus({loading: false, status: false, message: 'Opps! something went wrong'})
+    }).finally(()=>{
+      setTimeout(()=>{
+        setRequestStatus({loading: false, status: false, message: ''})
+      }, 5000)
+    })
+  }
+
   return (
     <Layout>
 
-        <div className="py-[20px] bg-white px-4 rounded-2xl shadow-md lg:flex justify-between items-start space-y-4 lg:space-x-4 lg:space-y-0">
+        <div className="py-[20px] bg-white px-4 rounded-2xl shadow-md md:flex justify-between items-start space-y-4 md:space-x-4 md:space-y-0">
             {/* job title */}
-            <div className="w-full lg:w-1/2">
+            <div className="w-full md:w-8/12">
               <div className="w-full flex justify-start space-x-3 items-start">
                 <button
                   type="button"
@@ -136,7 +194,7 @@ function ActiveJobs(props) {
             {/* end of job title */}
 
             {/* job details */}
-            <div className="w-full lg:w-1/2">
+            <div className="w-full md:w-4/12">
               <p className="text-base text-sky-blue">Delivery Detail</p>
               <div className="mt-2">
                   <p className="text-base text-slate-700 dark:text-black">
@@ -198,7 +256,7 @@ function ActiveJobs(props) {
                     <div className="p-4 w-full h-[300px] text-base text-slate-600 border border-slate-300">
                       <div className="files">
                         <label htmlFor="file" className="h-20 btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer">Select Files to Upload</label>
-                        <input type="file" id='file' style={{display: 'none'}} onChange={handleFileChange}/>
+                        <input type="file" id='file' accept="image/*" style={{display: 'none'}} onChange={handleFileChange}/>
                       </div>
                       <div className="selected_file my-2">
                         {filesToSend.length > 0 &&
@@ -267,15 +325,21 @@ function ActiveJobs(props) {
                     {tab == 'files' ? 
                       (
                         <button
-                          onClick={()=>{console.log('working')}}
+                          onClick={sendFile}
                           type="button"
                           className="btn-gradient text-base tracking-wide px-4 py-3 rounded-full flex justify-center items-center"
                         >
-                          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill='white'>
-                            <path d="M12 2L2 12h3v8h14v-8h3L12 2zm0 16v-6h-2v6H7l5-5 5 5h-3z"/>
-                          </svg>
+                          {requestStatus.loading ? 
+                            <LoadingSpinner size='6' color='sky-blue' />
+                            :
+                            <>
+                              <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill='white'>
+                                <path d="M12 2L2 12h3v8h14v-8h3L12 2zm0 16v-6h-2v6H7l5-5 5 5h-3z"/>
+                              </svg>
 
-                          <span className="text-white">Upload Files</span>
+                              <span className="text-white">Upload Files</span>
+                            </>
+                          }
                         </button>
                       )
                       :
@@ -319,3 +383,22 @@ function ActiveJobs(props) {
 }
 
 export default ActiveJobs;
+
+
+function convertFileToBase64(file) {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+
+    reader.onload = () => {
+      const base64String = reader.result.split(',')[1];
+      resolve(base64String);
+    };
+
+    reader.onerror = error => {
+      reject(error);
+    };
+
+    reader.readAsDataURL(file);
+  });
+}
+

src/components/MyTasks/MyOffersTable.jsx

@@ -51,9 +51,9 @@ export default function MyOffersTable({ className, MyActiveOffersList}) {
         // }
     };
 
-//    if ( !MyActiveOffersList || MyActiveOffersList?.result_list?.length == 0 ){
-//        return(''); // want blank or no appear when no items
-//    }
+   if ( !MyActiveOffersList || MyActiveOffersList?.result_list?.length == 0 ){
+       return(''); // want blank or no appear when no items
+   }
 
     return (
         <>

src/components/Partials/Header.jsx

@@ -100,7 +100,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
 
   // User Profile
   let { firstname, lastname, email, profile_pic } = userDetails;
-  let userEmail = email.split("@")[0];
+  let userEmail = email?.split("@")[0];
 
   return (
     <>

src/components/Partials/RightSideBar.jsx

@@ -51,24 +51,11 @@ export default function RightSideBar() {
             <div className="item flex space-x-3 items-center mb-4">
               {/* image */}
               <div className="w-8 h-8 rounded-full">
-                <svg
-                  width="40"
-                  height="41"
-                  viewBox="0 0 40 41"
-                  fill="none"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <ellipse
-                    cx="20"
-                    cy="20.5745"
-                    rx="20"
-                    ry="19.9392"
-                    fill="#FDD903"
-                  />
-                  <path
-                    d="M30.0432 20.1565C29.8181 20.2625 29.8101 20.5908 30.0328 20.7018C31.565 21.4629 32.3814 22.7261 32.4556 24.4068C32.5245 25.8708 32.4715 27.3349 32.4821 28.7989C32.4821 29.0738 32.3973 29.1636 32.1216 29.1636C30.0169 29.153 27.907 29.153 25.8023 29.1636C25.4524 29.1636 25.4471 28.9945 25.4471 28.7408C25.4524 27.5569 25.4524 26.3782 25.4471 25.1943C25.4418 23.91 24.9169 23.318 23.6287 23.3022C20.8825 23.2705 18.1417 23.2916 15.3955 23.2757C15.0615 23.2757 15.035 23.4237 15.035 23.688C15.0456 25.3476 15.0297 27.0072 15.0456 28.6668C15.0509 29.0526 14.9608 29.1742 14.5526 29.1689C12.5327 29.1478 10.5182 29.1478 8.49834 29.1689C8.09543 29.1742 8 29.0632 8 28.6668C8.0106 23.2123 8.0106 17.7578 8.0053 12.3034C8.0053 11.9757 8.03181 11.8013 8.44532 11.8013C14.1444 11.8171 19.8488 11.8066 25.5478 11.833C27.0216 11.8383 28.4901 11.9968 29.842 12.6469C31.5279 13.4609 32.3125 14.8562 32.2117 16.7748C32.1332 18.3693 31.4419 19.4977 30.0432 20.1565ZM19.6208 18.6035C20.909 18.6035 22.2026 18.6088 23.4909 18.5982C23.7877 18.5982 24.0952 18.5824 24.3868 18.5242C24.7791 18.4449 24.9965 18.186 25.0018 17.7737C25.0071 17.3509 24.8109 17.0549 24.3815 16.9809C24.0899 16.9281 23.7877 16.9016 23.4855 16.9016C21.084 16.8963 18.6771 16.8963 16.2756 16.8963C15.0191 16.8963 15.035 16.8963 15.0297 18.1701C15.0297 18.5295 15.1464 18.6088 15.4804 18.6035C16.864 18.5929 18.2424 18.6035 19.6208 18.6035Z"
-                    fill="#020200"
-                  />
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" id="history">
+                  <g data-name="14"><circle cx="9" cy="14" r="7" fill="#ffd54f"></circle>
+                    <path fill="#ef6c00" d="M21 9H17a1 1 0 0 1 0-2h4a1 1 0 0 1 0 2zM21 5H3A1 1 0 0 1 3 3H21a1 1 0 0 1 0 2zM21 13H19a1 1 0 0 1 0-2h2a1 1 0 0 1 0 2zM21 17H19a1 1 0 0 1 0-2h2a1 1 0 0 1 0 2zM21 21H17a1 1 0 0 1 0-2h4a1 1 0 0 1 0 2z"></path><path fill="#ff8f00" d="M10,10a1,1,0,0,0-2,0v3.59L6.29,15.29a1,1,0,1,0,1.41,1.41l2-2A1,1,0,0,0,10,14Z">
+                    </path>
+                  </g>
                 </svg>
               </div>
               {/* name */}
@@ -83,37 +70,8 @@ export default function RightSideBar() {
                 <div className="item flex space-x-3 items-center mb-4">
                   {/* image */}
                   <div className="w-8 h-8 rounded-full">
-                    <svg
-                      width="40"
-                      height="41"
-                      viewBox="0 0 40 41"
-                      fill="none"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <ellipse
-                        cx="20"
-                        cy="20.4043"
-                        rx="20"
-                        ry="19.9392"
-                        fill="url(#paint0_linear_249_2794)"
-                      />
-                      <path
-                        d="M16.7403 14.4243C17.8836 14.4243 19.0272 14.4261 20.1705 14.4233C20.5666 14.4226 20.9612 14.4431 21.3489 14.5184C22.272 14.698 23.0864 15.0843 23.742 15.7545C23.8172 15.8312 23.8625 15.8401 23.9512 15.7762C24.8988 15.091 25.9527 14.6419 27.1244 14.484C27.8811 14.3821 28.6353 14.4115 29.3836 14.5947C30.3403 14.829 31.1613 15.277 31.8103 16.0013C32.413 16.674 32.7934 17.4511 32.9361 18.3386C33.054 19.0731 32.9989 19.7955 32.8499 20.5197C32.6718 21.3867 32.5167 22.2578 32.3477 23.1265C32.1933 23.92 32.0337 24.7123 31.8768 25.5054C31.7749 26.0202 31.6807 26.5367 31.5694 27.0493C31.5198 27.2772 31.3745 27.371 31.1365 27.3713C29.9446 27.3727 28.7528 27.3742 27.561 27.3745C27.2971 27.3745 27.1996 27.273 27.2463 27.0252C27.3872 26.2776 27.5365 25.5313 27.6807 24.7844C27.8136 24.095 27.9428 23.4052 28.076 22.7158C28.2148 21.9976 28.356 21.2798 28.4958 20.5616C28.5601 20.2311 28.6272 19.9038 28.5196 19.5662C28.3527 19.0422 27.8877 18.7075 27.3171 18.667C26.2023 18.5882 25.2894 19.4682 25.1459 20.415C25.0269 21.2017 24.844 21.9788 24.6918 22.7609C24.5703 23.386 24.4546 24.0126 24.3319 24.6378C24.1727 25.4483 24.0125 26.2587 23.8446 27.0674C23.8026 27.2694 23.65 27.3749 23.4365 27.3752C22.2322 27.377 21.028 27.3774 19.8237 27.3763C19.5956 27.3759 19.4854 27.2393 19.5292 27.0142C19.6609 26.3365 19.7956 25.6591 19.9278 24.9814C20.0869 24.1649 20.2446 23.3481 20.4031 22.5312C20.5549 21.7495 20.7017 20.9671 20.8604 20.1868C21.013 19.4359 20.4038 18.7124 19.6179 18.6688C18.5688 18.6102 17.6843 19.3695 17.4934 20.2162C17.3587 20.8144 17.2583 21.42 17.1415 22.0225C16.9389 23.0648 16.7359 24.1067 16.5322 25.1486C16.4114 25.7681 16.2895 26.3873 16.1683 27.0067C16.1187 27.2602 15.9832 27.3798 15.7197 27.3802C13.4145 27.3816 11.1097 27.3816 8.8045 27.3795C8.47305 27.3791 8.20621 27.1083 8.20548 26.7866C8.20475 26.471 8.48911 26.192 8.82823 26.1902C9.56414 26.186 10.3 26.1916 11.0359 26.1863C11.4995 26.1828 11.7854 25.749 11.5864 25.3581C11.5003 25.1888 11.3524 25.0904 11.1641 25.0503C11.0078 25.0169 10.8491 25.0304 10.6914 25.0301C9.77293 25.029 8.85451 25.0304 7.93645 25.0287C7.58712 25.0279 7.36408 24.893 7.27063 24.636C7.12754 24.242 7.42395 23.8444 7.87878 23.8323C8.18869 23.8241 8.49897 23.8305 8.80925 23.8305C9.95253 23.8302 11.0962 23.8312 12.2395 23.8287C12.5326 23.828 12.7702 23.6388 12.8148 23.3814C12.867 23.0807 12.7301 22.839 12.4494 22.7243C12.3493 22.6835 12.2468 22.6885 12.1442 22.6885C11.2805 22.687 10.4169 22.687 9.55318 22.6863C9.25933 22.686 9.03557 22.5749 8.91766 22.3001C8.76471 21.944 8.9998 21.5713 9.39257 21.5209C10.0653 21.4346 10.7403 21.5028 11.4138 21.4793C11.5171 21.4758 11.6207 21.4804 11.7237 21.4719C12.0642 21.4435 12.2891 21.206 12.2814 20.8886C12.2741 20.5943 12.0037 20.3351 11.6861 20.3277C11.4127 20.3213 11.1385 20.3316 10.8651 20.3231C10.5895 20.3142 10.3292 20.098 10.2884 19.8601C10.2362 19.5556 10.365 19.3056 10.633 19.1849C10.7487 19.1327 10.871 19.1402 10.9914 19.1398C11.7211 19.1367 12.4512 19.1388 13.1809 19.1342C13.5488 19.1317 13.7376 19.0099 13.8482 18.7444C13.9891 18.4064 13.6992 18.0148 13.3919 17.9829C13.1791 17.9609 12.967 17.9687 12.7549 17.9683C11.8124 17.9673 10.8699 17.9729 9.92734 17.9744C9.65539 17.9747 9.39002 17.6992 9.37468 17.4074C9.35899 17.1096 9.62181 16.8153 9.93318 16.7865C10.0117 16.7794 10.0912 16.7826 10.1701 16.7826C11.5689 16.7823 12.9677 16.783 14.3665 16.7819C14.6666 16.7816 14.8754 16.6342 14.9535 16.3754C15.0312 16.1184 14.9316 15.8546 14.702 15.7112C14.5728 15.6303 14.4264 15.625 14.28 15.6246C13.8055 15.6235 13.3313 15.6285 12.8567 15.6221C12.4822 15.6171 12.2252 15.4088 12.1876 15.0964C12.1435 14.7271 12.4253 14.4282 12.8359 14.4254C13.5963 14.4204 14.3563 14.4236 15.1167 14.4236C15.658 14.4236 16.1993 14.4236 16.7407 14.4236C16.7403 14.424 16.7403 14.424 16.7403 14.4243Z"
-                        fill="white"
-                      />
-                      <defs>
-                        <linearGradient
-                          id="paint0_linear_249_2794"
-                          x1="3"
-                          y1="16.4165"
-                          x2="26.9783"
-                          y2="26.4379"
-                          gradientUnits="userSpaceOnUse"
-                        >
-                          <stop stopColor="#E100C5" />
-                          <stop offset="1" stopColor="#FF812B" />
-                        </linearGradient>
-                      </defs>
+                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" id="add-user">
+                      <path fill="#9bcb5b" d="M12 13.4c-2 0-3.7-1.6-3.7-3.6s1.6-3.7 3.6-3.7 3.7 1.6 3.7 3.6-1.6 3.6-3.6 3.7zm0-6.2c-1.4 0-2.6 1.1-2.6 2.6 0 1.4 1.1 2.6 2.6 2.6s2.6-1.1 2.6-2.6c-.1-1.5-1.2-2.6-2.6-2.6z"></path><path fill="#9bcb5b" d="M16.6 17.9c-.3 0-.5-.2-.6-.5 0-2.2-1.8-4-4-4s-4 1.8-4 4c0 .3-.3.5-.6.5-.2 0-.4-.2-.5-.5 0-2.8 2.3-5.1 5.1-5.1s5.1 2.3 5.1 5.1c0 .3-.2.5-.5.5z"></path><path fill="#0376bc" d="M12 23.7C5.5 23.7.3 18.4.3 12 .3 5.5 5.6.3 12 .3c2.6 0 5.1.9 7.2 2.5.2.2.2.6 0 .8-.2.2-.4.2-.7.1-1.9-1.4-4.1-2.2-6.5-2.2C6.2 1.4 1.4 6.2 1.4 12S6.2 22.6 12 22.6 22.6 17.8 22.6 12c0-2.4-.8-4.6-2.2-6.5-.2-.3-.1-.6.2-.8.2-.1.5-.1.7.1 1.6 2 2.5 4.6 2.4 7.2 0 6.4-5.3 11.7-11.7 11.7z"></path><circle cx="20.2" cy="20.3" r="2.4" fill="#fff"></circle><path fill="#9bcb5b" d="M18 18.1c.6-.6 1.4-.9 2.2-.9.8 0 1.6.3 2.2.9s1 1.4.9 2.2c0 .8-.3 1.6-.9 2.2s-1.4 1-2.2.9c-.8 0-1.6-.3-2.2-.9s-1-1.4-.9-2.2c-.1-.8.3-1.7.9-2.2zm3.8 2.5V20h-1.3v-1.3h-.6V20h-1.3v.6h1.3v1.3h.6v-1.3h1.3z"></path>
                     </svg>
                   </div>
                   {/* name */}
@@ -130,29 +88,9 @@ export default function RightSideBar() {
             <div className="item flex space-x-3 items-center mb-4">
               {/* image */}
               <div className="w-8 h-8 rounded-full">
-                <svg
-                    width="40"
-                    height="41"
-                    viewBox="0 0 40 41"
-                    fill="none"
-                    xmlns="http://www.w3.org/2000/svg"
-                >
-                  <ellipse
-                      cx="20"
-                      cy="20.2341"
-                      rx="20"
-                      ry="19.9392"
-                      fill="#5165FF"
-                  />
-                  <path
-                      d="M26.1647 27.2085C22.5316 27.2448 19.3317 24.2111 19.3359 20.2195C19.3402 16.4128 22.3393 13.2525 26.1704 13.2554C30.0813 13.2583 33.012 16.5264 33.0006 20.2501C32.9892 24.1456 29.8505 27.2492 26.1647 27.2085Z"
-                      fill="white"
-                  />
-                  <path
-                      d="M20.5815 27.1983C20.5217 27.2245 20.4405 27.207 20.3607 27.207C16.0039 27.2085 11.647 27.2085 7.29019 27.2085C7.25742 27.2085 7.22465 27.2099 7.1933 27.2085C7.01094 27.2026 7.00951 27.2026 7.00381 27.0076C7.00239 26.9581 7.00381 26.9086 7.00381 26.8576C7.00381 22.4395 7.00381 18.0214 7.00381 13.6033C7.00381 13.5072 6.99099 13.4082 7.01236 13.334C11.5373 17.9559 16.0566 22.5749 20.5815 27.1983Z"
-                      fill="white"
-                  />
-                </svg>
+                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" id="InternationalUser">
+                    <path fill="#e6e7f9" d="M38.5 31.1c2.1-1.1 3.9-2.5 5.4-4.4h-3.2c-.6 1.6-1.3 3.1-2.2 4.4zm-5.8 1.4c2-.7 3.7-2.8 4.9-5.8h-4.9v5.8zm8.8-8.6h4.2c.9-1.8 1.5-3.7 1.7-5.8h-5.1c-.1 2-.4 4-.8 5.8zm2.4-17.3c-1.5-1.8-3.3-3.3-5.4-4.4.8 1.2 1.6 2.7 2.2 4.4h3.2zm-5.3 2.9h-5.9v5.8h6.7c-.1-2.1-.4-4.1-.8-5.8zm3.7 5.8h5.1c-.2-2.1-.8-4-1.7-5.8h-4.2c.4 1.8.7 3.7.8 5.8zM32.7.8v5.8h4.9c-1.2-2.9-2.9-5.1-4.9-5.8zm6.7 17.3h-6.7v5.8h5.9c.4-1.8.7-3.8.8-5.8zM25 6.6h4.9V.8c-2 .7-3.7 2.9-4.9 5.8zm-1.8 8.7h6.7V9.5H24c-.4 1.7-.7 3.7-.8 5.8zm6.7 17.2v-5.8H25c1.2 3 2.9 5.1 4.9 5.8zM24.1 2.3c-2.1 1.1-3.9 2.5-5.4 4.4H22c.5-1.7 1.3-3.2 2.1-4.4zM24 23.9h5.9v-5.8h-6.7c.1 2 .4 4 .8 5.8z" className="colorc1e5ff svgShape"></path><path fill="#ff6699" d="M3.7 44.7c0 1.6 1.2 2.8 2.8 2.8 1.3 0 2.4-.9 2.7-2.2.3 1.3 1.4 2.2 2.7 2.2 1.5 0 2.8-1.3 2.8-2.8V30.1h3.1V18.8c0-4.2-3.3-7.5-7.4-7.5H8c-4.1 0-7.4 3.4-7.4 7.5v11.3h3.1v14.6z" className="colorff99b0 svgShape"></path><path fill="#998da0" d="M9.2 10.3c2.4 0 4.4-2.2 4.4-4.9S11.6.5 9.2.5C6.8.5 4.8 2.7 4.8 5.4s2 4.9 4.4 4.9z" className="colorffd499 svgShape"></path><path fill="#e6e7f9" d="M16.9 9.5c-.3.6-.5 1.2-.8 1.8 1.3 1 2.3 2.4 2.9 4h1.3c.1-2 .3-4 .8-5.8h-4.2zm2.9 9.3v5.1h1.4c-.4-1.8-.7-3.8-.8-5.8h-.6c-.1.2 0 .4 0 .7zm2.2 7.9h-2.2v1.2c1.3 1.3 2.7 2.4 4.4 3.2-.9-1.3-1.7-2.8-2.2-4.4z" className="colorc1e5ff svgShape"></path>
+                  </svg>
               </div>
               {/* name */}
               <div>

src/components/jobPopout/PendingJobsPopout.jsx

@@ -1,12 +1,64 @@
-import React from 'react'
-import Detail from './popoutcomponent/Detail'
-import ModalCom from '../Helpers/ModalCom'
+import React, { useCallback, useMemo, useState } from "react";
+import Detail from "./popoutcomponent/Detail";
+import ModalCom from "../Helpers/ModalCom";
+import usersService from "../../services/UsersService";
+import { toast } from "react-toastify";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
 
+const showSuccessToast = (message) => {
+  toast.success(message, {
+    autoClose: 3000,
+    hideProgressBar: true,
+  });
+};
+
+function PendingJobsPopout({ details, onClose, situation }) {
+  const [pendingJobLoader, setPendingJobLoader] = useState({
+    extend: false,
+    offer: false,
+  });
+  const apiCall = useMemo(() => new usersService(), []);
+
+  const handlePendingJobsBtn = useCallback(
+    async ({ target: { name } }) => {
+      let { job_uid, offer_code } = details;
+
+      let reqData;
+
+      let pendingData = { job_uid, offer_code };
+
+      try {
+        if (name === "extend") {
+          setPendingJobLoader({ extend: true });
+          reqData = { ...pendingData };
+          // let { data } =
+          await apiCall.pendingJobExtend(reqData);
+          // console.log("This is for extend", data);
+          showSuccessToast("Job has been extended by a week!");
+        } else if (name === "offer") {
+          setPendingJobLoader({ offer: true });
+          reqData = { ...pendingData };
+          // let { data } =
+          await apiCall.pendingJobSendTome(reqData);
+          // console.log("This is for offer", data);
+          showSuccessToast("Offer sent, check your email");
+        } else return;
+
+        setTimeout(() => {
+          setPendingJobLoader({ extend: false, offer: false });
+          onClose();
+        }, 2700);
+      } catch (error) {
+        setPendingJobLoader({ extend: false, offer: false });
+        throw new Error(error);
+      }
+    },
+    [onClose, apiCall, details]
+  );
 
-function PendingJobsPopout({details, onClose, situation}) {
   return (
-    <ModalCom action={onClose} situation={situation}>
-    <div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+    <ModalCom action={onClose} situation={situation} className="edit-popup">
+      <div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
         <div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
           <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
             Manage Pending Item
@@ -37,93 +89,131 @@ function PendingJobsPopout({details, onClose, situation}) {
             </svg>
           </button>
         </div>
-        <div className='md:flex bg-white rounded-lg shadow-lg'>
-          <div className='p-4 w-full md:w-3/4 md:border-r-2'>
-            <p className='text-base font-semibold text-slate-900 tracking-wide'>{details.title}</p>
-            <div className='my-2 p-2 flex justify-start items-center space-x-2 bg-red-100 border-2 border-red-300'>
-              <span className='w-8 h-8 text-center text-sm rounded-full flex justify-center items-center text-red-300 bg-yellow-100'>!</span>
-              <div className=''>
-                <p className='text-sm'>This Job have been sent to public view</p>
-                <p className='text-sm text-slate-600'>This Job will expire</p>
+        <div className="md:flex bg-white rounded-lg shadow-lg">
+          <div className="p-4 w-full md:w-3/4 md:border-r-2">
+            <p className="text-base font-semibold text-slate-900 tracking-wide">
+              {details.title}
+            </p>
+            <div className="my-2 p-2 flex justify-start items-center space-x-2 bg-red-100 border-2 border-red-300">
+              <span className="w-8 h-8 text-center text-sm rounded-full flex justify-center items-center text-red-300 bg-yellow-100">
+                !
+              </span>
+              <div className="">
+                <p className="text-sm">
+                  This Job have been sent to public view
+                </p>
+                <p className="text-sm text-slate-600">This Job will expire</p>
               </div>
             </div>
-  
+
             {/* INPUT SECTION */}
-            <div className='my-2 md:flex'>
-              <Detail 
-                  label='Date Added' 
-                  value={details.offer_added || 'default'}
-              />
-            </div>
-  
-            <div className='my-2 md:flex'>
-              <Detail 
-                  label='Description' 
-                  value={details.description} 
-              />
-            </div>
-  
-            <div className='my-2 md:flex'>
-              <Detail 
-                  label='Offer Expire' 
-                  value={details.expire && `${details.expire.split(' ')[0]} ${details.expire.split(' ')[1].split('.')[0]}`}
-              />
-            </div>
-  
-            <div className='my-2 md:flex'>
-              <Detail 
-                  label='Price' 
-                  value={`${details.price*0.01} ${details.currency}`} 
-              />
-            </div>
-  
-            <div className='my-2 md:flex'>
-              <Detail 
-                  label='Duration' 
-                  value={`${details.timeline_days} day(s)`} 
+            <div className="my-2 md:flex">
+              <Detail
+                label="Date Added"
+                value={details.offer_added || "default"}
               />
             </div>
 
-            <div className='my-2 md:flex'>
-              <Detail 
-                  label='Detail' 
-                  value={details.job_description || details.description} 
+            <div className="my-2 md:flex">
+              <Detail label="Description" value={details.description} />
+            </div>
+
+            <div className="my-2 md:flex">
+              <Detail
+                label="Offer Expire"
+                value={
+                  details.expire &&
+                  `${details.expire.split(" ")[0]} ${
+                    details.expire.split(" ")[1].split(".")[0]
+                  }`
+                }
               />
             </div>
 
-            <div className='my-2 md:flex'>
-              <Detail 
-                  label='Public Link' 
-                  value='https://work.wrenchboard.com/plb/viewjob/218B4BWB83'
-                  bg='bg-slate-200'
+            <div className="my-2 md:flex">
+              <Detail
+                label="Price"
+                value={`${details.price * 0.01} ${details.currency}`}
+              />
+            </div>
+
+            <div className="my-2 md:flex">
+              <Detail
+                label="Duration"
+                value={`${details.timeline_days} day(s)`}
+              />
+            </div>
+
+            <div className="my-2 md:flex">
+              <Detail
+                label="Detail"
+                value={details.job_description || details.description}
+              />
+            </div>
+
+            <div className="my-2 md:flex">
+              <Detail
+                label="Public Link"
+                value="https://work.wrenchboard.com/plb/viewjob/218B4BWB83"
+                bg="bg-slate-200"
               />
             </div>
-  
           </div>
-  
+
           {/* ACTION SECTION */}
-          <div className='p-4 w-full md:w-1/4 h-full'>
-            <p className='mb-6 text-sm'>Actions</p>
-  
-            <div className='mb-3'>
-              <p className='px-2 py-1 text-sm bg-slate-100'>Job sent to public view</p>
+          <div className="p-4 w-full md:w-1/4 h-full">
+            <p className="mb-6 text-sm">Actions</p>
+
+            <div className="mb-3">
+              <p className="px-2 py-1 text-sm bg-slate-100">
+                Job sent to public view
+              </p>
             </div>
-  
-            <div className='my-3'>
-              <button className='px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white'>Extend by a week</button>
+
+            <div className="my-3">
+              <button
+                className="px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                onClick={handlePendingJobsBtn}
+                name="extend"
+              >
+                {pendingJobLoader.extend ? (
+                  <div className="w-[136px] flex justify-center items-center h-full">
+                    <LoadingSpinner size={5} color="sky-blue" />
+                  </div>
+                ) : (
+                  "Extend by a week"
+                )}
+              </button>
             </div>
-  
-            <div className='my-3'>
-              <button className='px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white'>Send to me</button>
+
+            <div className="my-3">
+              <button
+                className="px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                onClick={handlePendingJobsBtn}
+                name="offer"
+              >
+                {pendingJobLoader.offer ? (
+                  <div className="w-[96px] flex justify-center items-center h-full">
+                    <LoadingSpinner size={5} color="sky-blue" />
+                  </div>
+                ) : (
+                  "Send to me"
+                )}
+              </button>
             </div>
-  
-            <div className='mt-10 md:mt-32 md:flex md:justify-center'>
-              <button className='px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white'>Cancel Offer</button>
+
+            <div className="mt-10 md:mt-32 md:flex md:justify-center">
+              <button
+                className="px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                onClick={onClose}
+              >
+                Cancel Offer
+              </button>
             </div>
           </div>
         </div>
 
-        {/* close button */} 
+        {/* close button */}
         <div className="p-6 flex justify-center">
           <button
             onClick={onClose}
@@ -134,9 +224,9 @@ function PendingJobsPopout({details, onClose, situation}) {
           </button>
         </div>
         {/* end of close button */}
-    </div>
-  </ModalCom>
-    )
+      </div>
+    </ModalCom>
+  );
 }
 
-export default PendingJobsPopout
+export default PendingJobsPopout;

src/index.css

@@ -9,6 +9,17 @@
   font-family: "Product Sans";
   src: url("./assets/fonts/Product Sans Bold.ttf");
 }
+.msg_box{
+  background-color: aliceblue;
+  margin: 5px;
+  padding: 5px;
+  border-radius: 15px;
+}
+.msg_header{
+  background-color: #1a3544;
+  color: white;
+  font-weight: bold;
+}
 .siderCardHeader{
   margin: 40px 40px 10px 40px;
   font-size: 24px;

src/middleware/AuthRoute.jsx

@@ -12,23 +12,37 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
   const dispatch = useDispatch();
   const [lastActivityTime, setLastActivityTime] = useState(Date.now());
   const [isLogin, setIsLogin] = useState({ loading: true, status: false });
+  const [loadProfileDetails, setLoadProfileDetails] = useState([]);
   const navigate = useNavigate();
 
-  const {jobListTable} = useSelector((state) => state.tableReload)
-  
+  const { jobListTable } = useSelector((state) => state.tableReload);
+
   useEffect(() => {
     //Removing Data stored at localStorage after session expires
     const expireSession = () => {
-      localStorage.clear();
+      localStorage.removeItem("uid");
+      localStorage.removeItem("member_id");
+      localStorage.removeItem("session_token");
       navigate("/login", { replace: true }); // redirects user to login page after session expires
     };
 
+    console.log(loadProfileDetails);
     const checkInactivity = setInterval(() => {
-      if (
-        Date.now() - lastActivityTime >
-        process.env.REACT_APP_SESSION_EXPIRE_MINUTES
-      ) {
-        expireSession();
+      let { account_type } = loadProfileDetails;
+      if (account_type === "FAMILY") {
+        if (
+          Date.now() - lastActivityTime >
+          process.env.REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY
+        ) {
+          expireSession();
+        }
+      } else {
+        if (
+          Date.now() - lastActivityTime >
+          process.env.REACT_APP_SESSION_EXPIRE_MINUTES
+        ) {
+          expireSession();
+        }
       }
     }, process.env.REACT_APP_SESSION_EXPIRE_CHECKER); // Checks for inactivity every minute
 
@@ -65,6 +79,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
               setIsLogin({ loading: false, status: false });
               return;
             }
+            setLoadProfileDetails(res.data);
             dispatch(updateUserDetails(res.data));
             setIsLogin({ loading: false, status: true });
           })
@@ -76,22 +91,22 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
     }
   }, []);
 
-  useEffect(()=>{
+  useEffect(() => {
     const getMyJobList = async () => {
-      dispatch(updateUserJobList({loading: true, data:[]}))
+      dispatch(updateUserJobList({ loading: true, data: [] }));
       try {
         const res = await apiCall.getMyJobList();
         // setMyJobList({loading: false, data:res.data})
         // setMyJobList(res.data);
-        dispatch(updateUserJobList({loading: false, data:res.data}))
+        dispatch(updateUserJobList({ loading: false, data: res.data }));
       } catch (error) {
-        dispatch(updateUserJobList({loading: false, data:[]}))
+        dispatch(updateUserJobList({ loading: false, data: [] }));
         // setMyJobList({loading: false, data:[]})
         console.log("Error getting mode");
       }
     };
-    getMyJobList()
-  },[jobListTable])
+    getMyJobList();
+  }, [jobListTable]);
 
   useEffect(() => {
     // Getting market data

src/services/UsersService.js

@@ -212,6 +212,20 @@ class usersService {
     return this.postAuxEnd("/familymanage", postData);
   }
 
+  // Family Tasks
+  ManageTasks(reqData) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      limit: 30,
+      offset: 0,
+      action: 13008,
+      ...reqData
+    };
+    return this.postAuxEnd("/jobmanageractive", postData);
+  }
+
   // Task for the person doing the job
   getMyActiveTaskList() {
     var postData = {
@@ -486,6 +500,30 @@ class usersService {
     return this.postAuxEnd("/jobmanagerupdatejob", postData);
   }
 
+  pendingJobExtend(reqData) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      extend_days: 7,
+      action: 13041,
+      ...reqData,
+    };
+    return this.postAuxEnd("/pendingjobextend", postData);
+  }
+
+  pendingJobSendTome(reqData) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      mode: 200,
+      action: 13042,
+      ...reqData,
+    };
+    return this.postAuxEnd("/pendingjobsendtome", postData);
+  }
+
   // FUNCTION TO GET ACTIVE JOB MESSAGE LIST
   activeJobMesList(reqData) {
     var postData = {
@@ -512,6 +550,22 @@ class usersService {
     return this.postAuxEnd("/sendtaskmessage", postData);
   }
 
+  // FUNCTION TO SEND FILE UPLOAD
+  sendFiles(reqData) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      action: 14010,
+      ...reqData,
+    };
+    const formData = new FormData();
+    for (let data in postData) {
+      formData.append(data, postData[data]);
+    }
+    return this.postAuxEnd("/uploads", formData);
+  }
+
   // END POINT TO DELETE  A JOB
   deleteJob(reqData) {
     var postData = {