diff --git a/src/components/Home/FamilyDash.jsx b/src/components/Home/FamilyDash.jsx index e8e460a..a5fd284 100644 --- a/src/components/Home/FamilyDash.jsx +++ b/src/components/Home/FamilyDash.jsx @@ -5,6 +5,7 @@ import MyOffersFamilyTable from "../MyTasks/MyOffersFamilyTable"; import FamilyActiveLSlde from "./FamilyActiveLSlde"; import { useDispatch, useSelector } from "react-redux"; import { tableReload } from "../../store/TableReloads"; +import LoadingSpinner from "../Spinners/LoadingSpinner"; export default function FamilyDash({ MyActiveJobList, serverImg }) { // console.log("PROPS IN FAMILY DASH->", familyOffers?.result_list); @@ -76,7 +77,12 @@ export default function FamilyDash({ MyActiveJobList, serverImg }) { {process.env.REACT_APP_SHOW_NEW_FAMILY_DASH == '1' && <> - {familyBannersList?.result_list && Object.keys(familyBannersList?.result_list).length > 0 && + {familyBannersList?.loading ? +
+ +
+ : + familyBannersList?.result_list && Object.keys(familyBannersList?.result_list).length > 0 ? // Loop for Family Banners
{Object.keys(familyBannersList?.result_list).map((item, index) => { @@ -97,6 +103,8 @@ export default function FamilyDash({ MyActiveJobList, serverImg }) { ) })}
+ : + null } {tab_categories?.data && @@ -104,9 +112,29 @@ export default function FamilyDash({ MyActiveJobList, serverImg }) {

Resources

{tab_categories.data.map((item) => { + // onClick={()=>navigate('/resources', {state:{tab:'created'}})} + let resourceState = '' + switch(item?.action){ + case 'fam-blog': + resourceState = 'blog' + break + case 'ai-question': + resourceState = 'onsale' + break + case 'myfiles': + resourceState = 'created' + break + case 'ai-lab': + resourceState = 'onsale' + break + default: + resourceState = 'blog' + break + } + // console.log('EX', item.enabled, item?.action, resourceState) if(item.enabled){ return ( - +
banner image diff --git a/src/middleware/AuthRoute.jsx b/src/middleware/AuthRoute.jsx index b308721..231b282 100644 --- a/src/middleware/AuthRoute.jsx +++ b/src/middleware/AuthRoute.jsx @@ -264,8 +264,9 @@ const AuthRoute = ({ redirectPath = "/login", children }) => { // setFamilyBannersList({loading:true, result:[]}); try { const res = await apiCall.getFamilyBannersList(); - dispatch(familyBannersList(res.data)) + dispatch(familyBannersList({...res.data, loading:false})) } catch (error) { + dispatch(familyBannersList({loading:false})) console.log("Error getting tasks"); } }; diff --git a/src/store/FamilyBannerList.js b/src/store/FamilyBannerList.js index d89bfc5..f411343 100644 --- a/src/store/FamilyBannerList.js +++ b/src/store/FamilyBannerList.js @@ -1,7 +1,7 @@ import { createSlice } from "@reduxjs/toolkit"; const initialState = { - familyBannersList: {} + familyBannersList: {loading:true} }; export const familyBannersListSlice = createSlice({ diff --git a/src/views/ResourcePage.jsx b/src/views/ResourcePage.jsx index 00d08ce..801f2a1 100644 --- a/src/views/ResourcePage.jsx +++ b/src/views/ResourcePage.jsx @@ -6,7 +6,6 @@ export default function ResourcePage() { const {state, pathname} = useLocation() // CHECKS IF THERE IS AN ACTIVE TAB WITH LINK BACK TO RESOURCES const [MyResourceData, setMyResourceData] = useState([]); const api = new usersService(); - const getMyResourceData = async () => { try { const res = await api.getResourceList();