From 0f548e216d0ad95fe6580d95c7353308f4b32641 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Tue, 5 Mar 2024 15:49:04 +0100 Subject: [PATCH] removed active task display from family home page --- src/components/Home/FamilyDash.jsx | 29 ++++------------------------- src/components/Home/index.jsx | 26 ++------------------------ src/middleware/AuthRoute.jsx | 17 ++--------------- 3 files changed, 8 insertions(+), 64 deletions(-) diff --git a/src/components/Home/FamilyDash.jsx b/src/components/Home/FamilyDash.jsx index 02d2a94..6f84983 100644 --- a/src/components/Home/FamilyDash.jsx +++ b/src/components/Home/FamilyDash.jsx @@ -7,14 +7,14 @@ import { useDispatch, useSelector } from "react-redux"; import { tableReload } from "../../store/TableReloads"; import LoadingSpinner from "../Spinners/LoadingSpinner"; -export default function FamilyDash({ MyActiveJobList, serverImg }) { +export default function FamilyDash({ MyActiveJobList=[], serverImg }) { // console.log("PROPS IN FAMILY DASH->", familyOffers?.result_list); const dispatch = useDispatch(); const userApi = new usersService(); - const trending = MyActiveJobList; + // const trending = MyActiveJobList; const { familyBannersList } = useSelector((state) => state.familyBannersList); @@ -24,25 +24,6 @@ export default function FamilyDash({ MyActiveJobList, serverImg }) { let [reloadBanner, setReloadBanner] = useState(0) - // DO NOT UNCOMMENT THE CODE BELOW - - // let [familyBannersList, setFamilyBannersList] = useState({loading:false, result:{}}) - // const getFamilyBanners = async () => { // FUNCTION TO GET FAMILY BANNERS - // setFamilyBannersList({loading:true, result:[]}); - // try { - // const res = await userApi.getFamilyBannersList(); - // setFamilyBannersList({loading:false, result:res.data}); - // console.log('TEST RESPONSE', res.data) - // } catch (error) { - // setFamilyBannersList({loading:false, result:[]}); - // console.log("Error getting tasks"); - // } - // }; - - // useEffect(()=>{ - // getFamilyBanners() - // },[]) - useEffect(()=>{ if(reloadBanner >= 2){ dispatch(tableReload({ type: "FAMILYBANNERSLIST" })); // RELOAD FAMILY BANNERS LIST EVERY 10 MINS @@ -60,8 +41,6 @@ export default function FamilyDash({ MyActiveJobList, serverImg }) { return (
- {/* */} - {/* Header */}
@@ -148,13 +127,13 @@ export default function FamilyDash({ MyActiveJobList, serverImg }) { /> )} */} - {trending && trending.length > 0 && ( + {/* {trending && trending.length > 0 && ( - )} + )} */}
); diff --git a/src/components/Home/index.jsx b/src/components/Home/index.jsx index c0d4a2a..41d0ecb 100644 --- a/src/components/Home/index.jsx +++ b/src/components/Home/index.jsx @@ -58,17 +58,13 @@ export default function Home(props) { useEffect(() => { const fetchData = async () => { - await Promise.all([getHomeDate(), getMyOffersList()]); + await Promise.all([getHomeDate(), getMyOffersList(), getMyActiveJobList()]); }; if(userDetails?.account_type == 'FULL'){ fetchData(); } }, []); - useEffect(() => { - getMyActiveJobList(); - }, []); - return (
@@ -78,7 +74,7 @@ export default function Home(props) { commonHeadData={props.bannerList} // familyOffers={MyOffersList?.data} serverImg = {userDetails?.session_image_server} - MyActiveJobList={MyActiveJobList?.data} + // MyActiveJobList={MyActiveJobList?.data} /> ) : userDetails && userDetails?.account_type == "FULL" ? ( ); } -// /* -// -//
-// -// {/* -// */} -// -{ - /* - - */ -} -//
-//
diff --git a/src/middleware/AuthRoute.jsx b/src/middleware/AuthRoute.jsx index 231b282..06719fa 100644 --- a/src/middleware/AuthRoute.jsx +++ b/src/middleware/AuthRoute.jsx @@ -288,23 +288,10 @@ const AuthRoute = ({ redirectPath = "/login", children }) => { } }; getFamilyResourcesList() - }, [isLogin.status, familyBannersListTable]); + }, [isLogin.status]); - // useEffect(() => { - // apiCall - // .getHeroJBanners() - // .then((res) => { - // if (res.data.internal_return < 0) { - // return; - // } - // dispatch(commonHeadBanner(res.data)); - // }) - // .catch((error) => { - // console.log("ERROR ", error); - // }); - // }, []); - // + // RENDER PAGE return isLogin.loading && !loggedIn ? ( ) : !isLogin.status && !loggedIn ? (