repositioned offer list display

src/components/AuthPages/Login/index2.jsx

@@ -16,9 +16,6 @@ import { updateUserDetails } from "../../../store/UserDetails";
 
 import ReCAPTCHA from "react-google-recaptcha";
 
-import GoogleDownload from '../../../assets/images/download/andriod.jpg'
-import IOSDownload from '../../../assets/images/download/apple.jpg'
-
 export default function Login() {
   // eslint-disable-next-line no-restricted-globals
   const queryParams = new URLSearchParams(location?.search);
@@ -529,43 +526,40 @@ export default function Login() {
               {/* APP DOWNLOAD STORE */}
               <div className="w-full mt-4">
                 <div className="w-full flex justify-center items-center gap-4">
-                  <div className="w-32 lg:w-48">
+                  <div className="w-28 lg:w-32">
                     <a
-                      // className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
+                      className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
                       target="_blank"
                       rel="noreferrer"
                       href={process.env.REACT_APP_APPLE_APP}
                     >
-                      {/* <i className="fa-brands fa-apple text-3xl"></i>
+                      <i className="fa-brands fa-apple text-3xl"></i>
                       <div className="flex flex-col">
                         <span className="text-[11px]">Available on the</span>
                         <span className="text-[12px] lg:text-base">
                           App Store
                         </span>
-                      </div> */}
+                      </div>
-                      <img src={IOSDownload} className='w-full h-auto' alt='IOS Download' />
                     </a>
                   </div>
-                  <div className="w-32 lg:w-48">
+                  <div className="w-28 lg:w-32">
                     <a
-                      // className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
+                      className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
                       target="_blank"
                       rel="noreferrer"
                       href={process.env.REACT_APP_ANDROID_APP}
                     >
-                      {/* <i className="fa-brands fa-google-play text-2xl"></i>
+                      <i className="fa-brands fa-google-play text-2xl"></i>
                       <div className="flex flex-col">
                         <span className="text-[11px]">Available on the</span>
                         <span className="text-[12px] lg:text-base">
                           Google Play
                         </span>
-                      </div> */}
+                      </div>
-                      <img src={GoogleDownload} className='w-full h-auto' alt='IOS Download' />
                     </a>
                   </div>
                 </div>
               </div>
-
               {loginType == "full" && (
                 <>
                   <div className="pt-5 text-[#181c32] text-center font-semibold text-[13.975px] leading-[20.9625px]">

src/components/AuthPages/Promo/Promo.jsx

@@ -179,10 +179,10 @@ export default function Promo() {
                   </div>
                 </div>
 
-              {/* APP DOWNLOAD STORE */}
+                              {/* APP DOWNLOAD STORE */}
               <div className="w-full mt-4">
-                <div className="w-full flex justify-center items-center gap-4">
+                <div className="w-full flex justify-between items-center gap-10 sm:gap-32">
-                  <div className="w-32 lg:w-48">
+                  <div className="w-full">
                     <a
                       // className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
                       target="_blank"
@@ -199,7 +199,7 @@ export default function Promo() {
                       <img src={IOSDownload} className='w-full h-auto' alt='IOS Download' />
                     </a>
                   </div>
-                  <div className="w-32 lg:w-48">
+                  <div className="w-full">
                     <a
                       // className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
                       target="_blank"

src/components/AuthPages/SignUp/index2.jsx

@@ -5,9 +5,6 @@ import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout2";
 
-import GoogleDownload from '../../../assets/images/download/andriod.jpg'
-import IOSDownload from '../../../assets/images/download/apple.jpg'
-
 export default function SignUp() {
   // eslint-disable-next-line no-restricted-globals
   const queryParams = new URLSearchParams(location?.search);
@@ -350,38 +347,36 @@ export default function SignUp() {
                 {/* APP DOWNLOAD STORE */}
                 <div className="w-full mt-4">
                   <div className="w-full flex justify-center items-center gap-4">
-                    <div className="w-32 lg:w-48">
+                    <div className="w-28 lg:w-32">
                       <a
-                        // className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
+                        className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
                         target="_blank"
-                        rel="noreferrer"
                         href={process.env.REACT_APP_APPLE_APP}
+                        rel="noreferrer"
                       >
-                        {/* <i className="fa-brands fa-apple text-3xl"></i>
+                        <i className="fa-brands fa-apple text-3xl"></i>
                         <div className="flex flex-col">
                           <span className="text-[11px]">Available on the</span>
                           <span className="text-[12px] lg:text-base">
                             App Store
                           </span>
-                        </div> */}
+                        </div>
-                        <img src={IOSDownload} className='w-full h-auto' alt='IOS Download' />
                       </a>
                     </div>
-                    <div className="w-32 lg:w-48">
+                    <div className="w-28 lg:w-32">
                       <a
-                        // className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
+                        className="px-1 py-1 lg:py-2 flex justify-center items-center gap-1 w-full rounded-md bg-black text-white hover:text-slate-500 hover:shadow-lg transition-all duration-300"
                         target="_blank"
-                        rel="noreferrer"
                         href={process.env.REACT_APP_ANDROID_APP}
+                        rel="noreferrer"
                       >
-                        {/* <i className="fa-brands fa-google-play text-2xl"></i>
+                        <i className="fa-brands fa-google-play text-2xl"></i>
                         <div className="flex flex-col">
                           <span className="text-[11px]">Available on the</span>
                           <span className="text-[12px] lg:text-base">
                             Google Play
                           </span>
-                        </div> */}
+                        </div>
-                        <img src={GoogleDownload} className='w-full h-auto' alt='IOS Download' />
                       </a>
                     </div>
                   </div>

src/components/Contexts/SocketIOContext.js

@@ -85,7 +85,6 @@ export default function SocketIOContextProvider({children}) {
             }
             console.log('data', data)
         });
-        // dispatch(tableReload({ type: "HOMEBANNERS" })); // RELOADS HOME BANNERS
 
     }, [socket]);
 

src/components/Dashboards/AccountDashboard.jsx

@@ -5,15 +5,13 @@ import OfferJobPopout from '../../components/jobPopout/OfferJobPopout'
 import { PriceFormatter } from "../Helpers/PriceFormatter";
 import CountDown from '../Helpers/CountDown'
 
-const AccountDashboard = ({ className, bannerList, offersList, imageServer }) => {
+const AccountDashboard = ({ className, bannerList, offersList }) => {
 
   let [offerPopout, setOfferPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
 
-  let offersListLength = offersList?.length
-
   // getting the upper three banners for the home layout
-  const getUpperBanner = bannerList?.filter((value, idx) => idx <= 2 - offersListLength);
+  const getUpperBanner = bannerList?.filter((value, idx) => idx <= 2);
-  const getLowerBanner = bannerList?.filter((value, idx) => !getUpperBanner?.map(item => item?.title)?.includes(value.title));
+  const getLowerBanner = bannerList?.filter((value, idx) => idx > 2);
 
   let getImage = ({ banner_location, banner }) => {
     if (banner_location == "LOCAL") {
@@ -31,26 +29,24 @@ const AccountDashboard = ({ className, bannerList, offersList, imageServer }) =>
         }`}
       >
 
-        {/* for normal banner section */}
         <div className="w-full grid xxs:grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 items-center justify-center gap-2 md:gap-4">
+
           {/* OFFER LIST DISPLAY */}
           <>
-            {(offersList && offersList?.length > 0) &&
+            {(offersList && offersList?.result_list?.length > 0) &&
-              offersList.map((item, index) => {
+              offersList.result_list.map((item, index) => {
                 let thePrice = PriceFormatter(
                   item?.price * 0.01,
                   item?.currency_code,
                   item?.currency
                 );
               
-                let image = `${imageServer}${localStorage.getItem("session_token")}/job/${item.job_uid}`
+                let image = `${offersList.session_image_server}${localStorage.getItem("session_token")}/job/${item.job_uid}`
-                if(index < 3){
+                return (
-                  return (
+                  <div key={item.id}>
-                    <div key={item.offer_uid}>
+                    <NewOfferCard datas={item} image={image} price={thePrice} setOfferPopout={setOfferPopout} />
-                        <NewOfferCard datas={item} image={image} price={thePrice} setOfferPopout={setOfferPopout} />
+                  </div>
-                    </div>
+                )
-                  )
-                }
             })}
           </>
 
@@ -73,30 +69,7 @@ const AccountDashboard = ({ className, bannerList, offersList, imageServer }) =>
             );
           })}
         </div>
-
+        <div className="w-full grid-cols-1 md:grid-cols-2 2xl::grid-cols-3 grid items-center justify-center gap-2 md:gap-4">
-
-        {/* for flat banner section */}
-        <div className="w-full grid-cols-1 md:grid-cols-2 2xl:grid-cols-3 grid items-center justify-center gap-2 md:gap-4">    
-          {/* OFFER LIST DISPLAY */}
-          <>
-            {(offersList && offersList?.length > 0) &&
-              offersList.map((item, index) => {
-                let thePrice = PriceFormatter(
-                  item?.price * 0.01,
-                  item?.currency_code,
-                  item?.currency
-                );
-              
-                let image = `${imageServer}${localStorage.getItem("session_token")}/job/${item.job_uid}`
-                if(index >= 3) {
-                    return(
-                    <div key={item.offer_uid}>
-                        <NewOfferCardFlat datas={item} image={image} price={thePrice} setOfferPopout={setOfferPopout} />
-                    </div>
-                    )
-                }
-            })}
-          </>
           {getLowerBanner?.map((props, idx) => {
             let image = getImage(props);
 
@@ -184,17 +157,10 @@ const NewOfferCard = ({ datas, hidden = false, price, setOfferPopout, image }) =
         :
         <div
           className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4"
-          style={{
-            // background: `url(${image}) center / contain no-repeat`,
-          }}
-        >
-          {/* <img src={image} className='' /> */}
-          <div
-          className="thumbnail w-full h-full rounded-xl overflow-hidden"
           style={{
             background: `url(${image}) center / contain no-repeat`,
           }}
-        ></div>
+        >
           {hidden && <div className="flex justify-center"></div>}
         </div>
         }
@@ -204,15 +170,18 @@ const NewOfferCard = ({ datas, hidden = false, price, setOfferPopout, image }) =
           <h1 className="font-bold text-lg line-clamp-1 text-center">
             {datas?.title}
           </h1>
+          {/* <Link to={link_path} className="text-sm">
+            {desc}
+          </Link> */}
           <div className="card-buttons flex justify-center items-center space-x-2">
             <button
               type="button"
               onClick={() =>
-                setOfferPopout({ show: true, data: { ...datas, image } })
+                setOfferPopout({ show: true, data: { ...datas, price, image } })
               }
               className="btn-shine w-2/3 h-[40px] text-white rounded-full text-sm bg-pink flex justify-center items-center"
             >
-              Start Now
+              Start Task
             </button>
           </div>
         </div>
@@ -234,62 +203,6 @@ const NewOfferCard = ({ datas, hidden = false, price, setOfferPopout, image }) =
   );
 };
 
-const NewOfferCardFlat = ({ datas, hidden = false, price, setOfferPopout, image }) => {
-  return (
-    <div className="flex flex-col shadow-md bg-red-50 dark:bg-dark-white rounded-xl dark:border-[#5356fb29] overflow-hidden">
-      <div className="w-full xxs:flex justify-between items-center border-b border-slate-300 p-2">
-        <div className="min-h-[130px] sm:min-h-[100px] flex justify-between items-center">
-          <div className="px-2 flex flex-col gap-2 dark:text-white">
-            <h1 className="font-bold text-lg line-clamp-1 text-center">
-              {datas?.title}
-            </h1>
-            <div className="card-buttons flex items-center space-x-2">
-              <button
-                type="button"
-                onClick={() =>
-                  setOfferPopout({ show: true, data: { ...datas, image } })
-                }
-                className="btn-shine w-28 h-[40px] text-white rounded-full text-sm bg-pink flex justify-center items-center"
-              >
-                Start Now
-              </button>
-            </div>
-          </div>
-        </div>
-        <div className='w-[150px] h-[100px]'>
-          {datas.job_type == "MEDIA" ?
-          <Suspense fallback={<p>Loading...</p>}>
-            <VideoElement videoId={datas?.media_uid} />
-          </Suspense>
-          :
-          <div
-            className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4"
-            style={{
-              background: `url(${image}) center / contain no-repeat`,
-            }}
-          >
-            {hidden && <div className="flex justify-center"></div>}
-          </div>
-          }
-        </div>
-      </div>
-      <div className="flex justify-between w-full p-1 items-center">
-        <div className="flex gap-1 items-center">
-          <p className="text-[12px] text-red-500 tracking-wide">Expires</p>
-          <p className="text-[12px] font-semibold tracking-wide text-dark-gray dark:text-white">
-            <CountDown lastDate={datas.expire} />
-          </p>
-        </div>
-        <button className="flex items-center justify-center gap-2">
-          <div className="w-[4px] h-[4px] bg-slate-400 rounded-full"></div>
-          <div className="w-[4px] h-[4px] bg-slate-400 rounded-full"></div>
-          <div className="w-[4px] h-[4px] bg-slate-400 rounded-full"></div>
-        </button>
-      </div>
-    </div>
-  );
-};
-
 const LowerBanner = ({ image, title = "", desc = "", btn, link_path, card_type, blog_id, key }) => {
   const newLinkPath = card_type == 'BLOG' ? `${link_path}?blog_id=${blog_id}` : link_path
 

src/components/Dashboards/FamilyParentDashboard.jsx

@@ -5,6 +5,7 @@ import { useSelector } from "react-redux";
 export default function FamilyParentDashboard({
   className,
   bannerList,
+  nextDueTask,
 }) {
   const { userDetails } = useSelector((state) => state?.userDetails);
 

src/components/Dashboards/HomeDashboard.jsx

@@ -2,7 +2,7 @@ import React from "react";
 // import HomeSliders from "./HomeSliders";
 import { useSelector } from "react-redux";
 
-export default function HomeDashboard({ className, bannerList }) {
+export default function HomeDashboard({ className, bannerList, nextDueTask }) {
   const { userDetails } = useSelector((state) => state?.userDetails);
 
   let loginDate = userDetails?.last_login.split(" ")[0];

src/components/Dashboards/JobOwnerDashboard.jsx

@@ -5,6 +5,7 @@ import { useSelector } from "react-redux";
 export default function JobOwnerDashboard({
   className,
   bannerList,
+  nextDueTask,
 }) {
   const { userDetails } = useSelector((state) => state?.userDetails);
 

src/components/Dashboards/WorkerDashboard.jsx

@@ -5,6 +5,7 @@ import { useSelector } from "react-redux";
 export default function WorkerDashboard({
   className,
   bannerList,
+  nextDueTask,
 }) {
   const { userDetails } = useSelector((state) => state?.userDetails);
 

src/components/FamilyAcc/FamilyTableNew.jsx

@@ -20,9 +20,6 @@ export default function FamilyTableNew() {
 
   let { pathname } = useLocation();
 
-  const queryParams = new URLSearchParams(location?.search);
-  const preSelectedTab = queryParams.get("tab");
-
   // Initial state for family details
   const initialDetailState = {
     loading: false,
@@ -58,9 +55,9 @@ export default function FamilyTableNew() {
 
   // Array of tab names
   const tabs = [
-    { id: 1, name: "tasks" },
+    { id: 1, name: "Tasks" },
-    { id: 2, name: "waiting" },
+    { id: 2, name: "Waiting" },
-    { id: 3, name: "pending" },
+    { id: 3, name: "Pending" },
   ];
 
   // State for the currently selected tab
@@ -97,14 +94,6 @@ export default function FamilyTableNew() {
   // Selected tab component based on the current 'tab'
   const selectedTabComponent = tabComponents[tab] || defaultTabComponent;
 
-  useEffect(()=>{ // EFFECT TO CHECK FOR PRE SELECTED TAB AND DEFAULT TO IT OR TO DEFAULT IF NOT AVALIABLE
-    if(preSelectedTab && tabs.map(item => item.name.toLowerCase()).includes(preSelectedTab.toLowerCase())){
-      setTab(preSelectedTab)
-    }else{
-      setTab(tabs[0].name)
-    }
-  },[])
-
 
   // Effect to manage active family task details
   useEffect(() => {

src/components/Home/FullAccountDash.jsx

@@ -22,6 +22,7 @@ export default function FullAccountDash(props) {
             className="mb-4"
             data={userDetails}
             bannerList={props.bannerList}
+            nextDueTask={props.nextDueTask}
           />
         );
       case "FAMILY_PARENT_DASH":
@@ -30,6 +31,7 @@ export default function FullAccountDash(props) {
             className="mb-4"
             data={userDetails}
             bannerList={props.bannerList}
+            nextDueTask={props.nextDueTask}
           />
         );
       case "WORKER_HOME_DASH":
@@ -38,6 +40,7 @@ export default function FullAccountDash(props) {
             className="mb-4"
             data={userDetails}
             bannerList={props.bannerList}
+            nextDueTask={props.nextDueTask}
           />
         );
       case "JOBOWNER_HOME_DASH":
@@ -46,6 +49,7 @@ export default function FullAccountDash(props) {
             className="mb-4"
             data={userDetails}
             bannerList={props.bannerList}
+            nextDueTask={props.nextDueTask}
           />
         );
       default:
@@ -58,18 +62,16 @@ export default function FullAccountDash(props) {
       <div className="home-page-wrapper">
         {renderDashboard()}
         {process.env.REACT_APP_SHOW_ACCOUNT_DASH == "1" && (
-          <AccountDashboard className="mb-4" bannerList={props.bannerList} offersList={props.offersList} imageServer={props.imageServer} />
+          <AccountDashboard className="mb-4" bannerList={props.bannerList} offersList={props.offersList?.data} />
         )}
 
-        {/* {props?.dashTypes !== "undefined" &&
+        {props?.dashTypes !== "undefined" &&
         props.offersList?.data?.result_list?.length ? (
           <MyOffersTable
             MyActiveOffersList={props.offersList?.data}
             className="mb-10"
           />
-        ) 
+        ) : props.MyActiveJobList?.data?.length ? (
-        : 
-        props.MyActiveJobList?.data?.length ? (
           <>
             <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">
@@ -82,7 +84,7 @@ export default function FullAccountDash(props) {
               imageServer={props.offersList?.data?.session_image_server}
             />
           </>
-        ) : null} */}
+        ) : null}
       </div>
     </>
   );

src/components/Home/index.jsx

@@ -5,65 +5,68 @@ import usersService from "../../services/UsersService";
 import { useSelector } from "react-redux";
 import FamilyDash from "./FamilyDash";
 import FullAccountDash from "./FullAccountDash";
-import LoadingSpinner from '../../components/Spinners/LoadingSpinner'
 
 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({loading: true, data: []});
+
   const { userDetails } = useSelector((state) => state?.userDetails);
 
-  // const [MyActiveJobList, setMyActiveJobList] = useState({loading:true, data:[]}); // STATE TO HOLD ACTIVE/CURRENT TASKS
+  const [MyActiveJobList, setMyActiveJobList] = useState({loading:true, data:[]}); // STATE TO HOLD ACTIVE/CURRENT TASKS
+  // const [MyActiveJobList, setMyActiveJobList] = useState([]); // STATE TO HOLD ACTIVE/CURRENT TASKS
 
-  // const getMyActiveJobList = async () => { // FUNCTION TO POPULATE ACTIVE/CURRENT TASK LIST
+  const getMyActiveJobList = async () => { // FUNCTION TO POPULATE ACTIVE/CURRENT TASK LIST
-  //   try {
+    try {
-  //     const res = await userApi.getMyActiveTaskList();
+      const res = await userApi.getMyActiveTaskList();
-  //     setMyActiveJobList({loading:false, data:res?.data?.result_list});
+      setMyActiveJobList({loading:false, data:res?.data?.result_list});
-  //     // setMyActiveJobList(res?.data?.result_list);
+      // setMyActiveJobList(res?.data?.result_list);
-  //   } catch (error) {
+    } catch (error) {
-  //     setMyActiveJobList({loading:false, data:[]});
+      setMyActiveJobList({loading:false, data:[]});
-  //     // setMyActiveJobList([]);
+      // setMyActiveJobList([]);
-  //     console.log("Error getting tasks");
+      console.log("Error getting tasks");
-  //   }
+    }
-  // };
+  };
 
   // FUNCTION TO GET DASH DATA TO DETERMINE CURRENT TASK DUE TIME
-  // const getHomeDate = () => {
+  const getHomeDate = () => {
-  //   userApi
+    userApi
-  //     .getHomeDate()
+      .getHomeDate()
-  //     .then((res) => {
+      .then((res) => {
-  //       if (res.status != 200 || res.internal_return < 0) {
+        if (res.status != 200 || res.internal_return < 0) {
-  //         return;
+          return;
-  //       }
+        }
-  //       setNextDueTask(res.data);
+        setNextDueTask(res.data);
-  //     })
+      })
-  //     .catch((error) => {
+      .catch((error) => {
-  //       console.log(error);
+        console.log(error);
-  //     });
+      });
-  // };
+  };
 
-  // const getMyOffersList = async () => {
+  const getMyOffersList = async () => {
-  //   try {
+    try {
-  //     const res = await userApi.getOffersList();
+      const res = await userApi.getOffersList();
-  //     setMyOffersList({loading:false, data:res.data});
+      setMyOffersList({loading:false, data:res.data});
-  //   } catch (error) {
+    } catch (error) {
-  //     setMyOffersList({loading:false, data:[]});
+      setMyOffersList({loading:false, data:[]});
-  //     console.log("Error getting offers", error);
+      console.log("Error getting offers", error);
-  //   }
+    }
-  // };
+  };
 
-  // useEffect(() => {
+  useEffect(() => {
-  //   if(userDetails?.account_type == 'FULL'){
+    const fetchData = async () => {
-  //     getMyActiveJobList();
+      await Promise.all([getHomeDate(), getMyOffersList(), getMyActiveJobList()]);
-  //   }
+    };
-  // }, []);
+    if(userDetails?.account_type == 'FULL'){
+      fetchData();
+    }
+  }, []);
 
   return (
     <Layout>
-      {Object.keys(commonHeadBanner).length < 1 ?
-      <LoadingSpinner height='h-48' size='16' />
-      :
       <div className="w-full">
         {userDetails && userDetails?.account_type == "FAMILY" ? (
           <FamilyDash
@@ -75,12 +78,11 @@ export default function Home(props) {
           />
         ) : userDetails && userDetails?.account_type == "FULL" ? (
           <FullAccountDash
+            nextDueTask={nextDueTask}
             bannerList={props.bannerList}
             dashTypes={props.dashTypes}
-            // offersList={MyOffersList}
+            offersList={MyOffersList}
-            // MyActiveJobList={MyActiveJobList}
+            MyActiveJobList={MyActiveJobList}
-            offersList={props.offersList}
-            imageServer={props.imageServer}
           />
         ) : (
           <div>
@@ -88,7 +90,6 @@ export default function Home(props) {
           </div>
         )}
       </div>
-      }
     </Layout>
   );
 }

src/components/jobPopout/OfferJobPopout.jsx

@@ -8,7 +8,6 @@ import LoadingSpinner from "../Spinners/LoadingSpinner";
 
 import { tableReload } from "../../store/TableReloads";
 import { useDispatch } from "react-redux";
-import { PriceFormatter } from "../Helpers/PriceFormatter";
 
 function OfferJobPopout({ details, onClose, situation }) {
   const apiUrl = new usersService();
@@ -22,12 +21,6 @@ function OfferJobPopout({ details, onClose, situation }) {
     trigger: "",
   });
 
-  let thePrice = PriceFormatter(
-    details?.price * 0.01,
-    details?.currency_code,
-    details?.currency
-  );
-
   //FUNCTION TO HANDLE AN OFFER
   const handleOffer = ({ target: { name } }) => {
     const reqData = {
@@ -78,7 +71,6 @@ function OfferJobPopout({ details, onClose, situation }) {
         setTimeout(() => {
           onClose();
           dispatch(tableReload({ type: "MYTASKTABLE" }));
-          dispatch(tableReload({ type: "HOMEBANNERS" }));
           navigate("/mytask", { replace: true });
           setRequestStatus({
             loading: false,
@@ -141,87 +133,56 @@ function OfferJobPopout({ details, onClose, situation }) {
             </svg>
           </button>
         </div>
-        <div className="grid md:grid-cols-4 bg-white dark:bg-dark-white rounded-lg">
+        <div className="md:flex bg-white dark:bg-dark-white rounded-lg">
-          <div className="p-4 w-full md:col-span-3 md:border-r-2">
+          <div className="p-4 w-full md:w-3/4 md:border-r-2">
-
+            <p className="text-lg my-5 font-semibold text-slate-900 dark:text-white tracking-wide">
-            {/* INPUT SECTION */}
-            <div className='grid md:grid-cols-2'>
-              <div className="my-2 md:flex">
-                {/* <Detail
-                  label="Date :"
-                  value={
-                    (details.offer_added && details.offer_added?.split(" ")[0]) ||
-                    "default"
-                  }
-                /> */}
-                <label className='job-label w-full md:w-[150px] md:text-right'>Date :</label>
-                <p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white`}>
-                  {
-                    (details.offer_added && details.offer_added?.split(" ")[0]) ||
-                    "default"
-                  }
-                </p>
-              </div>
-
-              <div className="my-2 md:flex">
-                {/* <Detail
-                  label="Offer Expire :"
-                  value={details.expire && details.expire.split(" ")[0]}
-                /> */}
-                <label className='job-label w-full md:w-[150px] md:text-right'>Expire :</label>
-                <p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white`}>{details.expire && details.expire.split(" ")[0]}</p>
-              </div>
-            </div>
-
-            <div className='grid md:grid-cols-2'>
-              <div className="my-2 md:flex">
-                {/* <Detail label="Reward :" value={thePrice} /> */}
-                <label className='job-label w-full md:w-[150px] md:text-right'>Reward :</label>
-                <p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white`}>{thePrice}</p>
-              </div>
-
-              <div className="my-2 md:flex">
-                {/* <Detail
-                  label="Duration :"
-                  value={`${details.timeline_days} day(s)`}
-                /> */}
-                <label className='job-label w-full md:w-[150px] md:text-right'>Duration :</label>
-                <p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white`}>{`${details.timeline_days} day(s)`}</p>
-              </div>
-            </div>
-
-            <p className="text-lg my-2 font-semibold text-slate-900 dark:text-white tracking-wide max-h-[200px] overflow-y-auto">
               {details.title}
             </p>
 
+            {/* INPUT SECTION */}
             <div className="my-2 md:flex">
-              <label className='job-label w-full md:w-[150px]'>Description :</label>
+              <Detail
-              <p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white max-h-[200px] overflow-y-auto`}>{details.description}</p>
+                label="Date"
-              {/* <Detail label="Description" value={details.description} /> */}
+                value={
+                  (details.offer_added && details.offer_added?.split(" ")[0]) ||
+                  "default"
+                }
+              />
             </div>
 
+            <div className="my-2 md:flex">
+              <Detail label="Description" value={details.description} />
+            </div>
 
+            <div className="my-2 md:flex">
+              <Detail
+                label="Offer Expire"
+                value={details.expire && details.expire.split(" ")[0]}
+              />
+            </div>
 
-            <div className="my-2 md:flx">
+            <div className="my-2 md:flex">
-              {/* <label className='job-label w-full md:w-[150px]'>Detail</label>
+              <Detail label="Reward" value={details.thePrice} />
-              <p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white min-h-[100px] max-h-[200px] overflow-y-auto border-2 rounded-md`}>{details.job_description || details.job_detail}</p> */}
+            </div>
-              <label className="w-full text-slate-900 dark:text-white tracking-wide font-semibold">
+
-                Delivery Detail :
+            <div className="my-2 md:flex">
-              </label>
+              <Detail
-              <textarea
+                label="Duration"
-                className={`p-2 w-full text-sm text-slate-900 dark:text-white bg-transparent outline-none border border-slate-300 rounded-md`}
+                value={`${details.timeline_days} day(s)`}
-                rows="5"
+              />
-                style={{ resize: "none" }}
+            </div>
-                value={details.job_description || details.job_detail}
+
-                readOnly
+            <div className="my-2 md:flex">
+              <Detail
+                label="Detail"
+                value={details.job_description || details.description}
               />
             </div>
           </div>
 
           {/* ACTION SECTION */}
-          <div className="p-4 w-full md:col-span-1 h-full flex flex-col justify-between">
+          <div className="p-4 w-full md:w-1/4 h-full">
-            <div className="my-3 md:flex flex-col md:justify-center">
+            <div className="my-3 md:flex md:justify-center">
-              <h1 className='mb-2 text-base font-semibold text-slate-900 dark:text-white tracking-wide'>I understand the task</h1>
               {requestStatus.loading && requestStatus.trigger == "offer" ? (
                 <LoadingSpinner size={8} color="sky-blue" />
               ) : (
@@ -229,9 +190,9 @@ function OfferJobPopout({ details, onClose, situation }) {
                   name="accept"
                   onClick={handleOffer}
                   disabled={requestStatus.loading}
-                  className="px-2 h-28 flex justify-center items-center btn-gradient text-2xl rounded-xl text-white"
+                  className="px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                 >
-                  Start Now
+                  Accept Offer
                 </button>
               )}
             </div>
@@ -244,10 +205,9 @@ function OfferJobPopout({ details, onClose, situation }) {
                   name="reject"
                   onClick={handleOffer}
                   disabled={requestStatus.loading}
-                  className="group relative px-2 h-11 flex justify-center items-center text-base text-black dark:text-white"
+                  className="px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                 >
                   Reject Offer
-                  <div className='absolute bottom-1 w-full h-[1px] bg-black hidden group-hover:block'></div>
                 </button>
               )}
             </div>

src/middleware/AuthRoute.jsx

@@ -27,7 +27,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
   const [loadProfileDetails, setLoadProfileDetails] = useState([]);
   const navigate = useNavigate();
 
-  const { jobListTable, marketTableList, walletTable, familyBannersListTable, homeBanners } = useSelector(
+  const { jobListTable, marketTableList, walletTable, familyBannersListTable } = useSelector(
     (state) => state.tableReload
   );
 
@@ -111,8 +111,8 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
     }
   }, []);
 
-  useEffect(() => { // FUNCTION TO GET NOTIFICATIONS LIST
+  useEffect(() => {
-    const notifications = () => {
+    const getNotifications = () => {
       // function to load user notification
       dispatch(updateNotifications({ loading: true }));
       apiCall
@@ -168,9 +168,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
           dispatch(updateNotifications({ loading: false, data: null }));
         });
     };
-      // delay verify requests by 10000ms
+    getNotifications();
-    const delay15secs = setTimeout(notifications, 15000)
-    return ()=> clearTimeout(delay15secs)
   }, []);
 
   useEffect(() => {
@@ -247,26 +245,26 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
         .catch((error) => {
           console.log("ERROR ", error);
         });
-  }, [isLogin.status, homeBanners]);
+  }, [isLogin.status]);
 
   //FUNCTION TO GET COMMON HEAD DATA
-  // useEffect(() => {
+  useEffect(() => {
-  //   if((!loggedIn && !isLogin.status) || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
+    if((!loggedIn && !isLogin.status) || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
-  //     return
+      return
-  //   }
+    }
-  //   apiCall
+    apiCall
-  //     .getRecentActivitiedData()
+      .getRecentActivitiedData()
-  //     .then((res) => {
+      .then((res) => {
-  //       //   debugger;
+        //   debugger;
-  //       if (res?.data?.internal_return < 0) {
+        if (res?.data?.internal_return < 0) {
-  //         return;
+          return;
-  //       }
+        }
-  //       dispatch(recentActivitiesData(res.data));
+        dispatch(recentActivitiesData(res.data));
-  //     })
+      })
-  //     .catch((error) => {
+      .catch((error) => {
-  //       console.log("ERROR ", error);
+        console.log("ERROR ", error);
-  //     });
+      });
-  // }, [isLogin.status]);
+  }, [isLogin.status]);
 
 
   //FUNCTION TO GET FAMILY BANNERS

src/store/TableReloads.js

@@ -14,7 +14,6 @@ const initialState = {
   familyOfferList: false,
   parentFamilyTaskList: false,
   offerInterestListReload: false,
-  homeBanners: false,
 };
 
 export const tableReloadSlice = createSlice({
@@ -62,9 +61,6 @@ export const tableReloadSlice = createSlice({
         case "OFFERINTERESTLISTRELOAD": // to reload offer interest list of owner when a worker sends interest in a job
           state.offerInterestListReload = !state.offerInterestListReload;
           return;
-        case "HOMEBANNERS": // to reload offer interest list of owner when a worker sends interest in a job
-          state.homeBanners = !state.homeBanners;
-          return;
         default:
           return state;
       }

src/views/HomePages.jsx

@@ -1,23 +1,13 @@
-import {useState, useEffect} from 'react'
 import { useSelector } from "react-redux";
 import Home from "../components/Home";
 
 export default function HomePages() {
   const { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
 
-  const [bannerOptions, setBannerOptions] = useState({})
+  const bannerOptions = {
-
+    bannerList: commonHeadBanner?.result_list,
-
+    dashTypes: commonHeadBanner?.home_dash_type,
-
+  };
-  useEffect(()=>{
-    const bannerOptions = {
-      bannerList: commonHeadBanner?.result_list,
-      dashTypes: commonHeadBanner?.home_dash_type,
-      offersList: commonHeadBanner?.offers_list,
-      imageServer: commonHeadBanner?.session_image_server
-    };
-    setBannerOptions(bannerOptions)
-  },[commonHeadBanner])
 
   return (
     <>