From 58a75a1c89def3e179eae03d7f76ce19384fa45c Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Thu, 28 Nov 2024 11:19:02 +0100
Subject: [PATCH 1/2] family jome page bug fix

---
 src/components/Home/index.jsx | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/components/Home/index.jsx b/src/components/Home/index.jsx
index 5787de0..38ccd87 100644
--- a/src/components/Home/index.jsx
+++ b/src/components/Home/index.jsx
@@ -24,9 +24,6 @@ export default function Home(props) {
   return (
     <Layout>
       <div className="w-full">
-        {commonHeadBanner.loading ?
-        <LoadingSpinner height='h-48' size='16' />
-        :
         <>
         {userDetails && userDetails?.account_type == "FAMILY" ? (
           <FamilyDash
@@ -35,19 +32,24 @@ export default function Home(props) {
             serverImg = {userDetails?.session_image_server}
           />
         ) : userDetails && userDetails?.account_type == "FULL" ? (
-          <FullAccountDash
-            bannerList={commonHeadBanner?.data?.result_list}
-            dashTypes={commonHeadBanner?.data?.home_dash_type}
-            offersList={commonHeadBanner?.data?.offers_list}
-            imageServer={commonHeadBanner?.data?.session_image_server}
-          />
+          <>
+              {commonHeadBanner.loading ?
+                <LoadingSpinner height='h-48' size='16' />
+                :
+                <FullAccountDash
+                  bannerList={commonHeadBanner?.data?.result_list}
+                  dashTypes={commonHeadBanner?.data?.home_dash_type}
+                  offersList={commonHeadBanner?.data?.offers_list}
+                  imageServer={commonHeadBanner?.data?.session_image_server}
+                />
+              }
+          </>
         ) : (
           <div>
             You are not logged in or your account type is not supported.
           </div>
         )}
         </>
-        }
       </div>
     </Layout>
   );

From 02773ed1dacaa9e8a8cea4ce9ec2fff00765441e Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Thu, 28 Nov 2024 11:53:19 +0100
Subject: [PATCH 2/2] made expire session for kids 30mins

---
 .env             | 2 +-
 .env.development | 2 +-
 .env.production  | 2 +-
 src/Routers.jsx  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.env b/.env
index 58ed8da..75e505b 100644
--- a/.env
+++ b/.env
@@ -23,7 +23,7 @@ REACT_APP_PRIMARY_SOCKET="https://socket-dev.wrenchboard.com"
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
 REACT_APP_SESSION_EXPIRE_MINUTES=600000
-REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
+REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=1800000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000
 
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
diff --git a/.env.development b/.env.development
index 1ac7d2f..3f1f9f5 100644
--- a/.env.development
+++ b/.env.development
@@ -23,7 +23,7 @@ REACT_APP_PRIMARY_SOCKET="https://socket-dev.wrenchboard.com"
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
 REACT_APP_SESSION_EXPIRE_MINUTES=600000
-REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
+REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=1800000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000
 
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
diff --git a/.env.production b/.env.production
index 1cf48dc..00fb57e 100644
--- a/.env.production
+++ b/.env.production
@@ -23,7 +23,7 @@ REACT_APP_PRIMARY_SOCKET="https://socket.wrenchboard.com"
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
 REACT_APP_SESSION_EXPIRE_MINUTES=600000
-REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=600000
+REACT_APP_SESSION_EXPIRE_MINUTES_FAMILY=1800000
 REACT_APP_SESSION_EXPIRE_CHECKER=60000
 
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
diff --git a/src/Routers.jsx b/src/Routers.jsx
index 2b1d10b..d282677 100644
--- a/src/Routers.jsx
+++ b/src/Routers.jsx
@@ -75,7 +75,7 @@ export default function Routers() {
     <ScrollToTop>
       <Routes>
         {/* guest routes */}
-        {process.env.REACT_APP_NEW_LOGIN_LAYOUT == 1 ? (
+        {Number(process.env.REACT_APP_NEW_LOGIN_LAYOUT) === 1 ? (
           <>
             <Route exact path="/login" element={<LoginLandingPage />} />
             <Route exact path="/login/:type" element={<LoginPageTwo />} />