From 02d90ebb1484c488bfc2f6e106933d68e327c1a1 Mon Sep 17 00:00:00 2001 From: Ebube Date: Sun, 2 Jul 2023 03:02:29 +0100 Subject: [PATCH] Family market added --- src/Routers.jsx | 2 + src/components/FamilyAcc/FamilyMarket.jsx | 89 ++++++++++++++ .../MyPendingJobs/ParentWaiting.jsx | 112 +++++++++--------- src/components/MyTasks/MyJobTable.jsx | 2 +- src/components/Partials/Layout.jsx | 7 +- src/components/Partials/Sidebar.jsx | 9 ++ src/views/FamilyMarketPage.jsx | 9 ++ 7 files changed, 169 insertions(+), 61 deletions(-) create mode 100644 src/components/FamilyAcc/FamilyMarket.jsx create mode 100644 src/views/FamilyMarketPage.jsx diff --git a/src/Routers.jsx b/src/Routers.jsx index a25c6e1..6bb5318 100644 --- a/src/Routers.jsx +++ b/src/Routers.jsx @@ -46,6 +46,7 @@ import MyReviewDueJobsPage from "./views/MyReviewDueJobsPage"; import OffersInterestPage from "./views/OffersInterestPage"; import ManageInterestOfferPage from './views/ManageInterestOfferPage' import MyWaitingJobsPage from "./views/MyWaitingJobsPage"; +import FamilyMarketPage from "./views/FamilyMarketPage"; export default function Routers() { return ( @@ -87,6 +88,7 @@ export default function Routers() { } /> } /> } /> + } /> } /> } /> } /> diff --git a/src/components/FamilyAcc/FamilyMarket.jsx b/src/components/FamilyAcc/FamilyMarket.jsx new file mode 100644 index 0000000..246688f --- /dev/null +++ b/src/components/FamilyAcc/FamilyMarket.jsx @@ -0,0 +1,89 @@ +import React, { useCallback, useEffect, useMemo, useState } from "react"; +import InputCom from "../Helpers/Inputs/InputCom"; +import Layout from "../Partials/Layout"; +import SiteService from "../../services/SiteService"; +import ModalCom from "../Helpers/ModalCom"; + +export default function FamilyMarket() { + const [selectTab, setValue] = useState("today"); + const [popUp, setPopUp] = useState(false); + + const apiCall = useMemo(() => new SiteService(), []); + + // This is to make sure it's called once and used everywhere + let memberId = localStorage.getItem("member_id"); + let uid = localStorage.getItem("uid"); + let sessionId = localStorage.getItem("session_token"); + + const popUpHandler = () => { + setPopUp((prev) => !prev); + }; + + // tab handler + const filterHandler = (value) => { + setValue(value); + }; + + + return ( + + {/**/} +
+
+ {/* heading */} +
+
+

+ + Family Market + + {/* */} +

+
+
+
filterHandler("today")} + className="relative" + >
+
+
+
+
+ {popUp && ( + + {/* */} + + )} + + ); +} + +const CloseIcon = () => ( + + + + +); diff --git a/src/components/MyPendingJobs/ParentWaiting.jsx b/src/components/MyPendingJobs/ParentWaiting.jsx index 523e845..b092237 100644 --- a/src/components/MyPendingJobs/ParentWaiting.jsx +++ b/src/components/MyPendingJobs/ParentWaiting.jsx @@ -7,61 +7,61 @@ import CountDown from "../Helpers/CountDown"; import ParentWaitingTable from "./ParentWaitingTable"; export default function ParentWaiting({ className }) { - const [addFavorite, setValue] = useState(false); - const favoriteHandler = () => { - if (!addFavorite) { - setValue(true); - toast.success("Added to Favorite List"); - } else { - setValue(false); - toast.warn("Remove to Favorite List"); - } - }; - return ( - <> -
-
-

Waiting for Parent to Get Started...

-
-
-
- banner -
+ const [addFavorite, setValue] = useState(false); + const favoriteHandler = () => { + if (!addFavorite) { + setValue(true); + toast.success("Added to Favorite List"); + } else { + setValue(false); + toast.warn("Remove to Favorite List"); + } + }; + return ( + <> +
+
+

+ Waiting for Parent to Get Started... +

+
+
+
+ banner +
-
- {} - - {/*
*/} - {/*

*/} - {/* Lock and Lob x Fiesta Spurs*/} - {/*

*/} - {/* */} - {/* ID : 2320382*/} - {/**/} - {/*
*/} - {/* /!* user *!/*/} - {/*
*/} - {/*
*/} - {/* */} - {/*
*/} - {/*
*/} - {/*

*/} - {/* Brokln Simons*/} - {/*

*/} - {/*

*/} - {/* @broklinslam_75*/} - {/*

*/} - {/*
*/} - {/*
*/} - -
-
-
- - ); -} +
+ {} + {/*
*/} + {/*

*/} + {/* Lock and Lob x Fiesta Spurs*/} + {/*

*/} + {/* */} + {/* ID : 2320382*/} + {/**/} + {/*
*/} + {/* /!* user *!/*/} + {/*
*/} + {/*
*/} + {/* */} + {/*
*/} + {/*
*/} + {/*

*/} + {/* Brokln Simons*/} + {/*

*/} + {/*

*/} + {/* @broklinslam_75*/} + {/*

*/} + {/*
*/} + {/*
*/} +
+
+
+ + ); +} \ No newline at end of file diff --git a/src/components/MyTasks/MyJobTable.jsx b/src/components/MyTasks/MyJobTable.jsx index fb4e74f..c91b5b9 100644 --- a/src/components/MyTasks/MyJobTable.jsx +++ b/src/components/MyTasks/MyJobTable.jsx @@ -33,7 +33,7 @@ export default function MyJobTable({ className, ActiveJobList, Account }) { const navigateMarket = () => { setBtnLoader(true); const timeoutId = setTimeout(() => { - navigate(accountType ? "/market" : "/", { replace: true }); + navigate(accountType ? "/market" : "/familymarket", { replace: true }); setBtnLoader(false); }, 2500); return () => clearTimeout(timeoutId); diff --git a/src/components/Partials/Layout.jsx b/src/components/Partials/Layout.jsx index c8392b6..ea29f0b 100644 --- a/src/components/Partials/Layout.jsx +++ b/src/components/Partials/Layout.jsx @@ -1,4 +1,4 @@ -import React, { useState} from "react"; +import React, { useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { useNavigate } from "react-router-dom"; import useToggle from "../../hooks/useToggle"; @@ -10,10 +10,9 @@ import RightSideBar from "./RightSideBar"; import Sidebar from "./Sidebar"; import usersService from "../../services/UsersService"; - export default function Layout({ children }) { const { drawer } = useSelector((state) => state.drawer); - const {userJobList} = useSelector((state) => state.userJobList) + const { userJobList } = useSelector((state) => state.userJobList); const dispatch = useDispatch(); const [MobileSideBar, setMobileSidebar] = useToggle(false); const [logoutModal, setLogoutModal] = useState(false); @@ -196,4 +195,4 @@ export default function Layout({ children }) { )} ); -} \ No newline at end of file +} diff --git a/src/components/Partials/Sidebar.jsx b/src/components/Partials/Sidebar.jsx index c657947..662ca6d 100644 --- a/src/components/Partials/Sidebar.jsx +++ b/src/components/Partials/Sidebar.jsx @@ -124,6 +124,15 @@ export default function Sidebar({ iconName="market" /> )} + {userDetails && userDetails?.account_type == "FAMILY" && ( + + )} + + + ); +}