From de477f32edc3ed8b8a5b7867ee61e2319aed08b6 Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Sun, 25 Feb 2024 21:16:38 +0100
Subject: [PATCH] added banner to family dashboard banner list

---
 src/components/Home/FamilyDash.jsx | 20 ++++++++-------
 src/middleware/AuthRoute.jsx       | 41 ++++++++++++++++++------------
 2 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/components/Home/FamilyDash.jsx b/src/components/Home/FamilyDash.jsx
index dde6128..062ebd7 100644
--- a/src/components/Home/FamilyDash.jsx
+++ b/src/components/Home/FamilyDash.jsx
@@ -1,9 +1,9 @@
 import React, { useEffect, useState } from "react";
+import { Link } from "react-router-dom";
+import usersService from "../../services/UsersService";
 import ParentWaiting from "../MyOffers/ParentWaiting";
 import MyOffersFamilyTable from "../MyTasks/MyOffersFamilyTable";
 import FamilyActiveLSlde from "./FamilyActiveLSlde";
-import { Link } from "react-router-dom";
-import usersService from "../../services/UsersService";
 
 export default function FamilyDash({ familyOffers, MyActiveJobList }) {
   // console.log("PROPS IN FAMILY DASH->", familyOffers?.result_list);
@@ -19,7 +19,7 @@ export default function FamilyDash({ familyOffers, MyActiveJobList }) {
     try {
       const res = await userApi.getFamilyBannersList();
       setFamilyBannersList({loading:false, result:res.data});
-      // console.log('TEST RESPONSE', res)
+      // console.log('TEST RESPONSE', res.data)
     } catch (error) {
       setFamilyBannersList({loading:false, result:[]});
       console.log("Error getting tasks");
@@ -38,15 +38,17 @@ export default function FamilyDash({ familyOffers, MyActiveJobList }) {
 
         {process.env.REACT_APP_SHOW_NEW_FAMILY_DASH == '1' &&
         <>
-          {!familyBannersList.loading && familyBannersList?.result?.data && Object.keys(familyBannersList?.result?.data).length > 0 &&
+          {!familyBannersList.loading && familyBannersList?.result?.result_list && Object.keys(familyBannersList?.result?.result_list).length > 0 &&
             // Loop for Family Banners
             <div className="w-full mb-4 grid grid-cols-2 md:grid-cols-4 gap-2 md:gap-4">
-              {Object.keys(familyBannersList?.result?.data).map((item, index) => {
-                let content = familyBannersList?.result?.data[item]
+              {Object.keys(familyBannersList?.result?.result_list).map((item, index) => {
+                let content = familyBannersList?.result?.result_list[item]
                 return (
-                  <Link key={item} to='/' className={`p-2 h-40 rounded-lg shadow-sm flex justify-center items-center ${index%2==0 ? 'bg-red-200/50' : 'bg-sky-300/50'}`}>
-                    <div className="">
-                    {content.banner.text} for <span className="font-bold">{item}</span> content
+                  <Link key={item} to='/' className={`p-2 h-40 rounded-lg shadow-sm flex justify-center items-center transition-all duration-300 hover:shadow-md ${index%2==0 ? 'bg-red-200/50' : 'bg-sky-300/50'}`}>
+                    <div className="h-full w-full">
+                      <img className="w-full h-1/2 object-cover rounded-lg" src={content.banner.image} alt='banner image' />
+                      <h1 className="my-2 text-lg font-medium tracking-wide">{content.banner.text}</h1>
+                      <p className="text-sm">{content.banner.description}</p>
                     </div>
                   </Link>
                 )
diff --git a/src/middleware/AuthRoute.jsx b/src/middleware/AuthRoute.jsx
index fa22223..73d1f08 100644
--- a/src/middleware/AuthRoute.jsx
+++ b/src/middleware/AuthRoute.jsx
@@ -25,11 +25,11 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
   );
 
   const {
-    userDetails: { username, uid, session },
+    userDetails: { username, uid, session, account_type },
   } = 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
-
+console.log('USER', account_type)
   useEffect(() => {
     //Removing Data stored at localStorage after session expires
     const expireSession = () => {
@@ -166,6 +166,9 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
   }, []);
 
   useEffect(() => {
+    if(!account_type || !isLogin.status || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
+      return
+    }
     const getMyJobList = async () => {
       dispatch(updateUserJobList({ loading: true, data: [] }));
       try {
@@ -180,7 +183,7 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
       }
     };
     getMyJobList();
-  }, [jobListTable]);
+  }, [jobListTable, isLogin.status]);
 
   useEffect(() => {
     const getMyWalletList = async () => {
@@ -200,6 +203,9 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
   }, [walletTable]);
 
   useEffect(() => {
+    if(!account_type || !isLogin.status || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
+      return
+    }
     // Getting market data
     const getMarketActiveJobList = async () => {
       try {
@@ -210,22 +216,25 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
       }
     };
     getMarketActiveJobList();
-  }, [apiCall, dispatch, jobListTable]);
+  }, [apiCall, dispatch, jobListTable, isLogin.status]);
 
   //FUNCTION TO GET COMMON HEAD DATA
   useEffect(() => {
-    apiCall
-      .getHeroJBanners()
-      .then((res) => {
-        if (res.data.internal_return < 0) {
-          return;
-        }
-        dispatch(commonHeadBanner(res.data));
-      })
-      .catch((error) => {
-        console.log("ERROR ", error);
-      });
-  }, []);
+    if(!account_type || !isLogin.status || account_type == 'FAMILY'){  // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
+      return
+    }
+      apiCall
+        .getHeroJBanners()
+        .then((res) => {
+          if (res.data.internal_return < 0) {
+            return;
+          }
+          dispatch(commonHeadBanner(res.data));
+        })
+        .catch((error) => {
+          console.log("ERROR ", error);
+        });
+  }, [isLogin.status]);
 
   //FUNCTION TO GET COMMON HEAD DATA
   useEffect(() => {