diff --git a/src/components/AuthPages/AuthLayout2.jsx b/src/components/AuthPages/AuthLayout2.jsx index 0014a6c..c3f8b05 100644 --- a/src/components/AuthPages/AuthLayout2.jsx +++ b/src/components/AuthPages/AuthLayout2.jsx @@ -1,6 +1,7 @@ import React, { useContext } from "react"; import { Link } from "react-router-dom"; import { localImgLoad } from "../../lib"; +import WrenchBoard from "../../assets/images/wrenchboard-logo-text.png"; import DarkModeContext from "../Contexts/DarkModeContext"; @@ -18,15 +19,23 @@ export default function LoginLayout({ slogan, children }) { backgroundImage: `url(${countryMode == "NG" ? bgImgNig : bgImgCom})`, }} > - -
+
+ + wrenchboard + +
+
{/* */} -
-
+
+
{children && children}
diff --git a/src/components/AuthPages/ForgotPassword/index2.jsx b/src/components/AuthPages/ForgotPassword/index2.jsx index fb41a86..9c832a6 100644 --- a/src/components/AuthPages/ForgotPassword/index2.jsx +++ b/src/components/AuthPages/ForgotPassword/index2.jsx @@ -89,15 +89,6 @@ export default function ForgotPassword() { <>
-
- - wrenchboard - -
{msgSuccess == null ? diff --git a/src/components/AuthPages/Login/LoginLanding.jsx b/src/components/AuthPages/Login/LoginLanding.jsx index 70b9fde..fae7488 100644 --- a/src/components/AuthPages/Login/LoginLanding.jsx +++ b/src/components/AuthPages/Login/LoginLanding.jsx @@ -11,6 +11,9 @@ import AuthLayout from "../AuthLayout2"; import { useDispatch } from "react-redux"; // import { updateUserDetails } from "../../../store/UserDetails"; +import GoogleDownload from '../../../assets/images/download/andriod.jpg' +import IOSDownload from '../../../assets/images/download/apple.jpg' + export default function LoginLanding() { const queryParams = new URLSearchParams(location?.search); @@ -27,7 +30,7 @@ export default function LoginLanding() { <>
-
+ {/*
-
+
*/} {/*
*/}
-
+
+ {/* APP DOWNLOAD STORE */} +
+
+
+ + IOS Download + +
+
+ + IOS Download + +
+
+
+

Log in as a:

- -
-
+
Don't have an account?{" "}
+
diff --git a/src/components/AuthPages/Login/index2.jsx b/src/components/AuthPages/Login/index2.jsx index 2703c97..5d382af 100644 --- a/src/components/AuthPages/Login/index2.jsx +++ b/src/components/AuthPages/Login/index2.jsx @@ -259,7 +259,7 @@ export default function Login() { <>
-
+ {/*
-
+
*/} {/*
*/}
{/* HIDES THIS IF USER SESSION HAS EXPIRED */} {sessionExpired != "true" && ( -
+
{/*

Sign In to WrenchBoard

*/} @@ -390,7 +390,7 @@ export default function Login() { {msgError}
)} -
+
{/* END of login component */} {/* APP DOWNLOAD STORE */} -
+
: navigate("/login")} /> diff --git a/src/components/AuthPages/SignUp/index2.jsx b/src/components/AuthPages/SignUp/index2.jsx index a8978a4..d402bb7 100644 --- a/src/components/AuthPages/SignUp/index2.jsx +++ b/src/components/AuthPages/SignUp/index2.jsx @@ -157,15 +157,6 @@ export default function SignUp() { <>
-
- - wrenchboard - -
@@ -346,46 +337,6 @@ export default function SignUp() {
- - {/* APP DOWNLOAD STORE */} -
diff --git a/src/components/AuthPages/VerifyLink/index2.jsx b/src/components/AuthPages/VerifyLink/index2.jsx index 4fe8142..ad377e2 100644 --- a/src/components/AuthPages/VerifyLink/index2.jsx +++ b/src/components/AuthPages/VerifyLink/index2.jsx @@ -137,15 +137,6 @@ export default function VerifyLink() {
) : (
-
- - wrenchboard - -
diff --git a/src/components/AuthPages/VerifyPassword/index2.jsx b/src/components/AuthPages/VerifyPassword/index2.jsx index 0d3c89b..5ca5fcc 100644 --- a/src/components/AuthPages/VerifyPassword/index2.jsx +++ b/src/components/AuthPages/VerifyPassword/index2.jsx @@ -139,15 +139,6 @@ const VerifyPassword = () => { <>
-
- - wrenchboard - -
{requestStatus.loading ? ( diff --git a/src/components/AuthPages/VerifyYou/index2.jsx b/src/components/AuthPages/VerifyYou/index2.jsx index 6e1031d..14c76ae 100644 --- a/src/components/AuthPages/VerifyYou/index2.jsx +++ b/src/components/AuthPages/VerifyYou/index2.jsx @@ -8,15 +8,6 @@ export default function VerifyYou() { <>
-
- - wrenchboard - -
diff --git a/src/components/Partials/Layout.jsx b/src/components/Partials/Layout.jsx index 7994d3c..4c82f54 100644 --- a/src/components/Partials/Layout.jsx +++ b/src/components/Partials/Layout.jsx @@ -11,7 +11,7 @@ import Sidebar from "./Sidebar"; export default function Layout({ children }) { const { userDetails } = useSelector((state) => state?.userDetails); // CHECKS FOR USER Details - + const { drawer } = useSelector((state) => state.drawer); const { userJobList } = useSelector((state) => state.userJobList); const dispatch = useDispatch(); @@ -22,13 +22,14 @@ export default function Layout({ children }) { }; const navigate = useNavigate(); const logOut = () => { + let loginType = userDetails?.account_type == 'FULL' ? 'parent' : 'kid' sessionStorage.clear(); localStorage.clear(); // toast.success("Come Back Soon", { // icon: `🙂`, // }); - navigate("/login", { replace: true }); + navigate(`/login/${loginType}`, {state:{loginType:userDetails?.account_type.toLowerCase()}, replace:true}); }; return (