From 2d565c5572ae0447dae7c65594df90c6110de3f4 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Sun, 21 May 2023 22:00:24 +0100 Subject: [PATCH] family login implemented --- src/components/AuthPages/Login/index.jsx | 91 ++++++++++++++---------- src/components/Partials/Layout.jsx | 6 +- 2 files changed, 56 insertions(+), 41 deletions(-) diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx index 85826fd..4fdfb11 100644 --- a/src/components/AuthPages/Login/index.jsx +++ b/src/components/AuthPages/Login/index.jsx @@ -52,49 +52,58 @@ export default function Login() { const navigate = useNavigate(); const userApi = new usersService(); - const doLogin = async () => { - try { - if (email !== "" && password !== "") { - var postData = { - username: email, - password: password, - sessionid: "STARTING", - }; - const loginResult = await userApi.logInUser(postData); // just for a test - //debugger; - // if (email === "support@mermsemr.com") { - if ( - loginResult.data.status > 0 && - loginResult.data.internal_return == 100 && - loginResult.data.session != "" - ) { - // just for a start - localStorage.setItem("member_id", `${loginResult.data.member_id}`); - localStorage.setItem("uid", `${loginResult.data.uid}`); - localStorage.setItem("session_token", `${loginResult.data.session}`); - localStorage.setItem("session", `${loginResult.data.session}`); - setLoginLoading(true); - // userApi.getUserReminders(); //testing - dispatch(updateUserDetails(loginResult.data)); - setTimeout(() => { - navigate("/", { replace: true }); - setLoginLoading(false); - }, 2000); - } else { - // toast.error("Invalid Credential"); - setLoginError(true); - } - } else { - setMsgError("Please fill in the fields"); + // FUNCTION TO HANDLE USER LOGIN + const doLogin = ({target:{name}}) => { + setLoginLoading(true); + let postData = {}; // Post Data for API + if(!email || !password){ + setLoginLoading(false); + setMsgError("Please fill in the fields"); + return + } + + if(name == 'userlogin'){ // Post Data Info for normal Login + postData = { + username: email, + password: password, + sessionid: "STARTING", + }; + }else{ + postData = { // Post Data Info for family Login + username: email, + pin: password, + sessionid: "20067A92714", + login_mode: 1105, + action: 11025 + }; + } + + userApi.logInUser(postData).then((res)=>{ + if(res.status != 200 || res.data.internal_return < 0){ + // setMsgError("Wrong, email/password"); + setLoginError(true); + setLoginLoading(false); + return } - } catch (error) { - setMsgError("An error occurred"); - } finally { + localStorage.setItem("member_id", `${res.data.member_id}`); + localStorage.setItem("uid", `${res.data.uid}`); + localStorage.setItem("session_token", `${res.data.session}`); + // localStorage.setItem("session", `${res.data.session}`); + dispatch(updateUserDetails(res.data)); + setTimeout(() => { + navigate("/", { replace: true }); + setLoginLoading(false); + }, 2000); + }).catch(error => { + setMsgError("Unable to login, try again"); + setLoginLoading(false); + }).finally(()=>{ setTimeout(() => { setLoginError(false); setMsgError(null); + setLoginLoading(false); }, Number(process.env.REACT_APP_LOGIN_ERROR_TIMEOUT)); - } + }) }; return ( @@ -197,8 +206,10 @@ export default function Login() {