diff --git a/src/authorization/UserExists.jsx b/src/authorization/UserExists.jsx index d6ed098..f4058f3 100644 --- a/src/authorization/UserExists.jsx +++ b/src/authorization/UserExists.jsx @@ -1,5 +1,6 @@ import React, { useEffect, useState } from 'react' import { useLocation, useNavigate, Outlet } from 'react-router-dom' +import Layout from '../components/layout/Layout' import myLinks from '../myLinks' import PageLoader from '../components/PageLoader' @@ -13,7 +14,7 @@ export default function UserExists() { const [loading, setLoading] = useState(true) useEffect(()=>{ - if(!state){ + if(!state || localStorage.getItem('active') != 'true'){ return navigate(myLinks.getStarted, {replace:true}) } setTimeout(()=>{ @@ -27,7 +28,9 @@ export default function UserExists() { loading ? : - + + + } ) diff --git a/src/components/GetLoan.jsx b/src/components/GetLoan.jsx index a3cef1d..7e36878 100644 --- a/src/components/GetLoan.jsx +++ b/src/components/GetLoan.jsx @@ -57,7 +57,7 @@ export default function GetLoan() { },[]) return ( -
+
@@ -68,7 +68,6 @@ export default function GetLoan() { BVN: {state?.user.bvn}
- {!step?.screen?.length || step?.screen[step.screen.length -1 ] == screens.products ? <>
@@ -103,7 +102,7 @@ export default function GetLoan() { }
{products && -
+
} diff --git a/src/components/HomeCom.jsx b/src/components/HomeCom.jsx index d6fb16b..b9d0f4a 100644 --- a/src/components/HomeCom.jsx +++ b/src/components/HomeCom.jsx @@ -28,8 +28,8 @@ export default function HomeCom() { } return ( -
-
+ +
Users
{isFetching ? <> @@ -88,7 +88,7 @@ export default function HomeCom() { }
-
+ ) } diff --git a/src/components/TableWrapper.jsx b/src/components/TableWrapper.jsx index 4aac601..41d9fd2 100644 --- a/src/components/TableWrapper.jsx +++ b/src/components/TableWrapper.jsx @@ -61,7 +61,7 @@ export default function TableWrapper({ },[itemsPerPage]) return ( -
+
{data.length > 0 && filterItem && (
{filterItem.map((item, index) => ( diff --git a/src/components/auth/LoginCom.jsx b/src/components/auth/LoginCom.jsx index 571cb91..bd0a8a5 100644 --- a/src/components/auth/LoginCom.jsx +++ b/src/components/auth/LoginCom.jsx @@ -42,6 +42,7 @@ export default function LoginCom() { // // dispatch(updateUserDetails({ ...data })); // } navigate(myLinks.home, {state:{proceed:'true'}}) // later add redux to dispatch state + localStorage.setItem('active', 'true') } }) diff --git a/src/components/layout/Layout.jsx b/src/components/layout/Layout.jsx new file mode 100644 index 0000000..de95710 --- /dev/null +++ b/src/components/layout/Layout.jsx @@ -0,0 +1,23 @@ +import {Outlet, useNavigate} from 'react-router-dom' +import myLinks from '../../myLinks' + +export default function Layout() { + + const navigate = useNavigate() + + const handleLogout = () => { + navigate(myLinks.login, {state:{proceed:'false'}, replace:true}) + localStorage.clear() + } + + return ( +
+
+ +
+
+ +
+
+ ) +}