Compare commits

...

3 Commits

Author SHA1 Message Date
victorAnumudu 02773ed1da made expire session for kids 30mins 2024-11-28 11:53:19 +01:00
victorAnumudu 58a75a1c89 family jome page bug fix 2024-11-28 11:19:02 +01:00
ameye 883a98951a Merge branch 'home-banner-reload' of WrenchBoard/Users-Wrench into master 2024-11-27 10:23:00 +00:00
5 changed files with 16 additions and 14 deletions
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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 />} />
+12 -10
View File
@@ -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>
);