changed login type tab and made login route to home page without loading again once user logs in

Merge branch 'suggested-task-page' of WrenchBoard/Users-Wrench into master
Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into suggested-task-page
2023-07-07 09:51:54 +01:00 · 2023-07-07 03:12:17 +00:00 · 2023-07-07 03:25:29 +01:00 · 2023-07-07 03:25:09 +01:00 · 2023-07-07 01:51:34 +00:00 · 2023-07-07 02:46:25 +01:00
40 changed files with 1543 additions and 1068 deletions
@@ -108,7 +108,7 @@ export default function Login() {
        localStorage.setItem("uid", `${res.data.uid}`);
        localStorage.setItem("session_token", `${res.data.session}`);
        // localStorage.setItem("session", `${res.data.session}`);
-        dispatch(updateUserDetails(res.data));
+        dispatch(updateUserDetails({...res.data, loggedIn:true}));
        setTimeout(() => {
          navigate("/", { replace: true });
          setLoginLoading(false);
@@ -139,24 +139,37 @@ export default function Login() {

  // In order to update the selected login type whenever the component renders
  // useEffect(() => {
-  //   document.cookie.includes("loginType=family") ? "loginfamily" : "loginfull"
-
-        // Set the loginType cookie to remember the user's selection
-      // document.cookie = "loginType=family; expires=Session; path=/;";
-
-            // Clear the loginType cookie if the user switches to loginfull
+      // Clear the loginType cookie if the user switches to loginfull
      // document.cookie ="loginType=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
  // }, []);

  useLayoutEffect(()=>{ // checks the cookie in order to set the login type before components mounts
-    if(document.cookie.includes("loginType=family")){
-      setLoginType('family')
-    }else if(document.cookie.includes("loginType=full")){
-      setLoginType('full')
-    }else{
-      setLoginType('full')
+    // if(document.cookie.includes("loginType=family")){
+    //   setLoginType('family')
+    // }else if(document.cookie.includes("loginType=full")){
+    //   setLoginType('full')
+    // }else{
+    //   setLoginType('full')
+    // }
+    function readCookie(cname) { // checks the cookie in order to set the login type before components mounts
+      let name = cname + "=";
+      let decoded_cookie = decodeURIComponent(document.cookie);
+      let carr = decoded_cookie.split(';');
+      for(let i=0; i<carr.length;i++){
+        let c = carr[i];
+        while(c.charAt(0)==' '){
+            c=c.substring(1);
+        }
+        if(c.indexOf(name) == 0) {
+            return c.substring(name.length, c.length);
+        }
+      }
+      return 'full'
    }
+    let loginValue = readCookie('loginType')
+    setLoginType(loginValue)
  },[])
+  

  useEffect(() => {
    setMail("");
@@ -194,11 +207,11 @@ export default function Login() {
              </div>

              {/* switch login component */}
-              <div className="flex justify-start items-end">
+              <div className="flex justify-start items-center gap-3">
                <button
                  name="full"
-                  className={`px-2 py-1 w-[100px] text-left h-[40px] text-lg font-bold text-[#4687ba] hover:text-[#009ef7] tracking-wide transition outline-none border-2 border-b-0 border-r-0 border-[#4687ba] ${
-                    loginType=='full' && "border-r-2 h-[45px]"
+                  className={`login-type-btn px-4 py-1 rounded-t-[3px] transition duration-200 ${
+                    loginType=='full' ? "bg-white text-[#000] border-t-[3px] border-[#4687ba]" : "bg-[#4687ba] text-white"
                  }`}
                  onClick={handleLoginType}
                >
@@ -206,8 +219,8 @@ export default function Login() {
                </button>
                <button
                  name="family"
-                  className={`px-2 py-1 w-[100px] text-left h-[40px] text-lg font-bold text-[#4687ba] hover:text-[#009ef7] tracking-wide transition outline-none border-2 border-b-0 border-l-0 border-[#4687ba] ${
-                    loginType=='family' && "border-l-2 h-[45px]"
+                  className={`login-type-btn px-4 py-1 rounded-t-[3px] transition duration-200 ${
+                    loginType=='family' ? "bg-white text-[#000] border-t-[3px] border-[#4687ba]" : "bg-[#4687ba] text-white"
                  }`}
                  onClick={handleLoginType}
                >
@@ -9,13 +9,13 @@ export default function AvailableJobsCard({
  className,
  datas,
  hidden = false,
-  contentDisplay
+  contentDisplay,
 }) {
  //debugger;
  const [marketPopUp, setMarketPopUp] = useState({ show: false, data: {} });
  const [imageUrl, setImageUrl] = useState("");

-  let thePrice = PriceFormatter(  
+  let thePrice = PriceFormatter(
    datas?.price * 0.01,
    datas?.currency_code,
    datas?.currency
@@ -27,121 +27,136 @@ export default function AvailableJobsCard({
  }, []);
  return (
    <>
-    {contentDisplay == 'grid' ?
-      <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">
+      {contentDisplay == "grid" ? (
+        <div
+          className={`card-style-two w-full h-[426px] p-[20px] bg-white dark:bg-dark-white   rounded-2xl section-shadow ${
+            className || ""
+          }`}
+        >
+          <div
+            onClick={() => {
+              setMarketPopUp({ show: true, data: datas });
+            }}
+            className="flex flex-col justify-between w-full h-full"
+          >
            <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 bg-center bg-cover bg-no-repeat"
-              style={{
-                backgroundImage: `url('${imageUrl}')`,
-              }}
-            >
-              <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">
-                    {/* {thePrice} | {datas.timeline_days} day(s) */}
-                    {thePrice}
+                  <p className="text-thin-light-gray text-sm leading-3">
+                    Added
                  </p>
-                  <p className="text-sm text-lighter-gray">
-                    ( {datas.offer_code}) |
-                    <span className="italic ml-1">
-                      {datas.timeline_days} day(s)
-                    </span>
+                  <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"
-                  onClick={() => {
-                    setMarketPopUp({ show: true, data: datas });
-                  }}
-                >
-                  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 bg-center bg-cover bg-no-repeat"
+                style={{
+                  backgroundImage: `url('${imageUrl}')`,
+                }}
+              >
+                <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">
+                      {/* {thePrice} | {datas.timeline_days} day(s) */}
+                      {thePrice}
+                    </p>
+                    <p className="text-sm text-lighter-gray">
+                      ( {datas.offer_code}) |
+                      <span className="italic ml-1">
+                        {datas.timeline_days} day(s)
+                      </span>
+                    </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>
-    :
-      <div className="card-style-two w-full p-8 my-2 flex items-center gap-4 bg-white dark:bg-dark-white rounded-2xl section-shadow">
-        <div className="flex gap-5 items-center w-full">
-          <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] min-w-[60px] max-w-[60px]">
-            <img src={dataImage2} alt="data" className="w-full h-full" />
-          </div>
-          <div className="flex flex-col flex-[0.9]">
-            <Link to="/shop-details" className="">
-              <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+      ) : (
+        <div className="card-style-two w-full p-8 my-2 flex items-center gap-4 bg-white dark:bg-dark-white rounded-2xl section-shadow">
+          <div className="flex gap-5 items-center w-full">
+            <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] min-w-[60px] max-w-[60px]">
+              <img src={dataImage2} alt="data" className="w-full h-full" />
+            </div>
+            <div className="flex flex-col flex-[0.9]">
+              <h1
+                onClick={() => {
+                  setMarketPopUp({ show: true, data: datas });
+                }}
+                className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize"
+              >
                {datas?.title}
              </h1>
-            </Link>

-            <div className="my-2">
-              <p className="text-dark-gray dark:text-white">{datas?.description}</p>
-            </div>
+              <div
+                onClick={() => {
+                  setMarketPopUp({ show: true, data: datas });
+                }}
+                className="my-2"
+              >
+                <p className="text-dark-gray dark:text-white">
+                  {datas?.description}
+                </p>
+              </div>

-            {/* <div className="card-two-info flex gap-2 items-center">
+              {/* <div className="card-two-info flex gap-2 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>
@@ -162,40 +177,37 @@ export default function AvailableJobsCard({
                </div>
              </div>
            </div> */}
-            <div className="block sm:flex flex-wrap gap-4">
-              <p className="text-sm text-thin-light-gray flex flext-start gap-1">
-                Price: <span className="text-purple">{thePrice}</span>
-              </p>
-              <p className="text-sm text-thin-light-gray">
-                Duration:{" "}
-                <span className="text-purple italic">
-                  {" "}
-                  {datas?.timeline_days} day(s)
-                </span>
-              </p>
-              <p className="text-sm text-thin-light-gray">
-                Code:{" "}
-                <span className="text-purple">
-                  {" "}
-                  {datas?.offer_code}
-                </span>
-              </p>
+              <div className="block sm:flex flex-wrap gap-4">
+                <p className="text-sm text-thin-light-gray flex flext-start gap-1">
+                  Price: <span className="text-purple">{thePrice}</span>
+                </p>
+                <p className="text-sm text-thin-light-gray">
+                  Duration:{" "}
+                  <span className="text-purple italic">
+                    {" "}
+                    {datas?.timeline_days} day(s)
+                  </span>
+                </p>
+                <p className="text-sm text-thin-light-gray">
+                  Code:{" "}
+                  <span className="text-purple"> {datas?.offer_code}</span>
+                </p>
+              </div>
            </div>
          </div>
+          <div className="">
+            <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 className="">
-          <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>
-    }
+      )}
      {marketPopUp.show && (
        <MarketPopUp
          details={datas}
@@ -0,0 +1,119 @@
+import { useState } from "react";
+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();
+
+    const [imageUrl, setImageUrl] = useState("");
+    const [addFavorite, setValue] = useState(false);
+    const [options, setOption] = useState(false);
+    const favoriteHandler = () => {
+        if (!addFavorite) {
+            setValue(true);
+            toast.success("Added to Favorite List");
+        } else {
+            setValue(false);
+            toast.warn("Remove to Favorite List");
+        }
+    };
+
+    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">
+                {/* thumbnail */}
+                <div className="w-full h-40">
+                    {/* thumbnail image */}
+                    <div
+                        className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4"
+                        style={{
+                            background: `url(${localImgLoad(
+                                `images/taskbanners/${datas.banner}`
+                            )}) center / contain no-repeat`,
+                        }}
+                    >
+              {/*          <div className="product-options flex justify-between relative">*/}
+              {/*<span*/}
+              {/*    onClick={favoriteHandler}*/}
+              {/*    className={`w-7 h-7 bg-white   rounded-full flex justify-center items-center  cursor-pointer ${*/}
+              {/*        addFavorite ? "text-pink" : "  text-dark-gray"*/}
+              {/*    }`}*/}
+              {/*>*/}
+              {/*  <Icons name="love" />*/}
+              {/*</span>*/}
+              {/*              <span*/}
+              {/*                  onClick={() => setOption(!options)}*/}
+              {/*                  className="w-7 h-7 flex justify-center items-center bg-white  rounded-full cursor-pointer"*/}
+              {/*              >*/}
+              {/*  <Icons name="dots" />*/}
+              {/*</span>*/}
+              {/*              {options && (*/}
+              {/*                  <div*/}
+              {/*                      onClick={() => setOption(!options)}*/}
+              {/*                      className="w-full h-screen fixed top-0 left-0 z-10"*/}
+              {/*                  ></div>*/}
+              {/*              )}*/}
+              {/*              <div*/}
+              {/*                  style={{ boxShadow: "0px 4px 87px 0px #0000002B" }}*/}
+              {/*                  className={`drop-down-content w-[80px] bg-white dark:bg-dark-white   rounded-[4px] p-2.5 absolute right-0 top-[100%] z-20 ${*/}
+              {/*                      options ? "active" : ""*/}
+              {/*                  }`}*/}
+              {/*              >*/}
+
+              {/*              </div>*/}
+              {/*          </div>*/}
+                        {hidden && (
+                            <div className="flex justify-center">
+
+                            </div>
+                        )}
+                    </div>
+                </div>
+                {/* details */}
+                <div className="details">
+                    {/* product title */}
+                    <Link
+                        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}
+                    </Link>
+                    {/* countdown */}
+                    <div className="w-full h-[54px] flex justify-evenly items-center p-2 rounded-lg border border-[#E3E4FE] dark:border-[#a7a9b533] ">
+                        <div className="flex flex-col justify-between">
+                            <p className="text-sm text-thin-light-gray dark:text-white tracking-wide">
+                                Task Code
+                            </p>
+                            <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
+                                {datas.contract}
+                            </p>
+                        </div>
+                        <div className="w-[1px] h-full bg-[#E3E4FE] dark:bg-[#a7a9b533] "></div>
+                        <div className="flex flex-col justify-between">
+                            <p className="text-sm text-thin-light-gray dark:text-white tracking-wide">
+                                Remaining Time
+                            </p>
+                            <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
+                                <CountDown lastDate={datas.delivery_date} />
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div className="card-buttons flex justify-end items-center space-x-2">
+                <Link
+                    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
+                </Link>
+            </div>
+        </div>
+    );
+}
@@ -0,0 +1,108 @@
+import localImgLoad from "../../lib/localImgLoad";
+import CountDown from "../Helpers/CountDown";
+import { PriceFormatter } from "../Helpers/PriceFormatter";
+
+export default function OfferCard({ datas, hidden = false, setOfferPopout }) {
+  let thePrice = PriceFormatter(
+    datas?.price * 0.01,
+    datas?.currency_code,
+    datas?.currency
+  );
+
+  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">
+        {/* thumbnail */}
+        <div className="w-full h-40">
+          {/* thumbnail image */}
+          <div
+            className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4"
+            style={{
+              background: `url(${localImgLoad(
+                `images/taskbanners/${datas.banner}`
+              )}) center / contain no-repeat`,
+            }}
+          >
+            {hidden && <div className="flex justify-center"></div>}
+          </div>
+        </div>
+        {/* details */}
+        <div className="details">
+          <h1 className="text-xl font-bold text-dark-gray dark:text-white mb-2 capitalize line-clamp-1">
+            {datas.title}
+          </h1>
+          {/* countdown */}
+          {/* <div className="w-full h-[54px] flex justify-evenly items-center p-2 rounded-lg border border-[#E3E4FE] dark:border-[#a7a9b533] ">
+                        <div className="flex flex-col justify-between">
+                            <p className="text-sm text-thin-light-gray dark:text-white tracking-wide">
+                                Task Code
+                            </p>
+                            <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
+                                {datas.contract}
+                            </p>
+                        </div>
+                        <div className="w-[1px] h-full bg-[#E3E4FE] dark:bg-[#a7a9b533] "></div>
+                        <div className="flex flex-col justify-between">
+                            <p className="text-sm text-thin-light-gray dark:text-white tracking-wide">
+                                Remaining Time
+                            </p>
+                            <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
+                                <CountDown lastDate={datas.expire} />
+                            </p>
+                        </div>
+                    </div> */}
+          <div className="w-full p-2 rounded-lg border border-[#E3E4FE] dark:border-[#a7a9b533] ">
+            <div className="grid grid-cols-2 gap-2">
+              <div className="flex flex-col justify-between items-center border-r-2">
+                <p className="text-sm text-thin-light-gray dark:text-white tracking-wide">
+                  Task Code
+                </p>
+                <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
+                  {datas.contract}
+                </p>
+              </div>
+              <div className="flex flex-col justify-between items-center">
+                <p className="text-sm text-red-500 tracking-wide">Expires</p>
+                <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
+                  <CountDown lastDate={datas.expire} />
+                </p>
+              </div>
+            </div>
+
+            <hr className="my-2" />
+
+            <div className="grid grid-cols-2 gap-2">
+              <div className="flex flex-col justify-between items-center border-r-2">
+                <p className="text-sm text-thin-light-gray dark:text-white tracking-wide">
+                  Reward
+                </p>
+                <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
+                  {thePrice}
+                </p>
+              </div>
+              <div className="flex flex-col justify-between items-center">
+                <p className="text-sm text-thin-light-gray dark:text-white tracking-wide">
+                  Timeline
+                </p>
+                <p className="text-base font-bold tracking-wide   text-dark-gray dark:text-white">
+                  {`${datas.timeline_days} day(s)`}
+                </p>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div className="card-buttons flex justify-end items-center space-x-2">
+        <button
+          type="button"
+          onClick={() =>
+            setOfferPopout({ show: true, data: { ...datas, thePrice } })
+          }
+          className="btn-shine w-[98px] h-[33px] text-white rounded-full text-sm bg-pink flex justify-center items-center"
+        >
+          Start Task
+        </button>
+      </div>
+    </div>
+  );
+}
@@ -1,8 +1,8 @@
-import React, { useState, useEffect } from "react";
-import Layout from "../Partials/Layout";
-import FamilyManageTabs from "./Tabs/FamilyManageTabs";
+import React, { useEffect, useState } from "react";
 import { useLocation, useNavigate } from "react-router-dom";
+import Layout from "../Partials/Layout";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
+import FamilyManageTabs from "./FamilyManageTabs";

 export default function FamilyManage() {
  const [selectTab, setValue] = useState("today");
@@ -11,7 +11,7 @@ export default function FamilyManage() {
  let location = useLocation();
  let navigate = useNavigate();
  let accountDetails = location?.state;
-  
+
  //   tab handler
  const filterHandler = (value) => {
    setValue(value);
@@ -0,0 +1,251 @@
+import React, {
+  Suspense,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { useReactToPrint } from "react-to-print";
+import profile from "../../assets/images/profile-info-profile.png";
+import usersService from "../../services/UsersService";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import AssignTaskPopout from "./FamilyPopout/AssignTaskPopout";
+import {
+  FamilyWaitlist,
+  FamilyAccount,
+  FamilyProfile,
+  FamilyTasks,
+  ProfileInfo,
+  FamilyPending,
+} from "./Tabs";
+
+export default function FamilyManageTabs({
+  className,
+  accountDetails,
+  listReload,
+  loader,
+}) {
+  const [details, setDetails] = useState({
+    familyDetails: { loading: false, data: null },
+    familyTasks: { loading: false, data: null },
+    familyWaitList: { loading: false, data: null },
+    familyPending: { loading: false, data: null },
+  });
+  const [errMsg, setErrMsg] = useState("");
+  const [familyTaskPopout, setFamilyTaskPopout] = useState(false);
+
+  const familyPopUpHandler = () => {
+    setFamilyTaskPopout((prev) => !prev);
+  };
+
+  const [profileImg, setProfileImg] = useState(profile);
+  const profileImgInput = useRef(null);
+
+  const browseProfileImg = () => {
+    profileImgInput.current.click();
+  };
+
+  const profileImgChangeHandler = (e) => {
+    if (e.target.value !== "") {
+      const imgReader = new FileReader();
+      imgReader.onload = (event) => {
+        setProfileImg(event.target.result);
+      };
+      imgReader.readAsDataURL(e.target.files[0]);
+    }
+  };
+
+  const apiCall = useMemo(() => new usersService(), []);
+
+  const manageFamily = useCallback(async () => {
+    try {
+      setDetails({
+        familyDetails: { loading: true },
+        familyTasks: { loading: true },
+        familyWaitList: { loading: true },
+        familyPending: { loading: true },
+      });
+
+      const { family_uid } = accountDetails;
+      const reqData = { family_uid };
+
+      const [familyRes, tasksRes, familyWaitRes, familyPending] =
+        await Promise.all([
+          apiCall.ManageFamily(reqData),
+          apiCall.ManageTasks(reqData),
+          apiCall.ManageFamilyWaitlist(),
+          apiCall.ManageFamilyPending(),
+        ]);
+
+      const familyData = familyRes.data;
+      const tasksData = tasksRes.data;
+      const familyWaitData = familyWaitRes.data;
+      const familyPendingData = familyPending.data;
+
+      if (
+        familyData?.internal_return < 0 ||
+        tasksData?.internal_return < 0 ||
+        familyWaitData?.internal_return < 0 ||
+        familyPendingData?.internal_return < 0
+      )
+        return;
+
+      setDetails({
+        familyDetails: { loading: false, data: familyData },
+        familyTasks: { loading: false, data: tasksData },
+        familyWaitList: { loading: false, data: familyWaitData },
+        familyPending: { loading: false, data: familyPendingData },
+      });
+    } catch (error) {
+      setDetails({
+        familyDetails: { loading: false },
+        familyTasks: { loading: false },
+        familyWaitList: { loading: false },
+        familyPending: { loading: false },
+      });
+      setErrMsg("An error occurred");
+      throw new Error(error);
+    }
+  }, [apiCall, accountDetails]);
+
+  const accountRef = useRef();
+
+  const useHandlePrint = useReactToPrint({
+    content: () => accountRef.current,
+  });
+
+  const tabs = [
+    { id: 1, name: "Tasks" },
+    { id: 2, name: "Waiting" },
+    { id: 3, name: "Pending" },
+    { id: 4, name: "Account" },
+    { id: 5, name: "Profile" },
+  ];
+
+  const [tab, setTab] = useState(tabs[0].name);
+
+  const tabHandler = (value) => {
+    setTab(value);
+  };
+
+  const tabComponents = {
+    Tasks: (
+      <FamilyTasks
+        className={className}
+        loader={details.familyTasks.loading}
+        familyData={details.familyTasks.data}
+        accountDetails={accountDetails}
+      />
+    ),
+    Waiting: (
+      <FamilyWaitlist
+        familyData={details.familyWaitList.data}
+        accountDetails={accountDetails}
+        loader={details.familyWaitList.loading}
+      />
+    ),
+    Pending: (
+      <FamilyPending
+        familyData={details.familyPending.data}
+        accountDetails={accountDetails}
+        loader={details.familyWaitList.loading}
+      />
+    ),
+    Account: (
+      <FamilyAccount
+        familyData={details.familyDetails.data}
+        myRef={accountRef}
+        loader={details.familyDetails.loading}
+        handlePrint={useHandlePrint}
+      />
+    ),
+    Profile: <FamilyProfile />,
+  };
+
+  const defaultTabComponent = (
+    <FamilyTasks
+      className={className}
+      loader={details.familyTasks.loading}
+      familyData={details.familyTasks.data}
+      accountDetails={accountDetails}
+    />
+  );
+
+  const selectedTabComponent = tabComponents[tab] || defaultTabComponent;
+
+  useEffect(() => {
+    manageFamily();
+  }, [tab, manageFamily]);
+
+  return (
+    <div
+      className={`w-full bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow min-h-[520px] max-h-[600px] ${
+        className || ""
+      }`}
+    >
+      <div className="relative w-full overflow-x-auto sm:rounded-lg">
+        <Suspense
+          fallback={
+            <div className="h-full min-h-[500px] w-full overflow-hidden flex justify-center items-center">
+              <LoadingSpinner size="16" color="sky-blue" />
+            </div>
+          }
+        >
+          <div className="w-full h-full text-sm text-left text-gray-500 dark:text-gray-400 relative grid grid-cols-4 min-h-[520px]">
+            <div className="border-r border-[#E3E4FE] dark:border-[#a7a9b533] p-6 h-full">
+              <ProfileInfo
+                profileImg={profileImg}
+                profileImgInput={profileImgInput}
+                profileImgChangeHandler={profileImgChangeHandler}
+                browseProfileImg={browseProfileImg}
+                accountDetails={accountDetails}
+              />
+            </div>
+            <div className="col-span-3 justify-self-end h-full w-full">
+              <div className="flex flex-col w-full">
+                <div className="w-full pr-8 flex items-center gap-1">
+                  <ul className="flex gap-2 items-center border-b border-b-[#FAFAF] w-full">
+                    {tabs.map(({ name, id }) => (
+                      <li
+                        onClick={() => tabHandler(name)}
+                        className={`p-4 flex hover:text-purple transition-all ease-in-out items-center cursor-pointer overflow-hidden text-xl relative top-[2px] ${
+                          tab === name
+                            ? "text-purple border-r"
+                            : "text-thin-light-gray"
+                        }`}
+                        key={id}
+                      >
+                        <h1>{name}</h1>
+                      </li>
+                    ))}
+                  </ul>
+                  <button
+                    type="button"
+                    onClick={familyPopUpHandler}
+                    className="p-1 my-1 w-[100px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                  >
+                    Add task
+                  </button>
+                </div>
+                <div className="flex-[0.9] lg:min-h-[450px] h-full">
+                  <div className="h-full p-4 border border-[#dbd9d9] relative overflow-y-auto">
+                    {selectedTabComponent}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </Suspense>
+      </div>
+
+      {familyTaskPopout && (
+        <AssignTaskPopout
+          action={familyPopUpHandler}
+          situation={familyTaskPopout}
+          familyDetails={details.familyDetails.data}
+        />
+      )}
+    </div>
+  );
+}
@@ -1,6 +1,5 @@
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import Layout from "../Partials/Layout";
-import DataIteration from "../Helpers/DataIteration";
 import SearchCom from "../Helpers/SearchCom";
 import FamilyMarketCard from "../Cards/FamilyMarketCard";
 import usersService from "../../services/UsersService";
@@ -0,0 +1,56 @@
+import { forwardRef } from 'react'
+import QRCode from 'react-qr-code';
+
+const FamilyAccount = forwardRef(({ familyData, myRef, handlePrint }, ref) => {
+    return (
+      <div
+        className="w-full lg:min-h-[500px] h-full flex flex-col items-center justify-center"
+        ref={myRef}
+      >
+        <div className="update-table w-full lg:min-h-[450px] h-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow ">
+          <div className="flex items-center justify-around h-[380px]">
+            <div className="flex flex-col">
+              <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">
+                  {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">
+                  {familyData?.pin ? familyData?.pin : "please wait..."}
+                </span>
+              </h2>
+            </div>
+  
+            <span className="text-5xl text-gray-400 opacity-20 font-bold">
+              or
+            </span>
+  
+            <div className="max-w-[200px]">
+              <p className="text-xl tracking-wide mb-[15px] text-center font-bold text-dark-gray dark:text-white">
+                Scan the code from mobile app
+              </p>
+              <QRCode
+                size={256}
+                style={{ height: "auto", maxWidth: "100%", width: "100%" }}
+                value={`https://www.google.com`}
+                viewBox={`0 0 256 256`}
+              />
+            </div>
+          </div>
+          <div className="h-[50px] w-full flex justify-center items-center">
+            <button
+              className="btn-shine w-[116px] h-[46px] text-white rounded-full text-base bg-pink flex justify-center items-center"
+              onClick={handlePrint}
+            >
+              Print
+            </button>
+          </div>
+        </div>
+      </div>
+    );
+  });
+
+export default FamilyAccount
@@ -1,342 +0,0 @@
-import React, {
-  Suspense,
-  forwardRef,
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-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";
-
-import AssignTaskPopout from '../FamilyPopout/AssignTaskPopout'
-
-
-export default function FamilyManageTabs({
-  className,
-  accountDetails,
-  listReload,
-  loader,
-}) {
-  const [details, setDetails] = useState({
-    familyDetails: {
-      loading: false,
-      data: null,
-    },
-    familyTasks: {
-      loading: false,
-      data: null,
-    },
-  });
-  const [errMsg, setErrMsg] = useState("");
-  // List of tabs
-  const tabs = [
-    {
-      id: 1,
-      name: "Tasks",
-    },
-    {
-      id: 2,
-      name: "Account",
-    },
-    {
-      id: 3,
-      name: "Profile",
-    },
-  ];
-  const [tab, setTab] = useState(tabs[0].name);
-  const tabHandler = (value) => {
-    setTab(value);
-  };
-
-  let [familyTaskPopout, setFamilyTaskPopout] = useState(false) // DETERMINES WHEN FAMILY ADD TASK POPOUT DISPLAYS
-
-  const familyPopUpHandler = () => { // FUNCTION TO CHANGE THE FAMILY ADD TASK POPOIUT STATE
-    setFamilyTaskPopout(prev => !prev)
-  }
-
-  //   For profile uploads
-  const [profileImg, setProfileImg] = useState(profile);
-  // profile img
-  const profileImgInput = useRef(null);
-  const browseProfileImg = () => {
-    profileImgInput.current.click();
-  };
-  const profileImgChangHandler = (e) => {
-    if (e.target.value !== "") {
-      const imgReader = new FileReader();
-      imgReader.onload = (event) => {
-        setProfileImg(event.target.result);
-      };
-      imgReader.readAsDataURL(e.target.files[0]);
-    }
-  };
-
-  //   Api call
-  const apiCall = useMemo(() => new usersService(), []);
-  // function for manage family
-  const manageFamily = useCallback(async () => {
-    try {
-      setDetails({
-        familyDetails: { loading: true },
-        familyTasks: { loading: true },
-      });
-      let { family_uid } = accountDetails;
-      let reqData = { family_uid };
-
-      // 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(() => {
-    manageFamily();
-  }, [tab, manageFamily]);
-
-  const accountRef = useRef();
-  // to handle printing
-  const useHandlePrint = useReactToPrint({
-    content: () => accountRef.current,
-  });
-
-  return (
-    <div
-      className={`w-full bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow min-h-[520px] max-h-[600px] ${
-        className || ""
-      }`}
-    > 
-      <div className="relative w-full overflow-x-auto sm:rounded-lg">
-        <Suspense
-          fallback={
-            <div className="h-full min-h-[500px] w-full overflow-hidden flex justify-center items-center">
-              <LoadingSpinner size="16" color="sky-blue" />
-            </div>
-          }
-        >
-          <div className="w-full h-full text-sm text-left text-gray-500 dark:text-gray-400 relative grid grid-cols-4 min-h-[520px]">
-            <div className="border-r border-[#E3E4FE] dark:border-[#a7a9b533] p-6 h-full">
-              <ProfileInfo
-                profileImg={profileImg}
-                profileImgInput={profileImgInput}
-                profileImgChangHandler={profileImgChangHandler}
-                browseProfileImg={browseProfileImg}
-                accountDetails={accountDetails}
-              />
-            </div>
-            <div className="col-span-3 justify-self-end h-full w-full">
-              <div className="flex flex-col w-full">
-                <div className="w-full pr-8 flex items-center gap-1">
-                  <ul className="flex gap-2 items-center border-b border-b-[#FAFAF] w-full">
-                    {tabs.map(({ name, id }) => (
-                      <li
-                        onClick={() => tabHandler(name)}
-                        className={`p-4 flex hover:text-purple transition-all ease-in-out items-center cursor-pointer overflow-hidden text-xl ${
-                          tab === name
-                            ? "text-purple border-r"
-                            : " text-thin-light-gray"
-                        }`}
-                        key={id}
-                      >
-                        <h1>{name}</h1>
-                      </li>
-                    ))}
-                  </ul>
-                  <button
-                    type="button"
-                    onClick={familyPopUpHandler}
-                    className="p-1 my-1 w-[100px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                  >
-                    Add task
-                    {/* {accountDetails?.firstname} */}
-                  </button>
-                </div>
-                <div className="flex-[0.9] lg:min-h-[450px] h-full">
-                  {/* Your content here */}
-                  {tabs.map(({ name, id }) => {
-                    return (
-                      <div
-                        className={`${
-                          tab === name ? "block" : "hidden"
-                        } h-full p-4 border border-[#dbd9d9] relative overflow-y-auto`}
-                        key={id}
-                      >
-                        {name === "Tasks" && (
-                          <FamilyTasks
-                            className={className}
-                            loader={details.familyTasks.loading}
-                            familyData={details.familyTasks.data}
-                            accountDetails={accountDetails}
-                          />
-                        )}
-                        {name === "Account" && (
-                          <Account
-                            familyData={details.familyDetails.data}
-                            myRef={accountRef}
-                            loader={details.familyDetails.loading}
-                            handlePrint={useHandlePrint}
-                          />
-                        )}
-                        {name === "Profile" && <Profile />}
-                      </div>
-                    );
-                  })}
-                </div>
-              </div>
-            </div>
-          </div>
-        </Suspense>
-      </div>
-
-      {/* FAMILY ADD TASK POPOUT */}
-      {familyTaskPopout &&
-        <AssignTaskPopout 
-          action={familyPopUpHandler}
-          situation={familyTaskPopout}
-          familyDetails={details.familyDetails.data}
-        />
-      }
-    </div>
-  );
-}
-
-function ProfileInfo({
-  profileImg,
-  profileImgInput,
-  profileImgChangHandler,
-  browseProfileImg,
-  accountDetails,
-}) {
-  return (
-    <div className="flex flex-col items-center gap-6">
-      <div className="flex justify-center">
-        <div className="w-full relative">
-          <img
-            src={profileImg}
-            alt=""
-            className="sm:w-[198px] sm:h-[198px] w-[120px] h-[120px] rounded-full overflow-hidden object-cover"
-          />
-          <input
-            ref={profileImgInput}
-            onChange={(e) => profileImgChangHandler(e)}
-            type="file"
-            className="hidden"
-          />
-          <div
-            onClick={browseProfileImg}
-            className="w-[32px] h-[32px] absolute bottom-7 sm:right-2 right-[105px]  hover:bg-pink bg-dark-gray rounded-full cursor-pointer"
-          >
-            <svg
-              width="32"
-              height="32"
-              viewBox="0 0 32 32"
-              fill="none"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M16.5147 11.5C17.7284 12.7137 18.9234 13.9087 20.1296 15.115C19.9798 15.2611 19.8187 15.4109 19.6651 15.5683C17.4699 17.7635 15.271 19.9587 13.0758 22.1539C12.9334 22.2962 12.7948 22.4386 12.6524 22.5735C12.6187 22.6034 12.5663 22.6296 12.5213 22.6296C11.3788 22.6334 10.2362 22.6297 9.09365 22.6334C9.01498 22.6334 9 22.6034 9 22.536C9 21.4009 9 20.2621 9.00375 19.1271C9.00375 19.0746 9.02997 19.0109 9.06368 18.9772C10.4123 17.6249 11.7609 16.2763 13.1095 14.9277C14.2295 13.8076 15.3459 12.6913 16.466 11.5712C16.4884 11.5487 16.4997 11.5187 16.5147 11.5Z"
-                fill="white"
-              />
-              <path
-                d="M20.9499 14.2904C19.7436 13.0842 18.5449 11.8854 17.3499 10.6904C17.5634 10.4694 17.7844 10.2446 18.0054 10.0199C18.2639 9.76139 18.5261 9.50291 18.7884 9.24443C19.118 8.91852 19.5713 8.91852 19.8972 9.24443C20.7251 10.0611 21.5492 10.8815 22.3771 11.6981C22.6993 12.0165 22.7105 12.4698 22.3996 12.792C21.9238 13.2865 21.4443 13.7772 20.9686 14.2717C20.9648 14.2792 20.9536 14.2867 20.9499 14.2904Z"
-                fill="white"
-              />
-            </svg>
-          </div>
-        </div>
-      </div>
-      <div className="flex flex-col justify-center gap-3 items-center">
-        <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
-          {accountDetails?.firstname}
-        </h1>
-        <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
-          {accountDetails?.lastname}
-        </h1>
-        <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
-          {accountDetails?.age}
-        </h1>
-      </div>
-    </div>
-  );
-}
-
-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"
-      ref={myRef}
-    >
-      <div className="update-table w-full lg:min-h-[450px] h-full p-8 bg-white dark:bg-dark-white overflow-hidden rounded-2xl section-shadow ">
-        <div className="flex items-center justify-around h-[380px]">
-          <div className="flex flex-col">
-            <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">
-                {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">
-                {familyData?.pin ? familyData?.pin : "please wait..."}
-              </span>
-            </h2>
-          </div>
-
-          <span className="text-5xl text-gray-400 opacity-20 font-bold">
-            or
-          </span>
-
-          <div className="max-w-[200px]">
-            <p className="text-xl tracking-wide mb-[15px] text-center font-bold text-dark-gray dark:text-white">
-              Scan the code from mobile app
-            </p>
-            <QRCode
-              size={256}
-              style={{ height: "auto", maxWidth: "100%", width: "100%" }}
-              value={`https://www.google.com`}
-              viewBox={`0 0 256 256`}
-            />
-          </div>
-        </div>
-        <div className="h-[50px] w-full flex justify-center items-center">
-          <button
-            className="btn-shine w-[116px] h-[46px] text-white rounded-full text-base bg-pink flex justify-center items-center"
-            onClick={handlePrint}
-          >
-            Print
-          </button>
-        </div>
-      </div>
-    </div>
-  );
-});
-
-function Profile() {
-  return <>Profile</>;
-}
@@ -0,0 +1,154 @@
+import { useState } from "react";
+import { PaginatedList, handlePagingFunc } from "../../Pagination";
+import { PriceFormatter } from "../../Helpers/PriceFormatter";
+import dataImage2 from "../../../assets/images/data-table-user-2.png";
+import PendingJobsPopout from "../../jobPopout/PendingJobsPopout";
+
+export default function FamilyPending({
+  familyData,
+  className,
+  accountDetails,
+  loader,
+}) {
+  let [jobPopout, setJobPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
+
+  let filteredFamilyData = familyData?.result_list?.filter(
+    (data) => data?.family_uid === accountDetails?.family_uid
+  );
+
+  const [currentPage, setCurrentPage] = useState(0);
+  const itemsPerPage = Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const indexOfFirstItem = Number(currentPage);
+  const indexOfLastItem =
+    Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const currentPendingTasks = filteredFamilyData?.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 min-h-[520px] ${
+        className || ""
+      }`}
+    >
+      {filteredFamilyData && (
+        <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>
+              {
+                <>
+                  {currentPendingTasks.length > 0 ? (
+                    currentPendingTasks.map((value, index) => {
+                      let deliveryDate = value?.expire?.split(" ")[0];
+                      let thePrice = PriceFormatter(
+                        value?.price * 0.01,
+                        value?.currency_code,
+                        value?.currency
+                      );
+                      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]">
+                                <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 flex items-start gap-1">
+                                  Price:{" "}
+                                  <span className="text-purple">
+                                    {thePrice}
+                                  </span>
+                                </span>
+                                <div className="flex items-center gap-4">
+                                  <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">
+                                      {" "}
+                                      {deliveryDate}
+                                    </span>
+                                  </span>
+                                  <span className="text-sm text-thin-light-gray">
+                                    Sent to:{" "}
+                                    <span className="text-purple">
+                                      {" "}
+                                      {value.job_to}
+                                    </span>
+                                  </span>
+                                </div>
+                              </div>
+                            </div>
+                          </td>
+
+                          <td className="text-right py-4 px-2">
+                            <button
+                              type="button"
+                              onClick={() => {
+                                setJobPopout({ show: true, data: value });
+                              }}
+                              className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                            >
+                              View
+                            </button>
+                          </td>
+                        </tr>
+                      );
+                    })
+                  ) : (
+                    <tr className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                      <td className="p-2">No Pending Task!</td>
+                    </tr>
+                  )}
+                </>
+              }
+            </tbody>
+          </table>
+          {/* PAGINATION BUTTON */}
+          <PaginatedList
+            onClick={handlePagination}
+            prev={currentPage == 0}
+            next={currentPage + itemsPerPage >= filteredFamilyData.length}
+            data={filteredFamilyData}
+            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>
+  );
+}
@@ -0,0 +1,3 @@
+export default function FamilyProfile() {
+    return <>Profile</>;
+}
@@ -0,0 +1,122 @@
+import { useState } from "react";
+import { handlePagingFunc, PaginatedList } from "../../Pagination";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import SuggestTask from "../../FamilyPopup/SuggestTask";
+
+const FamilyWaitlist = ({ familyData, className, accountDetails, loader }) => {
+  const [popUp, setPopUp] = useState({ show: false, data: {} });
+
+  let filteredFamilyData = familyData?.result_list?.filter(
+    (data) => data?.family_uid === accountDetails?.family_uid
+  );
+
+  const [currentPage, setCurrentPage] = useState(0);
+  const itemsPerPage = Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const indexOfFirstItem = currentPage;
+  const indexOfLastItem = currentPage + itemsPerPage;
+  const currentTask = filteredFamilyData?.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>
+      ) : (
+        <>
+          {filteredFamilyData && (
+            <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>
+                  {currentTask.map((value) => {
+                    const addedDate = value?.added.split(" ")[0];
+                    const selectedImage = require(`../../../assets/images/family/${
+                      value?.banner || "default.jpg"
+                    }`);
+                    return (
+                      <tr
+                        className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50"
+                        key={value.uid}
+                      >
+                        <td className="py-4">
+                          <div className="w-full flex justify-between items-center">
+                            <div className="account-name flex space-x-4 items-center">
+                              <div className="icon w-14 h-14 flex justify-center items-center">
+                                <img
+                                  src={selectedImage}
+                                  alt="task_img"
+                                  className="w-full object-cover"
+                                />
+                              </div>
+                              <div className="">
+                                <p className="text-xl font-bold text-dark-gray dark:text-white mb-2 capitalize line-clamp-1">
+                                  {value.title}
+                                </p>
+                                <p className="text-sm text-thin-light-gray font-medium">
+                                  {value.description}
+                                </p>
+                              </div>
+                            </div>
+                            <div className="px-2 flex flex-col items-center justify-center">
+                              <p className="text-sm font-bold text-dark-gray dark:text-white">
+                                {addedDate}
+                              </p>
+                              <p className="text-xs py-1.5 w-[70px] cursor-default tracking-wide rounded-full bg-gold text-white flex justify-center items-center">
+                                {value.status_text}
+                              </p>
+                            </div>
+                          </div>
+                        </td>
+                        <td className="text-right py-4 px-2">
+                          <button
+                            onClick={() =>
+                              setPopUp({
+                                show: true,
+                                data: { ...value, selectedImage },
+                              })
+                            }
+                            className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                          >
+                            View
+                          </button>
+                        </td>
+                      </tr>
+                    );
+                  })}
+                </tbody>
+              </table>
+              <PaginatedList
+                onClick={handlePagination}
+                prev={currentPage === 0}
+                next={currentPage + itemsPerPage >= filteredFamilyData?.length}
+                data={filteredFamilyData}
+                start={indexOfFirstItem}
+                stop={indexOfLastItem}
+              />
+            </div>
+          )}
+        </>
+      )}
+      {popUp.show && (
+        <SuggestTask
+          details={popUp.data}
+          onClose={() => {
+            setPopUp({ show: false, data: {} });
+          }}
+          situation={popUp.show}
+        />
+      )}
+    </div>
+  );
+};
+
+export default FamilyWaitlist;
@@ -0,0 +1,61 @@
+import React from "react";
+
+export default function ProfileInfo({
+  profileImg,
+  profileImgInput,
+  profileImgChangHandler,
+  browseProfileImg,
+  accountDetails,
+}) {
+  return (
+    <div className="flex flex-col items-center gap-6">
+      <div className="flex justify-center">
+        <div className="w-full relative">
+          <img
+            src={profileImg}
+            alt=""
+            className="sm:w-[198px] sm:h-[198px] w-[120px] h-[120px] rounded-full overflow-hidden object-cover"
+          />
+          <input
+            ref={profileImgInput}
+            onChange={(e) => profileImgChangHandler(e)}
+            type="file"
+            className="hidden"
+          />
+          <div
+            onClick={browseProfileImg}
+            className="w-[32px] h-[32px] absolute bottom-7 sm:right-2 right-[105px]  hover:bg-pink bg-dark-gray rounded-full cursor-pointer"
+          >
+            <svg
+              width="32"
+              height="32"
+              viewBox="0 0 32 32"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M16.5147 11.5C17.7284 12.7137 18.9234 13.9087 20.1296 15.115C19.9798 15.2611 19.8187 15.4109 19.6651 15.5683C17.4699 17.7635 15.271 19.9587 13.0758 22.1539C12.9334 22.2962 12.7948 22.4386 12.6524 22.5735C12.6187 22.6034 12.5663 22.6296 12.5213 22.6296C11.3788 22.6334 10.2362 22.6297 9.09365 22.6334C9.01498 22.6334 9 22.6034 9 22.536C9 21.4009 9 20.2621 9.00375 19.1271C9.00375 19.0746 9.02997 19.0109 9.06368 18.9772C10.4123 17.6249 11.7609 16.2763 13.1095 14.9277C14.2295 13.8076 15.3459 12.6913 16.466 11.5712C16.4884 11.5487 16.4997 11.5187 16.5147 11.5Z"
+                fill="white"
+              />
+              <path
+                d="M20.9499 14.2904C19.7436 13.0842 18.5449 11.8854 17.3499 10.6904C17.5634 10.4694 17.7844 10.2446 18.0054 10.0199C18.2639 9.76139 18.5261 9.50291 18.7884 9.24443C19.118 8.91852 19.5713 8.91852 19.8972 9.24443C20.7251 10.0611 21.5492 10.8815 22.3771 11.6981C22.6993 12.0165 22.7105 12.4698 22.3996 12.792C21.9238 13.2865 21.4443 13.7772 20.9686 14.2717C20.9648 14.2792 20.9536 14.2867 20.9499 14.2904Z"
+                fill="white"
+              />
+            </svg>
+          </div>
+        </div>
+      </div>
+      <div className="flex flex-col justify-center gap-3 items-center">
+        <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+          {accountDetails?.firstname}
+        </h1>
+        <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+          {accountDetails?.lastname}
+        </h1>
+        <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+          {accountDetails?.age}
+        </h1>
+      </div>
+    </div>
+  );
+}
@@ -0,0 +1,15 @@
+import FamilyAccount from "./FamilyAccount";
+import FamilyProfile from "./FamilyProfile";
+import FamilyTasks from "./FamilyTasks";
+import FamilyWaitlist from "./FamilyWaitlist";
+import FamilyPending from "./FamilyPending";
+import ProfileInfo from "./ProfileInfo";
+
+export {
+  FamilyAccount,
+  FamilyProfile,
+  FamilyTasks,
+  FamilyWaitlist,
+  FamilyPending,
+  ProfileInfo,
+};
@@ -1,27 +1,36 @@
-import React, { useMemo, useState } from "react";
+import { useState } from "react";
+import { useLocation } from "react-router-dom";
 import ModalCom from "../Helpers/ModalCom";
 import { Form, Formik } from "formik";
 import InputCom from "../Helpers/Inputs/InputCom";
 import usersService from "../../services/UsersService";
+import Icons from "../Helpers/Icons";

 const DEFAULT_IMAGE = require("../../assets/images/family/default.jpg");
 const SuggestTask = ({ details, onClose, situation }) => {
+  const { pathname, state } = useLocation();
  const [submitTask, setSubmitTask] = useState({
    loading: false,
    msg: "",
    state: "",
  });
-  // default image
+  const [suggestedNextStep, setSuggestedNextStep] = useState("Send Task");
+
+  const switchNextStep = (value) => {
+    setSuggestedNextStep(value);
+  };
+
  const selectedImage = details?.selectedImage || DEFAULT_IMAGE;
  const initialValues = {
    title: details?.title || "",
    description: details?.description || "",
+    banner: details?.banner,
  };

  const apiCall = new usersService();

  const handleSubmit = async (values) => {
-    if(!values.title && !values.description) return;
+    if (!values.title && !values.description) return;
    try {
      setSubmitTask({ loading: true });
      const reqData = { ...values };
@@ -39,12 +48,16 @@ const SuggestTask = ({ details, onClose, situation }) => {
      throw new Error("Error Occurred", error);
    }
  };
+
+  // console.log("state >-->>", state);
  return (
    <ModalCom action={onClose} situation={situation}>
      <div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
        <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-base md:text-lg font-bold text-dark-gray dark:text-white tracking-wide">
-            Suggest to Parent
+            {pathname === "/manage-family"
+              ? `${state?.firstname}'s Suggested Task`
+              : "Suggest to Parent"}
          </h1>
          <button
            type="button"
@@ -72,16 +85,19 @@ const SuggestTask = ({ details, onClose, situation }) => {
            </svg>
          </button>
        </div>
-        <Formik initialValues={initialValues} onSubmit={handleSubmit}>
+        <Formik
+          initialValues={initialValues}
+          onSubmit={pathname !== "/manage-family" && handleSubmit}
+        >
          {(props) => {
            return (
              <Form>
                <div className="p-5 w-full bg-white rounded-md flex justify-between">
+                  {/* Image Section */}
                  <div className="p-4 w-full md:w-2/4 md:border-r-2">
                    <div
                      className="w-full h-[236px] p-6 bg-gray-400 rounded-xl overflow-hidden"
                      style={{
-                        // background: `url(${selectedImage}) 0% 0% / cover no-repeat`,
                        background: `url(${selectedImage}) center / contain no-repeat`,
                      }}
                    ></div>
@@ -92,10 +108,17 @@ const SuggestTask = ({ details, onClose, situation }) => {
                    {/* Title */}
                    <div className="field w-full mb-[15px]">
                      <InputCom
-                        fieldClass="px-6"
+                        fieldClass={
+                          pathname === "/manage-family" ? "px-2" : "px-6"
+                        }
                        label="Title"
                        labelClass="tracking-wide"
-                        inputBg="bg-slate-100"
+                        inputBg={
+                          pathname === "/manage-family"
+                            ? "bg-white"
+                            : "bg-slate-100"
+                        }
+                        inputClass="disabled:cursor-default"
                        type="text"
                        name="title"
                        disable={details?.title}
@@ -127,7 +150,11 @@ const SuggestTask = ({ details, onClose, situation }) => {
                      <textarea
                        id="description"
                        rows="5"
-                        className={`input-field px-3 pt-2 placeholder:text-base text-dark-gray dark:text-white w-full h-[130px] bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] rounded-[10px]`}
+                        className={`input-field pt-2 placeholder:text-base text-dark-gray dark:text-white w-full ${
+                          pathname === "/manage-family"
+                            ? "px-2 h-[110px]"
+                            : "bg-slate-100 px-3 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] rounded-[10px] h-[130px]"
+                        }`}
                        style={{ resize: "none" }}
                        name="description"
                        value={props.values.description}
@@ -135,6 +162,53 @@ const SuggestTask = ({ details, onClose, situation }) => {
                        onBlur={props.handleBlur}
                      />
                    </div>
+
+                    {/* Radio buttons for family */}
+                    {pathname === "/manage-family" && (
+                      <div className="h-[20px] w-full border-t dark:border-[#5356fb29] border-light-purple relative">
+                        <div id="my-radio-group" className="sr-only">
+                          Parent suggested next step
+                        </div>
+                        <div
+                          role="group"
+                          className="flex items-center justify-between py-2"
+                          aria-labelledby="parent-suggested-radio-group"
+                        >
+                          {[
+                            { title: "Send Task" },
+                            { title: "Duplicate" },
+                            { title: "Not Now" },
+                          ].map(({ title }, idx) => (
+                            <label
+                              role="group"
+                              key={idx}
+                              htmlFor="parent-suggested"
+                            >
+                              <input
+                                type="radio"
+                                name="parent-suggested"
+                                value={title}
+                                checked={title == suggestedNextStep}
+                                onChange={switchNextStep}
+                                className={`transition duration-150 ease-in-out parent-suggest`}
+                              />
+                              <span
+                                onClick={switchNextStep}
+                                className={`ml-1 ${
+                                  title == "Not Now"
+                                    ? "text-red-500"
+                                    : title == "Duplicate"
+                                    ? "text-purple"
+                                    : "text-black"
+                                } font-semibold`}
+                              >
+                                {title}
+                              </span>
+                            </label>
+                          ))}
+                        </div>
+                      </div>
+                    )}
                  </div>
                </div>
                <div className="w-full h-[70px] border-t border-light-purple dark:border-[#5356fb29]  flex justify-end items-center">
@@ -146,21 +220,31 @@ const SuggestTask = ({ details, onClose, situation }) => {
                    >
                      <span className="text-gradient"> Cancel</span>
                    </button>
-
-                    <button
-                      type="submit"
-                      disabled={props.isSubmitting}
-                      className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full"
-                    >
-                      {submitTask.loading
-                        ? "Submitting Task"
-                        : submitTask.state == "success"
-                        ? "Task Submitted"
-                        : submitTask.state == "bad"
-                        ? "An Error Occurred"
-                        : "Send to Parents"}
-                    </button>
-                    {/* )} */}
+                    {pathname !== "/manage-family" ? (
+                      <button
+                        type="submit"
+                        disabled={props.isSubmitting}
+                        className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full transition duration-150 ease-in-out"
+                      >
+                        {submitTask.loading
+                          ? "Submitting Task"
+                          : submitTask.state == "success"
+                          ? "Task Submitted"
+                          : submitTask.state == "bad"
+                          ? "An Error Occurred"
+                          : "Send to Parents"}
+                      </button>
+                    ) : (
+                      <button className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full flex items-center transition duration-150 ease-in-out">
+                        {suggestedNextStep == "Send Task" ? (
+                          <>
+                            Continue <Icons name="chevron-right" />
+                          </>
+                        ) : (
+                          "Complete"
+                        )}
+                      </button>
+                    )}
                  </div>
                </div>
              </Form>
@@ -1,8 +1,8 @@
 import React from "react";

-import ATMCard from '../../assets/images/card.svg'
-import VisaCard from '../../assets/images/visa.svg'
-import MasterCard from '../../assets/images/master.svg'
+import ATMCard from "../../assets/images/card.svg";
+import VisaCard from "../../assets/images/visa.svg";
+import MasterCard from "../../assets/images/master.svg";

 export default function Icons({ name }) {
  return (
@@ -472,6 +472,21 @@ export default function Icons({ name }) {
        >
          <rect y="0.823242" width="20" height="2.35294" rx="1.17647" />
        </svg>
+      ) : name === "chevron-right" ? (
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          fill="none"
+          viewBox="0 0 24 24"
+          stroke-width="1.5"
+          stroke="currentColor"
+          className="w-4 h-4"
+        >
+          <path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            d="M8.25 4.5l7.5 7.5-7.5 7.5"
+          />
+        </svg>
      ) : name === "right-arrow" ? (
        <svg
          width="24"
@@ -76,7 +76,7 @@ export default function InputCom({
        )}
      </div>
      <div
-        className={`input-wrapper border w-full rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base ${inputClass}`}
+        className={`input-wrapper w-full rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-base ${inputClass ? inputClass : "text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] border"}`}
      >
        <input
          placeholder={placeholder}
@@ -1,20 +1,22 @@
 import React, { useRef } from "react";
-import ProductCardStyleOne from "../Cards/ProductCardStyleOne";
+//import ProductCardStyleOne from "../Cards/ProductCardStyleOne";
 import Icons from "../Helpers/Icons";
 import SliderCom from "../Helpers/SliderCom";
+import FamilyActiveJobsCard from "../Cards/FamilyActiveJobsCard";

 export default function FamilyActiveLSlde({ className, trending }) {
    const settings = {
        arrows: false,
-        slidesToShow: 4,
-        slidesToScroll: 4,
-        infinite: true,
+        slidesToShow: 3,
+        slidesToScroll: 3,
+        infinite: trending?.length > 3,
        responsive: [
            {
                breakpoint: 1025,
                settings: {
                    slidesToShow: 3,
                    slidesToScroll: 3,
+                    infinite: trending?.length > 3,
                },
            },
            {
@@ -22,6 +24,7 @@ export default function FamilyActiveLSlde({ className, trending }) {
                settings: {
                    slidesToShow: 2,
                    slidesToScroll: 2,
+                    infinite: trending?.length > 2,
                },
            },
            {
@@ -29,6 +32,7 @@ export default function FamilyActiveLSlde({ className, trending }) {
                settings: {
                    slidesToShow: 1,
                    slidesToScroll: 1,
+                    infinite: trending?.length > 1,
                },
            },
        ],
@@ -89,12 +93,12 @@ export default function FamilyActiveLSlde({ className, trending }) {
                </div>
            </div>
            {/* trending products */}
-            <div className="trending-products relative w-full">
+            <div className="trending-products slider-left relative w-full rounded-2xl p-[10px] bg-alice-blue">
                <SliderCom selector={trendingSlider} settings={settings}>
                    {trending &&
                        trending.length > 0 &&
                        trending.map((item) => (
-                            <ProductCardStyleOne key={item.id} datas={item} />
+                            <FamilyActiveJobsCard key={item.id} datas={item} />
                        ))}
                </SliderCom>
            </div>
@@ -6,16 +6,21 @@ import FamilyActiveLSlde from "./FamilyActiveLSlde";
 import ParentWaiting from "../MyPendingJobs/ParentWaiting";
 import MyOffersFamilyTable from "../MyTasks/MyOffersFamilyTable";

-export default function FamilyDash(props) {
-  console.log("PROPS IN FAMILY DASH->", props);
+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 MyActiveOffersList={trending} className="mb-10" />
+        {familyOffers && familyOffers.length > 0 &&
+        <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>
@@ -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
@@ -1,8 +1,8 @@
 import React, { useEffect, useMemo, useState } from "react";
 import DataIteration from "../Helpers/DataIteration";
 import AvailableJobsCard from "../Cards/AvailableJobsCard";
-import ListView from '../../assets/images/list-view.png'
-import GridView from '../../assets/images/grid-view.svg'
+import ListView from "../../assets/images/list-view.png";
+import GridView from "../../assets/images/grid-view.svg";
 import SelectBox from "../Helpers/SelectBox";

 export default function MainSection({
@@ -17,7 +17,7 @@ export default function MainSection({
  );
  const [tab, setTab] = useState(Object.keys(marketCategories)[0]);

-  let [contentDisplay, setContentDisplay] = useState('grid') // STATE TO HOLD LIST VIEW STYLE
+  let [contentDisplay, setContentDisplay] = useState("grid"); // STATE TO HOLD LIST VIEW STYLE

  // Convert to array in order to map
  const mappedArray = Object.entries(marketCategories).map(([key, value]) => {
@@ -29,8 +29,8 @@ export default function MainSection({
    setTab(value);
  };

-   // Handles the category selection on mobile view
-   const handleSetCategory = (value) => {
+  // Handles the category selection on mobile view
+  const handleSetCategory = (value) => {
    for (let i in marketCategories) {
      if (marketCategories[i] == value) {
        setTab(i);
@@ -57,7 +57,7 @@ export default function MainSection({
            <div className="hidden lg:flex md:space-x-8 space-x-2">
              {mappedArray.map(({ key, value }) => (
                <span
-                key={key}
+                  key={key}
                  onClick={() => tabHandler(key)}
                  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 === key
@@ -76,30 +76,43 @@ export default function MainSection({
                datas={Object.values(marketCategories)}
                className="Update-table-dropdown"
                contentBodyClasses="w-auto min-w-max"
-                position='left'
+                position="left"
              />
            </div>
          </div>
          {/* contentDisplay toggler */}
          <div className="p-2 w-[35px] h-[35px] bg-white dark:bg-slate-200 rounded-lg">
-              <img 
-                title={contentDisplay=='grid'? 'list view' : 'grid view'}
-                onClick={()=>setContentDisplay((prev)=>prev=='grid'? 'list' : 'grid')}
-                src={contentDisplay=='grid'? ListView : GridView}
-                className="w-full h-full cursor-pointer" alt="view" 
-              />
+            <img
+              title={contentDisplay == "grid" ? "list view" : "grid view"}
+              onClick={() =>
+                setContentDisplay((prev) => (prev == "grid" ? "list" : "grid"))
+              }
+              src={contentDisplay == "grid" ? ListView : GridView}
+              className="w-full h-full cursor-pointer"
+              alt="view"
+            />
          </div>
          {/* end of contentDisplay toggler */}
        </div>
        <div className="filter-navigate-content w-full min-h-screen">
-          <div className={contentDisplay == 'grid' ? 'grid lg:grid-cols-3 sm:grid-cols-2 gap-[30px]' : 'w-full'}>
+          <div
+            className={
+              contentDisplay == "grid"
+                ? "grid lg:grid-cols-3 sm:grid-cols-2 gap-[30px]"
+                : "w-full"
+            }
+          >
            <DataIteration
              datas={products}
              startLength={process.env.REACT_APP_ZERO_STATE}
              endLength={products?.length}
            >
              {({ datas }) => (
-                <AvailableJobsCard contentDisplay={contentDisplay} key={datas.id} datas={datas} />
+                <AvailableJobsCard
+                  contentDisplay={contentDisplay}
+                  key={datas.id}
+                  datas={datas}
+                />
              )}
            </DataIteration>
          </div>
@@ -95,7 +95,7 @@ export default function ParentWaitingTable() {
                                <div className="w-full flex justify-between items-center">
                                    <div className="account-name flex space-x-4 items-center">
                                        <div className="icon w-14 h-14 flex justify-center items-center">
-                                            <img src={Image} alt="" className="" />
+                                            <img src={Image} alt="" className="w-full h-full" />
                                        </div>
                                        <div className="">
                                            <p className="text-xl font-bold text-dark-gray dark:text-white mb-2 capitalize line-clamp-1">
@@ -107,12 +107,12 @@ export default function ParentWaitingTable() {
                                            </p>
                                        </div>
                                    </div>
-                                    <div className="px-2">
+                                    <div className="px-2 self-end">
                                        <p className="text-sm font-bold text-dark-gray dark:text-white">
                                            {new Date(item.added).toLocaleString().split(',')[0]}
                                            
                                        </p>
-                                        <p className="text-sm text-dark-gray dark:text-white">Status: {item.status}</p>
+                                        <p className="text-xs py-1.5 w-[50px] tracking-wide rounded-full bg-gold text-white flex justify-center items-center">{item.status_text}</p>
                                    </div>
                                </div>
                            </li>
@@ -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");
@@ -52,7 +53,7 @@ export default function MyJobTable({ className, ActiveJobList, Account }) {
    >
      {/* Adding this dark overlay in order to see the texts properly */}
      {!ActiveJobList?.data.length && accountType && (
-        <div class="absolute inset-0 bg-black opacity-30"></div>
+        <div className="absolute inset-0 bg-black opacity-30"></div>
      )}
      {ActiveJobList?.data.length > 0 && ActiveJobList.loading && (
        <div className="w-full h-[520px] flex items-center justify-center">
@@ -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"
                        />
@@ -151,10 +152,10 @@ export default function MyJobTable({ className, ActiveJobList, Account }) {
                You currently have {accountType ? '"0"' : "no"} task
              </div>
              <div
-                className={
-                  !accountType &&
-                  "bg-[#f0f8ff] h-[17rem] p-5 rounded-md -translate-x-20"
-                }
+                className={`
+                  ${!accountType &&
+                  "bg-[#f0f8ff] h-[17rem] p-5 rounded-md -translate-x-20"}
+                `}
              >
                <button
                  className={`${
@@ -1,160 +1,127 @@
 import { useRef, useState } from "react";
+import OfferCard from "../Cards/OfferCard";
 import Icons from "../Helpers/Icons";
 import SliderCom from "../Helpers/SliderCom";
-
 import OfferJobPopout from "../jobPopout/OfferJobPopout";
-import LoadingSpinner from "../Spinners/LoadingSpinner";
-import { PriceFormatter } from "../Helpers/PriceFormatter";

-export default function MyOffersFamilyTable({ className, MyActiveOffersList }) {
+export default function MyOffersFamilyTable({ className, familyOffers }) {
  let [offerPopout, setOfferPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
  const settings = {
    arrows: false,
-    dots: false,
-    infinite: MyActiveOffersList?.result_list?.length > 4,
-    autoplay: true,
-    slidesToShow: 4,
-    slidesToScroll: 1,
+    slidesToShow: 3,
+    slidesToScroll: 3,
+    infinite: familyOffers?.length > 3,
    responsive: [
      {
-        breakpoint: 426,
+        breakpoint: 1025,
+        settings: {
+          slidesToShow: 3,
+          slidesToScroll: 3,
+          infinite: familyOffers?.length > 3,
+        },
+      },
+      {
+        breakpoint: 769,
        settings: {
          slidesToShow: 2,
+          slidesToScroll: 2,
+          infinite: familyOffers?.length > 2,
+        },
+      },
+      {
+        breakpoint: 619,
+        settings: {
+          slidesToShow: 1,
          slidesToScroll: 1,
-          infinite: MyActiveOffersList?.result_list?.length > 2,
+          infinite: familyOffers?.length > 1,
        },
      },
    ],
  };

-  console.log("YES WE SEE OFFERS", MyActiveOffersList);
-  const sellSlider = useRef(null);
-  //const buySlider = useRef(null);
-  const prevHandler = (value) => {
-    if (value === "sell") {
-      sellSlider.current.slickPrev();
-    }
-    // if (value === "buy") {
-    //     buySlider.current.slickPrev();
-    // }
+  console.log("YES WE SEE OFFERS", familyOffers);
+
+  const trendingSlider = useRef(null);
+  const prevHandler = () => {
+    trendingSlider.current.slickPrev();
  };
-  const nextHandler = (value) => {
-    if (value === "sell") {
-      sellSlider.current.slickNext();
-    }
-    // if (value === "buy") {
-    //     buySlider.current.slickNext();
-    // }
+  const nextHandler = () => {
+    trendingSlider.current.slickNext();
  };

-  if (!MyActiveOffersList || MyActiveOffersList?.result_list?.length == 0) {
+  if (!familyOffers || familyOffers?.result_list?.length == 0) {
    return ""; // want blank or no appear when no items
  }

  return (
    <>
      <div className={`top-seller-top-buyer-wrapper ${className || ""}`}>
-        <div className="top-seller-top-buyer-wrapper-container">
-          <div className="main-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4">
-            <div className="lg:w-2/2 w-full mb-10 lg:mb-0 sm:p-8 p-4 bg-white dark:bg-dark-white   rounded-2xl section-shadow">
-              <div className="heading flex justify-between items-center mb-4">
-                <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
-                  You Have Task(s) Waiting For You
-                </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}>
-                  {MyActiveOffersList &&
-                    MyActiveOffersList?.result_list?.length > 0 &&
-                    MyActiveOffersList?.result_list?.map((value, index) => {
-                      let thePrice = PriceFormatter(
-                        value?.price * 0.01,
-                        value?.currency_code,
-                        value?.currency
-                      );
-                      return (
-                        <div className="item" key={index}>
-                          <div className="offer-slide-item flex flex-col justify-between items-center">
-                            {/* title */}
-                            <div className="flex justify-center">
-                              <p className="text-xl text-dark-gray dark:text-white font-bold mb-2">
-                                {value.title}
-                              </p>
-                            </div>
-                            {/* username */}
-                            <div className="flex flex-col justify-center my-1">
-                              <p className="text-xs text-thin-light-gray">
-                                {value.timeline_days} Days
-                              </p>
-                              <div className="my-2 flex space-x-1 items-center text-purple text-xs">
-                                <span>{thePrice}</span>
-                              </div>
-                            </div>
-                            <button
-                              type="button"
-                              onClick={() => {
-                                setOfferPopout({
-                                  show: true,
-                                  data: {...value, thePrice },
-                                });
-                              }}
-                              className="w-20 h-11 self-center btn-gradient text-base rounded-full text-white"
-                            >
-                              Start Task
-                            </button>
-                          </div>
-                        </div>
-                      );
-                    })}
-                </SliderCom>
-              </div>
+        <div
+          className={`trending-section w-full px-2 sm:px-0 ${className || ""}`}
+        >
+          {/* heading */}
+          <div className="flex justify-between items-center mb-6">
+            <div>
+              <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+                Ready to Start?
+              </h1>
            </div>
+            <div className="slider-btns flex space-x-3">
+              <button onClick={nextHandler} type="button">
+                <div className="trending-slider-left-btn relative text-white w-10 h-10 flex justify-center items-center rounded-full overflow-hidden">
+                  <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>
+              <button onClick={prevHandler} type="button">
+                <div className="trending-slider-right-btn  primary-gradient  text-white w-10 h-10 relative flex justify-center items-center rounded-full ">
+                  <Icons name="arrows" />
+                </div>
+              </button>
+            </div>
+          </div>
+          {/* trending products */}
+          <div className="trending-products slider-left relative w-full rounded-2xl p-[10px] bg-alice-blue">
+            <SliderCom selector={trendingSlider} settings={settings}>
+              {familyOffers &&
+                familyOffers.length > 0 &&
+                familyOffers.map((item) => {
+                  return (
+                    <OfferCard
+                      key={item.id}
+                      datas={item}
+                      setOfferPopout={setOfferPopout}
+                    />
+                  );
+                })}
+            </SliderCom>
          </div>
        </div>

@@ -1,35 +1,45 @@
 import React, { useRef, useState } 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 OfferCard from "../Cards/OfferCard";
 import OfferJobPopout from "../jobPopout/OfferJobPopout";
-import LoadingSpinner from "../Spinners/LoadingSpinner";
-import { PriceFormatter } from "../Helpers/PriceFormatter";

 export default function MyOffersTable({ className, MyActiveOffersList }) {
  let [offerPopout, setOfferPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
+
  const settings = {
    arrows: false,
-    dots: false,
-    infinite: MyActiveOffersList?.result_list?.length > 4,
-    autoplay: true,
-    slidesToShow: 4,
-    slidesToScroll: 1,
+    slidesToShow: 3,
+    slidesToScroll: 3,
+    infinite: MyActiveOffersList?.result_list?.length > 3,
    responsive: [
-      {
-        breakpoint: 426,
-        settings: {
-          slidesToShow: 2,
-          slidesToScroll: 1,
-          infinite: MyActiveOffersList?.result_list?.length > 2,
+        {
+            breakpoint: 1025,
+            settings: {
+                slidesToShow: 3,
+                slidesToScroll: 3,
+                infinite: MyActiveOffersList?.result_list?.length > 3,
+            },
+        },
+        {
+            breakpoint: 769,
+            settings: {
+                slidesToShow: 2,
+                slidesToScroll: 2,
+                infinite: MyActiveOffersList?.result_list?.length > 2,
+            },
+        },
+        {
+            breakpoint: 619,
+            settings: {
+                slidesToShow: 1,
+                slidesToScroll: 1,
+                infinite: MyActiveOffersList?.result_list?.length > 1,
+            },
        },
-      },
    ],
-  };
+};

  console.log("YES WE SEE OFFERS", MyActiveOffersList);
  const sellSlider = useRef(null);
@@ -58,344 +68,64 @@ export default function MyOffersTable({ className, MyActiveOffersList }) {
  return (
    <>
      <div className={`top-seller-top-buyer-wrapper ${className || ""}`}>
-        <div className="top-seller-top-buyer-wrapper-container">
-          <div className="main-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4">
-            <div className="lg:w-2/2 w-full mb-10 lg:mb-0 sm:p-8 p-4 bg-white dark:bg-dark-white   rounded-2xl section-shadow">
-              <div className="heading flex justify-between items-center mb-4">
-                <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
-                  Offers
-                </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"
+        <div className={`trending-section w-full px-2 sm:px-0 ${className || ""}`}>
+          {/* heading */}
+          <div className="flex justify-between items-center mb-6">
+              <div>
+                  <h1 className="text-26 font-bold   text-dark-gray dark:text-white">Ready to Start?</h1>
+              </div>
+              <div className="slider-btns flex space-x-3">
+                  <button onClick={() => nextHandler("sell")} type="button">
+                      <div className="trending-slider-left-btn relative text-white w-10 h-10 flex justify-center items-center rounded-full overflow-hidden">
+                          <svg
+                              width="11"
+                              height="19"
+                              viewBox="0 0 11 19"
+                              fill="none"
+                              xmlns="http://www.w3.org/2000/svg"
                          >
-                            <stop stopColor="#F539F8" />
-                            <stop offset="0.416763" stopColor="#C342F9" />
-                            <stop offset="1" stopColor="#5356FB" />
-                          </linearGradient>
-                        </defs>
-                      </svg>
-                    </div>
+                              <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>
+                  <button onClick={() => prevHandler("sell")} type="button">
+                      <div className="trending-slider-right-btn  primary-gradient  text-white w-10 h-10 relative flex justify-center items-center rounded-full ">
+                          <Icons name="arrows" />
+                      </div>
                  </button>
-                </div>
              </div>
-              <div className="slider-content">
-                <SliderCom settings={settings} selector={sellSlider}>
+          </div>
+          {/* trending products */}
+          <div className="trending-products slider-left relative w-full rounded-2xl p-[10px] bg-alice-blue">
+              <SliderCom selector={sellSlider} settings={settings}>
                  {MyActiveOffersList &&
-                    MyActiveOffersList?.result_list?.length > 0 &&
-                    MyActiveOffersList?.result_list?.map((value, index) => {
-                      let thePrice = PriceFormatter(
-                        value?.price * 0.01,
-                        value?.currency_code,
-                        value?.currency
-                      );
-                      return (
-                        <div className="item" key={index}>
-                          <div className="offer-slide-item flex flex-col justify-between items-center">
-                            {/* title */}
-                            <div className="flex justify-center">
-                              <p className="text-xl text-dark-gray dark:text-white font-bold mb-2">
-                                {value.title}
-                              </p>
-                            </div>
-                            {/* username */}
-                            <div className="flex flex-col justify-center my-1">
-                              <p className="text-xs text-thin-light-gray">
-                                {value.timeline_days} Days
-                              </p>
-                              <div className="my-2 flex space-x-1 items-center text-purple text-xs">
-                                <span>{thePrice}</span>
-                              </div>
-                            </div>
-                            <button
-                              type="button"
-                              onClick={() => {
-                                setOfferPopout({
-                                  show: true,
-                                  data: {...value, thePrice },
-                                });
-                              }}
-                              className="w-20 h-11 self-center btn-gradient text-base rounded-full text-white"
-                            >
-                              Start Task
-                            </button>
-                          </div>
-                        </div>
-                      );
-                    })}
-
-                  {/*            <div className="item">*/}
-                  {/*                /!* img *!/*/}
-                  {/*                <div className="flex justify-center mb-4">*/}
-                  {/*                    <div className=" w-14 h-14 relative">*/}
-                  {/*                        <img src={top2} alt="top" className="w-full h-full" />*/}
-                  {/*                        <div className="absolute right-0 top-0">*/}
-                  {/*                            <svg*/}
-                  {/*                                width="18"*/}
-                  {/*                                height="17"*/}
-                  {/*                                viewBox="0 0 18 17"*/}
-                  {/*                                fill="none"*/}
-                  {/*                                xmlns="http://www.w3.org/2000/svg"*/}
-                  {/*                            >*/}
-                  {/*                                <path*/}
-                  {/*                                    d="M13.3341 14.7394C12.8954 14.7394 12.4564 14.7416 12.0177 14.7375C11.9347 14.7367 11.8877 14.7647 11.8451 14.835C11.4401 15.4977 11.0288 16.1565 10.6273 16.8213C10.5678 16.9196 10.5247 16.9134 10.444 16.8631C9.84979 16.4937 9.25283 16.1283 8.65967 15.7566C8.58338 15.7089 8.53208 15.708 8.45471 15.755C7.84092 16.1275 7.22251 16.4926 6.60872 16.865C6.51805 16.9202 6.48086 16.9117 6.42548 16.8178C6.03646 16.1562 5.63903 15.4993 5.24757 14.8391C5.20251 14.7628 5.15066 14.7373 5.06297 14.7375C4.23961 14.7408 3.41652 14.7397 2.59315 14.7392C2.38765 14.7392 2.41561 14.7563 2.41561 14.5549C2.4148 13.7182 2.41371 12.8812 2.41724 12.0446C2.41778 11.9479 2.39145 11.892 2.30539 11.8396C1.59985 11.4093 0.899185 10.9712 0.193637 10.5406C0.10921 10.4891 0.0950937 10.4578 0.149387 10.3707C0.541931 9.74279 0.926874 9.11 1.31969 8.48236C1.36855 8.40445 1.36611 8.35423 1.31969 8.27768C0.968138 7.69863 0.624187 7.11497 0.272634 6.5362C0.221055 6.45151 0.238972 6.41974 0.317427 6.37332C0.985783 5.97779 1.65088 5.57656 2.31978 5.18157C2.39905 5.13488 2.41751 5.08167 2.41724 4.99697C2.41452 4.12855 2.41778 3.26012 2.41317 2.39169C2.41262 2.27306 2.43624 2.23152 2.566 2.23261C3.39371 2.23912 4.22142 2.23478 5.0494 2.23777C5.13627 2.23804 5.18459 2.21388 5.23183 2.13651C5.64989 1.44996 6.07501 0.767762 6.49497 0.0823035C6.54574 -0.000494485 6.57994 -0.0284558 6.6793 0.0339821C7.333 0.444986 7.99321 0.845131 8.64799 1.25423C8.73351 1.30771 8.79459 1.30799 8.87874 1.25695C9.44231 0.914355 10.01 0.57882 10.5727 0.23514C10.6764 0.171888 10.7209 0.179218 10.7855 0.289706C11.1428 0.901868 11.512 1.50697 11.8725 2.11723C11.9244 2.20492 11.98 2.23939 12.0853 2.23885C12.9402 2.23369 13.795 2.23804 14.6499 2.23342C14.7604 2.23288 14.7943 2.25948 14.7935 2.37404C14.7886 3.21994 14.7921 4.06557 14.7889 4.91146C14.7886 5.0024 14.8133 5.0548 14.895 5.10475C15.5699 5.51575 16.2391 5.93653 16.9156 6.34509C17.0269 6.41241 17.0179 6.45965 16.9596 6.55276C16.5741 7.16927 16.1956 7.79012 15.8085 8.40554C15.742 8.51114 15.7417 8.58742 15.808 8.69574C16.1799 9.3041 16.5396 9.92006 16.9115 10.5287C16.9756 10.6335 16.959 10.6747 16.8597 10.7331C16.2062 11.1186 15.5574 11.5114 14.9037 11.8964C14.8179 11.9468 14.7881 12.0011 14.7886 12.0991C14.7924 12.9315 14.7889 13.7635 14.7932 14.5958C14.7938 14.7074 14.7645 14.7432 14.6499 14.7416C14.2117 14.7359 13.7728 14.7397 13.3341 14.7394ZM6.15184 8.14086C6.10596 8.18103 6.07881 8.20356 6.05329 8.22745C5.80979 8.45685 5.56655 8.68651 5.32358 8.91644C5.15283 9.07824 5.15093 9.08068 5.3111 9.25143C6.0723 10.062 6.8354 10.871 7.59551 11.6824C7.65577 11.7468 7.69975 11.7546 7.75703 11.6854C7.78282 11.6545 7.81676 11.6306 7.84662 11.6026C8.54565 10.9473 9.24522 10.2922 9.94399 9.63665C10.788 8.84477 11.6304 8.05154 12.4765 7.26184C12.5436 7.1994 12.5257 7.16954 12.4735 7.11497C12.2488 6.87934 12.0234 6.64398 11.8087 6.39965C11.7205 6.29921 11.67 6.30926 11.5777 6.3964C10.3569 7.54661 9.13148 8.69194 7.91014 9.84161C7.83223 9.9149 7.79395 9.91246 7.72201 9.83509C7.22034 9.29568 6.71323 8.76116 6.20857 8.2242C6.18713 8.20194 6.17301 8.17262 6.15184 8.14086Z"*/}
-                  {/*                                    fill="#3897EF"*/}
-                  {/*                                />*/}
-                  {/*                            </svg>*/}
-                  {/*                        </div>*/}
-                  {/*                    </div>*/}
-                  {/*                </div>*/}
-                  {/*                /!* title *!/*/}
-                  {/*                <div className="flex justify-center">*/}
-                  {/*                    <p className="text-base font-bold   text-dark-gray dark:text-white">*/}
-                  {/*                        Brokln Simons*/}
-                  {/*                    </p>*/}
-                  {/*                </div>*/}
-                  {/*                /!* username *!/*/}
-                  {/*                <div className="flex justify-center mb-1">*/}
-                  {/*                    <p className="text-xs text-thin-light-gray">*/}
-                  {/*                        @broklinslam_75*/}
-                  {/*                    </p>*/}
-                  {/*                </div>*/}
-                  {/*                /!* items *!/*/}
-                  {/*                <div className="flex justify-center">*/}
-                  {/*                    <div className="flex space-x-1 items-center text-purple text-xs">*/}
-                  {/*<span>*/}
-                  {/*  <svg*/}
-                  {/*      className="fill-current"*/}
-                  {/*      width="13"*/}
-                  {/*      height="11"*/}
-                  {/*      viewBox="0 0 13 11"*/}
-                  {/*      fill="none"*/}
-                  {/*      xmlns="http://www.w3.org/2000/svg"*/}
-                  {/*  >*/}
-                  {/*    <path d="M6.49948 11.0002C6.45633 10.9222 6.44195 10.8402 6.41935 10.7642C5.68171 8.2937 4.94614 5.82125 4.20645 3.35081C4.18385 3.27679 4.19001 3.25879 4.27836 3.25879C5.71459 3.28079 7.15287 3.2968 8.5891 3.3168C8.698 3.3188 8.698 3.3188 8.66923 3.42482C7.9542 5.92527 7.23917 8.42573 6.52414 10.9242C6.51797 10.9462 6.50975 10.9682 6.49948 11.0002Z" />*/}
-                  {/*    <path d="M13.0002 3.25468C10.9619 5.75913 8.93804 8.24759 6.91418 10.736C6.88952 10.71 6.91007 10.69 6.91623 10.67C7.60866 8.24959 8.30109 5.82715 8.99352 3.40671C9.00585 3.3607 9.04489 3.34269 9.07776 3.31469C9.20515 3.19867 9.34898 3.25868 9.48048 3.25868C10.6147 3.25268 11.7489 3.25468 12.883 3.25468C12.9159 3.25468 12.9467 3.25468 13.0002 3.25468Z" />*/}
-                  {/*    <path d="M0 3.25444C0.0472578 3.25444 0.0739687 3.25444 0.10068 3.25444C1.32322 3.25444 2.5437 3.25444 3.76624 3.25244C3.82994 3.25244 3.86281 3.26444 3.88336 3.33046C4.59428 5.72089 5.30725 8.11132 6.01818 10.5018C6.02845 10.5338 6.04694 10.5638 6.03667 10.6078C4.02513 8.15933 2.01976 5.71489 0 3.25444Z" />*/}
-                  {/*    <path d="M8.66592 2.93668C7.16189 2.93668 5.67224 2.93668 4.18054 2.93668C4.17438 2.90268 4.20314 2.88867 4.21753 2.86867C4.94899 1.96651 5.68046 1.06434 6.40988 0.160178C6.44275 0.120171 6.45919 0.0821637 6.51261 0.150176C7.21942 1.06634 7.93034 1.98051 8.63921 2.89668C8.64743 2.90668 8.65154 2.91668 8.66592 2.93668Z" />*/}
-                  {/*    <path d="M2.70399 0.129883C3.0615 1.07205 3.41491 2.00222 3.77037 2.93639C2.52729 2.93639 1.29448 2.93639 0.0390625 2.93639C0.930796 1.99622 1.81226 1.06805 2.70399 0.129883Z" />*/}
-                  {/*    <path d="M12.9687 2.9386C12.7324 2.9386 12.5166 2.9386 12.3009 2.9386C11.3126 2.9386 10.3263 2.9386 9.33803 2.9386C9.28255 2.9386 9.25173 2.9406 9.2805 2.86859C9.63185 1.97642 9.98115 1.08226 10.3304 0.190099C10.3366 0.174096 10.3387 0.154092 10.3633 0.14209C11.2263 1.06826 12.0913 1.99643 12.9687 2.9386Z" />*/}
-                  {/*    <path d="M8.97094 2.81832C8.24152 1.87815 7.52238 0.947984 6.79297 0.0078125C7.89223 0.0078125 8.9771 0.0078125 10.0702 0.0078125C9.70651 0.939982 9.34283 1.87015 8.97094 2.81832Z" />*/}
-                  {/*    <path d="M3.99333 2.65048C3.66252 1.78032 3.33994 0.930169 3.01735 0.0780142C2.99886 0.0320058 2.97626 0 3.0605 0C4.07962 0.00200036 5.09875 0.00200036 6.13842 0.00200036C5.42133 0.888161 4.71247 1.76432 3.99333 2.65048Z" />*/}
-                  {/*  </svg>*/}
-                  {/*</span>*/}
-                  {/*                        <span>3435 Items</span>*/}
-                  {/*                    </div>*/}
-                  {/*                </div>*/}
-                  {/*            </div>*/}
-                  {/*            <div className="item">*/}
-                  {/*                /!* img *!/*/}
-                  {/*                <div className="flex justify-center mb-4">*/}
-                  {/*                    <div className=" w-14 h-14 relative">*/}
-                  {/*                        <img src={top3} alt="top" className="w-full h-full" />*/}
-                  {/*                        <div className="absolute right-0 top-0">*/}
-                  {/*                            <svg*/}
-                  {/*                                width="18"*/}
-                  {/*                                height="17"*/}
-                  {/*                                viewBox="0 0 18 17"*/}
-                  {/*                                fill="none"*/}
-                  {/*                                xmlns="http://www.w3.org/2000/svg"*/}
-                  {/*                            >*/}
-                  {/*                                <path*/}
-                  {/*                                    d="M13.3341 14.7394C12.8954 14.7394 12.4564 14.7416 12.0177 14.7375C11.9347 14.7367 11.8877 14.7647 11.8451 14.835C11.4401 15.4977 11.0288 16.1565 10.6273 16.8213C10.5678 16.9196 10.5247 16.9134 10.444 16.8631C9.84979 16.4937 9.25283 16.1283 8.65967 15.7566C8.58338 15.7089 8.53208 15.708 8.45471 15.755C7.84092 16.1275 7.22251 16.4926 6.60872 16.865C6.51805 16.9202 6.48086 16.9117 6.42548 16.8178C6.03646 16.1562 5.63903 15.4993 5.24757 14.8391C5.20251 14.7628 5.15066 14.7373 5.06297 14.7375C4.23961 14.7408 3.41652 14.7397 2.59315 14.7392C2.38765 14.7392 2.41561 14.7563 2.41561 14.5549C2.4148 13.7182 2.41371 12.8812 2.41724 12.0446C2.41778 11.9479 2.39145 11.892 2.30539 11.8396C1.59985 11.4093 0.899185 10.9712 0.193637 10.5406C0.10921 10.4891 0.0950937 10.4578 0.149387 10.3707C0.541931 9.74279 0.926874 9.11 1.31969 8.48236C1.36855 8.40445 1.36611 8.35423 1.31969 8.27768C0.968138 7.69863 0.624187 7.11497 0.272634 6.5362C0.221055 6.45151 0.238972 6.41974 0.317427 6.37332C0.985783 5.97779 1.65088 5.57656 2.31978 5.18157C2.39905 5.13488 2.41751 5.08167 2.41724 4.99697C2.41452 4.12855 2.41778 3.26012 2.41317 2.39169C2.41262 2.27306 2.43624 2.23152 2.566 2.23261C3.39371 2.23912 4.22142 2.23478 5.0494 2.23777C5.13627 2.23804 5.18459 2.21388 5.23183 2.13651C5.64989 1.44996 6.07501 0.767762 6.49497 0.0823035C6.54574 -0.000494485 6.57994 -0.0284558 6.6793 0.0339821C7.333 0.444986 7.99321 0.845131 8.64799 1.25423C8.73351 1.30771 8.79459 1.30799 8.87874 1.25695C9.44231 0.914355 10.01 0.57882 10.5727 0.23514C10.6764 0.171888 10.7209 0.179218 10.7855 0.289706C11.1428 0.901868 11.512 1.50697 11.8725 2.11723C11.9244 2.20492 11.98 2.23939 12.0853 2.23885C12.9402 2.23369 13.795 2.23804 14.6499 2.23342C14.7604 2.23288 14.7943 2.25948 14.7935 2.37404C14.7886 3.21994 14.7921 4.06557 14.7889 4.91146C14.7886 5.0024 14.8133 5.0548 14.895 5.10475C15.5699 5.51575 16.2391 5.93653 16.9156 6.34509C17.0269 6.41241 17.0179 6.45965 16.9596 6.55276C16.5741 7.16927 16.1956 7.79012 15.8085 8.40554C15.742 8.51114 15.7417 8.58742 15.808 8.69574C16.1799 9.3041 16.5396 9.92006 16.9115 10.5287C16.9756 10.6335 16.959 10.6747 16.8597 10.7331C16.2062 11.1186 15.5574 11.5114 14.9037 11.8964C14.8179 11.9468 14.7881 12.0011 14.7886 12.0991C14.7924 12.9315 14.7889 13.7635 14.7932 14.5958C14.7938 14.7074 14.7645 14.7432 14.6499 14.7416C14.2117 14.7359 13.7728 14.7397 13.3341 14.7394ZM6.15184 8.14086C6.10596 8.18103 6.07881 8.20356 6.05329 8.22745C5.80979 8.45685 5.56655 8.68651 5.32358 8.91644C5.15283 9.07824 5.15093 9.08068 5.3111 9.25143C6.0723 10.062 6.8354 10.871 7.59551 11.6824C7.65577 11.7468 7.69975 11.7546 7.75703 11.6854C7.78282 11.6545 7.81676 11.6306 7.84662 11.6026C8.54565 10.9473 9.24522 10.2922 9.94399 9.63665C10.788 8.84477 11.6304 8.05154 12.4765 7.26184C12.5436 7.1994 12.5257 7.16954 12.4735 7.11497C12.2488 6.87934 12.0234 6.64398 11.8087 6.39965C11.7205 6.29921 11.67 6.30926 11.5777 6.3964C10.3569 7.54661 9.13148 8.69194 7.91014 9.84161C7.83223 9.9149 7.79395 9.91246 7.72201 9.83509C7.22034 9.29568 6.71323 8.76116 6.20857 8.2242C6.18713 8.20194 6.17301 8.17262 6.15184 8.14086Z"*/}
-                  {/*                                    fill="#3897EF"*/}
-                  {/*                                />*/}
-                  {/*                            </svg>*/}
-                  {/*                        </div>*/}
-                  {/*                    </div>*/}
-                  {/*                </div>*/}
-                  {/*                /!* title *!/*/}
-                  {/*                <div className="flex justify-center">*/}
-                  {/*                    <p className="text-base font-bold   text-dark-gray dark:text-white">*/}
-                  {/*                        Brokln Simons*/}
-                  {/*                    </p>*/}
-                  {/*                </div>*/}
-                  {/*                /!* username *!/*/}
-                  {/*                <div className="flex justify-center mb-1">*/}
-                  {/*                    <p className="text-xs text-thin-light-gray">*/}
-                  {/*                        @broklinslam_75*/}
-                  {/*                    </p>*/}
-                  {/*                </div>*/}
-                  {/*                /!* items *!/*/}
-                  {/*                <div className="flex justify-center">*/}
-                  {/*                    <div className="flex space-x-1 items-center text-purple text-xs">*/}
-                  {/*<span>*/}
-                  {/*  <svg*/}
-                  {/*      className="fill-current"*/}
-                  {/*      width="13"*/}
-                  {/*      height="11"*/}
-                  {/*      viewBox="0 0 13 11"*/}
-                  {/*      fill="none"*/}
-                  {/*      xmlns="http://www.w3.org/2000/svg"*/}
-                  {/*  >*/}
-                  {/*    <path d="M6.49948 11.0002C6.45633 10.9222 6.44195 10.8402 6.41935 10.7642C5.68171 8.2937 4.94614 5.82125 4.20645 3.35081C4.18385 3.27679 4.19001 3.25879 4.27836 3.25879C5.71459 3.28079 7.15287 3.2968 8.5891 3.3168C8.698 3.3188 8.698 3.3188 8.66923 3.42482C7.9542 5.92527 7.23917 8.42573 6.52414 10.9242C6.51797 10.9462 6.50975 10.9682 6.49948 11.0002Z" />*/}
-                  {/*    <path d="M13.0002 3.25468C10.9619 5.75913 8.93804 8.24759 6.91418 10.736C6.88952 10.71 6.91007 10.69 6.91623 10.67C7.60866 8.24959 8.30109 5.82715 8.99352 3.40671C9.00585 3.3607 9.04489 3.34269 9.07776 3.31469C9.20515 3.19867 9.34898 3.25868 9.48048 3.25868C10.6147 3.25268 11.7489 3.25468 12.883 3.25468C12.9159 3.25468 12.9467 3.25468 13.0002 3.25468Z" />*/}
-                  {/*    <path d="M0 3.25444C0.0472578 3.25444 0.0739687 3.25444 0.10068 3.25444C1.32322 3.25444 2.5437 3.25444 3.76624 3.25244C3.82994 3.25244 3.86281 3.26444 3.88336 3.33046C4.59428 5.72089 5.30725 8.11132 6.01818 10.5018C6.02845 10.5338 6.04694 10.5638 6.03667 10.6078C4.02513 8.15933 2.01976 5.71489 0 3.25444Z" />*/}
-                  {/*    <path d="M8.66592 2.93668C7.16189 2.93668 5.67224 2.93668 4.18054 2.93668C4.17438 2.90268 4.20314 2.88867 4.21753 2.86867C4.94899 1.96651 5.68046 1.06434 6.40988 0.160178C6.44275 0.120171 6.45919 0.0821637 6.51261 0.150176C7.21942 1.06634 7.93034 1.98051 8.63921 2.89668C8.64743 2.90668 8.65154 2.91668 8.66592 2.93668Z" />*/}
-                  {/*    <path d="M2.70399 0.129883C3.0615 1.07205 3.41491 2.00222 3.77037 2.93639C2.52729 2.93639 1.29448 2.93639 0.0390625 2.93639C0.930796 1.99622 1.81226 1.06805 2.70399 0.129883Z" />*/}
-                  {/*    <path d="M12.9687 2.9386C12.7324 2.9386 12.5166 2.9386 12.3009 2.9386C11.3126 2.9386 10.3263 2.9386 9.33803 2.9386C9.28255 2.9386 9.25173 2.9406 9.2805 2.86859C9.63185 1.97642 9.98115 1.08226 10.3304 0.190099C10.3366 0.174096 10.3387 0.154092 10.3633 0.14209C11.2263 1.06826 12.0913 1.99643 12.9687 2.9386Z" />*/}
-                  {/*    <path d="M8.97094 2.81832C8.24152 1.87815 7.52238 0.947984 6.79297 0.0078125C7.89223 0.0078125 8.9771 0.0078125 10.0702 0.0078125C9.70651 0.939982 9.34283 1.87015 8.97094 2.81832Z" />*/}
-                  {/*    <path d="M3.99333 2.65048C3.66252 1.78032 3.33994 0.930169 3.01735 0.0780142C2.99886 0.0320058 2.97626 0 3.0605 0C4.07962 0.00200036 5.09875 0.00200036 6.13842 0.00200036C5.42133 0.888161 4.71247 1.76432 3.99333 2.65048Z" />*/}
-                  {/*  </svg>*/}
-                  {/*</span>*/}
-                  {/*                        <span>3435 Items</span>*/}
-                  {/*                    </div>*/}
-                  {/*                </div>*/}
-                  {/*            </div>*/}
-                  {/*            <div className="item">*/}
-                  {/*                /!* img *!/*/}
-                  {/*                <div className="flex justify-center mb-4">*/}
-                  {/*                    <div className=" w-14 h-14 relative">*/}
-                  {/*                        <img src={top4} alt="top" className="w-full h-full" />*/}
-                  {/*                        <div className="absolute right-0 top-0">*/}
-                  {/*                            <svg*/}
-                  {/*                                width="18"*/}
-                  {/*                                height="17"*/}
-                  {/*                                viewBox="0 0 18 17"*/}
-                  {/*                                fill="none"*/}
-                  {/*                                xmlns="http://www.w3.org/2000/svg"*/}
-                  {/*                            >*/}
-                  {/*                                <path*/}
-                  {/*                                    d="M13.3341 14.7394C12.8954 14.7394 12.4564 14.7416 12.0177 14.7375C11.9347 14.7367 11.8877 14.7647 11.8451 14.835C11.4401 15.4977 11.0288 16.1565 10.6273 16.8213C10.5678 16.9196 10.5247 16.9134 10.444 16.8631C9.84979 16.4937 9.25283 16.1283 8.65967 15.7566C8.58338 15.7089 8.53208 15.708 8.45471 15.755C7.84092 16.1275 7.22251 16.4926 6.60872 16.865C6.51805 16.9202 6.48086 16.9117 6.42548 16.8178C6.03646 16.1562 5.63903 15.4993 5.24757 14.8391C5.20251 14.7628 5.15066 14.7373 5.06297 14.7375C4.23961 14.7408 3.41652 14.7397 2.59315 14.7392C2.38765 14.7392 2.41561 14.7563 2.41561 14.5549C2.4148 13.7182 2.41371 12.8812 2.41724 12.0446C2.41778 11.9479 2.39145 11.892 2.30539 11.8396C1.59985 11.4093 0.899185 10.9712 0.193637 10.5406C0.10921 10.4891 0.0950937 10.4578 0.149387 10.3707C0.541931 9.74279 0.926874 9.11 1.31969 8.48236C1.36855 8.40445 1.36611 8.35423 1.31969 8.27768C0.968138 7.69863 0.624187 7.11497 0.272634 6.5362C0.221055 6.45151 0.238972 6.41974 0.317427 6.37332C0.985783 5.97779 1.65088 5.57656 2.31978 5.18157C2.39905 5.13488 2.41751 5.08167 2.41724 4.99697C2.41452 4.12855 2.41778 3.26012 2.41317 2.39169C2.41262 2.27306 2.43624 2.23152 2.566 2.23261C3.39371 2.23912 4.22142 2.23478 5.0494 2.23777C5.13627 2.23804 5.18459 2.21388 5.23183 2.13651C5.64989 1.44996 6.07501 0.767762 6.49497 0.0823035C6.54574 -0.000494485 6.57994 -0.0284558 6.6793 0.0339821C7.333 0.444986 7.99321 0.845131 8.64799 1.25423C8.73351 1.30771 8.79459 1.30799 8.87874 1.25695C9.44231 0.914355 10.01 0.57882 10.5727 0.23514C10.6764 0.171888 10.7209 0.179218 10.7855 0.289706C11.1428 0.901868 11.512 1.50697 11.8725 2.11723C11.9244 2.20492 11.98 2.23939 12.0853 2.23885C12.9402 2.23369 13.795 2.23804 14.6499 2.23342C14.7604 2.23288 14.7943 2.25948 14.7935 2.37404C14.7886 3.21994 14.7921 4.06557 14.7889 4.91146C14.7886 5.0024 14.8133 5.0548 14.895 5.10475C15.5699 5.51575 16.2391 5.93653 16.9156 6.34509C17.0269 6.41241 17.0179 6.45965 16.9596 6.55276C16.5741 7.16927 16.1956 7.79012 15.8085 8.40554C15.742 8.51114 15.7417 8.58742 15.808 8.69574C16.1799 9.3041 16.5396 9.92006 16.9115 10.5287C16.9756 10.6335 16.959 10.6747 16.8597 10.7331C16.2062 11.1186 15.5574 11.5114 14.9037 11.8964C14.8179 11.9468 14.7881 12.0011 14.7886 12.0991C14.7924 12.9315 14.7889 13.7635 14.7932 14.5958C14.7938 14.7074 14.7645 14.7432 14.6499 14.7416C14.2117 14.7359 13.7728 14.7397 13.3341 14.7394ZM6.15184 8.14086C6.10596 8.18103 6.07881 8.20356 6.05329 8.22745C5.80979 8.45685 5.56655 8.68651 5.32358 8.91644C5.15283 9.07824 5.15093 9.08068 5.3111 9.25143C6.0723 10.062 6.8354 10.871 7.59551 11.6824C7.65577 11.7468 7.69975 11.7546 7.75703 11.6854C7.78282 11.6545 7.81676 11.6306 7.84662 11.6026C8.54565 10.9473 9.24522 10.2922 9.94399 9.63665C10.788 8.84477 11.6304 8.05154 12.4765 7.26184C12.5436 7.1994 12.5257 7.16954 12.4735 7.11497C12.2488 6.87934 12.0234 6.64398 11.8087 6.39965C11.7205 6.29921 11.67 6.30926 11.5777 6.3964C10.3569 7.54661 9.13148 8.69194 7.91014 9.84161C7.83223 9.9149 7.79395 9.91246 7.72201 9.83509C7.22034 9.29568 6.71323 8.76116 6.20857 8.2242C6.18713 8.20194 6.17301 8.17262 6.15184 8.14086Z"*/}
-                  {/*                                    fill="#3897EF"*/}
-                  {/*                                />*/}
-                  {/*                            </svg>*/}
-                  {/*                        </div>*/}
-                  {/*                    </div>*/}
-                  {/*                </div>*/}
-                  {/*                /!* title *!/*/}
-                  {/*                <div className="flex justify-center">*/}
-                  {/*                    <p className="text-base font-bold   text-dark-gray dark:text-white">*/}
-                  {/*                        Brokln Simons*/}
-                  {/*                    </p>*/}
-                  {/*                </div>*/}
-                  {/*                /!* username *!/*/}
-                  {/*                <div className="flex justify-center mb-1">*/}
-                  {/*                    <p className="text-xs text-thin-light-gray">*/}
-                  {/*                        @broklinslam_75*/}
-                  {/*                    </p>*/}
-                  {/*                </div>*/}
-                  {/*                /!* items *!/*/}
-                  {/*                <div className="flex justify-center">*/}
-                  {/*                    <div className="flex space-x-1 items-center text-purple text-xs">*/}
-                  {/*<span>*/}
-                  {/*  <svg*/}
-                  {/*      className="fill-current"*/}
-                  {/*      width="13"*/}
-                  {/*      height="11"*/}
-                  {/*      viewBox="0 0 13 11"*/}
-                  {/*      fill="none"*/}
-                  {/*      xmlns="http://www.w3.org/2000/svg"*/}
-                  {/*  >*/}
-                  {/*    <path d="M6.49948 11.0002C6.45633 10.9222 6.44195 10.8402 6.41935 10.7642C5.68171 8.2937 4.94614 5.82125 4.20645 3.35081C4.18385 3.27679 4.19001 3.25879 4.27836 3.25879C5.71459 3.28079 7.15287 3.2968 8.5891 3.3168C8.698 3.3188 8.698 3.3188 8.66923 3.42482C7.9542 5.92527 7.23917 8.42573 6.52414 10.9242C6.51797 10.9462 6.50975 10.9682 6.49948 11.0002Z" />*/}
-                  {/*    <path d="M13.0002 3.25468C10.9619 5.75913 8.93804 8.24759 6.91418 10.736C6.88952 10.71 6.91007 10.69 6.91623 10.67C7.60866 8.24959 8.30109 5.82715 8.99352 3.40671C9.00585 3.3607 9.04489 3.34269 9.07776 3.31469C9.20515 3.19867 9.34898 3.25868 9.48048 3.25868C10.6147 3.25268 11.7489 3.25468 12.883 3.25468C12.9159 3.25468 12.9467 3.25468 13.0002 3.25468Z" />*/}
-                  {/*    <path d="M0 3.25444C0.0472578 3.25444 0.0739687 3.25444 0.10068 3.25444C1.32322 3.25444 2.5437 3.25444 3.76624 3.25244C3.82994 3.25244 3.86281 3.26444 3.88336 3.33046C4.59428 5.72089 5.30725 8.11132 6.01818 10.5018C6.02845 10.5338 6.04694 10.5638 6.03667 10.6078C4.02513 8.15933 2.01976 5.71489 0 3.25444Z" />*/}
-                  {/*    <path d="M8.66592 2.93668C7.16189 2.93668 5.67224 2.93668 4.18054 2.93668C4.17438 2.90268 4.20314 2.88867 4.21753 2.86867C4.94899 1.96651 5.68046 1.06434 6.40988 0.160178C6.44275 0.120171 6.45919 0.0821637 6.51261 0.150176C7.21942 1.06634 7.93034 1.98051 8.63921 2.89668C8.64743 2.90668 8.65154 2.91668 8.66592 2.93668Z" />*/}
-                  {/*    <path d="M2.70399 0.129883C3.0615 1.07205 3.41491 2.00222 3.77037 2.93639C2.52729 2.93639 1.29448 2.93639 0.0390625 2.93639C0.930796 1.99622 1.81226 1.06805 2.70399 0.129883Z" />*/}
-                  {/*    <path d="M12.9687 2.9386C12.7324 2.9386 12.5166 2.9386 12.3009 2.9386C11.3126 2.9386 10.3263 2.9386 9.33803 2.9386C9.28255 2.9386 9.25173 2.9406 9.2805 2.86859C9.63185 1.97642 9.98115 1.08226 10.3304 0.190099C10.3366 0.174096 10.3387 0.154092 10.3633 0.14209C11.2263 1.06826 12.0913 1.99643 12.9687 2.9386Z" />*/}
-                  {/*    <path d="M8.97094 2.81832C8.24152 1.87815 7.52238 0.947984 6.79297 0.0078125C7.89223 0.0078125 8.9771 0.0078125 10.0702 0.0078125C9.70651 0.939982 9.34283 1.87015 8.97094 2.81832Z" />*/}
-                  {/*    <path d="M3.99333 2.65048C3.66252 1.78032 3.33994 0.930169 3.01735 0.0780142C2.99886 0.0320058 2.97626 0 3.0605 0C4.07962 0.00200036 5.09875 0.00200036 6.13842 0.00200036C5.42133 0.888161 4.71247 1.76432 3.99333 2.65048Z" />*/}
-                  {/*  </svg>*/}
-                  {/*</span>*/}
-                  {/*                        <span>3435 Items</span>*/}
-                  {/*                    </div>*/}
-                  {/*                </div>*/}
-                  {/*            </div>*/}
-                  {/*            <div className="item">*/}
-                  {/*                /!* img *!/*/}
-                  {/*                <div className="flex justify-center mb-4">*/}
-                  {/*                    <div className=" w-14 h-14 relative">*/}
-                  {/*                        <img src={top3} alt="top" className="w-full h-full" />*/}
-                  {/*                        <div className="absolute right-0 top-0">*/}
-                  {/*                            <svg*/}
-                  {/*                                width="18"*/}
-                  {/*                                height="17"*/}
-                  {/*                                viewBox="0 0 18 17"*/}
-                  {/*                                fill="none"*/}
-                  {/*                                xmlns="http://www.w3.org/2000/svg"*/}
-                  {/*                            >*/}
-                  {/*                                <path*/}
-                  {/*                                    d="M13.3341 14.7394C12.8954 14.7394 12.4564 14.7416 12.0177 14.7375C11.9347 14.7367 11.8877 14.7647 11.8451 14.835C11.4401 15.4977 11.0288 16.1565 10.6273 16.8213C10.5678 16.9196 10.5247 16.9134 10.444 16.8631C9.84979 16.4937 9.25283 16.1283 8.65967 15.7566C8.58338 15.7089 8.53208 15.708 8.45471 15.755C7.84092 16.1275 7.22251 16.4926 6.60872 16.865C6.51805 16.9202 6.48086 16.9117 6.42548 16.8178C6.03646 16.1562 5.63903 15.4993 5.24757 14.8391C5.20251 14.7628 5.15066 14.7373 5.06297 14.7375C4.23961 14.7408 3.41652 14.7397 2.59315 14.7392C2.38765 14.7392 2.41561 14.7563 2.41561 14.5549C2.4148 13.7182 2.41371 12.8812 2.41724 12.0446C2.41778 11.9479 2.39145 11.892 2.30539 11.8396C1.59985 11.4093 0.899185 10.9712 0.193637 10.5406C0.10921 10.4891 0.0950937 10.4578 0.149387 10.3707C0.541931 9.74279 0.926874 9.11 1.31969 8.48236C1.36855 8.40445 1.36611 8.35423 1.31969 8.27768C0.968138 7.69863 0.624187 7.11497 0.272634 6.5362C0.221055 6.45151 0.238972 6.41974 0.317427 6.37332C0.985783 5.97779 1.65088 5.57656 2.31978 5.18157C2.39905 5.13488 2.41751 5.08167 2.41724 4.99697C2.41452 4.12855 2.41778 3.26012 2.41317 2.39169C2.41262 2.27306 2.43624 2.23152 2.566 2.23261C3.39371 2.23912 4.22142 2.23478 5.0494 2.23777C5.13627 2.23804 5.18459 2.21388 5.23183 2.13651C5.64989 1.44996 6.07501 0.767762 6.49497 0.0823035C6.54574 -0.000494485 6.57994 -0.0284558 6.6793 0.0339821C7.333 0.444986 7.99321 0.845131 8.64799 1.25423C8.73351 1.30771 8.79459 1.30799 8.87874 1.25695C9.44231 0.914355 10.01 0.57882 10.5727 0.23514C10.6764 0.171888 10.7209 0.179218 10.7855 0.289706C11.1428 0.901868 11.512 1.50697 11.8725 2.11723C11.9244 2.20492 11.98 2.23939 12.0853 2.23885C12.9402 2.23369 13.795 2.23804 14.6499 2.23342C14.7604 2.23288 14.7943 2.25948 14.7935 2.37404C14.7886 3.21994 14.7921 4.06557 14.7889 4.91146C14.7886 5.0024 14.8133 5.0548 14.895 5.10475C15.5699 5.51575 16.2391 5.93653 16.9156 6.34509C17.0269 6.41241 17.0179 6.45965 16.9596 6.55276C16.5741 7.16927 16.1956 7.79012 15.8085 8.40554C15.742 8.51114 15.7417 8.58742 15.808 8.69574C16.1799 9.3041 16.5396 9.92006 16.9115 10.5287C16.9756 10.6335 16.959 10.6747 16.8597 10.7331C16.2062 11.1186 15.5574 11.5114 14.9037 11.8964C14.8179 11.9468 14.7881 12.0011 14.7886 12.0991C14.7924 12.9315 14.7889 13.7635 14.7932 14.5958C14.7938 14.7074 14.7645 14.7432 14.6499 14.7416C14.2117 14.7359 13.7728 14.7397 13.3341 14.7394ZM6.15184 8.14086C6.10596 8.18103 6.07881 8.20356 6.05329 8.22745C5.80979 8.45685 5.56655 8.68651 5.32358 8.91644C5.15283 9.07824 5.15093 9.08068 5.3111 9.25143C6.0723 10.062 6.8354 10.871 7.59551 11.6824C7.65577 11.7468 7.69975 11.7546 7.75703 11.6854C7.78282 11.6545 7.81676 11.6306 7.84662 11.6026C8.54565 10.9473 9.24522 10.2922 9.94399 9.63665C10.788 8.84477 11.6304 8.05154 12.4765 7.26184C12.5436 7.1994 12.5257 7.16954 12.4735 7.11497C12.2488 6.87934 12.0234 6.64398 11.8087 6.39965C11.7205 6.29921 11.67 6.30926 11.5777 6.3964C10.3569 7.54661 9.13148 8.69194 7.91014 9.84161C7.83223 9.9149 7.79395 9.91246 7.72201 9.83509C7.22034 9.29568 6.71323 8.76116 6.20857 8.2242C6.18713 8.20194 6.17301 8.17262 6.15184 8.14086Z"*/}
-                  {/*                                    fill="#3897EF"*/}
-                  {/*                                />*/}
-                  {/*                            </svg>*/}
-                  {/*                        </div>*/}
-                  {/*                    </div>*/}
-                  {/*                </div>*/}
-                  {/*                /!* title *!/*/}
-                  {/*                <div className="flex justify-center">*/}
-                  {/*                    <p className="text-base font-bold   text-dark-gray dark:text-white">*/}
-                  {/*                        Brokln Simons*/}
-                  {/*                    </p>*/}
-                  {/*                </div>*/}
-                  {/*                /!* username *!/*/}
-                  {/*                <div className="flex justify-center mb-1">*/}
-                  {/*                    <p className="text-xs text-thin-light-gray">*/}
-                  {/*                        @broklinslam_75*/}
-                  {/*                    </p>*/}
-                  {/*                </div>*/}
-                  {/*                /!* items *!/*/}
-                  {/*                <div className="flex justify-center">*/}
-                  {/*                    <div className="flex space-x-1 items-center text-purple text-xs">*/}
-                  {/*<span>*/}
-                  {/*  <svg*/}
-                  {/*      className="fill-current"*/}
-                  {/*      width="13"*/}
-                  {/*      height="11"*/}
-                  {/*      viewBox="0 0 13 11"*/}
-                  {/*      fill="none"*/}
-                  {/*      xmlns="http://www.w3.org/2000/svg"*/}
-                  {/*  >*/}
-                  {/*    <path d="M6.49948 11.0002C6.45633 10.9222 6.44195 10.8402 6.41935 10.7642C5.68171 8.2937 4.94614 5.82125 4.20645 3.35081C4.18385 3.27679 4.19001 3.25879 4.27836 3.25879C5.71459 3.28079 7.15287 3.2968 8.5891 3.3168C8.698 3.3188 8.698 3.3188 8.66923 3.42482C7.9542 5.92527 7.23917 8.42573 6.52414 10.9242C6.51797 10.9462 6.50975 10.9682 6.49948 11.0002Z" />*/}
-                  {/*    <path d="M13.0002 3.25468C10.9619 5.75913 8.93804 8.24759 6.91418 10.736C6.88952 10.71 6.91007 10.69 6.91623 10.67C7.60866 8.24959 8.30109 5.82715 8.99352 3.40671C9.00585 3.3607 9.04489 3.34269 9.07776 3.31469C9.20515 3.19867 9.34898 3.25868 9.48048 3.25868C10.6147 3.25268 11.7489 3.25468 12.883 3.25468C12.9159 3.25468 12.9467 3.25468 13.0002 3.25468Z" />*/}
-                  {/*    <path d="M0 3.25444C0.0472578 3.25444 0.0739687 3.25444 0.10068 3.25444C1.32322 3.25444 2.5437 3.25444 3.76624 3.25244C3.82994 3.25244 3.86281 3.26444 3.88336 3.33046C4.59428 5.72089 5.30725 8.11132 6.01818 10.5018C6.02845 10.5338 6.04694 10.5638 6.03667 10.6078C4.02513 8.15933 2.01976 5.71489 0 3.25444Z" />*/}
-                  {/*    <path d="M8.66592 2.93668C7.16189 2.93668 5.67224 2.93668 4.18054 2.93668C4.17438 2.90268 4.20314 2.88867 4.21753 2.86867C4.94899 1.96651 5.68046 1.06434 6.40988 0.160178C6.44275 0.120171 6.45919 0.0821637 6.51261 0.150176C7.21942 1.06634 7.93034 1.98051 8.63921 2.89668C8.64743 2.90668 8.65154 2.91668 8.66592 2.93668Z" />*/}
-                  {/*    <path d="M2.70399 0.129883C3.0615 1.07205 3.41491 2.00222 3.77037 2.93639C2.52729 2.93639 1.29448 2.93639 0.0390625 2.93639C0.930796 1.99622 1.81226 1.06805 2.70399 0.129883Z" />*/}
-                  {/*    <path d="M12.9687 2.9386C12.7324 2.9386 12.5166 2.9386 12.3009 2.9386C11.3126 2.9386 10.3263 2.9386 9.33803 2.9386C9.28255 2.9386 9.25173 2.9406 9.2805 2.86859C9.63185 1.97642 9.98115 1.08226 10.3304 0.190099C10.3366 0.174096 10.3387 0.154092 10.3633 0.14209C11.2263 1.06826 12.0913 1.99643 12.9687 2.9386Z" />*/}
-                  {/*    <path d="M8.97094 2.81832C8.24152 1.87815 7.52238 0.947984 6.79297 0.0078125C7.89223 0.0078125 8.9771 0.0078125 10.0702 0.0078125C9.70651 0.939982 9.34283 1.87015 8.97094 2.81832Z" />*/}
-                  {/*    <path d="M3.99333 2.65048C3.66252 1.78032 3.33994 0.930169 3.01735 0.0780142C2.99886 0.0320058 2.97626 0 3.0605 0C4.07962 0.00200036 5.09875 0.00200036 6.13842 0.00200036C5.42133 0.888161 4.71247 1.76432 3.99333 2.65048Z" />*/}
-                  {/*  </svg>*/}
-                  {/*</span>*/}
-                  {/*                        <span>3435 Items</span>*/}
-                  {/*                    </div>*/}
-                  {/*                </div>*/}
-                  {/*            </div>*/}
-                </SliderCom>
-              </div>
-            </div>
+                      MyActiveOffersList?.result_list?.length > 0 &&
+                      MyActiveOffersList.result_list.map((item) => {
+                        return (
+                          <OfferCard key={item.id} datas={item} setOfferPopout={setOfferPopout} />
+                        )
+                      })}
+              </SliderCom>
          </div>
        </div>

@@ -37,7 +37,8 @@ export default function MyTasks({
        <div className="notification-wrapper w-full">
          {/* heading */}
          <div className="sm:flex justify-between items-center mb-6">
-            <div className="w-full mb-5 sm:mb-0 flex justify-between items-center gap-1">
+            {/* <div className="w-full mb-5 sm:mb-0 flex justify-between items-center gap-1">
+              {userDetails.account_type == 'FAMILY' &&
              <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
                <span
                  className={`${selectTab === "today" ? "block" : "hidden"}`}
@@ -45,6 +46,7 @@ export default function MyTasks({
                  My Tasks
                </span>
              </h1>
+              }
              {ActiveJobList?.data?.length > 0 && userDetails.account_type == 'FAMILY' &&
                <button
                  type="button"
@@ -56,7 +58,7 @@ export default function MyTasks({
                  More Task
                </button>
              }
-            </div>
+            </div> */}
            <div className="slider-btns flex space-x-4">
              <div
                onClick={() => filterHandler("today")}
@@ -71,6 +73,27 @@ export default function MyTasks({
                className="mb-10"
              />
            )}
+            <div className="w-full mb-5 flex justify-between items-center gap-1">
+              <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+                <span
+                  className={`${selectTab === "today" ? "block" : "hidden"}`}
+                >
+                  My Tasks
+                </span>
+              </h1>
+
+              {ActiveJobList?.data?.length > 0 && userDetails.account_type == 'FAMILY' &&
+                <button
+                  type="button"
+                  onClick={() => {
+                    navigate("/familymarket");
+                  }}
+                  className="px-4 h-10 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                >
+                  More Task
+                </button>
+              }
+            </div>
          <MyJobTable ActiveJobList={ActiveJobList} Account={userDetails} />
        </div>
      </div>
@@ -0,0 +1,4 @@
+import { handlePagingFunc } from "./HandlePagination";
+import PaginatedList from "./PaginatedList";
+
+export { handlePagingFunc, PaginatedList };
@@ -6,8 +6,8 @@
      "profile_img": "profile.png",
      "price": "75,320 ETH",
      "thumbnil": "tranding-1.jpg",
-      "remaing": "2023-03-04 4:00:00",
-      "title": "laborum cupidatat sit"
+      "remaing": "2023-08-04 4:00:00",
+      "title": "Wash Dishes"
    },
    {
      "id": 1,
@@ -15,8 +15,8 @@
      "profile_img": "profile.png",
      "price": "75,320 ETH",
      "thumbnil": "tranding-2.jpg",
-      "remaing": "2023-03-04 4:00:00",
-      "title": "velit occaecat voluptate"
+      "remaing": "2023-07-24 4:00:00",
+      "title": "Wash Planes"
    },
    {
      "id": 2,
@@ -24,7 +24,7 @@
      "profile_img": "profile.png",
      "price": "75,320 ETH",
      "thumbnil": "tranding-3.jpg",
-      "remaing": "2023-03-04 4:00:00",
+      "remaing": "2023-07-17 4:00:00",
      "title": "est reprehenderit amet"
    },
    {
@@ -33,7 +33,7 @@
      "profile_img": "profile.png",
      "price": "75,320 ETH",
      "thumbnil": "tranding-4.jpg",
-      "remaing": "2023-03-04 4:00:00",
+      "remaing": "2023-08-04 4:00:00",
      "title": "velit tempor nostrud"
    },
    {
@@ -42,7 +42,7 @@
      "profile_img": "profile.png",
      "price": "75,320 ETH",
      "thumbnil": "tranding-4.jpg",
-      "remaing": "2023-03-04 4:00:00",
+      "remaing": "2023-09-04 4:00:00",
      "title": "adipisicing sit nostrud"
    },
    {
@@ -830,16 +830,22 @@ TODO: Responsive ===========================
  background-size: contain;
  background-position-y: bottom;
  background-repeat: no-repeat;
+
 }

 .layout-wrapper.login{
  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%);
+  font-family: Circular, Helvetica Neue, Helvetica, Roboto, Arial, sans-serif;
+  font-weight: 400;
+  font-size: 1.125rem;
+  line-height: 1.56;
 }

 .content-wrapper.login{
  --bg-color: 255,255,255;
  background: linear-gradient(90deg, rgba(236,237,240,1) 0%, rgba(255,255,255,1) 50%, rgba(236,237,240,1) 100%);
+
 }

 .content-wrapper select {
@@ -927,3 +933,12 @@ TODO: Responsive ===========================
 .ebu-animate-shake {
  animation: shake 0.3s linear 3;
 }
+
+/* TO REMOVE SLIDER COMPONENT FROM CENTRALIZED */
+.slider-left .slick-slider .slick-track{
+  margin: 0;
+}
+
+.login-type-btn{
+  box-shadow: 0 0 0.8rem #00000080;
+}
@@ -18,6 +18,8 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {

  const { jobListTable } = useSelector((state) => state.tableReload);

+  const { userDetails:{loggedIn} } = useSelector((state) => state?.userDetails); // CHECKS IF LOGGEDIN IS TRUE
+
  useEffect(() => {
    //Removing Data stored at localStorage after session expires
    const expireSession = () => {
@@ -68,7 +70,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
  }, [resetTime]);

  useEffect(() => {
-    if (!isLogin.status) {
+    if (!loggedIn) {
      const loadProfile = () => {
        // function to load user profile
        setIsLogin({ loading: true, status: false });
@@ -80,7 +82,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
              return;
            }
            setLoadProfileDetails(res.data);
-            dispatch(updateUserDetails(res.data));
+            dispatch(updateUserDetails({...res.data, loggedIn:true}));
            setIsLogin({ loading: false, status: true });
          })
          .catch((error) => {
@@ -134,13 +136,10 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
    });
  },[])

-  return isLogin.loading ? (
+  return isLogin.loading && !loggedIn ? (
    <LoadingSpinner size="32" color="sky-blue" height="h-screen" />
-  ) : // Stills needs fixing
-  // <div className="h-screen m-auto">
-  //   <img src={WrenchBoard} alt="wrenchboard" className="h-10" />
-  // </div>
-  !isLogin.status ? (
+  ) : 
+  !isLogin.status && !loggedIn ? (
    <Navigate to={redirectPath} replace />
  ) : (
    children || <Outlet />
@@ -251,6 +251,31 @@ class usersService {
    return this.postAuxEnd("/jobmanageractive", postData);
  }

+  // Family Waitlist
+  ManageFamilyWaitlist() {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      action: 13010,
+      limit: 30,
+      offset: 0,
+    };
+    return this.postAuxEnd("/familywaitingtasks", postData);
+  }
+
+  ManageFamilyPending() {
+    var postData = {
+      uuid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      page: 0,
+      offset: 0,
+      limit: 100,
+    };
+    return this.postAuxEnd("/jobmanageroffers", postData);
+  }
+
  // Task for the person doing the job
  getMyActiveTaskList() {
    var postData = {
@@ -312,8 +337,9 @@ class usersService {
    };
    return this.postAuxEnd("/jobmanageroffers", postData);
  }
-//
-  getResourceList() { // jobs you have shown inteterest in
+  //
+  getResourceList() {
+    // jobs you have shown inteterest in
    var postData = {
      uuid: localStorage.getItem("uid"),
      member_id: localStorage.getItem("member_id"),
@@ -324,7 +350,8 @@ class usersService {
    };
    return this.postAuxEnd("/resources", postData);
  }
-  getMyWiatingJobList() { // jobs you have shown inteterest in
+  getMyWiatingJobList() {
+    // jobs you have shown inteterest in
    var postData = {
      uuid: localStorage.getItem("uid"),
      member_id: localStorage.getItem("member_id"),
@@ -335,7 +362,7 @@ class usersService {
    };
    return this.postAuxEnd("/waitinginterest", postData);
  }
-  getMyJobList(reqData={}) {
+  getMyJobList(reqData = {}) {
    var postData = {
      uuid: localStorage.getItem("uid"),
      member_id: localStorage.getItem("member_id"),
@@ -343,7 +370,7 @@ class usersService {
      page: 0,
      offset: 0,
      limit: 100,
-      ...reqData
+      ...reqData,
    };
    return this.postAuxEnd("/jobmanagerlist", postData);
  }
@@ -818,7 +845,7 @@ class usersService {
      member_id: localStorage.getItem("member_id"),
      sessionid: localStorage.getItem("session_token"),
      action: 13025,
-      ...reqData
+      ...reqData,
    };
    return this.postAuxEnd("/assigntask", postData);
  }
@@ -831,7 +858,7 @@ class usersService {
      sessionid: localStorage.getItem("session_token"),
      limit: 30,
      offset: 0,
-      action: 13010
+      action: 13010,
    };
    return this.postAuxEnd("/familysuggestlist", postData);
  }
@@ -17,7 +17,8 @@ module.exports = {
        "white-opacity": "#7B7EFC",
        "dark-white":"#1D1F2F",
        "dark-light-purple":"#5356fb29",
-        'sky-blue': '#3a8fc3'
+        'sky-blue': '#3a8fc3',
+        'alice-blue': '#f0f8ff'
      },
    },
  },
Author	SHA1	Message	Date
victorAnumudu	1ae67ef3a4	changed login type tab and made login route to home page without loading again once user logs in	2023-07-07 09:51:54 +01:00
ameye	d32e8e2c8c	Merge branch 'suggested-task-page' of WrenchBoard/Users-Wrench into master	2023-07-07 03:12:17 +00:00
Ebube	f635372e31	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into suggested-task-page	2023-07-07 03:25:29 +01:00
Ebube	2913ae5bba	Waiting Label Format Fixed	2023-07-07 03:25:09 +01:00
ameye	f4bd4e4c7d	Merge branch 'suggested-task-page' of WrenchBoard/Users-Wrench into master	2023-07-07 01:51:34 +00:00
Ebube	6126564547	.	2023-07-07 02:46:25 +01:00
ameye	b5573aedd0	Merge branch 'full-account-offer-list' of WrenchBoard/Users-Wrench into master	2023-07-07 01:06:54 +00:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	2b93b09785	sty	2023-07-06 21:06:42 -04:00
victorAnumudu	c0281f3734	new layout for full account offer list added	2023-07-07 01:54:56 +01:00
ameye	ef045e2bc1	Merge branch 'suggested-task-page' of WrenchBoard/Users-Wrench into master	2023-07-06 23:30:45 +00:00
Ebube	cf20c38059	fixed image issue	2023-07-06 23:34:55 +01:00
ameye	6ed1466e2b	Merge branch 'family-offer-info-update' of WrenchBoard/Users-Wrench into master	2023-07-06 15:41:42 +00:00
victorAnumudu	6c59a24e6e	added more info to family offer card info	2023-07-06 16:17:48 +01:00
ameye	05865c9274	Merge branch 'resources-page' of WrenchBoard/Users-Wrench into master	2023-07-06 14:41:53 +00:00
Ebube	a868713ae3	Added family pending component	2023-07-06 15:02:26 +01:00
ameye	e68603d836	Merge branch 'family-offer-hidden' of WrenchBoard/Users-Wrench into master	2023-07-06 11:48:40 +00:00
victorAnumudu	67e227c554	hides family offer list when none	2023-07-06 12:39:39 +01:00
ameye	f6fc004a06	Merge branch 'resources-page' of WrenchBoard/Users-Wrench into master	2023-07-06 10:21:44 +00:00
ameye	1682a2221f	Merge branch 'family-dash-revamp' of WrenchBoard/Users-Wrench into master	2023-07-06 10:21:33 +00:00
victorAnumudu	b16b356532	family offer new layout	2023-07-06 11:01:54 +01:00
victorAnumudu	62b97d903c	family dashboard active and waiting list revamp	2023-07-06 07:06:53 +01:00
Ebube	abef3bec01	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into resources-page	2023-07-06 06:33:54 +01:00
Ebube	626835e1e0	Parent Waiting View Added & Market Link goes to bad page fixed	2023-07-06 06:33:33 +01:00
ameye	a6d68bc856	Merge branch 'family-current-task' of WrenchBoard/Users-Wrench into master	2023-07-05 19:55:29 +00:00
victorAnumudu	a674688dce	family current task added	2023-07-05 20:52:34 +01:00
ameye	ef339b163d	Merge branch 'cookie-fixing' of WrenchBoard/Users-Wrench into master	2023-07-05 16:54:23 +00:00
victorAnumudu	1ce154cc06	cookie bug fixing	2023-07-05 17:48:40 +01:00
victorAnumudu	67eb142ae2	cookie bug fixing	2023-07-05 17:47:05 +01:00
ameye	e784d84699	Merge branch 'cookie-value-reading' of WrenchBoard/Users-Wrench into master	2023-07-05 16:10:01 +00:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	cd6d540c4b	Family Activer Job	2023-07-05 11:12:08 -04:00
victorAnumudu	b2beaa7c2b	changed how the value of login type is read from the cookie	2023-07-05 15:40:05 +01:00
ameye	b0db896f6b	Merge branch 'resources-page' of WrenchBoard/Users-Wrench into master	2023-07-05 14:15:03 +00:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	fafea8b1ad	Task banners	2023-07-05 10:13:19 -04:00
Ebube	bbb099d51f	Modified status for family waitlist	2023-07-05 14:51:24 +01:00
Ebube	bfc0521e54	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into resources-page	2023-07-05 14:45:51 +01:00
Ebube	6870c145d7	Added banner name to suggested task payload	2023-07-05 14:45:29 +01:00
ameye	c18373f9db	Merge branch 'resources-page' of WrenchBoard/Users-Wrench into master	2023-07-05 13:34:21 +00:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	24ac0daf29	status_text	2023-07-05 08:58:08 -04:00
Ebube	4dd58b16d8	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into resources-page	2023-07-05 13:52:39 +01:00
Ebube	cc66ebbbde	Family waitlist complete	2023-07-05 13:51:10 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	3d61b3259d	Status label	2023-07-05 08:32:00 -04:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	40b614356f	active task spread	2023-07-05 08:17:57 -04:00
ameye	dbba6c4014	Merge branch 'resources-page' of WrenchBoard/Users-Wrench into master	2023-07-05 11:56:34 +00:00
Ebube	ae93de5f25	Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into resources-page	2023-07-05 12:53:41 +01:00
Ebube	4904f1d398	Added waiting component and rendered the offerlist	2023-07-05 12:53:19 +01:00
ameye	880b084547	Merge branch 'cookie-bug-fix' of WrenchBoard/Users-Wrench into master	2023-07-05 10:26:39 +00:00