diff --git a/src/components/Dashboards/FamilyParentDashboard.jsx b/src/components/Dashboards/FamilyParentDashboard.jsx index dbd5ccb..97198f8 100644 --- a/src/components/Dashboards/FamilyParentDashboard.jsx +++ b/src/components/Dashboards/FamilyParentDashboard.jsx @@ -1,31 +1,22 @@ -import React, { useState } from "react"; -import { Link } from "react-router-dom"; -import { toast } from "react-toastify"; -import heroBg from "../../assets/images/bg-sky-blue.jpg"; //hero-bg.svg"; -import heroUser from "../../assets/images/hero-user.png"; +import React from "react"; import CountDown from "../Helpers/CountDown"; // import HomeSliders from "./HomeSliders"; import { useSelector } from "react-redux"; -import HomeSliders from "../Home/HomeSliders"; -export default function FamilyParentDashboard({ className, bannerList, nextDueTask }) { - const settings = { - autoplay: true, - dots: true, - arrows: false, - infinite: true, - swipe: true, - }; - const sildeData = null; +export default function JobOwnerDashboard({ + className, + bannerList, + nextDueTask, +}) { const { userDetails } = useSelector((state) => state?.userDetails); let loginDate = userDetails?.last_login.split(" ")[0]; - let { firstname, lastname, email, profile_pic } = userDetails; + let { firstname, lastname, email } = userDetails; let userEmail = email.split("@")[0]; return (
-
+
{/* heading */} -
+

Welcome

- - Last Login : {loginDate} - -
- {/* user */} -
-
- -
+ {/* user */}
-

+

{`${firstname} ${lastname}`}

@{userEmail}

+ {/* countdown */} - {nextDueTask?.next_due && Object.keys(nextDueTask.next_due)?.length != 0 && ( -
-
-

Current Task

-

- {(nextDueTask.next_due.item_code).substr(0,4)+'...'} -

-

- {nextDueTask.next_due.price * 0.01} Naira -

-
-
-
-

Next due in

-

- {/* */} - -

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

+ Current Task +

+

+ {nextDueTask.next_due.item_code.substr(0, 4) + "..."} +

+

+ {nextDueTask.next_due.price * 0.01} Naira +

+
+
+
+

+ Next due in +

+

+ {/* */} + +

+
+ Hrs + Min + Sec +
-
- )} - {/* action */} -
- - - {" "} - View All Task(s) - - -
+ )} + + Last Login : {loginDate} +
); diff --git a/src/components/Dashboards/HomeDashboard.jsx b/src/components/Dashboards/HomeDashboard.jsx index ab6db00..97198f8 100644 --- a/src/components/Dashboards/HomeDashboard.jsx +++ b/src/components/Dashboards/HomeDashboard.jsx @@ -1,97 +1,80 @@ -import React, { useState } from "react"; -import { Link } from "react-router-dom"; -import { toast } from "react-toastify"; -import heroBg from "../../assets/images/bg-sky-blue.jpg"; //hero-bg.svg"; -import heroUser from "../../assets/images/hero-user.png"; +import React from "react"; import CountDown from "../Helpers/CountDown"; // import HomeSliders from "./HomeSliders"; import { useSelector } from "react-redux"; -import HomeSliders from "../Home/HomeSliders"; -export default function HomeDashboard({ className, bannerList, nextDueTask }) { - const settings = { - autoplay: true, - dots: true, - arrows: false, - infinite: true, - swipe: true, - }; - const sildeData = null; +export default function JobOwnerDashboard({ + className, + bannerList, + nextDueTask, +}) { const { userDetails } = useSelector((state) => state?.userDetails); let loginDate = userDetails?.last_login.split(" ")[0]; - let { firstname, lastname, email, profile_pic } = userDetails; + let { firstname, lastname, email } = userDetails; let userEmail = email.split("@")[0]; return (
-
+
{/* heading */} -
+

Welcome

- - Last Login : {loginDate} - -
- {/* user */} -
-
- -
+ {/* user */}
-

+

{`${firstname} ${lastname}`}

@{userEmail}

