diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx index 4f1f10b..424e10a 100644 --- a/src/components/AuthPages/Login/index.jsx +++ b/src/components/AuthPages/Login/index.jsx @@ -17,14 +17,14 @@ import { updateUserDetails } from "../../../store/UserDetails"; import ReCAPTCHA from "react-google-recaptcha"; export default function Login() { - + // eslint-disable-next-line no-restricted-globals const queryParams = new URLSearchParams(location?.search); - const sessionExpired = queryParams.get("sessionExpired") + const sessionExpired = queryParams.get("sessionExpired"); const dispatch = useDispatch(); const { state } = useLocation(); - const [validCaptcha, setValidCaptcha] = useState({show: false, valid:''}); // FOR CAPTCHA + const [validCaptcha, setValidCaptcha] = useState({ show: false, valid: "" }); // FOR CAPTCHA let [loginType, setLoginType] = useState(""); @@ -115,7 +115,8 @@ export default function Login() { }, Number(process.env.REACT_APP_LOGIN_ERROR_TIMEOUT)); return; } - if(name == "full" && !validCaptcha.valid && validCaptcha.show){ // RUNS AND DISPLAYS CAPTCHA, IF ERROR OCCURED DURING LOGIN FOR FULL LOGIN ALONE + if (name == "full" && !validCaptcha.valid && validCaptcha.show) { + // RUNS AND DISPLAYS CAPTCHA, IF ERROR OCCURED DURING LOGIN FOR FULL LOGIN ALONE setMsgError("Please Verify Captcha"); setLoginLoading(false); setTimeout(() => { @@ -136,12 +137,15 @@ export default function Login() { // setMsgError("Wrong, email/password"); setLoginError(true); setLoginLoading(false); - setValidCaptcha(prev => ({...prev, show:true})) // DISPLAYS CAPTCHA IF ERROR + setValidCaptcha((prev) => ({ ...prev, show: true })); // DISPLAYS CAPTCHA IF ERROR return; } localStorage.setItem("member_id", `${res.data.member_id}`); localStorage.setItem("uid", `${res.data.uid}`); localStorage.setItem("session_token", `${res.data.session}`); + if (name === "family") { + sessionStorage.setItem("family_uid", res.data?.family_uid); + } // localStorage.setItem("session", `${res.data.session}`); dispatch(updateUserDetails({ ...res.data })); setTimeout(() => { @@ -152,7 +156,7 @@ export default function Login() { .catch((error) => { setMsgError("Unable to login, try again"); setLoginLoading(false); - setValidCaptcha(prev => ({...prev, show:true})) // DISPLAYS CAPTCHA IF ERROR + setValidCaptcha((prev) => ({ ...prev, show: true })); // DISPLAYS CAPTCHA IF ERROR }) .finally(() => { setTimeout(() => { @@ -163,11 +167,12 @@ export default function Login() { }); }; - function captchaChecker(value) { // FUNCTION TO VALIDATE CAPTCHA - if(value){ - setValidCaptcha({show: true, valid:value}) - }else{ - setValidCaptcha({show: true, valid:''}) + function captchaChecker(value) { + // FUNCTION TO VALIDATE CAPTCHA + if (value) { + setValidCaptcha({ show: true, valid: value }); + } else { + setValidCaptcha({ show: true, valid: "" }); } } @@ -245,31 +250,32 @@ export default function Login() {
- {/* HIDES THIS IF USER SESSION HAS EXPIRED */} - {sessionExpired != 'true' && -
- {/*

+ {sessionExpired != "true" && ( +
+ {/*

Sign In to WrenchBoard

*/} - - New Here?{" "} - - Create an Account - - -
- } - + + New Here?{" "} + + Create an Account + + +

+ )} + {/* SHOWS THIS IF USER SESSION HAS EXPIRED */} - {sessionExpired == 'true' && -
-

Your session expired and will need to login again

-
- } + {sessionExpired == "true" && ( +
+

+ Your session expired and will need to login again +

+
+ )} {/* switch login component */}
@@ -335,14 +341,16 @@ export default function Login() {
{/* hCaptha clone for the time being */} - {validCaptcha.show && -
- + -
- } +
+ )} {loginError && (
@@ -499,7 +507,8 @@ export default function Login() { {loginType == "full" && (
- This site is protected by a Captcha. Our Privacy Policy and Terms of Service apply. + This site is protected by a Captcha. Our Privacy Policy and + Terms of Service apply.
)}
diff --git a/src/components/Partials/Header.jsx b/src/components/Partials/Header.jsx index 12acd09..1ec941f 100644 --- a/src/components/Partials/Header.jsx +++ b/src/components/Partials/Header.jsx @@ -37,11 +37,17 @@ export default function Header({ logoutModalHandler, sidebarHandler }) { const { walletDetails } = useSelector((state) => state?.walletDetails); // WALLET STORE const image = localStorage.getItem("session_token") - ? `${userDetails.session_image_server}${localStorage.getItem( - "session_token" - )}/profile/${userDetails.uid}` + ? userDetails.account_type === "FAMILY" + ? `${userDetails.session_image_server}${localStorage.getItem( + "session_token" + )}/family/${sessionStorage.getItem("family_uid")}` + : `${userDetails.session_image_server}${localStorage.getItem( + "session_token" + )}/profile/${userDetails.uid}` : ""; + // 9308RDR122 + const handlerBalance = () => { setbalanceValue.toggle(); if (notificationDropdown) { @@ -99,6 +105,8 @@ export default function Header({ logoutModalHandler, sidebarHandler }) { let userEmail = email?.split("@")[0]; const userProfileImage = image || DEFAULT_PROFILE_IMAGE; + console.log(userDetails); + return ( <>