From a674688dce3a84cc5d76fcb6869949b935e1b0e5 Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Wed, 5 Jul 2023 20:52:34 +0100
Subject: [PATCH] family current task added

---
 src/components/Cards/FamilyActiveJobsCard.jsx | 23 +++++++++++--------
 src/components/Home/FamilyActiveLSlde.jsx     |  5 +++-
 src/components/Home/FamilyDash.jsx            |  8 +++++--
 src/components/Home/index.jsx                 | 22 +++++++++++++++---
 src/components/MyTasks/MyJobTable.jsx         |  3 ++-
 5 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/src/components/Cards/FamilyActiveJobsCard.jsx b/src/components/Cards/FamilyActiveJobsCard.jsx
index f5acae3..6aca49b 100644
--- a/src/components/Cards/FamilyActiveJobsCard.jsx
+++ b/src/components/Cards/FamilyActiveJobsCard.jsx
@@ -1,11 +1,15 @@
 import { useState } from "react";
-import { Link } from "react-router-dom";
+import { Link, useLocation } from "react-router-dom";
 import { toast } from "react-toastify";
 import localImgLoad from "../../lib/localImgLoad";
 import CountDown from "../Helpers/CountDown";
 import Icons from "../Helpers/Icons";
 
 export default function FamilyActiveJobsCard({ datas, hidden = false }) {
+
+    let { pathname } = useLocation();
+    console.log('TESTING11111',datas)
+
     const [imageUrl, setImageUrl] = useState("");
     const [addFavorite, setValue] = useState(false);
     const [options, setOption] = useState(false);
@@ -19,7 +23,6 @@ export default function FamilyActiveJobsCard({ datas, hidden = false }) {
         }
     };
 
