Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 02773ed1da | |||
| 58a75a1c89 | |||
| 883a98951a |
@@ -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
@@ -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
@@ -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
@@ -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 />} />
|
||||
|
||||
@@ -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>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user