popout top amended

.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/Routers.jsx

@@ -40,6 +40,10 @@ import ManageActiveJobs from "./views/ManageActiveJobs";
 import FamilyManagePage from "./views/FamilyManagePage";
 import MyCouponPage from "./views/MyCouponPage";
 import AuthRedirect from "./views/AuthRedirect";
+import MyPastDueJobsPage from "./views/MyPastDueJobsPage";
+import BlogPage from "./views/BlogPage";
+import MyReviewDueJobsPage from "./views/MyReviewDueJobsPage";
+import OffersInterestPage from "./views/OffersInterestPage";
 
 export default function Routers() {
   return (
@@ -86,11 +90,17 @@ export default function Routers() {
           <Route exact path="/myjobs" element={<MyJobsPage />} />
           <Route exact path="/add-job" element={<AddJobPage />} />
           <Route exact path="/my-active-jobs"  element={<MyActiveJobsPage />} />
+          <Route exact path="/my-pastdue-jobs"  element={<MyPastDueJobsPage />} />
           <Route exact path="/my-pending-jobs"  element={<MyPendingJobsPage />} />
+          <Route exact path="/my-review-jobs"  element={<MyReviewDueJobsPage />} />
           <Route exact path="/acc-family"  element={<FamilyAccPage />} />
           <Route exact path="/manage-family"  element={<FamilyManagePage />} />
           <Route exact path="/start-job"  element={<StartJob />} />
           <Route exact path="/manage-active-job"  element={<ManageActiveJobs />} />
+          <Route exact path="/blog-page"  element={<BlogPage />} />
+          <Route exact path="/offer-interest"  element={<OffersInterestPage />} />
+
+
           <Route
             exact
             path="/my-collection/collection-item"

src/components/Blogs/index.jsx

@@ -0,0 +1,40 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import Layout from "../Partials/Layout";
+import CommonHead from "../UserHeader/CommonHead";
+
+export default function BlogItem(props) {
+    const [selectTab, setValue] = useState("today");
+    const filterHandler = (value) => {
+        setValue(value);
+    };
+    return (
+        <Layout>
+            <CommonHead
+                commonHeadData={props.commonHeadData}
+            />
+            <div className="notification-page w-full mb-10">
+                <div className="notification-wrapper w-full">
+                    {/* heading */}
+                    <div className="sm:flex justify-between items-center mb-6">
+                        <div className="mb-5 sm:mb-0">
+                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+                <span
+                    className={`${selectTab === "today" ? "block" : "hidden"}`}
+                >
+                  Title of this Blog Items
+                </span>
+                            </h1>
+                        </div>
+                        <div className="slider-btns flex space-x-4">
+
+                        </div>
+                    </div>
+                   <div>
+                       Blog Items Details
+                   </div>
+                </div>
+            </div>
+        </Layout>
+    );
+}

src/components/Cards/AvailableJobsCard.jsx

@@ -1,8 +1,10 @@
-import React, { useState } from "react";
-import { Link } from "react-router-dom";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
+import { Link, useNavigate,  } from "react-router-dom";
 import { toast } from "react-toastify";
 import localImgLoad from "../../lib/localImgLoad";
 import Icons from "../Helpers/Icons";
+import MarketPopUp from "../MarketPlace/PopUp/MarketPopUp";
+import usersService from "../../services/UsersService";
 
 export default function AvailableJobsCard({
   className,
@@ -11,7 +13,13 @@ export default function AvailableJobsCard({
 }) {
   //debugger;
   const [addFavorite, setValue] = useState(datas.whishlisted);
-  const [options, setOption] = useState(false);
+  const [marketPopUp, setMarketPopUp] = useState({ show: false, data: {} });
+  const [manageInt, setManageInt] = useState(null)
+
+  const navigate = useNavigate();
+  const apiCall = useMemo(() => new usersService(), []);
+
+
   const favoriteHandler = () => {
     if (!addFavorite) {
       setValue(true);
@@ -21,98 +29,134 @@ export default function AvailableJobsCard({
       toast.warn("Remove to Favorite List");
     }
   };
+
+  const marketInterestData = useCallback(async() => {
+    let { offer_code } = datas;
+    let reqData = { offer_code };
+
+    try {
+      const manageInt = await apiCall.MarketInterest(reqData);
+      const manageIntRes = await manageInt?.data;
+      setManageInt(manageIntRes)
+    } catch (error) {
+      throw new Error(error)
+    }
+
+  }, [])
+
+  useEffect(() => {
+    if (!datas) {
+      navigate("/market", { replace: true });
+    }
+    marketInterestData()
+  }, [marketInterestData, datas])
   return (
-    <div
-      className={`card-style-two w-full h-[426px] p-[20px] bg-white dark:bg-dark-white   rounded-2xl section-shadow ${
-        className || ""
-      }`}
-    >
-      <div className="flex flex-col justify-between w-full h-full">
-        <Link to="/shop-details" className="mb-2.5">
-          <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
-            {datas.title}
-          </h1>
-        </Link>
+    <>
+      <div
+        className={`card-style-two w-full h-[426px] p-[20px] bg-white dark:bg-dark-white   rounded-2xl section-shadow ${
+          className || ""
+        }`}
+      >
+        <div className="flex flex-col justify-between w-full h-full">
+          <Link to="/shop-details" className="mb-2.5">
+            <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+              {datas.title}
+            </h1>
+          </Link>
 
-        <div className="card-two-info flex justify-between items-center">
-          <div className="owned-by flex space-x-2 items-center">
-            <div>
-              <p className="text-thin-light-gray text-sm leading-3">Added</p>
-              <p className="text-base   text-dark-gray dark:text-white">
-                {datas.offer_added}
-              </p>
-            </div>
-          </div>
-          <div className="w-[1px] bg-light-purple dark:bg-dark-light-purple  h-7"></div>
-          <div className="created-by flex space-x-2 items-center flex-row-reverse">
-            <div>
-              <p className="text-thin-light-gray text-sm leading-3 text-right">
-                Expires
-              </p>
-              <p className="text-base text-dark-gray dark:text-white text-right">
-                {datas.expire}
-              </p>
-            </div>
-          </div>
-        </div>
-        <div className="thumbnail-area w-full">
-          <div
-            className="w-full h-[236px] p-6  rounded-xl overflow-hidden"
-            style={{
-              background: `url(${localImgLoad(
-                `images/${datas.thumbnil}`
-              )}) 0% 0% / cover no-repeat`,
-            }}
-          >
-            <div className="flex justify-center">{datas.description}</div>
-          </div>
-        </div>
-        <div className="details-area">
-          <div className="product-two-options flex justify-between mb-5 relative">
-            {/*      <div className="status">*/}
-            {/*          {datas.isActive && (*/}
-            {/*              <span className="text-xs px-3 py-1.5 tracking-wide rounded-full bg-gold text-white">*/}
-            {/*  Active*/}
-            {/*</span>*/}
-            {/*          )}*/}
-            {/*      </div>*/}
-
-            {/*<div className=" review flex space-x-2">*/}
-            {/*    <button*/}
-            {/*        onClick={favoriteHandler}*/}
-            {/*        type="button"*/}
-            {/*        className={`w-7 h-7 bg-white    rounded-full flex justify-center items-center  ${*/}
-            {/*            addFavorite ? "text-red-500" : "text-thin-light-gray"*/}
-            {/*        }`}*/}
-            {/*    >*/}
-            {/*        <Icons name="star" />*/}
-            {/*    </button>*/}
-            {/*</div>*/}
-          </div>
-
-          <div className="flex justify-between">
-            <div className="flex items-center space-x-2">
+          <div className="card-two-info flex justify-between items-center">
+            <div className="owned-by flex space-x-2 items-center">
               <div>
-                <p className="font-bold text-xl tracking-wide line-clamp-1   text-dark-gray dark:text-white">
-                  {datas.price * 0.01}
-                  {datas.currency} | {datas.timeline_days} day(s)
-                </p>
-                <p className="text-sm text-lighter-gray">
-                  ( {datas.offer_code})
+                <p className="text-thin-light-gray text-sm leading-3">Added</p>
+                <p className="text-base   text-dark-gray dark:text-white">
+                  {datas.offer_added}
                 </p>
               </div>
             </div>
-            <div>
-              <button
-                type="button"
-                className="px-4 py-2.5 text-white text-sm bg-pink rounded-full tracking-wide"
-              >
-                View
-              </button>
+            <div className="w-[1px] bg-light-purple dark:bg-dark-light-purple  h-7"></div>
+            <div className="created-by flex space-x-2 items-center flex-row-reverse">
+              <div>
+                <p className="text-thin-light-gray text-sm leading-3 text-right">
+                  Expires
+                </p>
+                <p className="text-base text-dark-gray dark:text-white text-right">
+                  {datas.expire}
+                </p>
+              </div>
+            </div>
+          </div>
+          <div className="thumbnail-area w-full">
+            <div
+              className="w-full h-[236px] p-6  rounded-xl overflow-hidden"
+              style={{
+                background: `url(${localImgLoad(
+                  `images/${datas.thumbnil}`
+                )}) 0% 0% / cover no-repeat`,
+              }}
+            >
+              <div className="flex justify-center">{datas.description}</div>
+            </div>
+          </div>
+          <div className="details-area">
+            <div className="product-two-options flex justify-between mb-5 relative">
+              {/*      <div className="status">*/}
+              {/*          {datas.isActive && (*/}
+              {/*              <span className="text-xs px-3 py-1.5 tracking-wide rounded-full bg-gold text-white">*/}
+              {/*  Active*/}
+              {/*</span>*/}
+              {/*          )}*/}
+              {/*      </div>*/}
+
+              {/*<div className=" review flex space-x-2">*/}
+              {/*    <button*/}
+              {/*        onClick={favoriteHandler}*/}
+              {/*        type="button"*/}
+              {/*        className={`w-7 h-7 bg-white    rounded-full flex justify-center items-center  ${*/}
+              {/*            addFavorite ? "text-red-500" : "text-thin-light-gray"*/}
+              {/*        }`}*/}
+              {/*    >*/}
+              {/*        <Icons name="star" />*/}
+              {/*    </button>*/}
+              {/*</div>*/}
+            </div>
+
+            <div className="flex justify-between">
+              <div className="flex items-center space-x-2">
+                <div>
+                  <p className="font-bold text-xl tracking-wide line-clamp-1   text-dark-gray dark:text-white">
+                    {datas.price * 0.01}
+                    {datas.currency} | {datas.timeline_days} day(s)
+                  </p>
+                  <p className="text-sm text-lighter-gray">
+                    ( {datas.offer_code})
+                  </p>
+                </div>
+              </div>
+              <div>
+                <button
+                  type="button"
+                  className="px-4 py-2.5 text-white text-sm bg-pink rounded-full tracking-wide"
+                  onClick={() => {
+                    setMarketPopUp({show: true, data: datas})
+                  }}
+                >
+                  View
+                </button>
+              </div>
             </div>
           </div>
         </div>
       </div>
-    </div>
+      {marketPopUp.show && (
+        <MarketPopUp
+          details={datas}
+          onClose={() => {
+            setMarketPopUp({ show: false, data: {} });
+          }}
+          situation={marketPopUp.show}
+          marketInt={manageInt}
+        />
+      )}
+    </>
   );
 }

src/components/Cards/HomeBannerOffersCard.jsx

@@ -32,7 +32,7 @@ export default function HomeBannerOffersCard(props) {
                        {props.itemData.description}
                     </div>
                     <div className="siderCardButton">
-                        [BUTTON HERE]
+                     [   {props.itemData.button_text}  ]
                     </div>
                 </div>
 

src/components/FamilyAcc/FamilyManage.jsx

@@ -1,44 +1,59 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import Layout from "../Partials/Layout";
-import FamilyManageTabs from "./FamilyManageTabs";
-import { useLocation } from "react-router-dom";
+import FamilyManageTabs from "./Tabs/FamilyManageTabs";
+import { useLocation, useNavigate } from "react-router-dom";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
 
 export default function FamilyManage() {
   const [selectTab, setValue] = useState("today");
+  let [pageLoading, setPageLoading] = useState(true);
 
   let location = useLocation();
-  let accountDetails = location?.state
+  let navigate = useNavigate();
+  let accountDetails = location?.state;
   //   tab handler
   const filterHandler = (value) => {
     setValue(value);
   };
 
+  useEffect(() => {
+    if (!accountDetails) {
+      navigate("/acc-family", { replace: true });
+    } else {
+      setPageLoading(false);
+    }
+  }, []);
+
   return (
     <Layout>
       {/*<CommonHead />*/}
-      <div className="notification-page w-full mb-10">
-        <div className="notification-wrapper w-full">
-          {/* heading */}
-          <div className="sm:flex justify-between items-center mb-6">
-            <div className="mb-5 sm:mb-0">
-              <h1 className="text-26 font-bold inline-flex gap-3 text-dark-gray dark:text-white items-center">
-                <span
-                  className={`${selectTab === "today" ? "block" : "hidden"}`}
-                >
-                  Manage Family
-                </span>
-              </h1>
-            </div>
-            <div className="slider-btns flex space-x-4">
-              <div
-                onClick={() => filterHandler("today")}
-                className="relative"
-              ></div>
+      {pageLoading ? (
+        <LoadingSpinner size={8} color="sky-blue" />
+      ) : (
+        <div className="notification-page w-full mb-10">
+          <div className="notification-wrapper w-full">
+            {/* heading */}
+            <div className="sm:flex justify-between items-center mb-6">
+              <div className="mb-5 sm:mb-0">
+                <h1 className="text-26 font-bold inline-flex gap-3 text-dark-gray dark:text-white items-center">
+                  <span
+                    className={`${selectTab === "today" ? "block" : "hidden"}`}
+                  >
+                    Manage Family
+                  </span>
+                </h1>
+              </div>
+              <div className="slider-btns flex space-x-4">
+                <div
+                  onClick={() => filterHandler("today")}
+                  className="relative"
+                ></div>
+              </div>
             </div>
+            <FamilyManageTabs accountDetails={accountDetails} />
           </div>
-          <FamilyManageTabs accountDetails={accountDetails} />
         </div>
-      </div>
+      )}
     </Layout>
   );
-}
+}

src/components/FamilyAcc/FamilyTable.jsx

@@ -5,7 +5,9 @@ import { useNavigate, useLocation, Link } from "react-router-dom";
 import { handlePagingFunc } from "../Pagination/HandlePagination";
 import PaginatedList from "../Pagination/PaginatedList";
 
-export default function FamilyTable({ className, familyList, loader }) {
+import familyImage from '../../assets/images/no-family-side.png'
+
+export default function FamilyTable({ className, familyList, loader, popUpHandler }) {
   const filterCategories = ["All Categories", "Explore", "Featured"];
   const [selectedCategory, setCategory] = useState(filterCategories[0]);
   const navigate = useNavigate();
@@ -32,9 +34,11 @@ export default function FamilyTable({ className, familyList, loader }) {
           <div className="h-full min-h-[500px] w-full overflow-hidden flex justify-center items-center">
             <LoadingSpinner size="16" color="sky-blue" />
           </div>
-        ) : (
-          <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 relative">
-            <>
+        ) 
+        :
+        familyList?.length > 0 ?
+          (
+            <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 relative">
               <thead className="sticky top-0">
                 <tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29]  default-border-bottom ">
                   <th className="py-4">Name</th>
@@ -44,9 +48,7 @@ export default function FamilyTable({ className, familyList, loader }) {
                 </tr>
               </thead>
               <tbody className="h-full">
-                <>
-                  {familyList?.length > 0 ? (
-                    currentFamilyList?.map((props, idx) => {
+                  {currentFamilyList?.map((props, idx) => {
                       let {
                         firstname,
                         lastname,
@@ -115,18 +117,29 @@ export default function FamilyTable({ className, familyList, loader }) {
                         </tr>
                       );
                     })
-                  ) : (
-                    <tr className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                      <td className="p-2" colSpan="4">
-                        No Family Accounts Found!
-                      </td>
-                    </tr>
-                  )}
-                </>
+                  }
               </tbody>
-            </>
-          </table>
-        )}
+            </table>
+          )
+          : 
+          (
+          <div className="font-bold text-center text-xl md:text-2xl lg:text-4xl text-dark-gray md:flex items-center justify-between">
+            <div className="p-2 w-full md:w-1/2">
+              <p className="mb-4 p-3 md:p-16">Add your family, assign tasks, and get the whole team engaged.</p>
+              <button
+                onClick={popUpHandler}
+                type="button"
+                className="text-white btn-gradient text-lg tracking-wide px-5 py-2 rounded-full"
+              >
+                Add Family
+              </button>
+            </div>
+            <div className="p-2 w-full md:w-1/2">
+              <img className='w-full' src={familyImage} alt="A Family" />
+            </div>
+          </div>
+          )
+        }
       </div>
         {/* PAGINATION BUTTON */}
         <PaginatedList

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,48 @@ 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);
+
+      // the family response
+      const familyRes = await apiCall.ManageFamily(reqData);
+      const familyData = familyRes.data;
+
+      // the tasks response
+      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 +163,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}
                           />
                         )}
@@ -166,7 +202,6 @@ function ProfileInfo({
   browseProfileImg,
   accountDetails,
 }) {
-  let { firstname, lastname, age } = accountDetails;
   return (
     <div className="flex flex-col items-center gap-6">
       <div className="flex justify-center">
@@ -207,20 +242,20 @@ function ProfileInfo({
       </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">
-          {firstname}
+          {accountDetails?.firstname}
         </h1>
         <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
-          {lastname}
+          {accountDetails?.lastname}
         </h1>
         <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
-          {age}
+          {accountDetails?.age}
         </h1>
       </div>
     </div>
   );
 }
 
-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 +267,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,142 @@
+import React, { useState } from "react";
+import dataImage2 from "../../../assets/images/data-table-user-2.png";
+import { useNavigate, useLocation } from "react-router-dom";
+import { handlePagingFunc } from "../../Pagination/HandlePagination";
+import PaginatedList from "../../Pagination/PaginatedList";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import Icons from "../../Helpers/Icons";
+
+export default function FamilyTasks({ familyData, className, loader }) {
+  const filterCategories = ["All Categories", "Explore", "Featured"];
+  const [selectedCategory, setCategory] = useState(filterCategories[0]);
+
+  let navigate = useNavigate();
+  let { pathname } = useLocation();
+
+  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) => {
+  // find due date
+  const dueDate = value?.delivery_date.split(" ")[0]
+                          return (
+                            <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 className="flex gap-4 items-center">
+                                    <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">
+                                      Due Date:{" "}
+                                      <span className="text-purple">
+                                        {" "}
+                                        {dueDate}
+                                      </span>
+                                    </span>
+                                    </div>
+                                  </div>
+                                </div>
+                              </td>
+  
+                              <td className="text-right py-4 px-2">
+                                <button
+                                  type="button"
+                                  onClick={() => {
+                                    navigate("/manage-active-job", {
+                                      state: { ...value, pathname },
+                                    });
+                                  }}
+                                  className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                                >
+                                  <Icons name="right-arrow" />
+                                </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/FamilyAcc/index.jsx

@@ -158,7 +158,7 @@ export default function FamilyAcc() {
               ></div>
             </div>
           </div>
-          <FamilyTable familyList={familyList} loader={loader} />
+          <FamilyTable familyList={familyList} loader={loader} popUpHandler={popUpHandler} />
         </div>
       </div>
       {popUp && (

src/components/Helpers/Icons.jsx

@@ -468,6 +468,21 @@ export default function Icons({ name }) {
         >
           <rect y="0.823242" width="20" height="2.35294" rx="1.17647" />
         </svg>
+      ) : name === "right-arrow" ? (
+        <svg
+          width="24"
+          height="24"
+          xmlns="http://www.w3.org/2000/svg"
+          // enableBackground="new 0 0 24 24"
+          viewBox="0 0 24 24"
+          className="fill-black dark:fill-white"
+          id="right-arrow"
+        >
+          <path
+            d="M15.5,11.3L9.9,5.6c-0.4-0.4-1-0.4-1.4,0s-0.4,1,0,1.4l4.9,4.9l-4.9,4.9c-0.2,0.2-0.3,0.4-0.3,0.7c0,0.6,0.4,1,1,1
+      c0.3,0,0.5-0.1,0.7-0.3l5.7-5.7c0,0,0,0,0,0C15.9,12.3,15.9,11.7,15.5,11.3z"
+          ></path>
+        </svg>
       ) : (
         ""
       )}

src/components/Home/FullAccountDash.jsx

@@ -15,9 +15,8 @@ export default function FullAccountDash(props) {
 
     const trending = datas.datas;
     const jobData =  datas.datas; // api calls or cache
-    //getHomeDate
+    
     const userApi = new usersService();
-    const homeData = userApi.getHomeDate();
 
     const {userDetails} = useSelector((state) => state?.userDetails)
 
@@ -27,6 +26,7 @@ export default function FullAccountDash(props) {
                 <Hero className="mb-10"
                       data={userDetails}
                       bannerList={props.bannerList}
+                      nextDueTask={props.nextDueTask}
                 />
                 <HomeActivities className="mb-10"/>
                 {/*<UpdateTable className="mb-10"/>*/}

src/components/Home/Hero.jsx

@@ -11,7 +11,7 @@ import SliderCom from "../Helpers/SliderCom";
 import HomeSliders from "./HomeSliders";
 import { useSelector } from "react-redux";
 
-export default function Hero({ className,bannerList }) {
+export default function Hero({ className, bannerList, nextDueTask }) {
   const settings = {
     autoplay: true,
     dots: true,
@@ -71,27 +71,32 @@ export default function Hero({ className,bannerList }) {
           </div>
         </div>
         {/* countdown */}
-        <div className="w-full h-32 flex justify-evenly items-center sm:p-6 p-1 rounded-2xl border border-white-opacity">
-          <div className="flex flex-col justify-between">
-            <p className="text-base text-white tracking-wide">Current Task</p>
-            <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
-              ABCDEFGH01
-            </p>
-            <p className="text-base text-white tracking-wide">773.69 USD</p>
-          </div>
-          <div className="w-[1px] h-full bg-white-opacity"></div>
-          <div className="flex flex-col justify-between">
-            <p className="text-base text-white tracking-wide">Next due in</p>
-            <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
-              <CountDown lastDate="2023-04-26 4:00:00" />
-            </p>
-            <div className="text-base text-white tracking-wide flex gap-[23px]">
-              <span>Hrs</span>
-              <span>Min</span>
-              <span>Sec</span>
+        { nextDueTask?.next_due && Object.keys(nextDueTask.next_due)?.length &&
+          (
+            <div className="w-full h-32 flex justify-evenly items-center sm:p-6 p-1 rounded-2xl border border-white-opacity">
+              <div className="flex flex-col justify-between">
+                <p className="text-base text-white tracking-wide">Current Task</p>
+                <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
+                  {nextDueTask.next_due.item_code}
+                </p>
+                <p className="text-base text-white tracking-wide">{nextDueTask.next_due.price} Naira</p>
+              </div>
+              <div className="w-[1px] h-full bg-white-opacity"></div>
+              <div className="flex flex-col justify-between">
+                <p className="text-base text-white tracking-wide">Next due in</p>
+                <p className="lg:text-2xl text-lg font-bold tracking-wide text-white">
+                  {/* <CountDown lastDate="2023-04-26 4:00:00" /> */}
+                  <CountDown lastDate={nextDueTask.next_due.due_date} />
+                </p>
+                <div className="text-base text-white tracking-wide flex gap-[23px]">
+                  <span>Hrs</span>
+                  <span>Min</span>
+                  <span>Sec</span>
+                </div>
+              </div>
             </div>
-          </div>
-        </div>
+          )
+        }
         {/* action */}
         <div className="flex lg:space-x-3 space-x-1 items-center">
           <Link

src/components/Home/HomeSliders.jsx

@@ -22,8 +22,8 @@ export default function HomeSliders(props) {
                         {/*<div className="item w-full h-full bg-white dark:bg-dark-white   rounded-2xl overflow-hidden">*/}
                         {/*    <img src={slider3} alt="slider" className="w-full h-full" />*/}
                         {/*</div>*/}
-                        {props.bannerList.map((item, index) => (
-                            <div className="item w-full h-full bg-white dark:bg-dark-white   rounded-2xl overflow-hidden">
+                        {props.bannerList?.length && props.bannerList.map((item, index) => (
+                            <div key={index} className="item w-full h-full bg-white dark:bg-dark-white   rounded-2xl overflow-hidden">
                                 <HomeBannerOffersCard
                                     itemData={item}
                                 />

src/components/Home/index.jsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState, useEffect } from "react";
 import datas from "../../data/product_data.json";
 import Layout from "../Partials/Layout";
 import usersService from "../../services/UsersService";
@@ -11,25 +11,38 @@ export default function Home(props) {
 
     console.log("PROPS IN HOME->",props);
 
-//    const trending = datas.datas;
-//    const jobData =  datas.datas; // api calls or cache
+    let [nextDueTask, setNextDueTask] = useState({})
+
     const userApi = new usersService();
-//    const homeData = userApi.getHomeDate();
+
     const {userDetails} = useSelector((state) => state?.userDetails)
 
-    const commonHeadData =()=>{
-        console.log("COMMON HEAD DATA INDEX ----------------=====---------------------");
-        return 0;
+    const {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
+
+    // FUNCTION TO GET DASH DATA TO DETERMINE CURRENT TASK DUE TIME
+    const getHomeDate = () => {
+        userApi.getHomeDate().then(res => {
+            if(res.status != 200 || res.internal_return < 0){
+                return
+            }
+            setNextDueTask(res.data)
+        }).catch(error => {
+            console.log(error)
+        })
     }
 
+    useEffect(()=>{
+        getHomeDate()
+    },[])
+
     return (
         <Layout>
             <div className="home-page-wrapper">
                 {userDetails && userDetails?.account_type == "FAMILY" && (
-                    <FamilyDash commonHeadData={commonHeadData} />
+                    <FamilyDash commonHeadData={props.bannerList} />
                 )}
                 {userDetails && userDetails?.account_type == "FULL" && (
-                    <FullAccountDash   bannerList={props.bannerList} />
+                    <FullAccountDash  nextDueTask={nextDueTask} bannerList={props.bannerList} />
 
                 )}
             </div>

src/components/MarketPlace/MainSection.jsx

@@ -3,7 +3,7 @@ import DataIteration from "../Helpers/DataIteration";
 import AvailableJobsCard from "../Cards/AvailableJobsCard";
 
 export default function MainSection({ className, marketPlaceProduct }) {
-  const [tab, setTab] = useState("explore");
+  const [tab, setTab] = useState("all");
   const [products, setProducts] = useState(marketPlaceProduct);
   const tabHandler = (value) => {
     setTab(value);
@@ -29,15 +29,17 @@ export default function MainSection({ className, marketPlaceProduct }) {
           <div className="tab-item lg:mb-0 mb-5">
             <div className="md:flex md:space-x-8 space-x-2">
               <span
-                onClick={() => tabHandler("explore")}
+                onClick={() => tabHandler("all")}
                 className={`md:text-[18px] text-md  text-dark-gray dark:text-white hover:text-pink border-b hover:border-pink font-medium cursor-pointer ${
-                  tab === "explore"
+                  tab === "all"
                     ? "text-pink border-pink"
                     : " border-transparent"
                 }`}
               >
-                Explore
+                All
               </span>
+
+
               <span
                 onClick={() => tabHandler("artist")}
                 className={`md:text-[18px] text-md  text-dark-gray dark:text-white hover:text-pink border-b hover:border-pink font-medium cursor-pointer ${
@@ -78,6 +80,8 @@ export default function MainSection({ className, marketPlaceProduct }) {
               >
                 Game Assets
               </span>
+
+
             </div>
           </div>
 

src/components/MarketPlace/PopUp/MarketPopUp.jsx

@@ -0,0 +1,290 @@
+import React, { useCallback, useMemo, useState } from "react";
+import ModalCom from "../../Helpers/ModalCom";
+import { toast } from "react-toastify";
+import { Form, Formik } from "formik";
+import usersService from "../../../services/UsersService";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+
+const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
+  const [marketMsg, setMarketMsg] = useState({
+    loading: false,
+    data: {},
+    state: undefined,
+  });
+  const [manageInt, setManageInt] = useState({
+    loading: false,
+    data: {},
+    state: undefined,
+    msg: "",
+  });
+
+  const [textValue, setTextValue] = useState("");
+
+  const handleInputChange = ({ target: { value } }) => {
+    setTextValue(value);
+  };
+
+  const apiCall = useMemo(() => new usersService(), []);
+
+  const marketCalls = useCallback(
+    async (e) => {
+      try {
+        const nameOfCall = e?.target?.name;
+        const { offer_code } = details;
+        const reqData = { offer_code };
+
+        if (nameOfCall === "market-message") {
+          setMarketMsg({ loading: true });
+          if (!textValue) return;
+
+          reqData.yourmessage = textValue;
+
+          const marketMessage = await apiCall.MarketMessage(reqData);
+          const marketMessageRes = marketMessage?.data;
+
+          if (marketMessageRes?.internal_return < 0) {
+            toast.warn("Something wrong happened", {
+              autoClose: 2000,
+              hideProgressBar: true,
+            });
+            onClose();
+            return;
+          }
+
+          toast.success("Message sent", {
+            autoClose: 2500,
+            hideProgressBar: true,
+          });
+
+          setMarketMsg({ data: marketMessageRes, state: true });
+          setTimeout(() => onClose(), 2000);
+        } else {
+          setManageInt({ loading: true });
+
+          const manageInt = await apiCall.MarketInterest(reqData);
+          const manageIntRes = manageInt?.data;
+
+          if (manageIntRes?.internal_return < 0) {
+            setManageInt({
+              loading: false,
+              msg: `Error - ${manageIntRes?.status}`,
+              data: manageIntRes,
+              state: false,
+            });
+          } else {
+            setManageInt({
+              loading: false,
+              msg: manageIntRes?.status,
+              data: manageIntRes,
+              state: true,
+            });
+          }
+
+          setTimeout(() => setManageInt({ msg: "" }), 3000);
+
+          return;
+        }
+      } catch (error) {
+        throw new Error(error);
+      } finally {
+        setTimeout(() => {
+          setTextValue("");
+          setMarketMsg({ loading: false });
+        }, 2000);
+      }
+    },
+    [apiCall, details, onClose, textValue]
+  );
+
+  console.log('Checking my mangeInt',manageInt)
+
+  // let addedIntDate = marketInt?.added?.split(" ")[0];
+  let expireIntDate = marketInt?.expire?.split(" ")[0];
+
+  return (
+    <ModalCom action={onClose} situation={situation} className="edit-popup">
+      <div className="logout-modal-wrapper md:w-[750px] md:h-[700px] h-full 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]">
+          <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+            {details.offer_code}
+          </h1>
+          <CloseIcon onClose={onClose} />
+        </div>
+
+        <div className="md:flex bg-white rounded-lg">
+          <div className="p-4 w-full md:w-3/4 md:border-r-1">
+            <div className="min-h-[290px]">
+              <h2 className="font-semibold text-slate-900 dark:text-black tracking-wide">
+                {details?.title}
+              </h2>
+
+              {/* INPUT SECTION */}
+              {[
+                {
+                  name: "Description",
+                  content: details.description,
+                },
+                {
+                  name: "",
+                  content: {
+                    text: `Timeline: ${details.timeline_days} day(s) -- `,
+                    bold: `Budget: ${details.price} naira`,
+                  },
+                },
+                {
+                  name: "Delivery Detail",
+                  content: details.job_description,
+                  danger: true,
+                },
+              ].map(({ name, content, danger }, idx) => (
+                <div className={`my-3 md:flex items-center`} key={idx}>
+                  <label className="w-full md:w-1/4 text-slate-900 tracking-wide font-semibold">
+                    {name}
+                  </label>
+                  <div
+                    className={`w-full md:w-3/4 text-slate-900 market-pop ${
+                      name !== "Delivery Detail"
+                        ? " h-full max-h-28 flex items-center"
+                        : " overflow-y-auto max-h-[100px]"
+                    }`}
+                  >
+                    {danger ? (
+                      <p
+                        className={``}
+                        dangerouslySetInnerHTML={{
+                          __html: danger && content?.replace(/"/g, ""),
+                        }}
+                      />
+                    ) : (
+                      <p className={`w-full md:w-3/4 text-slate-900`}>
+                        {name !== "Delivery Detail" ? (
+                          <>
+                            {typeof content !== "object" ? content : null}
+                            {typeof content === "object" && (
+                              <span className="flex items-center gap-2">
+                                {content?.text}
+                                <strong>{content?.bold}</strong>
+                              </span>
+                            )}
+                          </>
+                        ) : (
+                          ""
+                        )}
+                      </p>
+                    )}
+                  </div>
+                </div>
+              ))}
+            </div>
+            <hr />
+            <div className="my-3 w-full flex flex-col gap-3">
+              <div className="w-full">
+                <label className="w-full text-slate-900 tracking-wide">
+                  If you have any questions about this task:
+                </label>
+                <textarea
+                  className={`p-1 w-full text-sm text-slate-900 outline-none border border-slate-300 rounded-md`}
+                  rows="5"
+                  style={{ resize: "none" }}
+                  placeholder="Enter message here ..."
+                  value={textValue}
+                  onChange={handleInputChange}
+                />
+              </div>
+              <button
+                className="self-end w-[150px] h-[52px] rounded-md text-base bg-yellow-500 text-white"
+                name="market-message"
+                onClick={marketCalls}
+              >
+                {marketMsg.loading ? (
+                  <LoadingSpinner size={5} color="white" />
+                ) : !marketMsg.state ? (
+                  "Send Message"
+                ) : (
+                  "Message Sent"
+                )}
+              </button>
+            </div>
+          </div>
+
+          <div className="w-full md:w-1/4 h-full ">
+            <div className="w-[90%] mx-auto bg-[#f1f8ff] p-4 rounded-md md:min-h-[550px] flex flex-col justify-between">
+              <div className="w-full flex flex-col justify-center py-4 gap-2">
+                <p className="w-full text-slate-900 tracking-wide my-1">
+                  Interested in the task?
+                </p>
+                <hr />
+                <button
+                  className="bg-[#57cd89] text-center text-lg font-semibold text-white py-2 px-4 rounded-md inline-flex flex-col items-center justify-center"
+                  name="market-interest"
+                  onClick={marketCalls}
+                >
+                  {" "}
+                  <span>Send</span>
+                  <span>Interest</span>
+                  <span>Request</span>
+                </button>
+                <>
+                  {manageInt.loading ? (
+                    <p className="text-sm italic">please wait...</p>
+                  ) : (
+                    <>
+                      {manageInt?.msg !== "" && (
+                        <p
+                          className={`text-sm italic ${
+                            manageInt?.state ? "text-green-500" : "text-red-500"
+                          }`}
+                        >
+                          {manageInt?.msg}
+                        </p>
+                      )}
+                    </>
+                  )}
+                </>
+              </div>
+
+              <div className="">
+                <p className="flex items-center tracking-wide">
+                  Interest: <b className="ml-1">{marketInt?.public_view}</b>
+                </p>
+                <hr />
+                <p className="my-1">Expire: {expireIntDate}</p>
+              </div>
+            </div>
+          </div>
+          {/* END OF ACTION SECTION */}
+        </div>
+      </div>
+    </ModalCom>
+  );
+};
+
+export default MarketPopUp;
+
+const CloseIcon = ({ onClose }) => (
+  <button
+    type="button"
+    className="text-[#374557] dark:text-red-500"
+    onClick={onClose}
+  >
+    <svg
+      width="36"
+      height="36"
+      viewBox="0 0 36 36"
+      fill="none"
+      className="fill-current"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+        fill=""
+        fillOpacity="0.6"
+      />
+      <path
+        d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+        fill="#"
+        fillOpacity="0.6"
+      />
+    </svg>
+  </button>
+);

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

@@ -1,17 +1,23 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, useRef, forwardRef } from "react";
 import { useSelector } from "react-redux";
 import Layout from "../Partials/Layout";
 import { useNavigate } from "react-router-dom";
 import ActiveJobMessage from "./ActiveJobMessage";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
+import CountDown from "../Helpers/CountDown";
+import IndexJobActions from "./JobActions/IndexJobActions";
+import ModalCom from "../Helpers/ModalCom";
+import { useReactToPrint } from "react-to-print";
 
 import usersService from "../../services/UsersService";
 
 function ActiveJobs(props) {
   const ApiCall = new usersService()
+  let navigate = useNavigate()
 
   let { userDetails } = useSelector((state) => state.userDetails);
-  let navigate = useNavigate()
+
+  let [passDue, setPassDue] = useState(new Date() > new Date(props.details?.delivery_date)) // STATE TO KNOW IF TASK IS PASSED DUE TIME
 
   let [messageToSend, setMessageToSend] = useState('') // State to hold the value of message to be sent
 
@@ -21,6 +27,18 @@ function ActiveJobs(props) {
 
   let [requestStatus, setRequestStatus] = useState({loading: false, status: false, message: ''})
 
+  let [popUp, setPopUp] = useState(false) // STATE FOR POPOUT MODAL
+
+  const printRef = useRef();
+  // to handle printing
+  const handlePrint = useReactToPrint({
+    content: () => printRef.current,
+  });
+
+  const popUpHandler = () => { // FUNCTION TO HANDLE POPOUT
+      setPopUp(prev => !prev)
+  }
+
   // FUNCTION TO HANDLE MESSAGE CHANGE
   const handleMessageChange = ({target:{value}}) => {
     setMessageToSend(value)
@@ -96,64 +114,84 @@ function ActiveJobs(props) {
 
    // FUNCTION TO SEND FILES
    const sendFile = async () => {
-     setRequestStatus({loading: true, status: false, message: ''})
+    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()
+    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)
+   }
+
+   for(let i=0; i<=filesToSend.length-1; i++){ // Loops through files to send array and trigger upload API call
+  
+     const fileToBase64 = async () =>{ // Converts file data to base64 string
+       try {
+         const base64String = await convertFileToBase64(filesToSend[i]);
+         return base64String;
+       } catch (error) {
+         return false;
+       }
+     }
+
+     // if(await !fileToBase64()){
+     //   return
+     // }
+
+     let reqData={file_name: filesToSend[i].name, file_size: filesToSend[i].size, file_type: 'image/png', file_data: await fileToBase64(), msg_type: 'FILE', contract:props.details.contract}
     
-    // 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
-    // }
+     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(()=>{
+       if(i==filesToSend.length-1){
+         setRequestStatus({loading: false, status: true, message: 'File(s) Uploaded Successfully'})
+         setFilesToSend([]) // SETS FILES TO SEND TO SEND BACK TO EMPTY ARRAY
+         props.reloadActiveJobList(prev => !prev) // MAKES ACTIVE JOB MESSAGE LIST TO RELOAD
+         setTimeout(()=>{
+           setRequestStatus({loading: false, status: false, message: ''})
+         }, 5000)
+       }
+     })
+   }
+ }
 
-    const fileToBase64 = async () =>{
-      try {
-        const base64String = await convertFileToBase64(filesToSend[0]);
-        return base64String;
-      } catch (error) {
-        return false;
-      }
+
+  // FUNCTION TO CHECK IF TASK PASS DUE IS REACHED
+  let isPassedDue = () => {
+    // console.log('TESTING',new Date() > new Date(props.details?.delivery_date) )
+    if(new Date() > new Date(props.details?.delivery_date)){
+      setPassDue(true)
+    }else{
+      setPassDue(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)
-    })
   }
 
+
+  useEffect(()=>{
+    if(!passDue){
+      let passDueInterval = setInterval(()=>{
+        isPassedDue()
+      },1000)
+      return ()=>{
+        clearInterval(passDueInterval)
+      }
+    }
+  },[passDue])
+
   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 gap-16">
             {/* 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"
@@ -175,28 +213,24 @@ function ActiveJobs(props) {
                 </h1>
               </div>
 
-              <div className="w-full my-4">
-                <div className="pb-2 w-full flex items-center">
-                  <p className="w-full lg:w-2/3 text-base text-slate-700 dark:text-black">
-                    {props.details?.contract && props.details.contract}
-                  </p>
-                  <p className="w-full lg:w-1/3 text-base text-sky-blue">
+              <div className="w-full my-2">
+                  <p className="w-full text-base text-right text-sky-blue">
                     {userDetails.firstname && userDetails.firstname}
                   </p>
+                <div className="text-base text-slate-700 dark:text-black tracking-wide">
+                    <p className="font-semibold text-black">Description: </p>
+                    <p className="p-2 border border-sky-blue">{props.details?.description && props.details.description}</p>
                 </div>
-                
-                <p className="text-base text-slate-700 dark:text-black">
-                  <span className="font-semibold">Description: </span>
-                  {props.details?.description && props.details.description}
-                </p>
               </div>
             </div>
             {/* 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">
+              {passDue ? 
+              (
+                <div className="my-1">
                   <p className="text-base text-slate-700 dark:text-black">
                     <span className="font-semibold">Due: </span>
                     {props.details?.delivery_date &&
@@ -206,9 +240,33 @@ function ActiveJobs(props) {
                     {props.details?.delivery_date &&
                       props.details.delivery_date.split(" ")[1]}
                   </p>
-                  <p className="text-base text-slate-700 dark:text-black">
-                    {props.details?.timeline_days && props.details.timeline_days} day(s)
-                  </p>
+                </div>
+              )
+              :
+              (
+                <div className="my-1 flex items-start gap-3">
+                  <p className="font-semibold">Due: </p>
+                  <div className="flex flex-col justify-between">
+                    <p className="text-base text-slate-700 dark:text-black tracking-wide">
+                      <CountDown lastDate={props.details.delivery_date} />
+                    </p>
+                    <div className="text-base text-slate-700 dark:text-black tracking-wide flex gap-[5px]">
+                      <span>Hrs</span>
+                      <span>Min</span>
+                      <span>Sec</span>
+                    </div>
+                  </div>
+                </div>
+              )
+              }
+
+              <div className="my-1 text-base text-slate-700 dark:text-black tracking-wide flex items-center gap-3">
+                <span className="font-semibold text-black">Duration: </span>
+                <span className="">{props.details?.timeline_days && props.details.timeline_days} day(s)</span>
+              </div>
+              <div className="my-1 text-base text-slate-700 dark:text-black tracking-wide flex items-center gap-3">
+                <span className="font-semibold text-black">No: </span>
+                <span className="">{props.details?.contract && props.details.contract}</span>
               </div>
             </div>
             {/* end of job details */}
@@ -218,9 +276,10 @@ function ActiveJobs(props) {
             <div className="w-full lg:w-1/2">
               <div className="">
                 <h1 className="text-lg font-bold text-dark-gray dark:text-white tracking-wide">Actions</h1>
-                <p className="my-3 py-1 text-base">
+                {/* <p className="my-3 py-1 text-base">
                   Waiting for the completion message from the client before you can approve.
-                </p>
+                </p> */}
+                <IndexJobActions details={props.details} />
               </div>
 
               {/* TEXTAREA SECTION */}
@@ -296,24 +355,6 @@ function ActiveJobs(props) {
 
                 {/* Buttons Sections */}
                 <div className="py-2 sm:flex sm:justify-end sm:items-center">
-                  {/* <div className="w-full mb-3 sm:mb-0 sm:w-2/4">
-                    {tab == 'files' && 
-                      (
-                        <button
-                          onClick={()=>{console.log('working')}}
-                          type="button"
-                          className="btn-gradient text-base tracking-wide px-4 py-2 rounded-md 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>
-
-                          <span className="text-white">Upload Files</span>
-                        </button>
-                      )
-                    }
-                  </div> */}
-
                   <div className="w-full sm:w-2/4 flex justify-between items-center space-x-2">
                     <button
                         type="button"
@@ -368,7 +409,12 @@ function ActiveJobs(props) {
 
             {/* MESSAGE SECTION */}
             <div className="w-full lg:w-1/2">
-              <p className="text-lg font-bold text-dark-gray dark:text-black tracking-wide">Message</p>
+              <div className="flex justify-between items-center gap-5">
+                <p className="text-lg font-bold text-dark-gray dark:text-black tracking-wide">Message</p>
+                <button type="button" onClick={popUpHandler} className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+                    view all
+                </button>
+              </div>
               {props.activeJobMesList.loading ?
               <LoadingSpinner size='16' color='sky-blue' />
               :
@@ -378,6 +424,12 @@ function ActiveJobs(props) {
             {/* END OF MESSAGE */}
         </div>
 
+        {/* POPOUT SECTION */}
+        {popUp &&
+          <PopModal popUpHandler={popUpHandler} popUp={popUp} details={props.details} activeJobMesList={props.activeJobMesList} handlePrint={handlePrint} myRef={printRef} />
+        }
+        {/* END OF POPOUT SECTION */}
+
     </Layout>
   );
 }
@@ -402,3 +454,104 @@ function convertFileToBase64(file) {
   });
 }
 
+//POPOUT COMPONENT FUNCTION
+const PopModal = ({popUpHandler, popUp, details, activeJobMesList, handlePrint, myRef}) => {
+  return (
+    <ModalCom action={popUpHandler} situation={popUp} className="edit-popup">
+        <div ref={myRef} className="message-modal-wrapper min-w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
+            <div className="message-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 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">
+                  {details?.contract}
+                </h1>
+                <button
+                type="button"
+                className="text-[#374557] dark:text-red-500"
+                onClick={popUpHandler}
+                >
+                  <svg
+                        width="36"
+                        height="36"
+                        viewBox="0 0 36 36"
+                        fill="none"
+                        className="fill-current"
+                        xmlns="http://www.w3.org/2000/svg"
+                    >
+                        <path
+                        d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                        fill=""
+                        fillOpacity="0.6"
+                        />
+                        <path
+                        d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                        fill="#"
+                        fillOpacity="0.6"
+                        />
+                    </svg>
+                </button>
+            </div>
+            <div className="job-action-modal-body w-full px-10 py-8 gap-4">
+                <div className="w-full flex flex-col items-center">
+                  {activeJobMesList.loading ?
+                    <LoadingSpinner size='16' color='sky-blue' />
+                    :
+                    <div className="message-table h-[500px] overflow-y-auto">
+                      <table className="wallet-activity w-full table-auto border-collapse text-left">
+                          <thead className='border-b-2'>
+                              <tr className='text-slate-600'>
+                              <th className="p-2"></th>
+                              </tr>
+                          </thead>
+                          {activeJobMesList?.data?.length ?
+                          (
+                          <tbody>
+                              {activeJobMesList?.data?.map((item, index) => (
+                              <tr key={index} className='text-slate-500'>
+                                  <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>
+                          )
+                          :
+                          activeJobMesList.error ? 
+                          (
+                          <tbody>
+                              <tr className='text-slate-500'>
+                                  <td className="p-2" colSpan={4}>Opps! an error occurred. Please try again!</td>
+                              </tr>
+                          </tbody>
+                          )
+                          :
+                          <tbody>
+                              <tr className='text-slate-500'>
+                                  <td className="p-2" colSpan={4}>No Message Found!</td>
+                              </tr>
+                          </tbody>
+                          }
+                      </table>
+                    </div>
+                  }
+                </div>
+                
+                {/* btn */}
+                <div className='flex justify-end items-center'>
+                  <div className="py-3 w-full lg:w-1/2 flex justify-between items-center">
+                    <button onClick={handlePrint} type="button" className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+                        <span className='text-white'>Print</span>
+                    </button>
+                    <button onClick={popUpHandler} type="button" className="w-20 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white">
+                        <span className='text-gradient'>Cancel</span>
+                    </button>
+                  </div>
+                </div>
+            </div> 
+        </div>
+    </ModalCom>
+  )
+}
+

src/components/MyActiveJobs/JobActions/CurrentJobAction.jsx

@@ -0,0 +1,33 @@
+import React from 'react'
+
+function CurrentJobAction() {
+  return (
+    <div className='job-action'>
+      <p className="my-3 py-1 text-base active-owner">
+          <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+              <tbody>
+              <tr className=" border-b dark:border-[#5356fb29]  hover:bg-gray-50">
+                  <td className=" py-1">
+                      <div className="flex space-x-2 items-center w-full">
+                          <div className="flex flex-col flex-[0.9]">
+                              <h1 className="text-xl text-dark-gray dark:text-white">
+                                  Waiting for the completion message from the client before you can approve.
+                              </h1>
+                          </div>
+                      </div>
+                  </td>
+
+                  <td className="text-right py-4 px-2">
+                      <div className="flex justify-center items-center">
+                          .
+                      </div>
+                  </td>
+              </tr>
+              </tbody>
+          </table>
+      </p>
+    </div>
+  )
+}
+
+export default CurrentJobAction

src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx

@@ -0,0 +1,156 @@
+import React, { useState, useRef } from 'react'
+
+import ModalCom from '../../Helpers/ModalCom'
+import LoadingSpinner from '../../Spinners/LoadingSpinner'
+
+function CurrentTaskAction({jobDetails}) {
+
+    const [checked, setChecked] = useState(false)
+
+    const [reqStatus, setReqStatus] = useState({loading:false, status: false, message: ''})
+
+    let [popUp, setPopUp] = useState(false)
+
+    const popUpHandler = () => {
+        if(popUp){
+            setChecked(false)
+        }
+        setPopUp(prev => !prev)
+    }
+   
+    // FUNCTION TO HANDLE WHEN USER CLICKS ON SEND FOR REVIEW AND ACCEPTANCE
+    const taskCompletedSubmit = () => {
+        setReqStatus({loading:true, status: false, message: ''})
+        if(!checked){
+            setReqStatus({loading:false, status: false, message: 'Please check the box above'})
+            return setTimeout(()=>{
+                setReqStatus({loading:false, status: false, message: ''})
+            }, 3000)
+        }
+        setTimeout(()=>{
+            setReqStatus({loading:false, status: false, message: ''})
+        }, 3000)
+    }
+
+  return (
+    <div className='job-action'>
+
+          <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 active-worker">
+              <tbody>
+              <tr className=" border-b">
+                  <td>
+
+                      <div className="flex space-x-2 items-center w-full">
+                          <h1 className="text-xl text-dark-gray dark:text-white">
+                              I completed this task and ready for review and acceptance.
+                          </h1>
+                          {/*<div className="flex flex-col flex-[0.9]">*/}
+
+                          {/*</div>*/}
+                      </div>
+                  </td>
+              </tr>
+              <tr>
+                  <td>
+                      <div className="flex justify-center items-center">
+                          <button onClick={popUpHandler} type="button" className="w-120 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+                              Send of Review
+                          </button>
+                      </div>
+                  </td>
+              </tr>
+              </tbody>
+          </table>
+
+          {popUp && (
+            <ModalCom action={popUpHandler} situation={popUp}>
+                <div className="logout-modal-wrapper lg:w-[460px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
+                    <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 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">
+                        Confirm Completion
+                        </h1>
+                        <button
+                        type="button"
+                        className="text-[#374557] dark:text-red-500"
+                        onClick={popUpHandler}
+                        >
+                          <svg
+                                width="36"
+                                height="36"
+                                viewBox="0 0 36 36"
+                                fill="none"
+                                className="fill-current"
+                                xmlns="http://www.w3.org/2000/svg"
+                            >
+                                <path
+                                d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                                fill=""
+                                fillOpacity="0.6"
+                                />
+                                <path
+                                d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                                fill="#"
+                                fillOpacity="0.6"
+                                />
+                            </svg>
+                        </button>
+                    </div>
+                    <div className="job-action-modal-body w-full px-10 py-8 gap-4">
+                        <div className="w-full flex flex-col items-center">
+                            <div className="mb-10 flex justify-center items-center gap-2">
+                                <input 
+                                    type='checkbox' 
+                                    checked={checked} 
+                                    onChange={()=>{setChecked(prev => !prev)}} 
+                                    className='w-6 h-6 text-sky-blue bg-gray-100 focus:ring-sky-blue' 
+                                />
+                                <p className='font-bold text-base tracking-wide text-dark-gray dark:text-white'>If you have completed this task</p>
+                            </div>
+
+                            <div className="mb-10 flex justify-center items-center">
+                                {reqStatus.loading ?
+                                    <LoadingSpinner color='sky-blue' size='10' />
+                                :
+                                    <button type="button" onClick={taskCompletedSubmit} className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+                                        Send for Review & Acceptance
+                                    </button>
+                                }
+                            </div>
+
+                            {/* FOR SUCCESS/ERROR DISPLAY SECTION*/}
+                            <div className="w-full">
+                            {reqStatus.message != "" &&
+                                (!reqStatus.status ? (
+                                <div
+                                    className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                                >
+                                    {reqStatus.message}
+                                </div>
+                                ) : (
+                                reqStatus.status && (
+                                    <div
+                                    className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                                    >
+                                    {reqStatus.message}
+                                    </div>
+                                )
+                                ))}
+                            </div>
+                            {/* END OF FOR SUCCESS/ERROR DISPLAY SECTION*/}
+                        </div>
+                        
+                        {/* cancel btn */}
+                        <div className='flex justify-end items-center'>
+                            <button onClick={popUpHandler} type="button" className="w-20 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white">
+                                <span className='text-gradient'>Cancel</span>
+                            </button>
+                        </div>
+                    </div> 
+                </div>
+            </ModalCom>
+        )}
+    </div>
+  )
+}
+
+export default CurrentTaskAction

src/components/MyActiveJobs/JobActions/IndexJobActions.jsx

@@ -0,0 +1,45 @@
+import React from 'react'
+
+import CurrentJobAction from './CurrentJobAction'
+import CurrentTaskAction from './CurrentTaskAction'
+
+import PastDueJobAction from './PastDueJobAction'
+import PastDueTaskAction from './PastDueTaskAction'
+
+import ReviewJobAction from './ReviewJobAction'
+import ReviewTaskAction from './ReviewTaskAction'
+
+function IndexJobActions({details}) { // FUNCTION TO RENDER SPECIFIC JOB ACTION DEPENDING ON OWNER STATUS & STATUS DESCRIPTION
+    let owner = details.owner_status
+    let description = details.status_description
+    switch(owner) {
+        case 'OWNER':
+            return (()=>{
+                if(description == 'ACTIVE'){
+                    return <CurrentJobAction jobDetails={details} />
+                }else if(description == 'PASTDUE'){
+                    return <PastDueJobAction jobDetails={details} />
+                }else if(description == 'REVIEW'){
+                    return <ReviewJobAction jobDetails={details} />
+                } else {
+                    return null
+                }
+            })()
+        case 'WORKER':
+            return (()=>{
+                if(description == 'ACTIVE'){
+                    return <CurrentTaskAction jobDetails={details} />
+                }else if(description == 'PASTDUE'){
+                    return <PastDueTaskAction jobDetails={details} />
+                }else if(description == 'REVIEW'){
+                    return <ReviewTaskAction jobDetails={details} />
+                } else {
+                    return null
+                }
+            })()
+        default:
+            return null
+    }
+}
+
+export default IndexJobActions

src/components/MyActiveJobs/JobActions/PastDueJobAction.jsx

@@ -0,0 +1,35 @@
+import React from 'react'
+
+function PastDueJobAction() {
+  return (
+    <div className='job-action'>
+
+        <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 owner-pastdue">
+            <tbody>
+            <tr className="border-b dark:border-[#5356fb29]  hover:bg-gray-50">
+                <td>
+                    <div className="flex space-x-2 items-center w-full">
+                        <div className="flex flex-col flex-[0.9]">
+                            <h1 className="text-xl text-dark-gray dark:text-white">
+                                Time allocated has passed
+                            </h1>
+                        </div>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <div className="flex justify-center items-center">
+                        <button type="button" className="w-120 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+                            Cancel or Extend Timeline
+                        </button>
+                    </div>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+  )
+}
+
+export default PastDueJobAction

src/components/MyActiveJobs/JobActions/PastDueTaskAction.jsx

@@ -0,0 +1,35 @@
+import React from 'react'
+
+function PastDueTaskAction() {
+  return (
+    <div className='job-action'>
+
+        <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 worker-pastdue">
+            <tbody>
+            <tr className=" border-b dark:border-[#5356fb29]  hover:bg-gray-50">
+                <td>
+                    <div className="flex space-x-2 items-center w-full">
+                        <div className="flex flex-col flex-[0.9]">
+                            <h1 className="text-xl text-dark-gray dark:text-white">
+                                You have missed the allocated time
+                            </h1>
+                        </div>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <div className="flex justify-center items-center">
+                        <button type="button" className="w-120 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+                            Request Extension
+                        </button>
+                    </div>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+  )
+}
+
+export default PastDueTaskAction

src/components/MyActiveJobs/JobActions/ReviewJobAction.jsx

@@ -0,0 +1,36 @@
+import React from 'react'
+
+function ReviewJobAction() {
+  return (
+    <div className='job-action'>
+      <p className="my-3 py-1 text-base">
+          <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 review-owner">
+              <tbody>
+              <tr className="border-b dark:border-[#5356fb29]">
+                  <td className=" py-1">
+                      <div className="flex space-x-2 items-center w-full">
+                          <div className="flex flex-col flex-[0.9]">
+                              <h1 className="text-xl text-dark-gray dark:text-white">
+                                  This Job is Ready for your review
+                              </h1>
+                          </div>
+                      </div>
+                  </td>
+              </tr>
+              <tr>
+                  <td>
+                      <div className="flex justify-center items-center">
+                          <button  type="button" className="w-120 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
+                             Reject or Accept
+                          </button>
+                      </div>
+                  </td>
+              </tr>
+              </tbody>
+          </table>
+      </p>
+    </div>
+  )
+}
+
+export default ReviewJobAction

src/components/MyActiveJobs/JobActions/ReviewTaskAction.jsx

@@ -0,0 +1,13 @@
+import React from 'react'
+
+function ReviewTaskAction() {
+  return (
+    <div className='job-action'>
+      <p className="my-3 py-1 text-base">
+        Waiting for the completion message from the client before you can approve. Worker True & Review Job
+      </p>
+    </div>
+  )
+}
+
+export default ReviewTaskAction

src/components/MyActiveJobs/MyPastDueJobs.jsx

@@ -0,0 +1,42 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import Layout from "../Partials/Layout";
+import CommonHead from "../UserHeader/CommonHead";
+import MyActiveJobTable from "./MyActiveJobTable";
+
+export default function MyPastDueJobs(props) {
+    const [selectTab, setValue] = useState("today");
+    const filterHandler = (value) => {
+        setValue(value);
+    };
+    return (
+        <Layout>
+            <CommonHead
+                commonHeadData={props.commonHeadData}
+            />
+            <div className="notification-page w-full mb-10">
+                <div className="notification-wrapper w-full">
+                    {/* heading */}
+                    <div className="sm:flex justify-between items-center mb-6">
+                        <div className="mb-5 sm:mb-0">
+                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+                <span
+                    className={`${selectTab === "today" ? "block" : "hidden"}`}
+                >
+                 Pass Due Job(s)
+                </span>
+                            </h1>
+                        </div>
+                        <div className="slider-btns flex space-x-4">
+                            <div
+                                onClick={() => filterHandler("today")}
+                                className="relative"
+                            ></div>
+                        </div>
+                    </div>
+                    <MyActiveJobTable MyJobList={props.MyJobList} />
+                </div>
+            </div>
+        </Layout>
+    );
+}

src/components/MyActiveJobs/MyReviewDueJobs.jsx

@@ -0,0 +1,42 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import Layout from "../Partials/Layout";
+import CommonHead from "../UserHeader/CommonHead";
+import MyActiveJobTable from "./MyActiveJobTable";
+
+export default function MyReviewDueJobs(props) {
+    const [selectTab, setValue] = useState("today");
+    const filterHandler = (value) => {
+        setValue(value);
+    };
+    return (
+        <Layout>
+            <CommonHead
+                commonHeadData={props.commonHeadData}
+            />
+            <div className="notification-page w-full mb-10">
+                <div className="notification-wrapper w-full">
+                    {/* heading */}
+                    <div className="sm:flex justify-between items-center mb-6">
+                        <div className="mb-5 sm:mb-0">
+                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+                <span
+                    className={`${selectTab === "today" ? "block" : "hidden"}`}
+                >
+                 Review Due Job(s)
+                </span>
+                            </h1>
+                        </div>
+                        <div className="slider-btns flex space-x-4">
+                            <div
+                                onClick={() => filterHandler("today")}
+                                className="relative"
+                            ></div>
+                        </div>
+                    </div>
+                    <MyActiveJobTable MyJobList={props.MyJobList} />
+                </div>
+            </div>
+        </Layout>
+    );
+}

src/components/MyCoupons/CouponTable.jsx

@@ -0,0 +1,67 @@
+import React, {useState} from 'react'
+
+//import PaginatedList from '../../Pagination/PaginatedList'
+import PaginatedList from '../Pagination/PaginatedList';
+import { handlePagingFunc } from '../Pagination/HandlePagination';
+
+function CouponTable({coupon}) {
+
+    const [currentPage, setCurrentPage] = useState(0);
+    const indexOfFirstItem = Number(currentPage);
+    const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
+    const currentCoupon = coupon?.data?.slice(indexOfFirstItem, indexOfLastItem);
+
+    const handlePagination = (e) => {
+        handlePagingFunc(e,setCurrentPage)
+    }
+
+    return (
+        <div className='flex flex-col justify-between h-full'>
+            <table className="wallet-activity w-full table-auto border-collapse text-left">
+                <thead className='border-b-2'>
+                <tr className='text-slate-600'>
+                    <th className="p-2">Coupon</th>
+                    {/*<th className="p-2">Description</th>*/}
+                    {/*<th className="p-2">Amount</th>*/}
+                    <th className="p-2">Status</th>
+                </tr>
+                </thead>
+                {coupon.data.length ?
+                    (
+                        <tbody>
+                        {currentCoupon.map((item, index) => (
+                            <tr key={index} className='text-slate-500'>
+                                <td className="p-2">{item.added} <br /> {item.code} <br />{item.amount}</td>
+                                {/*<td className="p-2"></td>*/}
+                                {/*<td className="p-2"></td>*/}
+                                <td className="p-2">{item.status}</td>
+                            </tr>
+                        ))}
+                        </tbody>
+                    )
+                    :
+                    coupon.error ?
+                        (
+                            <tbody>
+                            <tr className='text-slate-500'>
+                                <td className="p-2" colSpan={4}>Opps! an error occurred. Please try again!</td>
+                            </tr>
+                            </tbody>
+                        )
+                        :
+                        <tbody>
+                        <tr className='text-slate-500'>
+                            <td className="p-2" colSpan={4}>No Purchase History Found!</td>
+                        </tr>
+                        </tbody>
+                }
+            </table>
+
+            {/* PAGINATION BUTTON */}
+            <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= coupon?.data?.length ? true : false} data={coupon?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
+            {/* END OF PAGINATION BUTTON */}
+        </div>
+    )
+}
+
+export default CouponTable

src/components/MyCoupons/MyCoupons.jsx

@@ -0,0 +1,69 @@
+import React, { useEffect, useState } from 'react'
+import Layout from "../Partials/Layout";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import CouponTable from "./CouponTable";
+import usersService from '../../services/UsersService'
+
+export default function MyCoupons() {
+    const apiCall = new usersService()
+    let [couponHistory, setCouponHistory] = useState({ // FOR COUPON HISTORY
+        loading: true,
+        data: [],
+        error: false
+    })
+
+    //FUNCTION TO GET COUPON HISTORY
+    const getCouponHistory = ()=>{
+        apiCall.getCouponHx().then((res)=>{
+            if(res.data.internal_return < 0){ // success but no data
+                setCouponHistory(prev => ({...prev, loading: false}))
+                return
+            }
+            setCouponHistory(prev => ({...prev, loading: false, data: res.data.result_list}))
+        }).catch((error)=>{
+            setCouponHistory(prev => ({...prev, loading: false, error: true}))
+        })
+    }
+
+    useEffect(()=>{
+        getCouponHistory()
+    }, [])
+
+    return (
+        <>
+            <Layout>
+                <div className="my-wallet-wrapper w-full mb-10">
+                    {/* heading */}
+                    <div className="sm:flex justify-between items-center mb-6">
+                        <div className="mb-5 sm:mb-0">
+                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+
+                                Coupons
+
+                            </h1>
+                        </div>
+
+                        <div className="slider-btns flex space-x-4">
+
+                        </div>
+                    </div>
+                    <div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
+
+                    {/* COUPON SECTION */}
+                    <div className="lg:w-4/4 w-full mb-10 lg:mb-0">
+                        <div className="wallet w-full  md:p-8 p-4 h-full max-h-[500px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
+                            {couponHistory.loading ?
+                                <LoadingSpinner size='16' color='sky-blue' />
+                                :
+                                <CouponTable coupon={couponHistory} />
+                            }
+                        </div>
+                    </div>
+                    {/* END OF COUPON SECTION */}
+
+                </div>
+                </div>
+            </Layout>
+        </>
+    );
+}

src/components/MyPendingJobs/MyPendingJobTable.jsx

@@ -24,121 +24,121 @@ export default function MyPendingJobTable({ MyJobList, className }) {
   };
 
   return (
-    <div
-      className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow ${
-        className || ""
-      }`}
-    >
-      {MyJobList && MyJobList?.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>
-              {/*<tr className="text-base text-thin-light-gray border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">*/}
-              {/*    <td className="py-4">All Product</td>*/}
-              {/*    <td className="py-4 text-right">.</td>*/}
-              {/*</tr>*/}
+      <div
+        className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow ${
+          className || ""
+        }`}
+      >
+        {MyJobList && MyJobList?.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>
+                {/*<tr className="text-base text-thin-light-gray border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">*/}
+                {/*    <td className="py-4">All Product</td>*/}
+                {/*    <td className="py-4 text-right">.</td>*/}
+                {/*</tr>*/}
 
-              {
-                <>
-                  {MyJobList &&
-                    MyJobList?.result_list &&
-                    MyJobList.result_list.length > 0 &&
-                    currentActiveJobList.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]">
-                              <img
-                                src={dataImage2}
-                                alt="data"
-                                className="w-full h-full"
-                              />
+                {
+                  <>
+                    {MyJobList &&
+                      MyJobList?.result_list &&
+                      MyJobList.result_list.length > 0 &&
+                      currentActiveJobList.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]">
+                                <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>
-                            <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>
 
-                        <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>
-                    ))}
-                </>
+                          <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) >=
+                MyJobList?.result_list.length
+                  ? true
+                  : false
               }
-            </tbody>
-          </table>
-          {/* PAGINATION BUTTON */}
-          <PaginatedList
-            onClick={handlePagination}
-            prev={currentPage == 0 ? true : false}
-            next={
-              currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
-              MyJobList?.result_list.length
-                ? true
-                : false
-            }
-            data={MyJobList?.result_list}
-            start={indexOfFirstItem}
-            stop={indexOfLastItem}
-          />
-          {/* END OF PAGINATION BUTTON */}
-        </div>
-      )}
+              data={MyJobList?.result_list}
+              start={indexOfFirstItem}
+              stop={indexOfLastItem}
+            />
+            {/* END OF PAGINATION BUTTON */}
+          </div>
+        )}
 
-      {/* Active Job Popout */}
-      {jobPopout.show && (
-        <PendingJobsPopout
-          details={jobPopout.data}
-          onClose={() => {
-            setJobPopout({ show: false, data: {} });
-          }}
-          situation={jobPopout.show}
-        />
-      )}
-      {/* End of Active Job Popout */}
-    </div>
+        {/* Active Job Popout */}
+        {jobPopout.show && (
+          <PendingJobsPopout
+            details={jobPopout.data}
+            onClose={() => {
+              setJobPopout({ show: false, data: {} });
+            }}
+            situation={jobPopout.show}
+          />
+        )}
+        {/* End of Active Job Popout */}
+      </div>
   );
 }

src/components/MyWallet/Balance.jsx

@@ -8,13 +8,24 @@ import LoadingSpinner from '../Spinners/LoadingSpinner'
 function Balance({wallet, coupon}) {
     return (
         <div className="content-wrapper">
+            {/* heading */}
+            <div className="sm:flex justify-between items-center mb-6">
+                <div className="mb-5 sm:mb-0">
+                    <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+                        Wallet
+                    </h1>
+                </div>
+                <div className="slider-btns flex space-x-4">
+
+                </div>
+            </div>
             <div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
                 {/* WALLET SECTION */}
-                <div className="lg:w-3/4 w-full mb-10 lg:mb-0">
+                <div className="lg:w-4/4 w-full mb-10 lg:mb-0">
                     <div className="wallet w-full  md:p-8 p-4 h-full bg-white dark:bg-dark-white rounded-2xl shadow">
                         <div className='flex items-baseline justify-between'>
-                            <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Wallet</h2>
-                            <p className='text-base text-slate-500 dark:text-white'>Add New Wallet</p>
+                            {/*<h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Wallet</h2>*/}
+                            {/*<p className='text-base text-slate-500 dark:text-white'>Add New Wallet</p>*/}
                         </div>
                         {/* wallet balance */}
                         {wallet.loading ?
@@ -26,7 +37,7 @@ function Balance({wallet, coupon}) {
                             <div className='text-slate-900 w-full md:w-1/2 flex space-x-3 items-start justify-start'>
                                 <div className='balance-info'>
                                     <p className='py-2'></p>
-                                    <span className='text-base'>{item.description}</span>
+                                    <span className='text-xl text-dark-gray dark:text-white'>{item.description}</span>
                                     <p className='text-base text-slate-500'>{item.symbol}</p>
                                 </div>
                                 <div className='balance-info'>
@@ -43,10 +54,10 @@ function Balance({wallet, coupon}) {
                                 {
                                     item.action_type != 'AC_AD_FD_ONLY' ?
                                         <Link to='transfer-fund' className='lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px]
-                                                                   items-center rounded-full relative  bg-purple pr-1.5 pl-4'>Transfer</Link>:''
+                                                                   items-center rounded-full relative  bg-purple pr-1.5 pl-4 lg:text-xl text-lg font-bold text-white'>Transfer</Link>:''
                                 }
                                 <Link to='add-fund' className='lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px]
-                                                                   items-center rounded-full relative  bg-purple pr-1.5 pl-4'>+Add Credit</Link>
+                                                                   items-center rounded-full relative  bg-purple pr-1.5 pl-4 lg:text-xl text-lg font-bold text-white'>+Add Credit</Link>
                             </div>
                         </div>
                         ))
@@ -73,22 +84,22 @@ function Balance({wallet, coupon}) {
 
             </div>
 
-            <div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
+            {/*<div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>*/}
 
-                {/* COUPON SECTION */}
-                <div className="lg:w-3/4 w-full mb-10 lg:mb-0">
-                    <div className="wallet w-full  md:p-8 p-4 h-full max-h-[500px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
-                        <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Coupons</h2>
-                        {coupon.loading ?
-                            <LoadingSpinner size='16' color='sky-blue' />
-                            :
-                            <CouponTable coupon={coupon} />
-                        }
-                    </div>
-                </div>
-                {/* END OF COUPON SECTION */}
+            {/*    /!* COUPON SECTION *!/*/}
+            {/*    <div className="lg:w-3/4 w-full mb-10 lg:mb-0">*/}
+            {/*        <div className="wallet w-full  md:p-8 p-4 h-full max-h-[500px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">*/}
+            {/*            <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Coupons</h2>*/}
+            {/*            {coupon.loading ?*/}
+            {/*                <LoadingSpinner size='16' color='sky-blue' />*/}
+            {/*                :*/}
+            {/*                <CouponTable coupon={coupon} />*/}
+            {/*            }*/}
+            {/*        </div>*/}
+            {/*    </div>*/}
+            {/*    /!* END OF COUPON SECTION *!/*/}
 
-            </div>
+            {/*</div>*/}
         </div>
       )
 }

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/MobileSideBar.jsx

@@ -76,7 +76,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ
       {/* menu and settings item */}
       <div className="menu-setting-items mb-11">
         {/* menus item */}
-        <div className="menu-item transition-all duration-300 ease-in-out mb-14">
+        <div className="menu-item transition-all duration-300 ease-in-out mb-5">
           <div className="heading mb-5 active">
             <h1 className="title text-xl font-bold text-purple">Menu</h1>
           </div>
@@ -110,20 +110,17 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ
 
         {/* menu and settings item */}
         {userDetails?.account_type !== "FAMILY" && (
-
-            <div className="menu-setting-items mb-11">
-              {/* menus item */}
               <div
                   className={`menu-item transition-all duration-300 ease-in-out ${
-                      sidebar ? "mb-14" : ""
+                      sidebar ? "mb-5" : "mb-2"
                   }`}
               >
+                <div className="heading mb-5">
+                  <h1 className="title text-xl font-bold text-purple">
+                    Family
+                  </h1>
+                </div>
                 <div className="items">
-                  <div className="heading mb-5">
-                    <h1 className="title text-xl font-bold text-purple">
-                      Family
-                    </h1>
-                  </div>
                   <ul className="flex flex-col space-y-6">
                     <ListItem
                         title="Family Corner"
@@ -134,25 +131,22 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ
                   </ul>
                 </div>
               </div>
-            </div>
         )}
 
         {userDetails?.account_type !== "FAMILY" && (
           <>
             {!userDetails?.post_jobs ? (
-              <div className="menu-setting-items mb-11">
-                {/* menus item */}
                 <div
                   className={`menu-item transition-all duration-300 ease-in-out bg-pink dark:bg-dark-white rounded-2xl p-3 ${
-                    sidebar ? "mb-14" : "rounded-none p-0"
+                    sidebar ? "mb-5" : "mb-2 rounded-none p-0"
                   }`}
                 >
+                  <div className="heading mb-5">
+                    <h1 className="title text-xl font-bold text-purple">
+                      Job Post
+                    </h1>
+                  </div>
                   <div className="items">
-                    <div className="heading mb-5">
-                      <h1 className="title text-xl font-bold text-purple">
-                        Job Post
-                      </h1>
-                    </div>
                     <ul className="flex flex-col space-y-6">
                       <li className="item group">
                         <NavLink
@@ -179,9 +173,12 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ
                     </ul>
                   </div>
                 </div>
-              </div>
             ) : myJobList?.data?.result_list?.length ? (
-              <div className="setting-item">
+              <div
+                  className={`menu-item transition-all duration-300 ease-in-out ${
+                      sidebar ? "mb-5" : "mb-2"
+                  }`}
+              >
                 <div className="heading mb-5">
                   <h1 className="title text-xl font-bold text-purple">
                     My Jobs
@@ -213,8 +210,12 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJ
                   </ul>
                 </div>
               </div>
-            ) : !myJobList?.loading && (
-              <div className="setting-item">
+            ) : (
+              <div
+                  className={`menu-item transition-all duration-300 ease-in-out ${
+                      sidebar ? "mb-5" : "mb-2"
+                  }`}
+              >
                 <div className="heading mb-5">
                   <h1 className="title text-xl font-bold text-purple">
                     My Jobs

src/components/Partials/Sidebar.jsx

@@ -95,7 +95,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler, myJobList
         {/* menus item */}
         <div
           className={`menu-item transition-all duration-300 ease-in-out ${
-            sidebar ? "mb-14" : ""
+            sidebar ? "mb-5" : "mb-2"
           }`}
         >
           <div className="heading mb-5">
@@ -131,19 +131,17 @@ export default function Sidebar({ sidebar, action, logoutModalHandler, myJobList
 
         {/* menu and settings item */}
         {userDetails?.account_type !== "FAMILY" && (
-          <div className="menu-setting-items mb-11">
-            {/* menus item */}
             <div
               className={`menu-item transition-all duration-300 ease-in-out ${
-                sidebar ? "mb-14" : ""
+                sidebar ? "my-5" : ""
               }`}
             >
+              <div className="heading mb-5">
+                <h1 className="title text-xl font-bold text-purple">
+                  Family
+                </h1>
+              </div>
               <div className="items">
-                <div className="heading mb-5">
-                  <h1 className="title text-xl font-bold text-purple">
-                    Family
-                  </h1>
-                </div>
                 <ul className="flex flex-col space-y-6">
                   <ListItem
                     title="Family Corner"
@@ -154,92 +152,94 @@ export default function Sidebar({ sidebar, action, logoutModalHandler, myJobList
                 </ul>
               </div>
             </div>
-          </div>
         )}
         {userDetails?.account_type !== "FAMILY" && (
           <>
             {!userDetails?.post_jobs ? (
-              <div className="menu-setting-items mb-11">
-                {/* menus item */}
-                <div
-                  className={`menu-item transition-all duration-300 ease-in-out bg-pink dark:bg-dark-white rounded-2xl p-3 ${
-                    sidebar ? "mb-14" : "rounded-none p-0"
-                  }`}
-                >
-                  <div className="items">
-                    <div className="heading mb-5">
-                      <h1 className="title text-xl font-bold text-purple">
-                        Job Post
-                      </h1>
-                    </div>
-                    <ul className="flex flex-col space-y-6">
-                      <li className="item group">
-                        <NavLink
-                          to="/start-job"
-                          className={`nav-item flex items-center ${
-                            ((navData) => (navData.isActive ? "active" : ""),
-                            sidebar
-                              ? "justify-start space-x-3.5"
-                              : "justify-center")
+              <div
+                className={`menu-item transition-all duration-300 ease-in-out bg-pink dark:bg-dark-white rounded-2xl p-3 ${
+                  sidebar ? "mb-5" : "mb-2 rounded-none p-0"
+                }`}
+              >
+                <div className="heading mb-5">
+                  <h1 className="title text-xl font-bold text-purple">
+                    Job Post
+                  </h1>
+                </div>
+                <div className="items">
+                  <ul className="flex flex-col space-y-6">
+                    <li className="item group">
+                      <NavLink
+                        to="/start-job"
+                        className={`nav-item flex items-center ${
+                          ((navData) => (navData.isActive ? "active" : ""),
+                          sidebar
+                            ? "justify-start space-x-3.5"
+                            : "justify-center")
+                        }`}
+                      >
+                        <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
+                          <Icons name="people-two" />
+                        </span>
+                        <span
+                          className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                            sidebar ? "active flex-1" : "w-0"
                           }`}
                         >
-                          <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                            <Icons name="people-two" />
-                          </span>
-                          <span
-                            className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                              sidebar ? "active flex-1" : "w-0"
-                            }`}
-                          >
-                            Enable Job Post
-                          </span>
-                        </NavLink>
-                      </li>
-                    </ul>
-                  </div>
+                          Enable Job Post
+                        </span>
+                      </NavLink>
+                    </li>
+                  </ul>
                 </div>
               </div>
             ) : myJobList?.data?.result_list?.length ? (
-              <>
-                <div className="setting-item">
-                  <div className="heading mb-5">
-                    <h1 className="title text-xl font-bold text-purple">
-                      My Jobs
-                    </h1>
-                  </div>
-                  <div className="items">
-                    <ul className="flex flex-col space-y-6">
-                      {[
-                        {
-                          name: "List",
-                          path: "/myjobs",
-                          iconName: "people-two",
-                        },
-                        {
-                          name: "Pending",
-                          path: "/my-pending-jobs",
-                          iconName: "people-two",
-                        },
-                        {
-                          name: "Active",
-                          path: "/my-active-jobs",
-                          iconName: "people-two",
-                        },
-                      ].map(({ name, path, iconName }, idx) => (
-                        <ListItem
-                          key={idx}
-                          title={name}
-                          route={path}
-                          sidebar={sidebar}
-                          iconName={iconName}
-                        />
-                      ))}
-                    </ul>
-                  </div>
+              <div
+                className={`menu-item transition-all duration-300 ease-in-out ${
+                  sidebar ? "mb-5" : "mb-2"
+                }`}
+              >
+                <div className="heading mb-5">
+                  <h1 className="title text-xl font-bold text-purple">
+                    My Jobs
+                  </h1>
                 </div>
-              </>
-            ) : !myJobList?.loading && (
-              <div className="setting-item">
+                <div className="items">
+                  <ul className="flex flex-col space-y-6">
+                    {[
+                      {
+                        name: "List",
+                        path: "/myjobs",
+                        iconName: "people-two",
+                      },
+                      {
+                        name: "Pending",
+                        path: "/my-pending-jobs",
+                        iconName: "people-two",
+                      },
+                      {
+                        name: "Active",
+                        path: "/my-active-jobs",
+                        iconName: "people-two",
+                      },
+                    ].map(({ name, path, iconName }, idx) => (
+                      <ListItem
+                        key={idx}
+                        title={name}
+                        route={path}
+                        sidebar={sidebar}
+                        iconName={iconName}
+                      />
+                    ))}
+                  </ul>
+                </div>
+              </div>
+            ) : (
+              <div
+                className={`menu-item transition-all duration-300 ease-in-out ${
+                  sidebar ? "mb-5" : "mb-2"
+                }`}
+              >
                 <div className="heading mb-5">
                   <h1 className="title text-xl font-bold text-purple">
                     My Jobs

src/components/UserHeader/CommonHead.jsx

@@ -1,34 +1,35 @@
 import React from "react";
 import { Link } from "react-router-dom";
+import RecomendedSliders from "./RecomendedSliders";
 
 export default function CommonHead({ className,commonHeadData }) {
-    const vvv=  commonHeadData();
-    console.log("UUUUUUUU-",vvv);
     return (
         <div
-            className={`create-nft w-full lg:h-[140px] shadow lg:flex rounded-lg justify-between items-center  md:p-9 p-4 bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29] -2 border-pink mb-10 ${
+            className={`create-nft w-full lg:h-[140px] shadow lg:flex rounded-lg justify-between items-center  md:p-2 p-2 bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29] -2 border-pink mb-10 ${
                 className || ""
             }`}
         >
-            <div className="lg:w-8/12 w-full mb-8 lg:mb-0">
-                <h1 className="text-2xl text-dark-gray dark:text-white font-bold mb-2">
-                    This is common head which will appear as needed , will take many shape
-                </h1>
-                <p className="text-base text-thin-light-gray tracking-wide">
-                    some space for extra texts here
-                </p>
-            </div>
-            <div className="flex-1 flex lg:justify-end">
-                <div className="flex items-center space-x-5">
-                    <Link
-                        to="/mytask"
-                        className="w-40 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                    >
-                       View Task
-                    </Link>
+            {commonHeadData?.length > 0 && <RecomendedSliders bannerData={commonHeadData}  /> }
+            {/*<div className="lg:w-8/12 w-full mb-8 lg:mb-0">*/}
+            {/*    /!*<h1 className="text-2xl text-dark-gray dark:text-white font-bold mb-2">*!/*/}
+            {/*    /!*    This is common head which will appear as needed , will take many shape*!/*/}
+            {/*    /!*</h1>*!/*/}
+            {/*    /!*<p className="text-base text-thin-light-gray tracking-wide">*!/*/}
+            {/*    /!*    some space for extra texts here*!/*/}
+            {/*    /!*</p>*!/*/}
+            {/*   */}
+            {/*</div>*/}
+            {/*<div className="flex-1 flex lg:justify-end">*/}
+            {/*    <div className="flex items-center space-x-5">*/}
+            {/*        <Link*/}
+            {/*            to="/mytask"*/}
+            {/*            className="w-40 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"*/}
+            {/*        >*/}
+            {/*           View Task*/}
+            {/*        </Link>*/}
 
-                </div>
-            </div>
+            {/*    </div>*/}
+            {/*</div>*/}
         </div>
     );
 }

src/components/UserHeader/RecomendedSliders.jsx

@@ -0,0 +1,132 @@
+import React, { useRef } from "react";
+import top from "../../assets/images/top-buyer-1png.png";
+import top2 from "../../assets/images/top-buyer-2.png";
+import top3 from "../../assets/images/top-buyer-3.png";
+import top4 from "../../assets/images/top-buyer-4.png";
+import Icons from "../Helpers/Icons";
+import SliderCom from "../Helpers/SliderCom";
+import { Link } from "react-router-dom";
+
+export default function RecomendedSliders({ className,bannerData }) {
+    const settings = {
+        arrows: false,
+        dots: false,
+        infinite: bannerData.length > 4 ? true : false,
+        autoplay: true,
+        slidesToShow: bannerData.length > 4 ? 4 : bannerData.length,
+        slidesToScroll: 1,
+        responsive: [
+            {
+                breakpoint: 426,
+                settings: {
+                    infinite: bannerData.length > 2 ? true : false,
+                    slidesToShow: bannerData.length > 2 ? 2 : bannerData.length,
+                    slidesToScroll: 1,
+                },
+            },
+        ],
+    };
+    const sellSlider = useRef(null);
+    const buySlider = useRef(null);
+    const prevHandler = (value) => {
+        if (value === "sell") {
+            sellSlider.current.slickPrev();
+        }
+        if (value === "buy") {
+            buySlider.current.slickPrev();
+        }
+    };
+    const nextHandler = (value) => {
+        if (value === "sell") {
+            sellSlider.current.slickNext();
+        }
+        if (value === "buy") {
+            buySlider.current.slickNext();
+        }
+    };
+    return (
+        <>
+            {/*<div className="heading flex justify-between items-center mb-4">*/}
+            {/*    <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">*/}
+            {/*        Top Seller*/}
+            {/*    </h1>*/}
+            {/*    <div className="slider-btns flex space-x-4">*/}
+            {/*        <button*/}
+            {/*            onClick={() => nextHandler("sell")}*/}
+            {/*            type="button"*/}
+            {/*            className="transform rotate-180 text-dark-gray dark:text-white dark:opacity-25"*/}
+            {/*        >*/}
+            {/*            <Icons name="arrows" />*/}
+            {/*        </button>*/}
+            {/*        <button*/}
+            {/*            onClick={() => prevHandler("sell")}*/}
+            {/*            type="button"*/}
+            {/*            className="transform rotate-180"*/}
+            {/*        >*/}
+            {/*            <div className="  text-dark-gray dark:text-white">*/}
+            {/*                <svg*/}
+            {/*                    width="11"*/}
+            {/*                    height="19"*/}
+            {/*                    viewBox="0 0 11 19"*/}
+            {/*                    fill="none"*/}
+            {/*                    xmlns="http://www.w3.org/2000/svg"*/}
+            {/*                >*/}
+            {/*                    <path*/}
+            {/*                        d="M9.09766 1.1499L1.13307 9.11449L9.09766 17.0791"*/}
+            {/*                        stroke="url(#paint0_linear_220_23410)"*/}
+            {/*                        strokeWidth="2"*/}
+            {/*                        strokeLinecap="round"*/}
+            {/*                        strokeLinejoin="round"*/}
+            {/*                    />*/}
+            {/*                    <defs>*/}
+            {/*                        <linearGradient*/}
+            {/*                            id="paint0_linear_220_23410"*/}
+            {/*                            x1="9.09766"*/}
+            {/*                            y1="1.1499"*/}
+            {/*                            x2="-4.2474"*/}
+            {/*                            y2="7.96749"*/}
+            {/*                            gradientUnits="userSpaceOnUse"*/}
+            {/*                        >*/}
+            {/*                            <stop stopColor="#F539F8" />*/}
+            {/*                            <stop offset="0.416763" stopColor="#C342F9" />*/}
+            {/*                            <stop offset="1" stopColor="#5356FB" />*/}
+            {/*                        </linearGradient>*/}
+            {/*                    </defs>*/}
+            {/*                </svg>*/}
+            {/*            </div>*/}
+            {/*        </button>*/}
+            {/*    </div>*/}
+            {/*</div>*/}
+            <div className="slider-content">
+                <SliderCom settings={settings} selector={sellSlider}>
+                    {bannerData.map((item, index) => (
+                        <Link key={index} to={`/${item.link_path}`}>
+                            <div className="item">
+                                <div className={`commonHeaderSliderItem ${item.short_style}`}>
+                                    {/* title */}
+                                    <div className="flex justify-center">
+                                        <p className="text-base font-bold   text-dark-gray dark:text-white">
+                                            {item.short_title}
+                                        </p>
+                                    </div>
+                                    {/* username */}
+                                    <div className="flex justify-center mb-1">
+                                        <p className="text-xs text-thin-light-gray">
+                                            {item.short_description}
+                                        </p>
+                                    </div>
+                                    {/* items */}
+                                    <div className="flex justify-center">
+                                        <div className="flex space-x-1 items-center text-purple text-xs">
+                                            <span>{item.short_button_text}</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </Link>
+                    ))}
+                </SliderCom>
+            </div>
+        </>
+    );
+}

src/components/jobPopout/PendingJobsPopout.jsx

@@ -1,46 +1,63 @@
-import React, { useMemo, useState } from "react";
+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(false)
+  const [pendingJobLoader, setPendingJobLoader] = useState({
+    extend: false,
+    offer: false,
+  });
   const apiCall = useMemo(() => new usersService(), []);
-  
-  const handlePendingJobsBtn = async ({ target: { name } }) => {
-    setPendingJobLoader(true)
-    let { job_uid, offer_code } = details;
 
-    let reqData;
+  const handlePendingJobsBtn = useCallback(
+    async ({ target: { name } }) => {
+      let { job_uid, offer_code } = details;
 
-    let pendingData = { job_uid, offer_code };
+      let reqData;
+
+      let pendingData = { job_uid, offer_code };
 
-    if (name === "extend") {
       try {
-        reqData = { ...pendingData };
-        let { data } = await apiCall.pendingJobExtend(reqData);
-        console.log("This is for extend", data);
-        setPendingJobLoader(false)
+        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(false)
+        setPendingJobLoader({ extend: false, offer: false });
         throw new Error(error);
       }
-    } else if (name === "offer") {
-      try {
-        reqData = { ...pendingData };
-        let { data } = await apiCall.pendingJobSendTome(reqData);
-        console.log("This is for offer", data);
-        setPendingJobLoader(false)
-      } catch (error) {
-        setPendingJobLoader(false)
-        throw new Error(error);
-      }
-    } else return;
+    },
+    [onClose, apiCall, details]
+  );
 
-    onClose();
-  };
   return (
-    <ModalCom action={onClose} situation={situation}>
+    <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">
@@ -159,7 +176,13 @@ function PendingJobsPopout({ details, onClose, situation }) {
                 onClick={handlePendingJobsBtn}
                 name="extend"
               >
-                Extend by a week
+                {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>
 
@@ -169,7 +192,13 @@ function PendingJobsPopout({ details, onClose, situation }) {
                 onClick={handlePendingJobsBtn}
                 name="offer"
               >
-                Send to me
+                {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>
 
@@ -200,4 +229,4 @@ function PendingJobsPopout({ details, onClose, situation }) {
   );
 }
 
-export default PendingJobsPopout;
+export default PendingJobsPopout;

src/index.css

@@ -9,6 +9,26 @@
   font-family: "Product Sans";
   src: url("./assets/fonts/Product Sans Bold.ttf");
 }
+
+
+
+.job-action{
+  background-color: lightgoldenrodyellow;
+  height: 100px;
+  border-radius: 15px;
+}
+
+.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;
@@ -23,6 +43,29 @@
   width: 100%;
   text-align: center;
 }
+.commonHeaderSliderItem{
+  background-color: aliceblue;
+  border-radius: 10px;
+  margin: 0px 5px 0px 5px;
+  height: 95px;
+  padding: 5px;
+}
+
+.short_style{
+  background-color: transparent;
+}
+.lr{
+  background-color: #e1cace;
+}
+.lg{
+  background-color: #a7dca7;
+}
+.lb{
+  background-color: #b3ccd7;
+}
+.ly{
+  background-color: #eeee67;
+}
 .offer-slide-item{
   background: rgb(2,0,36);
   background: radial-gradient(circle, rgba(2,0,36,1) 0%, rgba(3,51,2,0.782125350140056) 0%, rgba(0,212,255,0.07904411764705888) 0%, rgba(153,182,201,1) 99%);
@@ -578,6 +621,20 @@ input[type="text"][dir="rtl"] {
 .modal-com {
   transition: all 0.1s ease-in-out;
 }
+
+@media print {
+  body .modal-com{
+    height: 100%;
+    overflow: hidden;
+  }
+  .job-action-modal-body button, .message-modal-header button {
+    display: none;
+  }
+  .message-modal-wrapper .message-table{
+    height: 100%;
+    overflow-y: hidden;
+  }
+}
 /* TODO: =================================modal end================================= */
 /* TODO: =================================login ================================= */
 .btn-login {
@@ -775,13 +832,15 @@ TODO: Responsive ===========================
 }
 
 /* Update table scrollbar */
-.update-table::-webkit-scrollbar-track, .update-table > *::-webkit-scrollbar-track{
+.update-table::-webkit-scrollbar-track, .update-table > *::-webkit-scrollbar-track,
+.market-pop::-webkit-scrollbar-track{
   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1);
   background-color: transparent;
   border-radius: 10px;
 }
 
-.update-table::-webkit-scrollbar, .update-table > *::-webkit-scrollbar {
+.update-table::-webkit-scrollbar, .update-table > *::-webkit-scrollbar,
+.market-pop::-webkit-scrollbar {
   width: 10px;
   background-color: transparent;
 }
@@ -794,6 +853,15 @@ TODO: Responsive ===========================
   background: linear-gradient(134.38deg, #f539f8 0%, #c342f9 43.55%, #5356fb 104.51%);
 }
 
+.market-pop::-webkit-scrollbar-thumb {
+  border-radius: 100px;
+  
+  /* background-color: #fafafa; */
+  /* background: linear-gradient(134.38deg, #f539f8 0%, #c342f9 43.55%, #5356fb 104.51%); */
+  background: rgb(236,237,241);
+  background: linear-gradient(90deg, rgba(236,237,241,1) 0%, rgba(252,252,252,1) 31%, rgba(255,255,255,0.9416141456582633) 41%, rgba(255,255,255,0.9752275910364145) 61%, rgba(252,252,252,1) 71%, rgba(236,237,241,1) 100%);
+}
+
 .input-curve.lg{
   border-radius: 35px !important;
 }

src/middleware/AuthRoute.jsx

@@ -6,29 +6,43 @@ import { useDispatch, useSelector } from "react-redux";
 import { updateUserDetails } from "../store/UserDetails";
 import { updateJobs } from "../store/jobLists";
 import { updateUserJobList } from "../store/userJobList";
+import { commonHeadBanner } from "../store/CommonHeadBanner";
 
 const AuthRoute = ({ redirectPath = "/login", children }) => {
   const apiCall = useMemo(() => new usersService(), []);
   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
     };
 
     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
@@ -106,6 +121,19 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
     getMarketActiveJobList();
   }, [apiCall, dispatch]);
 
+  //FUNCTION TO GET COMMON HEAD DATA
+  useEffect(()=>{
+    apiCall.getHeroJBanners().then((res) => {
+      if (res.data.internal_return < 0) {
+        return;
+      }
+      dispatch(commonHeadBanner(res.data));
+    })
+    .catch((error) => {
+      console.log('ERROR ', error)
+    });
+  },[])
+
   return isLogin.loading ? (
     <LoadingSpinner size="32" color="sky-blue" height="h-screen" />
   ) : // Stills needs fixing

src/services/UsersService.js

@@ -16,9 +16,10 @@ class usersService {
     return this.postAuxEnd("/completesignuplink", reqData);
   }
 
+  // FUNCTION TO GET USER CURRENT TASK DUE TIME
   getHomeDate() {
     var postData = {
-      uuid: localStorage.getItem("uid"),
+      // uuid: localStorage.getItem("uid"),
       uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
@@ -212,6 +213,21 @@ 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"),
+      job_mode: "ACTIVE",
+      limit: 30,
+      offset: 0,
+      action: 13008,
+      ...reqData
+    };
+    return this.postAuxEnd("/jobmanageractive", postData);
+  }
+
   // Task for the person doing the job
   getMyActiveTaskList() {
     var postData = {
@@ -229,6 +245,32 @@ class usersService {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
+      job_mode: "ACTIVE",
+      page: 0,
+      offset: 0,
+      limit: 100,
+    };
+    return this.postAuxEnd("/jobmanageractive", postData);
+  }
+
+  getMyPastDueJobList() {
+    var postData = {
+      uuid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      job_mode: "PASTDUE",
+      page: 0,
+      offset: 0,
+      limit: 100,
+    };
+    return this.postAuxEnd("/jobmanageractive", postData);
+  }
+  getMyReviewDueJobList() {
+    var postData = {
+      uuid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      job_mode: "REVIEW",
       page: 0,
       offset: 0,
       limit: 100,
@@ -452,6 +494,31 @@ class usersService {
     return this.postAuxEnd("/accounttypes", postData);
   }
 
+  // Manage Interest
+  MarketInterest(reqData) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      msg_type: 'JOB',
+      action: 13033,
+      ...reqData
+    };
+    return this.postAuxEnd("/marketinterest", postData);
+  }
+
+  MarketMessage(reqData) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      msg_type: 'JOB',
+      action: 13036,
+      ...reqData
+    };
+    return this.postAuxEnd("/marketmessage", postData);
+  }
+
   // END POINT TO ACCEPT TERMS AND AGREEMENT
   jobManagerAgree() {
     var postData = {
@@ -549,7 +616,9 @@ class usersService {
     for (let data in postData) {
       formData.append(data, postData[data]);
     }
-    return this.postAuxEnd("/uploads", formData);
+  //  return this.postAuxEnd("/uploads", formData);
+
+    return this.postAuxEnd("/uploads", postData);
   }
 
   // END POINT TO DELETE  A JOB

src/store/CommonHeadBanner.js

@@ -0,0 +1,20 @@
+import { createSlice } from "@reduxjs/toolkit";
+
+const initialState = {
+  commonHeadBanner: {}
+};
+
+export const commonHeadBannerSlice = createSlice({
+  name: "commonHeadBanner",
+  initialState,
+  reducers: {
+    commonHeadBanner: (state,action) => {
+      state.commonHeadBanner = {...action.payload}
+    },
+  },
+});
+
+// Action creators are generated for each case reducer function
+export const { commonHeadBanner } = commonHeadBannerSlice.actions;
+
+export default commonHeadBannerSlice.reducer;

src/store/store.js

@@ -5,6 +5,7 @@ import userDetailReducer from "./UserDetails";
 import jobReducer from "./jobLists";
 import tableReloadReducer from "./TableReloads";
 import userJobListReducer from './userJobList'
+import commonHeadBannerReducer from './CommonHeadBanner'
 
 export default configureStore({
   reducer: {
@@ -12,6 +13,7 @@ export default configureStore({
     userDetails: userDetailReducer,
     jobLists: jobReducer,
     tableReload: tableReloadReducer,
-    userJobList: userJobListReducer
+    userJobList: userJobListReducer,
+    commonHeadBanner: commonHeadBannerReducer
   },
 });

src/views/BlogPage.jsx

@@ -0,0 +1,13 @@
+import React, { useContext, useState, useEffect } from "react";
+import BlogItem from "../components/Blogs";
+import { useSelector } from "react-redux";
+
+export default function BlogPage() {
+    let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
+
+    return (
+        <>
+            <BlogItem  commonHeadData={commonHeadBanner.result_list} />
+        </>
+    );
+}

src/views/HomePages.jsx

@@ -1,29 +1,17 @@
 import React, {useState, useEffect} from 'react'
 import Home from "../components/Home";
 import usersService from "../services/UsersService";
+
+import { useSelector } from 'react-redux';
+
 export default function HomePages() {
 
-   // const [marketActiveJobList, setMarketActiveJobList] = useState([]);
-    const [bannerList, setBannerList] = useState([]);
-    const api = new usersService();
-
-    const getHeroJBannersList = async () => {
-        try {
-            const res = await api.getHeroJBanners();
-           // console.log("BANNERS->",res.data);
-            setBannerList(res.data?.result_list);
-        } catch (error) {
-            console.log("Error getting BANNERS....");
-        }
-    };
-    useEffect(() => {
-        getHeroJBannersList();
-    }, []);
+  const {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
 
   return (
     <>
       <Home
-          bannerList={bannerList}
+          bannerList={commonHeadBanner?.result_list}
       />
     </>
   );

src/views/MarketPlacePage.jsx

@@ -1,16 +1,15 @@
 import MarketPlace from "../components/MarketPlace";
 
+import { useSelector } from "react-redux";
+
 export default function MarketPlacePage() {
 
-    const commonHeadData =()=>{
-        console.log("COMMON HEAD DATA ----------------=====---------------------");
-        return 0;
-    }
+  let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
 
   return (
     <>
       <MarketPlace
-          commonHeadData={commonHeadData} />
+          commonHeadData={commonHeadBanner?.result_list} />
     </>
   );
 }

src/views/MyActiveJobsPage.jsx

@@ -2,12 +2,10 @@ import React, { useContext,useState, useEffect } from "react";
 import usersService from "../services/UsersService";
 //import MyJobs from "../components/MyJobs";
 import MyActiveJobs from "../components/MyActiveJobs";
+import { useSelector } from "react-redux";
 
 export default function MyActiveJobsPage() {
-    const commonHeadData =()=>{
-        console.log("COMMON HEAD DATA ----------------=====---------------------");
-        return 0;
-    }
+    let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
     const [MyJobList, setMyJobList] = useState([]);
     const api = new usersService();
 //TARGET ENDPOINT[POST]http://10.204.5.100:9083/en/wrench/api/v1/jobmanageractive
@@ -28,7 +26,7 @@ export default function MyActiveJobsPage() {
         <>
             <MyActiveJobs
                 MyJobList={MyJobList}
-                commonHeadData={commonHeadData}
+                commonHeadData={commonHeadBanner.result_list}
             />
         </>
     );

src/views/MyCouponPage.jsx

@@ -1,10 +1,11 @@
 import React from "react";
-import WalletRoutes from "../components/MyWallet/Wallet";
+//import WalletRoutes from "../components/MyWallet/Wallet";
+import MyCoupons from "../components/MyCoupons/MyCoupons";
 
 export default function MyCouponPage() {
     return (
         <>
-            <WalletRoutes />
+            <MyCoupons />
         </>
     );
 }

src/views/MyJobsPage.jsx

@@ -7,10 +7,7 @@ import MyJobs from "../components/MyJobs";
 import { useSelector } from "react-redux";
 
 export default function MyJobsPage() {
-  const commonHeadData = () => {
-    console.log("COMMON HEAD DATA ----------------=====---------------------");
-    return 0;
-  };
+  let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
 
   const {userJobList} = useSelector((state) => state.userJobList)
   
@@ -38,7 +35,7 @@ export default function MyJobsPage() {
   // debugger;
   return (
     <>
-      <MyJobs MyJobList={userJobList} commonHeadData={commonHeadData} />
+      <MyJobs MyJobList={userJobList} commonHeadData={commonHeadBanner.result_list} />
     </>
   );
 }

src/views/MyPastDueJobsPage.jsx

@@ -0,0 +1,34 @@
+import React, { useContext,useState, useEffect } from "react";
+import usersService from "../services/UsersService";
+//import MyJobs from "../components/MyJobs";
+//import MyActiveJobs from "../components/MyActiveJobs";
+import MyPastDueJobs from "../components/MyActiveJobs/MyPastDueJobs";
+import { useSelector } from "react-redux";
+
+export default function MyPastDueJobsPage() {
+    let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
+    const [MyJobList, setMyJobList] = useState([]);
+    const api = new usersService();
+//TARGET ENDPOINT[POST]http://10.204.5.100:9083/en/wrench/api/v1/jobmanageractive
+    const getMyJobList = async () => {
+        try {
+            const res = await api.getMyPastDueJobList();
+            setMyJobList(res.data);
+        } catch (error) {
+            console.log("Error getting mode");
+        }
+    };
+    useEffect(() => {
+        getMyJobList();
+    }, []);
+
+    // debugger;
+    return (
+        <>
+            <MyPastDueJobs
+                MyJobList={MyJobList}
+                commonHeadData={commonHeadBanner?.result_list}
+            />
+        </>
+    );
+}

src/views/MyPendingJobsPage.jsx

@@ -3,12 +3,10 @@ import usersService from "../services/UsersService";
 //import MyJobs from "../components/MyJobs";
 import MyActiveJobs from "../components/MyActiveJobs";
 import MyPendingJobs from "../components/MyPendingJobs";
+import { useSelector } from "react-redux";
 
 export default function MyPendingJobsPage() {
-    const commonHeadData =()=>{
-        console.log("COMMON HEAD DATA ----------------=====---------------------");
-        return 0;
-    }
+    let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
     const [MyJobList, setMyJobList] = useState([]);
     const api = new usersService();
 
@@ -29,7 +27,7 @@ export default function MyPendingJobsPage() {
         <>
             <MyPendingJobs
                 MyJobList={MyJobList}
-                commonHeadData={commonHeadData}
+                commonHeadData={commonHeadBanner.result_list}
             />
         </>
     );

src/views/MyReviewDueJobsPage.jsx

@@ -0,0 +1,31 @@
+import React, { useContext,useState, useEffect } from "react";
+import usersService from "../services/UsersService";
+import MyReviewDueJobs from "../components/MyActiveJobs/MyReviewDueJobs";
+import { useSelector } from "react-redux";
+
+export default function MyReviewDueJobsPage() {
+    let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
+    const [MyJobList, setMyJobList] = useState([]);
+    const api = new usersService();
+    const getMyJobList = async () => {
+        try {
+            const res = await api.getMyReviewDueJobList();
+            setMyJobList(res.data);
+        } catch (error) {
+            console.log("Error getting mode");
+        }
+    };
+    useEffect(() => {
+        getMyJobList();
+    }, []);
+
+    // debugger;
+    return (
+        <>
+            <MyReviewDueJobs
+                MyJobList={MyJobList}
+                commonHeadData={commonHeadBanner.result_list}
+            />
+        </>
+    );
+}

src/views/MyTaskPage.jsx

@@ -8,6 +8,8 @@ import { useSelector } from "react-redux";
 export default function MyTaskPage() {
   const { myTaskTable } = useSelector((state) => state.tableReload);
 
+  let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
+
   const [MyActiveJobList, setMyActiveJobList] = useState({
     loading: true,
     status: false,
@@ -15,10 +17,7 @@ export default function MyTaskPage() {
   });
   const [MyActiveOffersList, setMyActiveOffersList] = useState([]);
   const api = new usersService();
-  const commonHeadData = () => {
-    console.log("COMMON HEAD DATA ----------------=====---------------------");
-    return 0;
-  };
+
   const getMyActiveJobList = async () => {
     setMyActiveJobList({ loading: true, status: false, data: [] });
     try {
@@ -53,7 +52,7 @@ export default function MyTaskPage() {
     <MyTasks
       ActiveJobList={MyActiveJobList}
       MyActiveOffersList={MyActiveOffersList}
-      commonHeadData={commonHeadData}
+      commonHeadData={commonHeadBanner?.result_list}
     />
   );
 }

src/views/OffersInterestPage.jsx

@@ -0,0 +1,13 @@
+import React, { useContext, useState, useEffect } from "react";
+import BlogItem from "../components/Blogs";
+import { useSelector } from "react-redux";
+
+export default function OffersInterestPage() {
+    let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
+
+    return (
+        <>
+            <BlogItem  commonHeadData={commonHeadBanner.result_list} />
+        </>
+    );
+}