6 Commits

Author SHA1 Message Date
Ebube 0001fe5d59 adjusted line 2023-04-17 21:35:22 +01:00
Ebube 2ee928a2e3 logout timeout 2023-04-17 21:33:39 +01:00
ameye dd581a8cdc Merge branch 'login-error-msg' of FloatSystems/float-fleet into master 2023-04-16 21:02:07 +00:00
Ebube 350626cfc3 other changes 2023-04-16 20:06:34 +01:00
Ebube 8b8a1548e1 login err msg 2023-04-16 19:05:53 +01:00
ameye b26dd7d574 Merge branch 'login-implementation' of FloatSystems/float-fleet into master 2023-04-15 19:57:47 +00:00
3 changed files with 27 additions and 5 deletions
+3 -1
View File
@@ -16,4 +16,6 @@ REACT_APP_PREVIEW_DOCS_URL=https://preview.keenthemes.com/metronic8/react/docs
REACT_APP_THEME_API_URL=https://preview.keenthemes.com/theme-api/api REACT_APP_THEME_API_URL=https://preview.keenthemes.com/theme-api/api
REACT_APP_TERMS_LINK='https://www.float.sg/terms' REACT_APP_TERMS_LINK='https://www.float.sg/terms'
REACT_APP_CONTACT_LINK='https://www.float.sg/contact' REACT_APP_CONTACT_LINK='https://www.float.sg/contact'
REACT_APP_ABOUT_LINK='https://www.float.sg/about' REACT_APP_ABOUT_LINK='https://www.float.sg/about'
REACT_APP_LOGOUT_SESSION_TIMEOUT=300000
+12 -3
View File
@@ -23,8 +23,8 @@ const loginSchema = Yup.object().shape({
}) })
const initialValues = { const initialValues = {
email: 'johndoe@email.com', email: '',
password: '****', password: '',
} }
/* /*
@@ -125,11 +125,19 @@ export function Login() {
</div> </div>
{/* end::Separator */} {/* end::Separator */}
{formik.status ? (
<div className='mb-lg-15 alert alert-danger'>
<div className='alert-text font-weight-bold'>{formik.status}</div>
</div>
) : (
null
)}
{/* begin::Form group */} {/* begin::Form group */}
<div className='fv-row mb-8'> <div className='fv-row mb-8'>
<label className='form-label fs-6 fw-bolder text-dark'>Email</label> <label className='form-label fs-6 fw-bolder text-dark'>Email</label>
<input <input
placeholder='Email' placeholder='floatuser@email.com'
{...formik.getFieldProps('email')} {...formik.getFieldProps('email')}
className={clsx( className={clsx(
'form-control bg-transparent', 'form-control bg-transparent',
@@ -155,6 +163,7 @@ export function Login() {
<label className='form-label fw-bolder text-dark fs-6 mb-0'>Password</label> <label className='form-label fw-bolder text-dark fs-6 mb-0'>Password</label>
<input <input
type='password' type='password'
placeHolder="●●●●●●"
autoComplete='off' autoComplete='off'
{...formik.getFieldProps('password')} {...formik.getFieldProps('password')}
className={clsx( className={clsx(
+12 -1
View File
@@ -8,6 +8,7 @@ import {
Dispatch, Dispatch,
SetStateAction, SetStateAction,
} from 'react' } from 'react'
import {useLocation} from 'react-router-dom'
import {LayoutSplashScreen} from '../../../../_res/layout/core' import {LayoutSplashScreen} from '../../../../_res/layout/core'
import {AuthModel, UserModel} from './_models' import {AuthModel, UserModel} from './_models'
import * as authHelper from './AuthHelpers' import * as authHelper from './AuthHelpers'
@@ -61,6 +62,7 @@ const AuthProvider: FC<WithChildren> = ({children}) => {
} }
const AuthInit: FC<WithChildren> = ({children}) => { const AuthInit: FC<WithChildren> = ({children}) => {
const {pathname} = useLocation()
const {auth, logout, setCurrentUser} = useAuth() const {auth, logout, setCurrentUser} = useAuth()
const didRequest = useRef(false) const didRequest = useRef(false)
const [showSplashScreen, setShowSplashScreen] = useState(true) const [showSplashScreen, setShowSplashScreen] = useState(true)
@@ -95,8 +97,17 @@ const AuthInit: FC<WithChildren> = ({children}) => {
logout() logout()
setShowSplashScreen(false) setShowSplashScreen(false)
} }
// adding a timeout for 5mins
const logOutSession = setTimeout(() => {
logout()
}, Number(process.env.REACT_APP_LOGOUT_SESSION_TIMEOUT))
return (() => {
clearInterval(logOutSession)
})
// eslint-disable-next-line // eslint-disable-next-line
}, []) }, [pathname])
return showSplashScreen ? <LayoutSplashScreen /> : <>{children}</> return showSplashScreen ? <LayoutSplashScreen /> : <>{children}</>
} }