From 154ea29504e6282d206a895dab92e06b7f2ba46e Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Wed, 28 Feb 2024 18:38:19 +0100 Subject: [PATCH 1/3] added parent waiting page --- src/Routers.jsx | 2 ++ src/components/FamilyAcc/ParentWaiting.jsx | 12 +++++++++++ src/components/Home/FamilyDash.jsx | 21 ++++---------------- src/components/MyOffers/ParentWaiting.jsx | 23 ---------------------- src/views/ParentWaitingPage.jsx | 10 ++++++++++ 5 files changed, 28 insertions(+), 40 deletions(-) create mode 100644 src/components/FamilyAcc/ParentWaiting.jsx create mode 100644 src/views/ParentWaitingPage.jsx diff --git a/src/Routers.jsx b/src/Routers.jsx index 3182a0b..3438e2e 100644 --- a/src/Routers.jsx +++ b/src/Routers.jsx @@ -57,6 +57,7 @@ import VerifyPasswordPagesTwo from "./views/VerifyPasswordPagesTwo"; import VerifyYouPages from "./views/VerifyYouPages"; import VerifyYouPagesTwo from "./views/VerifyYouPagesTwo"; import YourPages from "./views/YourPage_"; +import ParentWaitingPage from "./views/ParentWaitingPage"; export default function Routers() { return ( @@ -129,6 +130,7 @@ export default function Routers() { } /> } /> } /> + } /> + + + ) +} diff --git a/src/components/Home/FamilyDash.jsx b/src/components/Home/FamilyDash.jsx index 8ebe47b..959f7ec 100644 --- a/src/components/Home/FamilyDash.jsx +++ b/src/components/Home/FamilyDash.jsx @@ -1,7 +1,6 @@ import React, { useEffect, useState } from "react"; import { Link } from "react-router-dom"; import usersService from "../../services/UsersService"; -import ParentWaiting from "../MyOffers/ParentWaiting"; import MyOffersFamilyTable from "../MyTasks/MyOffersFamilyTable"; import FamilyActiveLSlde from "./FamilyActiveLSlde"; import { useDispatch, useSelector } from "react-redux"; @@ -65,13 +64,13 @@ export default function FamilyDash({ familyOffers, MyActiveJobList }) { {/* Header */}
-

Welcome

+

Welcome

-

{`${userDetails?.firstname} ${userDetails?.lastname}`}

+

{`${userDetails?.firstname} ${userDetails?.lastname}`}

-

Last Login: {`${userDetails?.last_login.split(' ')[0]}`}

+

Last Login: {`${userDetails?.last_login.split(' ')[0]}`}

@@ -86,7 +85,7 @@ export default function FamilyDash({ familyOffers, MyActiveJobList }) { return (
- banner image + banner image

{content.banner.text}

@@ -121,15 +120,6 @@ export default function FamilyDash({ familyOffers, MyActiveJobList }) {
- - {/*
- 6w ago -
-
-
-
-
-
*/}
@@ -155,9 +145,6 @@ export default function FamilyDash({ familyOffers, MyActiveJobList }) { image_server={familyOffers?.session_image_server} /> )} - - {/**/} - ); diff --git a/src/components/MyOffers/ParentWaiting.jsx b/src/components/MyOffers/ParentWaiting.jsx index 3fec455..5918c29 100644 --- a/src/components/MyOffers/ParentWaiting.jsx +++ b/src/components/MyOffers/ParentWaiting.jsx @@ -41,29 +41,6 @@ export default function ParentWaiting({ className }) {
{} - - {/*
*/} - {/*

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

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

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

*/} - {/*

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

*/} - {/*
*/} - {/*
*/}
diff --git a/src/views/ParentWaitingPage.jsx b/src/views/ParentWaitingPage.jsx new file mode 100644 index 0000000..9903162 --- /dev/null +++ b/src/views/ParentWaitingPage.jsx @@ -0,0 +1,10 @@ +import React from 'react' +import ParentWaitingLayout from '../components/FamilyAcc/ParentWaiting' + +export default function ParentWaitingPage() { + return ( + <> + + + ) +} From 271180932cf7a4ae61977fcb5cafb178c9269f82 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Thu, 29 Feb 2024 10:32:27 +0100 Subject: [PATCH 2/3] linked banner to page --- src/Routers.jsx | 4 +++- src/components/Home/FamilyDash.jsx | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Routers.jsx b/src/Routers.jsx index 3438e2e..765be10 100644 --- a/src/Routers.jsx +++ b/src/Routers.jsx @@ -130,7 +130,9 @@ export default function Routers() { } /> } /> } /> - } /> + } /> + } /> + } /> {Object.keys(familyBannersList?.result_list).map((item, index) => { let content = familyBannersList?.result_list[item] - let action = item == 'recommend' ? 'familymarket' : 'mytask' + // let action = item == 'recommend' ? 'familymarket' : 'mytask' return ( - +
banner image
From 2521fbc1d8f2e561e50c6d263960d3bed0b900b7 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Thu, 29 Feb 2024 12:38:35 +0100 Subject: [PATCH 3/3] more pages created for family banner links --- src/Routers.jsx | 6 ++- src/components/FamilyAcc/FamilyPastDue.jsx | 10 +++++ .../FamilyAcc/FamilyPendingOffer.jsx | 44 +++++++++++++++++++ src/views/FamilyPastDuePage.jsx | 10 +++++ src/views/FamilyPendingOfferPage.jsx | 10 +++++ 5 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 src/components/FamilyAcc/FamilyPastDue.jsx create mode 100644 src/components/FamilyAcc/FamilyPendingOffer.jsx create mode 100644 src/views/FamilyPastDuePage.jsx create mode 100644 src/views/FamilyPendingOfferPage.jsx diff --git a/src/Routers.jsx b/src/Routers.jsx index 765be10..a44c638 100644 --- a/src/Routers.jsx +++ b/src/Routers.jsx @@ -58,6 +58,8 @@ import VerifyYouPages from "./views/VerifyYouPages"; import VerifyYouPagesTwo from "./views/VerifyYouPagesTwo"; import YourPages from "./views/YourPage_"; import ParentWaitingPage from "./views/ParentWaitingPage"; +import FamilyPendingOfferPage from "./views/FamilyPendingOfferPage"; +import FamilyPastDuePage from "./views/FamilyPastDuePage"; export default function Routers() { return ( @@ -131,8 +133,8 @@ export default function Routers() { } /> } /> } /> - } /> - } /> + } /> + } /> +
Family PastDue Page Here
+ + ) +} diff --git a/src/components/FamilyAcc/FamilyPendingOffer.jsx b/src/components/FamilyAcc/FamilyPendingOffer.jsx new file mode 100644 index 0000000..36ef045 --- /dev/null +++ b/src/components/FamilyAcc/FamilyPendingOffer.jsx @@ -0,0 +1,44 @@ +import React, { useEffect, useState } from 'react' +import Layout from '../Partials/Layout' +import MyOffersFamilyTable from '../MyTasks/MyOffersFamilyTable' +import LoadingSpinner from '../Spinners/LoadingSpinner'; +import usersService from '../../services/UsersService'; + +export default function FamilyPendingOffer() { + const userApi = new usersService(); + + const [myOffersList, setMyOffersList] = useState({loading: true, data: []}); + + const getMyOffersList = async () => { + try { + const res = await userApi.getOffersList(); + setMyOffersList({loading:false, data:res.data}); + console.log('SAME', res.data) + } catch (error) { + setMyOffersList({loading:false, data:[]}); + console.log("Error getting offers", error); + } + }; + + useEffect(()=>{ + getMyOffersList() + },[]) + return ( + + {myOffersList.loading ? + + : + myOffersList?.data?.result_list && myOffersList?.data?.result_list.length > 0 ? + + : +
+

No Record Found!

+
+ } + + ) +} diff --git a/src/views/FamilyPastDuePage.jsx b/src/views/FamilyPastDuePage.jsx new file mode 100644 index 0000000..d3ee637 --- /dev/null +++ b/src/views/FamilyPastDuePage.jsx @@ -0,0 +1,10 @@ +import React from 'react' +import FamilyPastDue from '../components/FamilyAcc/FamilyPastDue' + +export default function FamilyPastDuePage() { + return ( + <> + + + ) +} diff --git a/src/views/FamilyPendingOfferPage.jsx b/src/views/FamilyPendingOfferPage.jsx new file mode 100644 index 0000000..2294e35 --- /dev/null +++ b/src/views/FamilyPendingOfferPage.jsx @@ -0,0 +1,10 @@ +import React from 'react' +import FamilyPending from '../components/FamilyAcc/FamilyPendingOffer' + +export default function FamilyPendingOfferPage() { + return ( + <> + + + ) +}