+ {/* countdown */} - {nextDueTask?.next_due && Object.keys(nextDueTask.next_due)?.length != 0 && ( -
-
-

Current Task

-

- {(nextDueTask.next_due.item_code).substr(0,4)+'...'} -

-

- {nextDueTask.next_due.price * 0.01} Naira -

-
-
-
-

Next due in

-

- {/* */} - -

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

+ Current Task +

+

+ {nextDueTask.next_due.item_code.substr(0, 4) + "..."} +

+

+ {nextDueTask.next_due.price * 0.01} Naira +

+
+
+
+

+ Next due in +

+

+ {/* */} + +

+
+ Hrs + Min + Sec +
-
- )} - {/* action */} -
- - - {" "} - View All Task(s) - - -
+ )} + + Last Login : {loginDate} +
); diff --git a/src/components/Dashboards/JobOwnerDashboard.jsx b/src/components/Dashboards/JobOwnerDashboard.jsx index ee84790..2f8dc0d 100644 --- a/src/components/Dashboards/JobOwnerDashboard.jsx +++ b/src/components/Dashboards/JobOwnerDashboard.jsx @@ -1,31 +1,22 @@ -import React, { useState } from "react"; -import { Link } from "react-router-dom"; -import { toast } from "react-toastify"; -import heroBg from "../../assets/images/bg-sky-blue.jpg"; //hero-bg.svg"; -import heroUser from "../../assets/images/hero-user.png"; +import React from "react"; import CountDown from "../Helpers/CountDown"; // import HomeSliders from "./HomeSliders"; import { useSelector } from "react-redux"; -import HomeSliders from "../Home/HomeSliders"; -export default function JobOwnerDashboard({ className, bannerList, nextDueTask }) { - const settings = { - autoplay: true, - dots: true, - arrows: false, - infinite: true, - swipe: true, - }; - const sildeData = null; +export default function JobOwnerDashboard({ + className, + bannerList, + nextDueTask, +}) { const { userDetails } = useSelector((state) => state?.userDetails); let loginDate = userDetails?.last_login.split(" ")[0]; - let { firstname, lastname, email, profile_pic } = userDetails; + let { firstname, lastname, email } = userDetails; let userEmail = email.split("@")[0]; return (
-
+
{/* heading */} -
+

Welcome

- - Last Login : {loginDate} - -
- {/* user */} -
-
- -
+ {/* user */}
-

+

{`${firstname} ${lastname}`}

@{userEmail}

+ {/* countdown */} - {nextDueTask?.next_due && Object.keys(nextDueTask.next_due)?.length != 0 && ( -
-
-

Current Task

-

- {(nextDueTask.next_due.item_code).substr(0,4)+'...'} -

-

- {nextDueTask.next_due.price * 0.01} Naira -

-
-
-
-

Next due in

-

- {/* */} - -

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

+ Current Task +

+

+ {nextDueTask.next_due.item_code.substr(0, 4) + "..."} +

+

+ {nextDueTask.next_due.price * 0.01} Naira +

+
+
+
+

+ Next due in +

+

+ {/* */} + +

+
+ Hrs + Min + Sec +
-
- )} - {/* action */} -
- - - {" "} - View All Task(s) - - -
+ )} + + Last Login : {loginDate} +
-
); } + diff --git a/src/components/Dashboards/OldDashboard.jsx b/src/components/Dashboards/OldDashboard.jsx new file mode 100644 index 0000000..5c56170 --- /dev/null +++ b/src/components/Dashboards/OldDashboard.jsx @@ -0,0 +1,103 @@ +import React, { useState } from "react"; +import { Link } from "react-router-dom"; +import { toast } from "react-toastify"; +import heroBg from "../../assets/images/bg-sky-blue.jpg"; //hero-bg.svg"; +import heroUser from "../../assets/images/hero-user.png"; +import CountDown from "../Helpers/CountDown"; +// import HomeSliders from "./HomeSliders"; +import { useSelector } from "react-redux"; +import HomeSliders from "../Home/HomeSliders"; + +export default function WorkerDashboard({ className, bannerList, nextDueTask }) { + const settings = { + autoplay: true, + dots: true, + arrows: false, + infinite: true, + swipe: true, + }; + const sildeData = null; + const { userDetails } = useSelector((state) => state?.userDetails); + + let loginDate = userDetails?.last_login.split(" ")[0]; + let { firstname, lastname, email, profile_pic } = userDetails; + let userEmail = email.split("@")[0]; + + return ( +
+
+ {/* heading */} +
+

