From 4dfb442a80988171fcc47061e2ae5394399ca0f9 Mon Sep 17 00:00:00 2001 From: Ebube Date: Wed, 28 Feb 2024 07:47:23 +0100 Subject: [PATCH 1/6] responsiveness check --- src/components/Dashboards/AccountDashboard.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Dashboards/AccountDashboard.jsx b/src/components/Dashboards/AccountDashboard.jsx index 92ed698..4a3d7fd 100644 --- a/src/components/Dashboards/AccountDashboard.jsx +++ b/src/components/Dashboards/AccountDashboard.jsx @@ -21,7 +21,7 @@ const AccountDashboard = ({ className, bannerList }) => { className || "" }`} > -
+
{getUpperBanner?.map((props, idx) => { let image = getImage(props); @@ -40,7 +40,7 @@ const AccountDashboard = ({ className, bannerList }) => { ); })}
-
+
{getLowerBanner?.map((props, idx) => { let image = getImage(props); From d8c5b3ff073c7f59bf9e5f079bfd2d3eeab7bb3c Mon Sep 17 00:00:00 2001 From: Ebube Date: Wed, 28 Feb 2024 07:49:57 +0100 Subject: [PATCH 2/6] home_dash board sizing --- src/components/Dashboards/FamilyParentDashboard.jsx | 2 +- src/components/Dashboards/HomeDashboard.jsx | 2 +- src/components/Dashboards/JobOwnerDashboard.jsx | 2 +- src/components/Dashboards/WorkerDashboard.jsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Dashboards/FamilyParentDashboard.jsx b/src/components/Dashboards/FamilyParentDashboard.jsx index 4ec5102..3d3b1a0 100644 --- a/src/components/Dashboards/FamilyParentDashboard.jsx +++ b/src/components/Dashboards/FamilyParentDashboard.jsx @@ -16,7 +16,7 @@ export default function JobOwnerDashboard({ return (
Date: Wed, 28 Feb 2024 08:30:43 +0100 Subject: [PATCH 3/6] adjusted home dash sizes --- src/components/Dashboards/FamilyParentDashboard.jsx | 4 ++-- src/components/Dashboards/HomeDashboard.jsx | 4 ++-- src/components/Dashboards/JobOwnerDashboard.jsx | 4 ++-- src/components/Dashboards/WorkerDashboard.jsx | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/Dashboards/FamilyParentDashboard.jsx b/src/components/Dashboards/FamilyParentDashboard.jsx index 3d3b1a0..50b4e02 100644 --- a/src/components/Dashboards/FamilyParentDashboard.jsx +++ b/src/components/Dashboards/FamilyParentDashboard.jsx @@ -16,7 +16,7 @@ export default function JobOwnerDashboard({ return (
-
+
{/* heading */}

diff --git a/src/components/Dashboards/HomeDashboard.jsx b/src/components/Dashboards/HomeDashboard.jsx index 3d3b1a0..50b4e02 100644 --- a/src/components/Dashboards/HomeDashboard.jsx +++ b/src/components/Dashboards/HomeDashboard.jsx @@ -16,7 +16,7 @@ export default function JobOwnerDashboard({ return (
-
+
{/* heading */}

diff --git a/src/components/Dashboards/JobOwnerDashboard.jsx b/src/components/Dashboards/JobOwnerDashboard.jsx index cb50e8e..e658fef 100644 --- a/src/components/Dashboards/JobOwnerDashboard.jsx +++ b/src/components/Dashboards/JobOwnerDashboard.jsx @@ -16,7 +16,7 @@ export default function JobOwnerDashboard({ return (
-
+
{/* heading */}

diff --git a/src/components/Dashboards/WorkerDashboard.jsx b/src/components/Dashboards/WorkerDashboard.jsx index 3d3b1a0..50b4e02 100644 --- a/src/components/Dashboards/WorkerDashboard.jsx +++ b/src/components/Dashboards/WorkerDashboard.jsx @@ -16,7 +16,7 @@ export default function JobOwnerDashboard({ return (
-
+
{/* heading */}

From fc2a78dde7a769fb636115a0e4a59b0946648e11 Mon Sep 17 00:00:00 2001 From: Ebube Date: Wed, 28 Feb 2024 11:05:58 +0100 Subject: [PATCH 4/6] changed the background --- src/components/AuthPages/AuthLayout2.jsx | 71 +++++++++-------- src/components/AuthPages/Login/index2.jsx | 79 +++++++++++-------- .../Helpers/Inputs/InputCom/index.jsx | 4 +- 3 files changed, 87 insertions(+), 67 deletions(-) diff --git a/src/components/AuthPages/AuthLayout2.jsx b/src/components/AuthPages/AuthLayout2.jsx index 778e1ac..2d9bf91 100644 --- a/src/components/AuthPages/AuthLayout2.jsx +++ b/src/components/AuthPages/AuthLayout2.jsx @@ -1,19 +1,22 @@ -import React, { lazy, useContext } from "react"; +import React, { useContext } from "react"; import { Link } from "react-router-dom"; import { localImgLoad } from "../../lib"; import DarkModeContext from "../Contexts/DarkModeContext"; export default function LoginLayout({ slogan, children }) { - const bgImg = localImgLoad('images/left-wrenchboard.jpg') - const bgImgNig = localImgLoad('images/wrench-home-back-nigeria.jpg') - const bgImgCom = localImgLoad('images/wrench-home-back-common.jpg') + const bgImg = localImgLoad("images/left-wrenchboard.jpg"); + const bgImgNig = localImgLoad("images/wrench-home-back-nigeria.jpg"); + const bgImgCom = localImgLoad("images/wrench-home-back-common.jpg"); - const {countryMode} = useContext(DarkModeContext); + const { countryMode } = useContext(DarkModeContext); return ( -
{/*
*/}
-
+
{children && children}

- © {new Date().getFullYear()} - + + © {new Date().getFullYear()} - + WrenchBoard {" "} diff --git a/src/components/AuthPages/Login/index2.jsx b/src/components/AuthPages/Login/index2.jsx index e6201a4..6fe2ca9 100644 --- a/src/components/AuthPages/Login/index2.jsx +++ b/src/components/AuthPages/Login/index2.jsx @@ -24,7 +24,9 @@ export default function Login() { const dispatch = useDispatch(); const { state } = useLocation(); - const [sessionExpired, setSessionExpired] = useState(queryParams.get("sessionExpired")) + const [sessionExpired, setSessionExpired] = useState( + queryParams.get("sessionExpired") + ); const [validCaptcha, setValidCaptcha] = useState({ show: false, valid: "" }); // FOR CAPTCHA @@ -97,7 +99,7 @@ export default function Login() { username: email, password: password, sessionid: "STARTING", - login_mode: 1100 + login_mode: 1100, }; } else if (name == "family") { // Post Data Info for family Login @@ -105,7 +107,7 @@ export default function Login() { username: email, pin: password, sessionid: "20067A92714", - login_mode: 1105 + login_mode: 1105, }; } else { setLoginLoading(false); @@ -235,19 +237,18 @@ export default function Login() { setPassword(""); }, [loginType]); - // EFFECT TO CLEAR SESSION EXPIRY IF IT EXISTS AFTER SOME SECONDS - useEffect(()=>{ + useEffect(() => { let timer; - if(sessionExpired == "true"){ - timer = setTimeout(()=>{ - setSessionExpired(false) - },5000) + if (sessionExpired == "true") { + timer = setTimeout(() => { + setSessionExpired(false); + }, 5000); } return () => { - clearTimeout(timer) - } - }, []) + clearTimeout(timer); + }; + }, []); return ( <> @@ -523,25 +524,39 @@ export default function Login() { {/* APP DOWNLOAD STORE */}

{loginType == "full" && ( <> @@ -590,7 +605,7 @@ const BrandBtn = ({ {isAnchor ? ( logo-icon(s) @@ -601,7 +616,7 @@ const BrandBtn = ({
- + */} {/* balance */} {/* My Page Button */} diff --git a/src/components/Partials/RightSideBar.jsx b/src/components/Partials/RightSideBar.jsx index db8b73d..9974a09 100644 --- a/src/components/Partials/RightSideBar.jsx +++ b/src/components/Partials/RightSideBar.jsx @@ -1,10 +1,11 @@ -import React, { useState } from "react"; +import React, { useContext, useState } from "react"; import { useSelector } from "react-redux"; import { NavLink } from "react-router-dom"; //import SideStatistics from "./SideStatistics"; import { localImgLoad } from "../../lib"; +import DarkModeContext from "../Contexts/DarkModeContext"; -export default function RightSideBar({myJobList}) { +export default function RightSideBar({ myJobList }) { const filterDatas = ["Last 15 days", "Last Month", "Last 6 month"]; const [filterDataSet, setFilterDataSet] = useState([10, 30, 20, 40]); const dataSetHandler = (value) => { @@ -16,6 +17,7 @@ export default function RightSideBar({myJobList}) { setFilterDataSet([8, 15, 40, 30]); } }; + const darkMode = useContext(DarkModeContext); const [selectedRate, setSelectedRate] = useState("ETH"); const [rateStaticsDropdown, setRateStaticsDropdown] = useState(false); @@ -153,79 +155,168 @@ export default function RightSideBar({myJobList}) {

+ {/* dark mode */} +
+
+ + + + + + + + + + + + + + +

+ {darkMode.theme === "light" ? "Dark" : "Light"} Mode +

+
+
{/*JOB LINKS*/} - {(userDetails?.account_type !== "FAMILY" && myJobList?.data?.result_list?.length > 0) && -
- {/* heading */} -
-

- Job Links -

-
-
- -
-
- {/* image */} -
- Active Task -
- {/* name */} -
-

- Active Task -

-
- {/* action */} + {userDetails?.account_type !== "FAMILY" && + myJobList?.data?.result_list?.length > 0 && ( +
+ {/* heading */} +
+

+ Job Links +

+
-
- {/* image */} -
- Review Task +
+
+ {/* image */} +
+ Active Task +
+ {/* name */} +
+

+ Active Task +

+
+ {/* action */}
- {/* name */} -
-

- Review -

+ +
+ {/* image */} +
+ Review Task +
+ {/* name */} +
+

+ Review +

+
+
+ +
+ {/* image */} +
+ Past Due Task +
+ {/* name */} +
+

+ Past Due +

+
+
+ + {/* Line */} +
+ +
+ {/* image */} +
+ Job Groups +
+ {/* name */} +
+

+ Job Groups +

+
- -
- {/* image */} -
- Past Due Task -
- {/* name */} -
-

- Past Due -

-
-
- - {/* Line */} -
- -
- {/* image */} -
- Job Groups -
- {/* name */} -
-

- Job Groups -

-
-
-
-
- } +
+ )}
); From cab5debfb7b1f00c8c8ea9de3fc886d54726874b Mon Sep 17 00:00:00 2001 From: Ebube Date: Wed, 28 Feb 2024 11:41:17 +0100 Subject: [PATCH 6/6] Added icon toggler --- src/components/Partials/RightSideBar.jsx | 37 ++++++++++++++++-------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/src/components/Partials/RightSideBar.jsx b/src/components/Partials/RightSideBar.jsx index 9974a09..8de8b76 100644 --- a/src/components/Partials/RightSideBar.jsx +++ b/src/components/Partials/RightSideBar.jsx @@ -158,17 +158,30 @@ export default function RightSideBar({ myJobList }) { {/* dark mode */}
-
- + + {darkMode.theme === "light" ? ( + + + ) : ( + - -

- {darkMode.theme === "light" ? "Dark" : "Light"} Mode -

-
+ )} + +

+ {darkMode.theme === "light" ? "Dark" : "Light"} Mode +