-
     return (
         <div className="card-style-one flex flex-col justify-between w-full h-[387px] bg-white dark:bg-dark-white   p-3 pb rounded-2xl">
             <div className="content">
@@ -30,8 +33,8 @@ export default function FamilyActiveJobsCard({ datas, hidden = false }) {
                         className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4"
                         style={{
                             background: `url(${localImgLoad(
-                                `images/${datas.thumbnil}`
-                            )}) 0% 0% / cover no-repeat`,
+                                `images/taskbanners/${datas.banner}`
+                            )}) center / contain no-repeat`,
                         }}
                     >
               {/*          <div className="product-options flex justify-between relative">*/}
@@ -75,7 +78,8 @@ export default function FamilyActiveJobsCard({ datas, hidden = false }) {
                 <div className="details">
                     {/* product title */}
                     <Link
-                        to="/active-bids"
+                        to="/manage-active-job"
+                        state={{ ...datas, pathname }}
                         className="text-xl font-bold text-dark-gray dark:text-white mb-2 capitalize line-clamp-1"
                     >
                         {datas.title}
@@ -87,7 +91,7 @@ export default function FamilyActiveJobsCard({ datas, hidden = false }) {
                                 Task Code
                             </p>
                             <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
-                                {datas.price}
+                                {datas.contract}
                             </p>
                         </div>
                         <div className="w-[1px] h-full bg-[#E3E4FE] dark:bg-[#a7a9b533] "></div>
@@ -96,15 +100,16 @@ export default function FamilyActiveJobsCard({ datas, hidden = false }) {
                                 Remaining Time
                             </p>
                             <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
-                                <CountDown lastDate={datas.remaing} />
+                                <CountDown lastDate={datas.delivery_date} />
                             </p>
                         </div>
                     </div>
                 </div>
             </div>
-            <div className="card-buttons flex items-center space-x-2">
+            <div className="card-buttons flex justify-end items-center space-x-2">
                 <Link
-                    to="/active-bids"
+                    to="/manage-active-job"
+                    state={{ ...datas, pathname }}
                     className="btn-shine w-[98px] h-[33px] text-white rounded-full text-sm bg-pink flex justify-center items-center"
                 >
                     View
diff --git a/src/components/Home/FamilyActiveLSlde.jsx b/src/components/Home/FamilyActiveLSlde.jsx
index cb55b29..6d7ff35 100644
--- a/src/components/Home/FamilyActiveLSlde.jsx
+++ b/src/components/Home/FamilyActiveLSlde.jsx
@@ -9,13 +9,14 @@ export default function FamilyActiveLSlde({ className, trending }) {
         arrows: false,
         slidesToShow: 3,
         slidesToScroll: 3,
-        infinite: true,
+        infinite: trending?.length > 3,
         responsive: [
             {
                 breakpoint: 1025,
                 settings: {
                     slidesToShow: 3,
                     slidesToScroll: 3,
+                    infinite: trending?.length > 3,
                 },
             },
             {
@@ -23,6 +24,7 @@ export default function FamilyActiveLSlde({ className, trending }) {
                 settings: {
                     slidesToShow: 2,
                     slidesToScroll: 2,
+                    infinite: trending?.length > 2,
                 },
             },
             {
@@ -30,6 +32,7 @@ export default function FamilyActiveLSlde({ className, trending }) {
                 settings: {
                     slidesToShow: 1,
                     slidesToScroll: 1,
+                    infinite: trending?.length > 1,
                 },
             },
         ],
diff --git a/src/components/Home/FamilyDash.jsx b/src/components/Home/FamilyDash.jsx
index ae85faa..1895363 100644
--- a/src/components/Home/FamilyDash.jsx
+++ b/src/components/Home/FamilyDash.jsx
@@ -6,16 +6,20 @@ import FamilyActiveLSlde from "./FamilyActiveLSlde";
 import ParentWaiting from "../MyPendingJobs/ParentWaiting";
 import MyOffersFamilyTable from "../MyTasks/MyOffersFamilyTable";
 
-export default function FamilyDash({familyOffers}) {
+export default function FamilyDash({familyOffers, MyActiveJobList}) {
   console.log("PROPS IN FAMILY DASH->", familyOffers);
 
-  const trending = datas.datas;
+  const trending = MyActiveJobList;
   return (
     <div>
       <div className="home-page-wrapper">
         {/* <CommonHead commonHeadData={props.commonHeadData} /> */}
         <MyOffersFamilyTable familyOffers={familyOffers} className="mb-10" />
+
+        {trending && trending.length > 0 &&
         <FamilyActiveLSlde trending={trending} className="mb-10" />
+        }
+        
         {/*<TopSellerTopBuyerSliderSection className="mb-10" />*/}
         <ParentWaiting className="mb-10" />
       </div>
diff --git a/src/components/Home/index.jsx b/src/components/Home/index.jsx
index 1890b71..42da14f 100644
--- a/src/components/Home/index.jsx
+++ b/src/components/Home/index.jsx
@@ -8,15 +8,26 @@ import FullAccountDash from "./FullAccountDash";
 
 export default function Home(props) {
   console.log("PROPS IN HOME->", props);
+  const userApi = new usersService();
+  const { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
 
   let [nextDueTask, setNextDueTask] = useState({});
   const [MyOffersList, setMyOffersList] = useState([]);
 
-  const userApi = new usersService();
-
   const { userDetails } = useSelector((state) => state?.userDetails);
 
-  const { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
+  const [MyActiveJobList, setMyActiveJobList] = useState([]); // STATE TO HOLD ACTIVE/CURRENT TASKS
+
+  const getMyActiveJobList = async () => { // FUNCTION TO POPULATE ACTIVE/CURRENT TASK LIST
+    try {
+      const res = await userApi.getMyActiveTaskList();
+      setMyActiveJobList(res?.data?.result_list);
+    } catch (error) {
+      setMyActiveJobList([]);
+      console.log("Error getting tasks");
+    }
+  };
+
 
   // FUNCTION TO GET DASH DATA TO DETERMINE CURRENT TASK DUE TIME
   const getHomeDate = () => {
@@ -50,6 +61,10 @@ export default function Home(props) {
     fetchData();
   }, []);
 
+  useEffect(() => {
+    getMyActiveJobList();
+  }, []);
+
   return (
     <Layout>
       <div className="home-page-wrapper">
@@ -58,6 +73,7 @@ export default function Home(props) {
             account={userDetails}
             commonHeadData={props.bannerList}
             familyOffers={MyOffersList}
+            MyActiveJobList={MyActiveJobList}
           />
         ) : userDetails && userDetails?.account_type == "FULL" ? (
           <FullAccountDash
diff --git a/src/components/MyTasks/MyJobTable.jsx b/src/components/MyTasks/MyJobTable.jsx
index a283bfd..40efcc3 100644
--- a/src/components/MyTasks/MyJobTable.jsx
+++ b/src/components/MyTasks/MyJobTable.jsx
@@ -5,6 +5,7 @@ import { handlePagingFunc } from "../Pagination/HandlePagination";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import { useNavigate, useLocation } from "react-router-dom";
 import { PriceFormatter } from "../Helpers/PriceFormatter";
+import localImgLoad from "../../lib/localImgLoad";
 
 const noTasksBg = require("../../assets/images/no-task-background.jpg");
 const noFamilyTasksBg = require("../../assets/images/family-no-task-background.jpg");
@@ -80,7 +81,7 @@ export default function MyJobTable({ className, ActiveJobList, Account }) {
                     <div className="flex space-x-2 items-center">
                       <div className="w-full min-w-[60px] max-w-[60px] flex-[0.1] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
                         <img
-                          src={dataImage1}
+                          src={localImgLoad(`images/taskbanners/${task?.banner}`)}
                           alt="data"
                           className="w-full h-full"
                         />