+ Welcome +

+ + Last Login : {loginDate} + +
+ {/* user */} +
+
+ +
+
+

+ {`${firstname} ${lastname}`} +

+

@{userEmail}

+
+
+ {/* countdown */} + {nextDueTask?.next_due && Object.keys(nextDueTask.next_due)?.length != 0 && ( +
+
+

Current Task

+

+ {(nextDueTask.next_due.item_code).substr(0,4)+'...'} +

+

+ {nextDueTask.next_due.price * 0.01} Naira +

+
+
+
+

Next due in

+

+ {/* */} + +

+
+ Hrs + Min + Sec +
+
+
+ )} + {/* action */} +
+ + + {" "} + View All Task(s) + + +
+
+ +
+ ); +} diff --git a/src/components/Dashboards/WorkerDashboard.jsx b/src/components/Dashboards/WorkerDashboard.jsx index 5c56170..97198f8 100644 --- a/src/components/Dashboards/WorkerDashboard.jsx +++ b/src/components/Dashboards/WorkerDashboard.jsx @@ -1,31 +1,22 @@ -import React, { useState } from "react"; -import { Link } from "react-router-dom"; -import { toast } from "react-toastify"; -import heroBg from "../../assets/images/bg-sky-blue.jpg"; //hero-bg.svg"; -import heroUser from "../../assets/images/hero-user.png"; +import React from "react"; import CountDown from "../Helpers/CountDown"; // import HomeSliders from "./HomeSliders"; import { useSelector } from "react-redux"; -import HomeSliders from "../Home/HomeSliders"; -export default function WorkerDashboard({ className, bannerList, nextDueTask }) { - const settings = { - autoplay: true, - dots: true, - arrows: false, - infinite: true, - swipe: true, - }; - const sildeData = null; +export default function JobOwnerDashboard({ + className, + bannerList, + nextDueTask, +}) { const { userDetails } = useSelector((state) => state?.userDetails); let loginDate = userDetails?.last_login.split(" ")[0]; - let { firstname, lastname, email, profile_pic } = userDetails; + let { firstname, lastname, email } = userDetails; let userEmail = email.split("@")[0]; return (
-
+
{/* heading */} -
+

Welcome

- - Last Login : {loginDate} - -
- {/* user */} -
-
- -
+ {/* user */}
-

+

{`${firstname} ${lastname}`}

@{userEmail}

+ {/* countdown */} - {nextDueTask?.next_due && Object.keys(nextDueTask.next_due)?.length != 0 && ( -
-
-

Current Task

-

- {(nextDueTask.next_due.item_code).substr(0,4)+'...'} -

-

- {nextDueTask.next_due.price * 0.01} Naira -

-
-
-
-

Next due in

-

- {/* */} - -

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

+ Current Task +

+

+ {nextDueTask.next_due.item_code.substr(0, 4) + "..."} +

+

+ {nextDueTask.next_due.price * 0.01} Naira +

+
+
+
+

+ Next due in +

+

+ {/* */} + +

+
+ Hrs + Min + Sec +
-
- )} - {/* action */} -
- - - {" "} - View All Task(s) - - -
+ )} + + Last Login : {loginDate} +
-
); } diff --git a/src/components/Home/FullAccountDash.jsx b/src/components/Home/FullAccountDash.jsx index e395926..ba029f4 100644 --- a/src/components/Home/FullAccountDash.jsx +++ b/src/components/Home/FullAccountDash.jsx @@ -21,7 +21,7 @@ export default function FullAccountDash(props) { case "DEFAULT_HOME_DASH": return (
+ {renderDashboard()} {process.env.REACT_APP_SHOW_ACCOUNT_DASH == "1" && ( )} - {renderDashboard()} {props?.dashTypes !== "undefined" && props.offersList?.data?.result_list?.length ? (