WrenchBoard/Users-Wrench
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'family-banner-bug' of WrenchBoard/Users-Wrench into master

Browse Source
This commit is contained in:
Olusesan Ameye
2024-02-26 10:39:23 +00:00
committed by Gogs
parent ae73f10c42 d3d2b3cb5a
commit 026dbb1a0a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/Home/FamilyDash.jsx
+1 -1
View File
@@ -40,7 +40,7 @@ export default function FamilyDash({ familyOffers, MyActiveJobList }) {
<> <>
{!familyBannersList.loading && familyBannersList?.result?.result_list && Object.keys(familyBannersList?.result?.result_list).length > 0 && {!familyBannersList.loading && familyBannersList?.result?.result_list && Object.keys(familyBannersList?.result?.result_list).length > 0 &&
// Loop for Family Banners // Loop for Family Banners
<div className="w-full mb-4 grid grid-cols-2 md:grid-cols-4 gap-2 md:gap-4"> <div className="w-full mb-4 grid grid-cols-2 md:grid-cols-3 gap-2 md:gap-4">
{Object.keys(familyBannersList?.result?.result_list).map((item, index) => { {Object.keys(familyBannersList?.result?.result_list).map((item, index) => {
let content = familyBannersList?.result?.result_list[item] let content = familyBannersList?.result?.result_list[item]
return ( return (
src/middleware/AuthRoute.jsx
+4 -4
View File
@@ -29,7 +29,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
} = useSelector((state) => state?.userDetails); // CHECKS IF USER Details are avaliable, to determine if user is active } = useSelector((state) => state?.userDetails); // CHECKS IF USER Details are avaliable, to determine if user is active
let loggedIn = username && session && uid ? true : false; // variable to determine if user is logged in let loggedIn = username && session && uid ? true : false; // variable to determine if user is logged in
console.log('USER', account_type)
useEffect(() => { useEffect(() => {
//Removing Data stored at localStorage after session expires //Removing Data stored at localStorage after session expires
const expireSession = () => { const expireSession = () => {
@@ -166,7 +166,7 @@ console.log('USER', account_type)
}, []); }, []);
useEffect(() => { useEffect(() => {
if(!account_type || !isLogin.status || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY if((!loggedIn && !isLogin.status) || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
return return
} }
const getMyJobList = async () => { const getMyJobList = async () => {
@@ -203,7 +203,7 @@ console.log('USER', account_type)
}, [walletTable]); }, [walletTable]);
useEffect(() => { useEffect(() => {
if(!account_type || !isLogin.status || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY if((!loggedIn && !isLogin.status) || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
return return
} }
// Getting market data // Getting market data
@@ -220,7 +220,7 @@ console.log('USER', account_type)
//FUNCTION TO GET COMMON HEAD DATA //FUNCTION TO GET COMMON HEAD DATA
useEffect(() => { useEffect(() => {
if(!account_type || !isLogin.status || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY if((!loggedIn && !isLogin.status) || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
return return
} }
apiCall apiCall