implemented logout

docker-compose.yml

@@ -12,6 +12,9 @@ services:
       - 6030:5173
     expose:
       - "5173"
+    extra_hosts:
+      - digifi-apidev.chiefsoft.net:10.10.33.15
+      - backend.wrenchboard.api.test:10.10.33.15
     environment:
       - PORT=${DIGIFI_PORT}
     tty: true

package.json

@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "@reduxjs/toolkit": "^2.2.1",
+    "axios": "^1.6.8",
     "clsx": "2.1.0",
     "formik": "2.4.5",
     "react": "^18.2.0",

src/components/Dashboard/DashboardHomeIntro.tsx

@@ -1,6 +1,7 @@
 import React, { FC } from "react";
 import NairaBag from "../../assets/images/dashboard/naira-bag.png";
 import { Button } from "../";
+import { useSelector } from "react-redux";
 
 export interface DashBoardCardProps {
   title?: string;
@@ -73,11 +74,12 @@ interface DashboardHomeIntroProps {
 }
 
 const DashboardHomeIntro: FC<DashboardHomeIntroProps> = ({ handleNextStep, step }) => {
+  const { userDetails } = useSelector((state:any) => state?.userDetails); // CHECKS IF USER Details are avaliable
   return (
     <>
     {step == 1 ?
       <>
-        <h1 className="font-bold my-5 text-2xl">Hello, Olanrewaju</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"
@@ -95,7 +97,7 @@ const DashboardHomeIntro: FC<DashboardHomeIntroProps> = ({ handleNextStep, step
       </>
       :
       <>
-        <h1 className="font-bold my-5 text-2xl">Welcome Back, Olanrewaju</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"

src/components/LetsGetStated/LetsGetStarted.tsx

@@ -5,6 +5,12 @@ import { InputCompOne } from "..";
 import {useNavigate} from 'react-router-dom'
 import { RouteHandler } from "../../router/routes";
 
+import { useDispatch } from "react-redux";
+import { updateUserDetails } from "../../store/UserDetails";
+
+import { validateBVN, verifyOTP } from "../../core/apiRequest";
+import { RequestStatus } from "../../core/models";
+
 // To get the validation schema
 const validationSchema = Yup.object().shape({
   bvn: Yup.string()
@@ -18,7 +24,11 @@ const validationSchema = Yup.object().shape({
   .min(11, "must be 11 digits")
   .max(11, "must be 11 digits"),
   otp: Yup.string()
-  .required("OTP is required")
+  // .when('require_otp', {
+  //   is: true,
+  //   then: Yup.string().required("OTP is required")
+  // })
+  // .required("OTP is required")
   .test("no-e", "Invalid number", (value:any) => {
     if (value && /^[0-9]*$/.test(value) == false) {
       return false;
@@ -41,50 +51,80 @@ let initialValues = {
   otp: '',
 };
 
+type ValidBVN = {
+  verification_id:string
+  valid: undefined | boolean
+}
+
 const LetsGetStarted: React.FC = () => {
+  const dispatch = useDispatch()
   const navigate = useNavigate()
   // const [pinValues, setPinValues] = React.useState({
   //   bvn: "",
   //   otp: "",
   // });
+  // const otpInputRef = React.useRef<HTMLInputElement>(null);
 
-  const [hideOTPComponent, setHideOTPComponent] = React.useState<boolean>(true);
+  const [requestStatusBVN, setRequestStatusBVN] = React.useState<RequestStatus>({loading:false, status:undefined, message:''});
-  const firstInputRef = React.useRef<HTMLInputElement>(null);
-  const secondInputRef = React.useRef<HTMLInputElement>(null);
 
-  // const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const [requestStatusOTP, setRequestStatusOTP] = React.useState<RequestStatus>({loading:false, status:undefined, message:''});
-  //   let { name, value } = e.target as HTMLInputElement;
 
-  //   setPinValues((prev) => ({ ...prev, [name]: value }));
+  const [bvnIsValid, setBvnIsValid] = React.useState<ValidBVN>({
-  // };
+    verification_id: '',
+    valid: undefined
+  });
 
-  const handleInput = (e: React.FormEvent<HTMLInputElement>) => {
-    let { name, value } = e.target as HTMLInputElement;
 
-    if (name === "bvn") {
+  // e: React.FormEvent<HTMLInputElement>
-      const regex = /^[0-9]+$/;
+  // let { value } = e.target as HTMLInputElement;
-
+  const bvnValidation = (values:any) => {   // Function to Validate BVN
-      if (regex.test(value)) {
+    let bvn = values.bvn
-        if (value?.length == 11) {
+    setRequestStatusBVN({loading:true, status:false, message:''})
-          setHideOTPComponent(false);
+    validateBVN({bvn}).then(res => {
-        //   secondInputRef.current?.focus();
+      if(!res || !res.data.call_return){
-        } else setHideOTPComponent(true);
+        setBvnIsValid({verification_id:'', valid: false})
-      } else {
+        setRequestStatusBVN({loading:false, status:false, message:'unable to verify BVN'})
-        console.log("object not found");
+        return setTimeout(()=>{
+          setRequestStatusBVN({loading:false, status:false, message:''})
+        }, 4000)
       }
-    }
+      setBvnIsValid({verification_id:res.data.verification_id, valid: true})
+      setRequestStatusBVN({loading:false, status:true, message:'verified'})
+    }).catch(err => {
+      setBvnIsValid({verification_id:'', valid: false})
+      console.log(err)
+    })
   };
 
-  const handleSubmit = (values:any) => {
+  const handleSubmit = (values:any) => {  // Function to VERIFY OTP AND LOGIN USER
-    console.log('values', values)
+    setRequestStatusOTP({loading:true, status:false, message:''})
-    navigate(RouteHandler.dashboardHome, {replace:true})
+    // console.log('values', values)
+    verifyOTP({...values, verification_id:bvnIsValid.verification_id}).then(res=>{
+      if(!res || !res.data.call_return){
+        setRequestStatusOTP({loading:false, status:false, message:'wrong otp'})
+        return setTimeout(()=>{
+          setRequestStatusOTP({loading:false, status:false, message:''})
+        },4000)
+      }
+      // console.log(res.data)
+      localStorage.setItem('token', res.data.token)
+      localStorage.setItem('uid', res.data.uid)
+      dispatch(updateUserDetails({ ...res.data }));
+      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)
+    })
   };
 
   return (
     <Formik
     initialValues={initialValues}
     validationSchema={validationSchema}
-    onSubmit={handleSubmit}
+    onSubmit={bvnIsValid.valid ? handleSubmit : bvnValidation}
     >
     {(props:any) => (
       <Form className="">
@@ -96,25 +136,25 @@ const LetsGetStarted: React.FC = () => {
               </h1>
             </div>
             <div className="mx-auto flex flex-col gap-8 max-w-[31.625rem] ">
-              <InputCompOne
+              <div className='w-full'>
-                parentClass="flex flex-col gap-2"
+                <InputCompOne
-                label="Enter Your BVN "
+                  parentClass="flex flex-col gap-2"
-                name="bvn"
+                  label="Enter Your BVN "
-                parentInputClass="w-full"
+                  name="bvn"
-                labelSpan="( To get your BVN, dial *565*0# )"
+                  parentInputClass="w-full"
-                labelSpanClass="text-[13px] text-[#5a5a5a] font-semibold"
+                  labelSpan="( To get your BVN, dial *565*0# )"
-                placeholder="Enter your BVN"
+                  labelSpanClass="text-[13px] text-[#5a5a5a] font-semibold"
-                labelClass="font-bold text-[18px] leading-[21.78px] tracking-[2%] text-[#282828] mb-[2px] flex item-center gap-[4px]"
+                  placeholder="Enter your BVN"
-                input
+                  labelClass="font-bold text-[18px] leading-[21.78px] tracking-[2%] text-[#282828] mb-[2px] flex item-center gap-[4px]"
-                inputClass="w-full h-[3.625rem] rounded bg-[#EFEFEF] px-4"
+                  input
-                value={props.values.bvn}
+                  inputClass="w-full h-[3.625rem] rounded bg-[#EFEFEF] px-4"
-                onChange={props.handleChange}
+                  value={props.values.bvn}
-                onInput={handleInput}
+                  onChange={props.handleChange}
-                ref={firstInputRef}
+                  error={(props.errors.bvn && props.touched.bvn) && props.errors.bvn}
-                maxLength={11}
+                />
-                error={(props.errors.bvn && props.touched.bvn) && props.errors.bvn}
+                <p className={`p-2 ${!requestStatusBVN.status ? 'text-red-500' : 'text-emerald-500'}`}>{requestStatusBVN.loading ? 'verifying...' : requestStatusBVN.message}</p>
-              />
+              </div>
-              {!hideOTPComponent && (
+              {bvnIsValid.valid && (
                 <InputCompOne
                   parentClass="flex flex-col gap-2"
                   label="Enter OTP "
@@ -128,21 +168,20 @@ const LetsGetStarted: React.FC = () => {
                   inputClass="w-full h-[3.625rem] rounded bg-[#EFEFEF] px-4"
                   value={props.values.otp}
                   onChange={props.handleChange}
-                  onInput={handleInput}
-                  ref={secondInputRef}
-                  maxLength={11}
                   error={(props.errors.otp && props.touched.otp) && props.errors.otp}
                 />
               )}
               <button
                 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={!props.values.otp}
+                disabled={requestStatusBVN.loading || (!props.values.otp && bvnIsValid.valid)}
               >
                 Enter
               </button>
               
-              {hideOTPComponent ? (
+              <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
                   secure. It is only important for us to verify your information and

src/core/apiRequest.ts

@@ -0,0 +1,19 @@
+import { postAuxEnd } from "./axiosCall";
+
+
+// FUNCTION TO START BVN VALIDATION
+export const validateBVN = (postData:any) => {
+    let reqData = {
+        ...postData
+    }
+    return postAuxEnd('https://digifi-apidev.chiefsoft.net/digiusers/v1/bvn', reqData)
+}
+
+
+// FUNCTION TO VERIFY OTP AND LOGIN
+export const verifyOTP = (postData:any) => {
+    let reqData = {
+        ...postData
+    }
+    return postAuxEnd('https://digifi-apidev.chiefsoft.net/digiusers/v1/bvn/verify', reqData)
+}

src/core/axiosCall.ts

@@ -0,0 +1,49 @@
+import axios from "axios";
+
+export function postAuxEnd(uri:string, reqData:any):Promise<any> {
+    // const endPoint = import.meta.env.REACT_APP_USERS_ENDPOINT + uri;
+    const formData = new FormData();
+    for (let value in reqData) {
+      formData.append(value, reqData[value]);
+    }
+    return axios.post(uri, formData)
+        .then((response:{}) => {
+        //   if (response.data.internal_return == "-9999") {
+        //     localStorage.clear();
+        //     window.location.href = `/login?sessionExpired=true`;
+        //   }
+          return response;
+        })
+        .catch((error:any) => {
+          if (error.response) {
+            //response status is an error code
+            console.log(
+                "ERROR-------------------------------------------------------"
+            );
+            console.log(error.response.status);
+            console.log(
+                "ERROR-------------------------------------------------------"
+            );
+          } else if (error.request) {
+            //response not received though the request was sent
+            console.log(
+                "ERROR2-------------------------------------------------------"
+            );
+            console.log(error?.request);
+            console.log(
+                "ERROR2-------------------------------------------------------"
+            );
+          } else {
+            //an error occurred when setting up the request
+            console.log(
+                "ERROR3-------------------------------------------------------"
+            );
+            console.log(error);
+            console.log(
+                "ERROR3-------------------------------------------------------"
+            );
+          }
+        });
+  }
+
+

src/core/models.ts

@@ -0,0 +1,18 @@
+export interface RequestStatus {
+    loading?:boolean
+    status?:boolean | undefined
+    message?:string
+    name?:string
+    data?:{}[] | [any] | {}
+}
+
+
+export interface User {
+    firstname?:string
+    lastname?:string
+    last_login?:string
+    message?:string
+    token?:string
+    uid?:string
+    call_return?:string
+  }

src/layouts/DashboardLayout/Aside.tsx

@@ -1,17 +1,16 @@
 import { useState } from "react";
-import { Link, useLocation, useNavigate } from "react-router-dom";
+import { Link, useLocation } from "react-router-dom";
 import Logo from "../../assets/icons/logo.svg";
 import { Icons } from "../../components";
 
 type Props = {
   asideDisplay?: () => void;
+  logoutUser: () => void
 };
 
-export default function Aside({ asideDisplay }: Props) {
+export default function Aside({ asideDisplay, logoutUser }: Props) {
   const { pathname } = useLocation();
 
-  const navigate = useNavigate();
-
   const [openNestedLink, setOpenNestedLink] = useState<{ name: string | null }>(
     { name: "" }
   );
@@ -115,7 +114,7 @@ export default function Aside({ asideDisplay }: Props) {
       <div className="w-full flex justify-center items-center flex-col gap-3">
         <button
           className="py-3 px-6 bg-red-100 text-red-500 font-medium rounded-md w-full"
-          onClick={() => navigate("/login", { replace: true })}
+          onClick={() => logoutUser()}
         >
           Log out
         </button>

src/layouts/DashboardLayout/DashboardAuth.tsx

@@ -1,11 +1,52 @@
 
+import {useState, useEffect} from 'react'
 import DashboardLayout from "./DashboardLayout";
-import { Outlet } from "react-router-dom";
+import { Outlet, useNavigate } from "react-router-dom";
+import { useSelector, useDispatch } from "react-redux";
+import { RouteHandler } from '../../router/routes';
+import { updateUserDetails } from '../../store/UserDetails';
+
+import Logo from '../../assets/images/logo.png'
 
 export default function DashboardAuth() {
+
+  const navigate = useNavigate()
+  const dispatch = useDispatch()
+
+  const { userDetails } = useSelector((state:any) => state?.userDetails); // CHECKS IF USER Details are avaliable
+
+  const [loading, setLoading] = useState(true)
+
+  useEffect(()=>{
+    let token = localStorage.getItem('token')
+    if(!token){
+      navigate(RouteHandler.letsGetStarted, {replace:true})
+      return
+    }
+    const getUserByToken = () => {
+      let data = {firstname:'firstname', lastname:'lastname', uid:'28273737646466464'}
+      setTimeout(()=>{
+        setLoading(false)
+        dispatch(updateUserDetails({...data}));
+      },4000)
+    }
+    if(!Object.keys(userDetails).length){
+      getUserByToken()
+    }
+  },[])
+
   return (
-  <DashboardLayout>
+    <>
-    <Outlet />
+    {loading && !Object.keys(userDetails).length ?
-  </DashboardLayout>
+      <div className='w-full h-screen flex flex-col justify-center items-center gap-4'>
+        <img className='animate-pulse' src={Logo} alt='Logo' />
+        <p className='animate-pulse'>loading...</p>
+      </div>
+    :
+      <DashboardLayout>
+        <Outlet />
+      </DashboardLayout>
+    }
+    </>
   )
 }

src/layouts/DashboardLayout/DashboardLayout.tsx

@@ -1,8 +1,12 @@
 import { ReactNode, useState, useEffect } from "react";
+import { RouteHandler } from "../../router/routes";
+import { useNavigate } from "react-router-dom";
 
 import Aside from "./Aside";
 
 export default function DashboardLayout({ children }: { children: ReactNode }) {
+  const navigate = useNavigate();
+
   const [showAside, setShowAside] = useState<boolean>(false);
   const asideDisplay = (): void => {
     setShowAside((prev) => !prev);
@@ -30,17 +34,22 @@ export default function DashboardLayout({ children }: { children: ReactNode }) {
   //   return child;
   // });
 
+  const logoutUser = () => {
+    localStorage.clear()
+    navigate(RouteHandler.letsGetStarted, {replace:true})
+  }
+
   return (
     <div className="w-full max-w-[2000px] mx-auto h-screen flex bg-[#020202] text-black">
       <aside className="max-w-[18.75rem] w-full bg-white hidden md:block border-r-2 border-[#E6E6E6]">
-        <Aside />
+        <Aside logoutUser={logoutUser} />
       </aside>
       <aside
         className={`max-w-[18.75rem] w-full md:hidden bg-white border-r-2 border-[#E6E6E6] fixed top-0 bottom-0 z-50 transition-all duration-500 ${
           showAside ? "left-0" : "-left-[200%]"
         }`}
       >
-        <Aside asideDisplay={asideDisplay} />
+        <Aside logoutUser={logoutUser} asideDisplay={asideDisplay} />
       </aside>
       <main className="dash-bg-image bg-[#F9F9F9] relative w-full overflow-y-auto overflow-x-hidden">
 

src/main.tsx

@@ -4,10 +4,15 @@ import { BrowserRouter } from "react-router-dom";
 import App from "./App.tsx";
 import "./index.css";
 
+import { Provider } from "react-redux";
+import store from "./store/store";
+
 ReactDOM.createRoot(document.getElementById("root")!).render(
   <React.StrictMode>
     <BrowserRouter>
-      <App />
+      <Provider store={store}>
+        <App />
+      </Provider>
     </BrowserRouter>
   </React.StrictMode>
 );

src/store/UserDetails.ts

@@ -0,0 +1,20 @@
+import { createSlice } from "@reduxjs/toolkit";
+
+const initialState = {
+  userDetails: {},
+};
+
+export const userSlice = createSlice({
+  name: "userDetails",
+  initialState,
+  reducers: {
+    updateUserDetails: (state, action) => {
+      state.userDetails = { ...action.payload };
+    },
+  },
+});
+
+// Action creators are generated for each case reducer function
+export const { updateUserDetails } = userSlice.actions;
+
+export default userSlice.reducer;

src/store/store.ts

@@ -0,0 +1,9 @@
+import { configureStore } from "@reduxjs/toolkit";
+
+import userDetailReducer from "./UserDetails";
+
+export default configureStore({
+  reducer: {
+    userDetails: userDetailReducer,
+  },
+});