diff --git a/src/Routers.jsx b/src/Routers.jsx index d7e4af7..061a28d 100644 --- a/src/Routers.jsx +++ b/src/Routers.jsx @@ -49,8 +49,8 @@ export default function Routers() { path="/update-password" element={} /> + } /> } /> - } /> {/* private route */} }> diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx index 71f8c34..df34e23 100644 --- a/src/components/AuthPages/Login/index.jsx +++ b/src/components/AuthPages/Login/index.jsx @@ -67,7 +67,6 @@ export default function Login() { setLoginLoading(true); // userApi.getUserReminders(); //testing setTimeout(() => { - toast.success("Login Successfully"); navigate("/", { replace: true }); setLoginLoading(false); }, 2000); diff --git a/src/components/AuthPages/VerifyLink/index.jsx b/src/components/AuthPages/VerifyLink/index.jsx index 7d48afe..567e7f5 100644 --- a/src/components/AuthPages/VerifyLink/index.jsx +++ b/src/components/AuthPages/VerifyLink/index.jsx @@ -1,4 +1,4 @@ -import { useEffect, useState } from "react"; +import { useState, useLayoutEffect, useCallback } from "react"; import { useLocation, Link, useNavigate } from "react-router-dom"; import AuthLayout from "../AuthLayout"; import InputCom from "../../Helpers/Inputs/InputCom"; @@ -14,31 +14,33 @@ export default function VerifyLink() { const queryParams = new URLSearchParams(location?.search) const token = queryParams.get('vlink') - const verifyEmail = async (code) => { - const userApi = new usersService() - - try { - const verifyRes = await userApi.verifyEmail(code) - if (verifyRes.status === 200) { - let { data } = verifyRes - - if (data && data.internal_return === 0 && data.status_text === 'Link Verfied') { - setPageLoader(false) - setLinkSuccess(true) - } else { - setPageLoader(false) - setLinkError(true) + const verifyEmail = useCallback( + async (code) => { + const userApi = new usersService() + + try { + const verifyRes = await userApi.verifyEmail(code) + if (verifyRes.status === 200) { + let { data } = verifyRes + + if (data && data.internal_return === 0 && data.status_text === 'Link Verfied') { + setPageLoader(false) + setLinkSuccess(true) + } else { + setPageLoader(false) + setLinkError(true) + } + console.log(data) } - console.log(data) + } catch (error) { + setPageLoader(false) + setLinkError(true) + throw new Error(error) } - } catch (error) { - setPageLoader(false) - setLinkError(true) - throw new Error(error) - } - } + }, [] + ) - useEffect(() => { + useLayoutEffect(() => { verifyEmail(token) })