From 8a81e6da541acbc0302daefe079371ca71afeab2 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Mon, 5 Jun 2023 19:24:54 +0100 Subject: [PATCH] user currect task due time implementation --- src/components/Home/FullAccountDash.jsx | 4 +-- src/components/Home/Hero.jsx | 47 ++++++++++++++----------- src/components/Home/index.jsx | 26 +++++++++++--- src/services/UsersService.js | 3 +- 4 files changed, 51 insertions(+), 29 deletions(-) diff --git a/src/components/Home/FullAccountDash.jsx b/src/components/Home/FullAccountDash.jsx index b79ea47..5e44e3c 100644 --- a/src/components/Home/FullAccountDash.jsx +++ b/src/components/Home/FullAccountDash.jsx @@ -15,9 +15,8 @@ export default function FullAccountDash(props) { const trending = datas.datas; const jobData = datas.datas; // api calls or cache - //getHomeDate + const userApi = new usersService(); - const homeData = userApi.getHomeDate(); const {userDetails} = useSelector((state) => state?.userDetails) @@ -27,6 +26,7 @@ export default function FullAccountDash(props) { {/**/} diff --git a/src/components/Home/Hero.jsx b/src/components/Home/Hero.jsx index 62a2956..9df9dfa 100644 --- a/src/components/Home/Hero.jsx +++ b/src/components/Home/Hero.jsx @@ -11,7 +11,7 @@ import SliderCom from "../Helpers/SliderCom"; import HomeSliders from "./HomeSliders"; import { useSelector } from "react-redux"; -export default function Hero({ className,bannerList }) { +export default function Hero({ className, bannerList, nextDueTask }) { const settings = { autoplay: true, dots: true, @@ -71,27 +71,32 @@ export default function Hero({ className,bannerList }) { {/* countdown */} -
-
-

Current Task

-

- ABCDEFGH01 -

-

773.69 USD

-
-
-
-

Next due in

-

- -

-
- Hrs - Min - Sec + { nextDueTask?.next_due && Object.keys(nextDueTask.next_due)?.length && + ( +
+
+

Current Task

+

+ {nextDueTask.next_due.item_code} +

+

{nextDueTask.next_due.price} Naira

+
+
+
+

Next due in

+

+ {/* */} + +

+
+ Hrs + Min + Sec +
+
-
-
+ ) + } {/* action */}
",props); -// const trending = datas.datas; -// const jobData = datas.datas; // api calls or cache + let [nextDueTask, setNextDueTask] = useState({}) + const userApi = new usersService(); -// const homeData = userApi.getHomeDate(); + const {userDetails} = useSelector((state) => state?.userDetails) const commonHeadData =()=>{ @@ -22,6 +22,22 @@ export default function Home(props) { return 0; } + // FUNCTION TO GET DASH DATA TO DETERMINE CURRENT TASK DUE TIME + const getHomeDate = () => { + userApi.getHomeDate().then(res => { + if(res.status != 200 || res.internal_return < 0){ + return + } + setNextDueTask(res.data) + }).catch(error => { + console.log(error) + }) + } + + useEffect(()=>{ + getHomeDate() + },[]) + return (
@@ -29,7 +45,7 @@ export default function Home(props) { )} {userDetails && userDetails?.account_type == "FULL" && ( - + )}
diff --git a/src/services/UsersService.js b/src/services/UsersService.js index c1c0b5a..5e6d6e8 100644 --- a/src/services/UsersService.js +++ b/src/services/UsersService.js @@ -16,9 +16,10 @@ class usersService { return this.postAuxEnd("/completesignuplink", reqData); } + // FUNCTION TO GET USER CURRENT TASK DUE TIME getHomeDate() { var postData = { - uuid: localStorage.getItem("uid"), + // uuid: localStorage.getItem("uid"), uid: localStorage.getItem("uid"), member_id: localStorage.getItem("member_id"), sessionid: localStorage.getItem("session_token"),