diff --git a/src/component/auth/Login2.jsx b/src/component/auth/Login2.jsx
index e2a7c24..8ea2974 100644
--- a/src/component/auth/Login2.jsx
+++ b/src/component/auth/Login2.jsx
@@ -38,8 +38,8 @@ export default function Login() {
const {token} = res?.data?.data
if(token){
localStorage.setItem('token', token)
- const data = {token}
- dispatch(updateUserDetails({ ...data }));
+ // const data = {token}
+ // dispatch(updateUserDetails({ ...data }));
navigate('/dash') // later add redux to dispatch state
}
}
diff --git a/src/component/authorization/UserExist.jsx b/src/component/authorization/UserExist.jsx
index 7a64744..499e53b 100644
--- a/src/component/authorization/UserExist.jsx
+++ b/src/component/authorization/UserExist.jsx
@@ -7,6 +7,7 @@ import Layout from '../layout/Layout'
import siteLinks from '../../links/siteLinks'
import debounceFunction from '../../utils/debounceFunction'
+import { accountDashboard } from '../../services/services';
export default function UserExist() {
@@ -19,9 +20,9 @@ export default function UserExist() {
const [lastActivityTime, setLastActivityTime] = useState(Date.now()); // HOLDS THE INITIAL TIME USER LOGS IN
- const { userDetails: { token }} = useSelector((state) => state?.userDetails); // CHECKS IF USER Details are avaliable, to determine if user is active
+ const { userDetails: { lastname }} = useSelector((state) => state?.userDetails); // CHECKS IF USER Details are avaliable, to determine if user is active
- let loggedIn = token ? true : false; // variable to determine if user is logged in
+ let loggedIn = lastname ? true : false; // variable to determine if user is logged in
// console.log('loggedIn', loggedIn)
// Function to log the user out
@@ -57,25 +58,40 @@ export default function UserExist() {
})
}
},[lastActivityTime])
-
-
+
useEffect(()=>{
let token = localStorage.getItem('token')
- const timer = setTimeout(()=>{
- if(token && loggedIn){
- setLoading(false)
- }else if(token && !loggedIn){
- const data = {token}
- dispatch(updateUserDetails({ ...data }));
- setLoading(false)
- // dispatch(updateUserDetails({ ...res.data }));
- }else{
- navigate('auth/login')
- }
- },1000)
-
- return () => clearTimeout(timer)
+ if(!token){
+ return navigate(siteLinks.login)
+ }
+
+ accountDashboard().then(res => {
+ const {dash_data} = res?.data
+ setLoading(false)
+ dispatch(updateUserDetails({ ...dash_data }));
+ }).catch(err => {
+ navigate(siteLinks.login)
+ })
},[])
+
+
+ // useEffect(()=>{
+ // let token = localStorage.getItem('token')
+ // const timer = setTimeout(()=>{
+ // if(token && loggedIn){
+ // setLoading(false)
+ // }else if(token && !loggedIn){
+ // const data = {token}
+ // dispatch(updateUserDetails({ ...data }));
+ // setLoading(false)
+ // // dispatch(updateUserDetails({ ...res.data }));
+ // }else{
+ // navigate('auth/login')
+ // }
+ // },1000)
+
+ // return () => clearTimeout(timer)
+ // },[])
return (
<>
diff --git a/src/component/home/HomeSections.jsx b/src/component/home/HomeSections.jsx
index e930d54..3172ba9 100644
--- a/src/component/home/HomeSections.jsx
+++ b/src/component/home/HomeSections.jsx
@@ -1,40 +1,40 @@
import React from "react";
import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
-import { useQuery } from "@tanstack/react-query";
-import { accountDashboard } from "../../services/services";
-import queryKeys from "../../services/queryKeys";
-import MainLoaderBS from "../loaders/MainLoaderBS";
+// import { useQuery } from "@tanstack/react-query";
+// import { accountDashboard } from "../../services/services";
+// import queryKeys from "../../services/queryKeys";
+// import MainLoaderBS from "../loaders/MainLoaderBS";
export default function HomeSections(){
- const {data:dashData, isFetching, isError} = useQuery({
- queryKey: queryKeys.dashboard,
- queryFn: async () => await accountDashboard()
- })
+ // const {data:dashData, isFetching, isError} = useQuery({
+ // queryKey: queryKeys.dashboard,
+ // queryFn: async () => await accountDashboard()
+ // })
- if(isFetching){
- return(
- <>
- {/*
Loading...
-Loading...
+ //Error occured! Please refresh to continue
-Error occured! Please refresh to continue
+ //