WrenchBoard/Users-Wrench
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'home-page-bug' of WrenchBoard/Users-Wrench into master

Browse Source
This commit is contained in:
Olusesan Ameye
2024-11-28 11:39:18 +00:00
committed by Gogs
parent b25a9c154b 02773ed1da
commit 8e9ae8187f
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env
+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" #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
REACT_APP_SESSION_EXPIRE_MINUTES=600000 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_SESSION_EXPIRE_CHECKER=60000
REACT_APP_LOGIN_ERROR_TIMEOUT=7000 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
.env.development
+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" #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
REACT_APP_SESSION_EXPIRE_MINUTES=600000 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_SESSION_EXPIRE_CHECKER=60000
REACT_APP_LOGIN_ERROR_TIMEOUT=7000 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
.env.production
+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" #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
REACT_APP_SESSION_EXPIRE_MINUTES=600000 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_SESSION_EXPIRE_CHECKER=60000
REACT_APP_LOGIN_ERROR_TIMEOUT=7000 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
src/Routers.jsx
+1 -1
View File
@@ -75,7 +75,7 @@ export default function Routers() {
<ScrollToTop> <ScrollToTop>
<Routes> <Routes>
{/* guest 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" element={<LoginLandingPage />} />
<Route exact path="/login/:type" element={<LoginPageTwo />} /> <Route exact path="/login/:type" element={<LoginPageTwo />} />
src/components/Home/index.jsx
+12 -10
View File
@@ -24,9 +24,6 @@ export default function Home(props) {
return ( return (
<Layout> <Layout>
<div className="w-full"> <div className="w-full">
{commonHeadBanner.loading ?
<LoadingSpinner height='h-48' size='16' />
:
<> <>
{userDetails && userDetails?.account_type == "FAMILY" ? ( {userDetails && userDetails?.account_type == "FAMILY" ? (
<FamilyDash <FamilyDash
@@ -35,19 +32,24 @@ export default function Home(props) {
serverImg = {userDetails?.session_image_server} serverImg = {userDetails?.session_image_server}
/> />
) : userDetails && userDetails?.account_type == "FULL" ? ( ) : userDetails && userDetails?.account_type == "FULL" ? (
<FullAccountDash <>
bannerList={commonHeadBanner?.data?.result_list} {commonHeadBanner.loading ?
dashTypes={commonHeadBanner?.data?.home_dash_type} <LoadingSpinner height='h-48' size='16' />
offersList={commonHeadBanner?.data?.offers_list} :
imageServer={commonHeadBanner?.data?.session_image_server} <FullAccountDash
/> bannerList={commonHeadBanner?.data?.result_list}
dashTypes={commonHeadBanner?.data?.home_dash_type}
offersList={commonHeadBanner?.data?.offers_list}
imageServer={commonHeadBanner?.data?.session_image_server}
/>
}
</>
) : ( ) : (
<div> <div>
You are not logged in or your account type is not supported. You are not logged in or your account type is not supported.
</div> </div>
)} )}
</> </>
}
</div> </div>
</Layout> </Layout>
); );