diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx index ffa0d35..dd37fb5 100644 --- a/src/components/AuthPages/Login/index.jsx +++ b/src/components/AuthPages/Login/index.jsx @@ -1,4 +1,4 @@ -import React, { useState } from "react"; +import React, { useEffect, useState } from "react"; import { Link, useNavigate } from "react-router-dom"; import linkedInLogo from "../../../assets/images/Linkedin.png"; import appleLogo from "../../../assets/images/apple-black.svg"; @@ -17,7 +17,7 @@ import { updateUserDetails } from "../../../store/UserDetails"; export default function Login() { const dispatch = useDispatch(); - let [loginCom, setLoginCom] = useState({ user: true, family: false }); + let [loginType, setLoginType] = useState({ full: true, family: false }); const [checked, setValue] = useState(false); const [loginLoading, setLoginLoading] = useState(false); @@ -32,11 +32,11 @@ export default function Login() { }; //FUNCTION TO DETERMINE/CHANGE LOGIN COMPONENT - const handleLoginCom = ({ target: { name } }) => { - if (name == "user") { - setLoginCom({ [name]: true, family: false }); - } else { - setLoginCom({ [name]: false, family: true }); + const handleLoginType = ({ target: { name } }) => { + if (name == "full") { + setLoginType({ [name]: true, family: false }); + } else if(name='family') { + setLoginType({ [name]: false, family: true }); } }; @@ -56,8 +56,9 @@ export default function Login() { // FUNCTION TO HANDLE USER LOGIN const doLogin = ({ target: { name } }) => { setMsgError(""); + setLoginError(false) setLoginLoading(true); - let postData = {}; // Post Data for API + let postData; // Post Data for API if (!email || !password) { setLoginLoading(false); setMsgError("Please fill all the fields"); @@ -67,14 +68,15 @@ export default function Login() { return; } - if (name == "userlogin") { // Post Data Info for normal Login + if (name == "loginfull") { // Post Data Info for normal Login postData = { username: email, password: password, sessionid: "STARTING", + login_mode: 1100, action: 11025, }; - } else if (name == "familylogin") { // Post Data Info for family Login + } else if (name == "loginfamily") { // Post Data Info for family Login postData = { username: email, pin: password, @@ -82,8 +84,14 @@ export default function Login() { login_mode: 1105, action: 11025, }; + }else{ + setLoginLoading(false); + setMsgError("Invalid Login Type. Consider refreshing the page"); + setTimeout(() => { + setMsgError(""); + }, Number(process.env.REACT_APP_LOGIN_ERROR_TIMEOUT)); + return; } - userApi.logInUser(postData).then((res) => { if (res.status != 200 || res.data.internal_return < 0) { // setMsgError("Wrong, email/password"); @@ -112,6 +120,11 @@ export default function Login() { }); }; + useEffect(()=>{ + setMail('') + setPassword('') + },[loginType.full, loginType.family]) + return ( <> @@ -145,20 +158,20 @@ export default function Login() { {/* switch login component */}
@@ -168,7 +181,7 @@ export default function Login() { {/* for login component */} { - loginCom.user ? ( + loginType.full ? ( //user login compoenent
@@ -219,7 +232,7 @@ export default function Login() {
) : ( - Continue + <>Continue )}
@@ -302,7 +315,7 @@ export default function Login() {
) : ( - Continue + <>Continue )}
diff --git a/src/components/Home/FamilyActiveLSlde.jsx b/src/components/Home/FamilyActiveLSlde.jsx index 90c5cf3..56d4e5c 100644 --- a/src/components/Home/FamilyActiveLSlde.jsx +++ b/src/components/Home/FamilyActiveLSlde.jsx @@ -47,7 +47,7 @@ export default function FamilyActiveLSlde({ className, trending }) {

Current Tasks

-
+