Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f045ebcfe4 |
@@ -17,5 +17,4 @@ REACT_APP_THEME_API_URL=https://preview.keenthemes.com/theme-api/api
|
||||
|
||||
REACT_APP_SITE_CONTACT_US=https://www.float.sg/contact
|
||||
REACT_APP_SITE_TERMS=https://www.float.sg/terms
|
||||
REACT_APP_SITE_ABOUT_US=https://www.float.sg/about
|
||||
REACT_APP_SESSION_TIMEOUT=300000
|
||||
REACT_APP_SITE_ABOUT_US=https://www.float.sg/about
|
||||
@@ -22,19 +22,19 @@ const SidebarLogo = () => {
|
||||
{config.layoutType === 'dark-sidebar' ? (
|
||||
<img
|
||||
alt='Logo'
|
||||
src={toAbsoluteUrl('/media/logos/default-dark.svg')}
|
||||
src={toAbsoluteUrl('/media/logos/logo.png')}
|
||||
className='h-25px app-sidebar-logo-default'
|
||||
/>
|
||||
) : (
|
||||
<>
|
||||
<img
|
||||
alt='Logo'
|
||||
src={toAbsoluteUrl('/media/logos/default.svg')}
|
||||
src={toAbsoluteUrl('/media/logos/logo.png')}
|
||||
className='h-25px app-sidebar-logo-default theme-light-show'
|
||||
/>
|
||||
<img
|
||||
alt='Logo'
|
||||
src={toAbsoluteUrl('/media/logos/default-dark.svg')}
|
||||
src={toAbsoluteUrl('/media/logos/logo.png')}
|
||||
className='h-25px app-sidebar-logo-default theme-dark-show'
|
||||
/>
|
||||
</>
|
||||
|
||||
@@ -8,7 +8,6 @@ import {
|
||||
Dispatch,
|
||||
SetStateAction,
|
||||
} from 'react'
|
||||
import {useLocation} from 'react-router-dom'
|
||||
import {LayoutSplashScreen} from '../../../../_res/layout/core'
|
||||
import {AuthModel, UserModel} from './_models'
|
||||
import * as authHelper from './AuthHelpers'
|
||||
@@ -62,17 +61,11 @@ const AuthProvider: FC<WithChildren> = ({children}) => {
|
||||
}
|
||||
|
||||
const AuthInit: FC<WithChildren> = ({children}) => {
|
||||
const pathname = useLocation().pathname
|
||||
const {auth, logout, setCurrentUser} = useAuth()
|
||||
const didRequest = useRef(false)
|
||||
const [showSplashScreen, setShowSplashScreen] = useState(true)
|
||||
// We should request user by authToken (IN OUR EXAMPLE IT'S API_TOKEN) before rendering the application
|
||||
useEffect(() => {
|
||||
// function to expire session after 5 mins
|
||||
let logoutSession = setTimeout(()=>{ //expire session after 5 mins
|
||||
logout()
|
||||
}, Number(process.env.REACT_APP_SESSION_TIMEOUT))
|
||||
|
||||
const requestUser = async (apiToken: string) => {
|
||||
try {
|
||||
if (!didRequest.current) {
|
||||
@@ -103,11 +96,7 @@ const AuthInit: FC<WithChildren> = ({children}) => {
|
||||
setShowSplashScreen(false)
|
||||
}
|
||||
// eslint-disable-next-line
|
||||
|
||||
return ()=>{ // clears session timeout side effect
|
||||
clearInterval(logoutSession)
|
||||
}
|
||||
}, [pathname])
|
||||
}, [])
|
||||
|
||||
return showSplashScreen ? <LayoutSplashScreen /> : <>{children}</>
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user