From 1ad3b746101f5ed6c78b9b5b0b65d8b1e75a6927 Mon Sep 17 00:00:00 2001 From: Ebube Date: Thu, 27 Apr 2023 08:31:25 +0100 Subject: [PATCH] added checkers --- src/components/AuthPages/SignUp/index.jsx | 33 ++++++++++--------- src/components/AuthPages/VerifyLink/index.jsx | 3 ++ yarn.lock | 5 --- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/components/AuthPages/SignUp/index.jsx b/src/components/AuthPages/SignUp/index.jsx index 3099c7e..549a501 100644 --- a/src/components/AuthPages/SignUp/index.jsx +++ b/src/components/AuthPages/SignUp/index.jsx @@ -37,7 +37,7 @@ export default function SignUp() { const navigate = useNavigate(); const userApi = new usersService(); - + // Get Country Api const getCountryList = async () => { const res = await userApi.getSignupCountryData() @@ -46,7 +46,7 @@ export default function SignUp() { if (res.status === 200) { const { signup_country } = await res.data setCountries(signup_country) - } else if (res.data.result != 100) { + } else if (res.data.result !== 100) { setCountries('Nothing see here!') } } catch (error) { @@ -63,6 +63,7 @@ export default function SignUp() { try { if (email !== '' && password !== '' && first_name !== '' && last_name !== '') { + setSignUpLoading(true) const reqData = { country: country, firstname: first_name, @@ -75,7 +76,6 @@ export default function SignUp() { } const res = await userApi.CreateUser(reqData) - setSignUpLoading(true) if (res.status === 200) { const { data } = res @@ -83,38 +83,39 @@ export default function SignUp() { setMsgError('This account has been already created') setSignUpLoading(false) } - if (data.status > 0 && data.session !== '') { - localStorage.setItem("email", `${data.email}`); - localStorage.setItem("country", `${data.country}`); - localStorage.setItem("firstname", `${data.firstname}`); - localStorage.setItem("lastname", `${data.lastname}`); - + if (data && data.status === '1') { setTimeout(() => { - navigate("/", { replace: true }); + navigate("/verify-you", { replace: true }); setSignUpLoading(false) }, 2000) } else { - setMsgError(data.status) setSignUpLoading(false) + setMsgError('This account does not exist') } + } else { + setSignUpLoading(false) + setMsgError('An error occurred') } - } else { - setMsgError('This account does not exist') - setSignUpLoading(false) } } catch (error) { throw new Error(error) - setMsgError('An error occurred') } finally { setTimeout(() => { setMsgError(null) }, process.env.REACT_APP_SIGNUP_ERROR_TIMEOUT) + setFormData({ + first_name: '', + last_name: '', + email: '', + country: '', + password: '' + }) } } useEffect(() => { getCountryList() - }, []) + }) return ( <> diff --git a/src/components/AuthPages/VerifyLink/index.jsx b/src/components/AuthPages/VerifyLink/index.jsx index 01d55c2..7d48afe 100644 --- a/src/components/AuthPages/VerifyLink/index.jsx +++ b/src/components/AuthPages/VerifyLink/index.jsx @@ -29,6 +29,7 @@ export default function VerifyLink() { setPageLoader(false) setLinkError(true) } + console.log(data) } } catch (error) { setPageLoader(false) @@ -41,6 +42,8 @@ export default function VerifyLink() { verifyEmail(token) }) + console.log(token) + return ( <>