fix merge conflict:auto logout after 7mins

src/components/Dashboard/DashboardHomeIntro.tsx

@@ -1,11 +1,11 @@
-import React, { FC, useState, useEffect } from "react";
+import React, { FC, useState, useEffect } from 'react';
-import NairaBag from "../../assets/images/dashboard/naira-bag.png";
+import NairaBag from '../../assets/images/dashboard/naira-bag.png';
-import { Button, Icons } from "../";
+import { Button, Icons } from '../';
-import { useSelector } from "react-redux";
+import { useSelector } from 'react-redux';
-import PendingList from "../paginated-list/PendingList";
+import PendingList from '../paginated-list/PendingList';
-import { PendingTableList } from "../../core/models";
+import { PendingTableList } from '../../core/models';
-import { NewDateTimeFormatter } from "../../lib/NewDateTimeFormatter";
+import { NewDateTimeFormatter } from '../../lib/NewDateTimeFormatter';
-import { getUserPendingLoanList } from "../../core/apiRequest";
+import { getUserPendingLoanList } from '../../core/apiRequest';
 
 export interface DashBoardCardProps {
   title?: string;
@@ -55,7 +55,7 @@ export const DashBoardCard: React.FC<DashBoardCardProps> = ({
         )}
         {desc && (
           <p className={`text-lg text-left ${descClass && descClass}`}>
-            {desc}{" "}
+            {desc}{' '}
             {descSpan && (
               <span className={`${descSpanClass && descSpanClass}`}>
                 {descSpan}
@@ -73,40 +73,50 @@ export const DashBoardCard: React.FC<DashBoardCardProps> = ({
 };
 
 interface DashboardHomeIntroProps {
-  handleNextStep:(value:{})=>any
+  handleNextStep: (value: {}) => any;
-  step?:number|string
+  step?: number | string;
 }
 
-const DashboardHomeIntro: FC<DashboardHomeIntroProps> = ({ handleNextStep, step }) => {
+const DashboardHomeIntro: FC<DashboardHomeIntroProps> = ({
+  handleNextStep,
+  step,
+}) => {
   const { userDetails } = useSelector((state: any) => state?.userDetails); // CHECKS IF USER Details are avaliable
 
-  const [userLoanList, setUserLoanList] = useState<{loading:boolean, data:PendingTableList}>({loading: true, data:[]})
+  const [userLoanList, setUserLoanList] = useState<{
+    loading: boolean;
+    data: PendingTableList;
+  }>({ loading: true, data: [] });
 
   useEffect(() => {
-    let token = localStorage.getItem('token')
+    let token = localStorage.getItem('token');
-    let uid = localStorage.getItem('uid')
+    let uid = localStorage.getItem('uid');
     if (!token || !uid) {
-      return
+      return;
     }
-    getUserPendingLoanList(uid).then(res => {
+    getUserPendingLoanList(uid)
-      console.log('RES', res)
+      .then((res) => {
-      console.log('RES', userLoanList)
+        console.log('RES', res);
+        console.log('RES', userLoanList);
         if (!res || !res.data.loans) {
-        setUserLoanList({loading:false, data:[]})
+          setUserLoanList({ loading: false, data: [] });
-        return
+          return;
         }
-      setUserLoanList({loading:false, data:res?.data?.loans})
+        setUserLoanList({ loading: false, data: res?.data?.loans });
-    }).catch(err => {
-      console.log(err)
-      setUserLoanList({loading:false, data:[]})
       })
-  },[])
+      .catch((err) => {
+        console.log(err);
+        setUserLoanList({ loading: false, data: [] });
+      });
+  }, []);
 
   return (
-    <div className='w-full'>
+    <div className="w-full">
-    {step == 1 ?
+      {step == 1 ? (
         <>
-        <h1 className="font-bold my-5 text-2xl">Hello, {userDetails.firstname}</h1>
+          <h1 className="font-bold my-5 text-2xl">
+            Hello, {userDetails.firstname}
+          </h1>
           <div className="group w-full lg:w-[27.8125rem] h-[12.75rem] mt-7 ">
             <DashBoardCard
               cardClass="bg-[#5C2684] relative"
@@ -122,9 +132,11 @@ const DashboardHomeIntro: FC<DashboardHomeIntroProps> = ({ handleNextStep, step
             />
           </div>
         </>
-      :
+      ) : (
         <>
-        <h1 className="font-bold my-5 text-2xl">Welcome Back, {userDetails.firstname}</h1>
+          <h1 className="font-bold my-5 text-2xl">
+            Welcome Back, {userDetails.firstname}
+          </h1>
           <div className="group w-full lg:w-[27.8125rem] h-[12.75rem] mt-7 ">
             <DashBoardCard
               cardClass="bg-[#5C2684] relative"
@@ -140,39 +152,47 @@ const DashboardHomeIntro: FC<DashboardHomeIntroProps> = ({ handleNextStep, step
             />
           </div>
         </>
-    }
+      )}
-    {userLoanList.loading ?
+      {userLoanList.loading ? null : (
-    null
+        <div className="mt-5 w-full">
-    :
-      <div className='mt-5 w-full'>
           <PendingList
             data={userLoanList.data}
             itemsPerPage={5}
-          tableTitle='Current Applications'
+            tableTitle="Current Applications"
           >
             {(data: any) => (
               <div className="w-full p-4 rounded-lg shadow-lg bg-white overflow-x-auto min-h-[250px] max-h-[450px]">
                 <table className="text-[12px] sm:text-base w-full table-auto">
                   <thead>
-                  <tr className='text-left border-b-2'>
+                    <tr className="text-left border-b-2">
-                    <th className='px-1 py-4'>Date</th>
+                      <th className="px-1 py-4">Date</th>
-                    <th className='px-1 py-4 text-right'>Amount</th>
+                      <th className="px-1 py-4 text-right">Amount</th>
-                    <th className='px-1 py-4 text-center min-w-[110px]'>Payment Term</th>
+                      <th className="px-1 py-4 text-center min-w-[110px]">
-                    <th className='px-1 py-4 text-center'>Status</th>
+                        Payment Term
-                    <th className='px-1 py-4'>Action</th>
+                      </th>
+                      <th className="px-1 py-4 text-center">Status</th>
+                      <th className="px-1 py-4 text-right">Action</th>
                     </tr>
                   </thead>
                   <tbody>
                     {data.map((item: any, index: any) => (
-                    <tr key={index || item} className='even:bg-slate-100'>
+                      <tr key={index || item} className="even:bg-slate-100">
-                      <td className='px-1 py-2'>{NewDateTimeFormatter(item?.added)}</td>
+                        <td className="px-1 py-2">
-                      <td className='px-1 py-2 text-right'>{item?.loan_amount}</td>
+                          {NewDateTimeFormatter(item?.added)}
-                      <td className='px-1 py-2 text-center'>{item?.payment_month}</td>
+                        </td>
-                      <td className='px-1 py-2 text-center'>{item?.status}</td>
+                        <td className="px-1 py-2 text-right">
-                      <td className='px-1 py-2'>
+                          {item?.loan_amount}
-                        <button className='px-2 py-1 border-2 border-black flex gap-2 items-center'>
+                        </td>
+                        <td className="px-1 py-2 text-center">
+                          {item?.payment_month}
+                        </td>
+                        <td className="px-1 py-2 text-center">
+                          {item?.status}
+                        </td>
+                        <td className="px-1 py-2 text-right">
+                          <button className="px-2 py-1 border-2 border-black">
                             View
-                          <Icons name='arrow-right' />
+                            <Icons name="arrow-right" />
                           </button>
                         </td>
                       </tr>
@@ -183,7 +203,7 @@ const DashboardHomeIntro: FC<DashboardHomeIntroProps> = ({ handleNextStep, step
             )}
           </PendingList>
         </div>
-    }
+      )}
     </div>
   );
 };

src/components/LetsGetStated/LetsGetStarted.tsx

@@ -1,42 +1,42 @@
-import React from "react";
+import React from 'react';
-import * as Yup from "yup";
+import * as Yup from 'yup';
-import { Form, Formik } from "formik";
+import { Form, Formik } from 'formik';
-import { InputCompOne } from "..";
+import { InputCompOne } from '..';
-import {useNavigate} from 'react-router-dom'
+import { useNavigate } from 'react-router-dom';
-import { RouteHandler } from "../../router/routes";
+import { RouteHandler } from '../../router/routes';
 
-import { useDispatch } from "react-redux";
+import { useDispatch } from 'react-redux';
-import { updateUserDetails } from "../../store/UserDetails";
+import { updateUserDetails } from '../../store/UserDetails';
 
-import { validateBVN, verifyOTP } from "../../core/apiRequest";
+import { validateBVN, verifyOTP } from '../../core/apiRequest';
-import { RequestStatus } from "../../core/models";
+import { RequestStatus } from '../../core/models';
 
 // To get the validation schema
 const validationSchema = Yup.object().shape({
   bvn: Yup.string()
-  .required("BVN is required")
+    .required('BVN is required')
-  .test("no-e", "Invalid number", (value:any) => {
+    .test('no-e', 'Invalid number', (value: any) => {
       if (value && /^[0-9]*$/.test(value) == false) {
         return false;
       }
       return true;
     })
-  .min(11, "must be 11 digits")
+    .min(11, 'must be 11 digits')
-  .max(11, "must be 11 digits"),
+    .max(11, 'must be 11 digits'),
   otp: Yup.string()
     // .when('require_otp', {
     //   is: true,
     //   then: Yup.string().required("OTP is required")
     // })
     // .required("OTP is required")
-  .test("no-e", "Invalid number", (value:any) => {
+    .test('no-e', 'Invalid number', (value: any) => {
       if (value && /^[0-9]*$/.test(value) == false) {
         return false;
       }
       return true;
     })
-  .min(5, "must be 5 digits")
+    .min(5, 'must be 5 digits')
-  .max(5, "must be 5 digits"),
+    .max(5, 'must be 5 digits'),
   // .test("no-e", "must be 11 characters", (value:any) => {
   //   if (value.length < 11) {
   //     return false;
@@ -52,72 +52,100 @@ let initialValues = {
 };
 
 type ValidBVN = {
-  verification_id:string
+  verification_id: string;
-  valid: undefined | boolean
+  valid: undefined | boolean;
-}
+};
 
 const LetsGetStarted: React.FC = () => {
-  const dispatch = useDispatch()
+  const dispatch = useDispatch();
-  const navigate = useNavigate()
+  const navigate = useNavigate();
   // const [pinValues, setPinValues] = React.useState({
   //   bvn: "",
   //   otp: "",
   // });
   // const otpInputRef = React.useRef<HTMLInputElement>(null);
 
-  const [requestStatusBVN, setRequestStatusBVN] = React.useState<RequestStatus>({loading:false, status:undefined, message:''});
+  const [requestStatusBVN, setRequestStatusBVN] = React.useState<RequestStatus>(
+    { loading: false, status: undefined, message: '' }
+  );
 
-  const [requestStatusOTP, setRequestStatusOTP] = React.useState<RequestStatus>({loading:false, status:undefined, message:''});
+  const [requestStatusOTP, setRequestStatusOTP] = React.useState<RequestStatus>(
+    { loading: false, status: undefined, message: '' }
+  );
 
   const [bvnIsValid, setBvnIsValid] = React.useState<ValidBVN>({
     verification_id: '',
-    valid: undefined
+    valid: undefined,
   });
 
-
   // e: React.FormEvent<HTMLInputElement>
   // let { value } = e.target as HTMLInputElement;
-  const bvnValidation = (values:any) => {   // Function to Validate BVN
+  const bvnValidation = (values: any) => {
-    let bvn = values.bvn
+    // Function to Validate BVN
-    setRequestStatusBVN({loading:true, status:false, message:''})
+    let bvn = values.bvn;
-    validateBVN({bvn}).then(res => {
+    setRequestStatusBVN({ loading: true, status: false, message: '' });
+    validateBVN({ bvn })
+      .then((res) => {
         if (!res || !res.data.call_return) {
-        setBvnIsValid({verification_id:'', valid: false})
+          setBvnIsValid({ verification_id: '', valid: false });
-        setRequestStatusBVN({loading:false, status:false, message:'unable to verify BVN'})
+          setRequestStatusBVN({
+            loading: false,
+            status: false,
+            message: 'unable to verify BVN',
+          });
           return setTimeout(() => {
-          setRequestStatusBVN({loading:false, status:false, message:''})
+            setRequestStatusBVN({ loading: false, status: false, message: '' });
-        }, 4000)
+          }, 4000);
         }
-      setBvnIsValid({verification_id:res.data.verification_id, valid: true})
+        setBvnIsValid({
-      setRequestStatusBVN({loading:false, status:true, message:'verified'})
+          verification_id: res.data.verification_id,
-    }).catch(err => {
+          valid: true,
-      setBvnIsValid({verification_id:'', valid: false})
+        });
-      console.log(err)
+        setRequestStatusBVN({
+          loading: false,
+          status: true,
+          message: 'verified',
+        });
       })
+      .catch((err) => {
+        setBvnIsValid({ verification_id: '', valid: false });
+        console.log(err);
+      });
   };
 
-  const handleSubmit = (values:any) => {  // Function to VERIFY OTP AND LOGIN USER
+  const handleSubmit = (values: any) => {
-    setRequestStatusOTP({loading:true, status:false, message:''})
+    // Function to VERIFY OTP AND LOGIN USER
+    setRequestStatusOTP({ loading: true, status: false, message: '' });
     // console.log('values', values)
-    verifyOTP({...values, verification_id:bvnIsValid.verification_id}).then(res=>{
+    verifyOTP({ ...values, verification_id: bvnIsValid.verification_id })
+      .then((res) => {
         if (!res || !res.data.call_return) {
-        setRequestStatusOTP({loading:false, status:false, message:'wrong otp'})
+          setRequestStatusOTP({
+            loading: false,
+            status: false,
+            message: 'wrong otp',
+          });
           return setTimeout(() => {
-          setRequestStatusOTP({loading:false, status:false, message:''})
+            setRequestStatusOTP({ loading: false, status: false, message: '' });
-        },4000)
+          }, 4000);
         }
         // console.log(res.data)
-      localStorage.setItem('token', res.data?.token)
+        localStorage.setItem('token', res.data?.token);
-      localStorage.setItem('uid', res?.data?.customer[0]?.uid)
+        localStorage.setItem('uid', res?.data?.customer[0]?.uid);
         dispatch(updateUserDetails({ ...res?.data?.customer[0] }));
-      navigate(RouteHandler.dashboardHome, {replace:true})
+        navigate(RouteHandler.dashboardHome, { replace: true });
-    }).catch(err => {
-      setRequestStatusOTP({loading:false, status:false, message:'something went wrong, try again'})
-      console.log(err)
-      return setTimeout(()=>{
-        setRequestStatusOTP({loading:false, status:false, message:''})
-      },4000)
       })
+      .catch((err) => {
+        setRequestStatusOTP({
+          loading: false,
+          status: false,
+          message: 'something went wrong, try again',
+        });
+        console.log(err);
+        return setTimeout(() => {
+          setRequestStatusOTP({ loading: false, status: false, message: '' });
+        }, 4000);
+      });
   };
 
   return (
@@ -136,7 +164,7 @@ const LetsGetStarted: React.FC = () => {
                 </h1>
               </div>
               <div className="mx-auto flex flex-col gap-8 max-w-[31.625rem] ">
-              <div className='w-full'>
+                <div className="w-full">
                   <InputCompOne
                     parentClass="flex flex-col gap-2"
                     label="Enter Your BVN "
@@ -150,9 +178,22 @@ const LetsGetStarted: React.FC = () => {
                     inputClass="w-full h-[3.625rem] rounded bg-[#EFEFEF] px-4"
                     value={props.values.bvn}
                     onChange={props.handleChange}
-                  error={(props.errors.bvn && props.touched.bvn) && props.errors.bvn}
+                    error={
+                      props.errors.bvn && props.touched.bvn && props.errors.bvn
+                    }
+                    maxLength={11}
                   />
-                <p className={`p-2 ${!requestStatusBVN.status ? 'text-red-500' : 'text-emerald-500'}`}>{requestStatusBVN.loading ? 'verifying...' : requestStatusBVN.message}</p>
+                  <p
+                    className={`p-2 ${
+                      !requestStatusBVN.status
+                        ? 'text-red-500'
+                        : 'text-emerald-500'
+                    }`}
+                  >
+                    {requestStatusBVN.loading
+                      ? 'verifying...'
+                      : requestStatusBVN.message}
+                  </p>
                 </div>
                 {bvnIsValid.valid && (
                   <InputCompOne
@@ -168,24 +209,39 @@ const LetsGetStarted: React.FC = () => {
                     inputClass="w-full h-[3.625rem] rounded bg-[#EFEFEF] px-4"
                     value={props.values.otp}
                     onChange={props.handleChange}
-                  error={(props.errors.otp && props.touched.otp) && props.errors.otp}
+                    error={
+                      props.errors.otp && props.touched.otp && props.errors.otp
+                    }
+                    maxLength={5}
                   />
                 )}
                 <button
-                type='submit'
+                  type="submit"
                   className="w-full h-[3.625rem] rounded bg-[#FBB700] rounded-2 px-4 text-[18px] text-[#282828] font-semibold disabled:text-[#282828] disabled:text-opacity-50"
-                disabled={requestStatusBVN.loading || (!props.values.otp && bvnIsValid.valid)}
+                  disabled={
+                    requestStatusBVN.loading ||
+                    (!props.values.otp && bvnIsValid.valid)
+                  }
                 >
                   Enter
                 </button>
 
-              <p className={`p-2 ${!requestStatusOTP.status ? 'text-red-500' : 'text-emerald-500'}`}>{requestStatusOTP.message}</p>
+                <p
+                  className={`p-2 ${
+                    !requestStatusOTP.status
+                      ? 'text-red-500'
+                      : 'text-emerald-500'
+                  }`}
+                >
+                  {requestStatusOTP.message}
+                </p>
 
                 {bvnIsValid.valid || bvnIsValid.valid == undefined ? (
                   <p className="text-[#5C2684] mt-[1.5625rem] w-fit">
-                  ***Every personal information attached to your BVN is safe and
+                    ***Every personal information attached to your BVN is safe
-                  secure. It is only important for us to verify your information and
+                    and secure. It is only important for us to verify your
-                  also give you access to your application profile/account.
+                    information and also give you access to your application
+                    profile/account.
                   </p>
                 ) : (
                   <p className="text-[#5C2684] mt-[1.5625rem] w-fit">

src/layouts/DashboardLayout/Aside.tsx

@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
 import { Link, useLocation } from 'react-router-dom';
 import Logo from '../../assets/icons/logo.svg';
 import { Icons } from '../../components';
@@ -27,6 +27,37 @@ export default function Aside({ asideDisplay, logoutUser }: Props) {
     }
   };
 
+  // Track user activity
+  useEffect(() => {
+    let timeout: number;
+
+    const resetTimeout = () => {
+      clearTimeout(timeout);
+      timeout = window.setTimeout(() => {
+        // Logout user after 7 minutes of inactivity
+        logoutUser();
+      }, 7 * 60 * 1000); // 7 minutes in milliseconds
+    };
+
+    const handleUserActivity = () => {
+      resetTimeout();
+    };
+
+    // Attach event listeners to track user activity
+    document.addEventListener('mousemove', handleUserActivity);
+    document.addEventListener('keypress', handleUserActivity);
+
+    // Initialize timeout
+    resetTimeout();
+
+    // Clear timeout and remove event listeners on component unmount
+    return () => {
+      clearTimeout(timeout);
+      document.removeEventListener('mousemove', handleUserActivity);
+      document.removeEventListener('keypress', handleUserActivity);
+    };
+  }, [logoutUser]);
+
   return (
     <div className="py-5 px-10 flex flex-col h-full bg-inherit">
       <Link to="/">