diff --git a/src/Routers.jsx b/src/Routers.jsx index 3182a0b..a44c638 100644 --- a/src/Routers.jsx +++ b/src/Routers.jsx @@ -57,6 +57,9 @@ 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"; +import FamilyPendingOfferPage from "./views/FamilyPendingOfferPage"; +import FamilyPastDuePage from "./views/FamilyPastDuePage"; export default function Routers() { return ( @@ -129,6 +132,9 @@ 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/components/FamilyAcc/ParentWaiting.jsx b/src/components/FamilyAcc/ParentWaiting.jsx new file mode 100644 index 0000000..e5f5054 --- /dev/null +++ b/src/components/FamilyAcc/ParentWaiting.jsx @@ -0,0 +1,12 @@ +import React from 'react' + +import Layout from '../Partials/Layout' +import ParentWaiting from '../MyOffers/ParentWaiting' + +export default function ParentWaitingLayout() { + return ( + + + + ) +} diff --git a/src/components/Home/FamilyDash.jsx b/src/components/Home/FamilyDash.jsx index 8ebe47b..2eee32d 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]}`} @@ -82,11 +81,11 @@ export default function FamilyDash({ familyOffers, MyActiveJobList }) { {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 ( - + - + {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/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 ( + <> + + > + ) +} 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 ( + <> + + > + ) +}
No Record Found!
Welcome
Last Login: {`${userDetails?.last_login.split(' ')[0]}`}
*/} - {/* Brokln Simons*/} - {/*
*/} - {/* @broklinslam_75*/} - {/*