merge master to branch and conflict resolved

.env

@@ -18,3 +18,6 @@ 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_LOGIN_ERROR_TIMEOUT=5000
+REACT_APP_SESSION_TIMEOUT=300000

src/_metronic/layout/components/sidebar/SidebarLogo.tsx

@@ -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'
             />
           </>

src/_res/assets/sass/layout/_auth.scss

@@ -1,4 +1,4 @@
 
-.auth-gray {
+.auth-height {
-	background-color: $gray-200;
+	min-height: 100vh;
 }

src/app/modules/auth/AuthLayout.tsx

@@ -1,47 +1,10 @@
 /* eslint-disable jsx-a11y/anchor-is-valid */
-import {useEffect, useState} from 'react'
+import {useEffect} from 'react'
 import {Outlet, Link} from 'react-router-dom'
 import {toAbsoluteUrl} from '../../../_res/helpers'
 
 const AuthLayout = () => {
-  //initial background color
-  let [bgColor, setBgColor] = useState({
-    backgroundImage: 'linear-gradient(70deg, #E6E7F9, #b4caed)'
-  })
-
-  // function to determine background color
-  let changeBgColor = () => {
-    // let randomNum = Math.round(Math.random() * 3)
-    let randomNum = Number(localStorage.getItem('bg-num'))
-    if(randomNum){
-      if(randomNum <= 1){
-        setBgColor({
-          backgroundImage: 'linear-gradient(70deg, #E6E7F9, #b4caed)'
-        })
-        localStorage.setItem('bg-num', '2')
-      }else if(randomNum <= 2){
-        setBgColor({
-          backgroundImage: 'linear-gradient(70deg, #eee, #fff)'
-        })
-        localStorage.setItem('bg-num', '3')
-      }else{
-        setBgColor({
-          backgroundImage: 'linear-gradient(70deg, #d5e1f5, #75a5f0)'
-        })
-        localStorage.setItem('bg-num', '1')
-      }
-    }else{
-      setBgColor({
-        backgroundImage: 'linear-gradient(70deg, #E6E7F9, #b4caed)'
-      })
-      localStorage.setItem('bg-num', '1')
-    }
-  }
-
   useEffect(() => {
-
-    changeBgColor() // calls the change color function after page loads
-
     const root = document.getElementById('root')
     if (root) {
       root.style.height = '100%'
@@ -54,17 +17,13 @@ const AuthLayout = () => {
   }, [])
 
   return (
-    <div className='d-flex flex-column flex-lg-row flex-column-fluid overflow-auto' style={{backgroundImage: `${bgColor.backgroundImage}`}}>
+    <div className='d-flex flex-column flex-lg-row flex-column-fluid h-100'>
       {/* begin::Body */}
-      <div className='d-flex flex-column flex-lg-row-fluid w-lg-50 p-10 order-2 order-lg-1 vh-100'>
+      <div className='d-flex flex-column flex-lg-row-fluid w-lg-50 p-10 order-2 order-lg-1'>
         {/* begin::Form */}
         <div className='d-flex flex-center flex-column flex-lg-row-fluid'>
-          <div className='text-center mb-11'>
-          {/* <h1 className='text-dark fw-bolder mb-3'>Sign In</h1> */}
-          <img alt='Float Mobility' src={toAbsoluteUrl('/media/logos/logo.png')} className='h-35px' />
-        </div>
           {/* begin::Wrapper */}
-          <div className='auth-gray w-lg-500px p-10 shadow-lg rounded-sm'>
+          <div className='w-lg-500px p-10'>
             <Outlet />
           </div>
           {/* end::Wrapper */}
@@ -101,53 +60,45 @@ const AuthLayout = () => {
 
       {/* begin::Aside */}
       <div
-        className='position-relative d-flex flex-lg-row-fluid w-lg-50 p-10 order-1 order-lg-2'
+        className='d-flex flex-lg-row-fluid w-lg-50 bgi-size-cover bgi-position-center order-1 order-lg-2'
+        style={{backgroundImage: `url(${toAbsoluteUrl('/media/misc/auth-bg.png')})`}}
       >
         {/* begin::Content */}
-        <div className='position-relative d-flex flex-column flex-center px-5 px-md-15 w-100'>
+        <div className='d-flex flex-column flex-center py-15 px-5 px-md-15 w-100'>
           {/* begin::Logo */}
-          {/* <Link to='/' className='mb-12'>
+          <Link to='/' className='mb-12'>
             <img alt='Float Mobility' src={toAbsoluteUrl('/media/logos/logo.png')} className='h-35px' />
-          </Link> */}
+          </Link>
           {/* end::Logo */}
 
-          {/* <img
+          {/* begin::Image */}
-            className='mx-auto w-350px w-md-50 w-xl-500px mb-10 mb-lg-20 rounded'
+          <img
-            src={toAbsoluteUrl('/media/misc/auth-bg-new.png')}
+            className='mx-auto w-275px w-md-50 w-xl-500px mb-10 mb-lg-20'
+            src={toAbsoluteUrl('/media/misc/auth-screens.png')}
             alt=''
-            style={{boxShadow: '0px 0px 10px white'}}
+          />
-          /> */}
-           <div className='mx-auto w-75 w-xl-500px mb-10 mb-lg-20 rounded'>
-            <img
-              className='img-fluid rounded'
-              src={toAbsoluteUrl('/media/misc/auth-bg-new.png')}
-              alt=''
-              // style={{boxShadow: '0px 0px 10px white'}}
-              />
-          </div>
           {/* end::Image */}
-            <div className='w-100 w-md-75'>
-              {/* begin::Title */}
-              <h1 className='text-dark fs-2qx fw-bolder text-center mb-7'>
-                Fast, Efficient and Productive
-              </h1>
-              {/* end::Title */}
 
-              {/* begin::Text */}
+          {/* begin::Title */}
-              {/* <div className='text-dark fs-base text-center'>
+          <h1 className='text-white fs-2qx fw-bolder text-center mb-7'>
-                In this kind of post,{' '}
+            Fast, Efficient and Productive
-                <a href='#' className='opacity-75-hover text-warning fw-bold me-1'>
+          </h1>
-                  the blogger
+          {/* end::Title */}
-                </a>
+
-                introduces a person they’ve interviewed <br /> and provides some background information
+          {/* begin::Text */}
-                about {' '}
+          <div className='text-white fs-base text-center'>
-                <a href='#' className='opacity-75-hover text-warning fw-bold me-1'>
+            In this kind of post,{' '}
-                  the interviewee
+            <a href='#' className='opacity-75-hover text-warning fw-bold me-1'>
-                </a>
+              the blogger
-                and their <br /> work following this is a transcript of the interview.
+            </a>
-              </div> */}
+            introduces a person they’ve interviewed <br /> and provides some background information
-              {/* end::Text */}
+            about
-            </div>
+            <a href='#' className='opacity-75-hover text-warning fw-bold me-1'>
+              the interviewee
+            </a>
+            and their <br /> work following this is a transcript of the interview.
+          </div>
+          {/* end::Text */}
         </div>
         {/* end::Content */}
       </div>

src/app/modules/auth/components/ForgotPassword.tsx

@@ -50,6 +50,12 @@ export function ForgotPassword() {
       id='kt_login_password_reset_form'
       onSubmit={formik.handleSubmit}
     >
+      {/* begin::Heading */}
+      <div className='text-center mb-11'>
+        {/* <h1 className='text-dark fw-bolder mb-3'>Sign In</h1> */}
+        <img alt='Float Mobility' src={toAbsoluteUrl('/media/logos/logo.png')} className='h-35px' />
+      </div>
+      {/* begin::Heading */}
       <div className='text-center mb-10'>
         {/* begin::Link */}
         <div className='text-gray-500 fw-semibold fs-6'>

src/app/modules/auth/components/Login.tsx

@@ -8,8 +8,6 @@ import {getUserByToken, login} from '../core/_requests'
 import {toAbsoluteUrl} from '../../../../_metronic/helpers'
 import {useAuth} from '../core/Auth'
 
-import {useNavigate} from 'react-router-dom'
-
 const loginSchema = Yup.object().shape({
   email: Yup.string()
     .email('Wrong email format')
@@ -23,8 +21,8 @@ const loginSchema = Yup.object().shape({
 })
 
 const initialValues = {
-  email: 'demo@float.sg',
+  email: '',
-  password: '****',
+  password: '',
 }
 //email: 'admin@demo.com',
 /*
@@ -34,7 +32,6 @@ const initialValues = {
 */
 
 export function Login() {
-  const navigate = useNavigate()
   const [loading, setLoading] = useState(false)
   const {saveAuth, setCurrentUser} = useAuth()
 
@@ -42,22 +39,30 @@ export function Login() {
     initialValues,
     validationSchema: loginSchema,
     onSubmit: async (values, {setStatus, setSubmitting}) => {
+      setStatus('')
       setLoading(true)
       try {
         const {data: auth} = await login(values.email, values.password)
-        console.log('yes')
-        saveAuth(auth)
         // const {data: user} = await getUserByToken(auth.session_token)
-        console.log('yes2')
         // setCurrentUser(user)
+        if(auth.status <= 0){ // checking if request is not successful
+          setStatus('The login details are incorrect')
+          setSubmitting(false)
+          setLoading(false)
+          return
+        }
+        saveAuth(auth)
         setCurrentUser(auth.profile)
-        navigate('/dashboard')
       } catch (error) {
         console.error(error)
         saveAuth(undefined)
         setStatus('The login details are incorrect')
         setSubmitting(false)
         setLoading(false)
+      } finally {
+        setTimeout(()=>{
+          setStatus('')
+        }, Number(process.env.REACT_APP_LOGIN_ERROR_TIMEOUT))
       }
     },
   })
@@ -70,6 +75,11 @@ export function Login() {
       id='kt_login_signin_form'
     >
       {/* begin::Heading */}
+      <div className='text-center mb-11'>
+        {/* <h1 className='text-dark fw-bolder mb-3'>Sign In</h1> */}
+        <img alt='Float Mobility' src={toAbsoluteUrl('/media/logos/logo.png')} className='h-35px' />
+      </div>
+      {/* begin::Heading */}
 
       {/* begin::Login options */}
       <div className='row g-3 mb-9'>
@@ -122,14 +132,6 @@ export function Login() {
       </div>
       {/* 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 */}
       <div className='fv-row mb-8'>
         <label className='form-label fs-6 fw-bolder text-dark'>Email</label>
@@ -213,6 +215,16 @@ export function Login() {
       </div>
       {/* end::Action */}
 
+      {/* error message */}
+      {formik.status ? (
+        <div className='mb-lg-15 alert alert-danger'>
+          <div className='alert-text font-weight-bold'>{formik.status}</div>
+        </div>
+      ) : (
+        null
+      )}
+      {/* end of error message */}
+
       <div className='text-gray-500 text-center fw-semibold fs-6'>
         Not a Member yet?{' '}
         <Link to='/auth/registration' className='link-primary'>

src/app/modules/auth/components/Registration.tsx

@@ -86,7 +86,12 @@ export function Registration() {
       id='kt_login_signup_form'
       onSubmit={formik.handleSubmit}
     >
-
+      {/* begin::Heading */}
+      <div className='text-center mb-11'>
+        {/* <h1 className='text-dark fw-bolder mb-3'>Sign In</h1> */}
+        <img alt='Float Mobility' src={toAbsoluteUrl('/media/logos/logo.png')} className='h-35px' />
+      </div>
+      {/* begin::Heading */}
       {/* begin::Login options */}
       <div className='row g-3 mb-9'>
         {/* begin::Col */}

src/app/modules/auth/core/Auth.tsx

@@ -8,6 +8,7 @@ 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'
@@ -61,23 +62,32 @@ 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) {
-          const {data} = await getUserByToken(apiToken)
+          // const {data} = await getUserByToken(apiToken)
-          if (data) {
+          // if (data) {
-            setCurrentUser(data)
+          //   setCurrentUser(data)
+          // }
+          if (localStorage.getItem('kt-auth-react-v')) {
+            setCurrentUser(auth.profile)
           }
         }
       } catch (error) {
         console.error(error)
         if (!didRequest.current) {
-          // logout()
+          logout()
         }
       } finally {
         setShowSplashScreen(false)
@@ -93,7 +103,11 @@ const AuthInit: FC<WithChildren> = ({children}) => {
       setShowSplashScreen(false)
     }
     // eslint-disable-next-line
-  }, [])
+
+    return ()=>{ // clears session timeout side effect
+      clearInterval(logoutSession)
+    }
+  }, [pathname])
 
   return showSplashScreen ? <LayoutSplashScreen /> : <>{children}</>
 }