load profile bug fix

.env

@@ -3,4 +3,7 @@ DIGIFI_PORT=5173
 # Social Links
 FACEBOOK_URL=https://www.facebook.com
 TWITTER_URL=https://twitter.com
-INSTAGRAM_URL=https://www.instagram.com
+INSTAGRAM_URL=https://www.instagram.com
+
+# BACKEND END POINTS
+VITE_USERS_ENDPOINT='https://digifi-apidev.chiefsoft.net/digiusers/v1'

.env.development

@@ -3,4 +3,7 @@ DIGIFI_PORT=5173
 # Social Links
 VITE_FACEBOOK_URL=https://www.facebook.com
 VITE_TWITTER_URL=https://twitter.com
-VITE_INSTAGRAM_URL=https://www.instagram.com
+VITE_INSTAGRAM_URL=https://www.instagram.com
+
+# BACKEND END POINTS
+VITE_USERS_ENDPOINT='https://digifi-apidev.chiefsoft.net/digiusers/v1'

.env.production

@@ -3,4 +3,7 @@ DIGIFI_PORT=5173
 # Social Links
 FACEBOOK_URL=https://www.facebook.com
 TWITTER_URL=https://twitter.com
-INSTAGRAM_URL=https://www.instagram.com
+INSTAGRAM_URL=https://www.instagram.com
+
+# BACKEND END POINTS
+VITE_USERS_ENDPOINT='https://digifi-apidev.chiefsoft.net/digiusers/v1'

src/components/Dashboard/DashboardFormInit.tsx

@@ -3,20 +3,20 @@ import {Formik, Form} from 'formik'
 import * as Yup from "yup";
 
 type Props = {
-  handleNextStep:()=>any
+  handleNextStep:(value:{})=>any
 }
 
 const initialValues = {
-  amount: "",
-  duration: "",
-  id: "",
+  loan_amount: "",
+  payment_month: "",
+  sales_agent: "",
 };
 
 // To get the validation schema
 const validationSchema = Yup.object().shape({
-  duration: Yup.string()
+  payment_month: Yup.string()
     .required("Required"),
-  amount: Yup.string()
+  loan_amount: Yup.string()
     .required("Required")
     .test("no-e", "Invalid", (value:any) => {
       if (value && /^[0-9]*$/.test(value) == false) {
@@ -24,16 +24,15 @@ const validationSchema = Yup.object().shape({
       }
       return true;
     }),
-  id: Yup.string()
+    sales_agent: Yup.string()
     .required("Required")
 });
 
 export default function DashboardFormInit({handleNextStep}:Props) {
 
   //FUNCTION TO HANDLE SUBMIT
-  const handleSubmit = (values:any) => {
-    console.log(values)
-    handleNextStep()
+  const handleSubmit = (values:{}) => {
+    handleNextStep(values)
   };
 
   return (
@@ -51,40 +50,40 @@ export default function DashboardFormInit({handleNextStep}:Props) {
                 <div className="mt-[3.25rem] flex flex-col gap-9">
                   <InputCompOne
                     parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"
-                    name="amount"
+                    name="loan_amount"
                     label="How Much Do You Want To Apply For?"
                     labelClass="font-bold text-[1.125rem]"
                     input
                     inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem] text-right"
                     placeholder="350,000"
-                    value={props.values.amount}
+                    value={props.values.loan_amount}
                     onChange={props.handleChange}
-                    error={(props.errors.amount && props.touched.amount) ? props.errors.amount : ''}
+                    error={(props.errors.loan_amount && props.touched.loan_amount) ? props.errors.loan_amount : ''}
                   />
                   <InputCompOne
                     parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"
-                    name="duration"
+                    name="payment_month"
                     label="For How Many Months?"
                     labelClass="font-bold text-[1.125rem]"
                     select={true}
                     selectClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
-                    selectOptions={duration}
-                    selectValue={props.values.duration}
+                    selectOptions={paymentMonth}
+                    selectValue={props.values.payment_month}
                     onChange={props.handleChange}
-                    error={(props.errors.duration && props.touched.duration) ? props.errors.duration : ''}
+                    error={(props.errors.payment_month && props.touched.payment_month) ? props.errors.payment_month : ''}
                   />
                   <InputCompOne
                     parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"
-                    name="id"
+                    name="sales_agent"
                     label="Direct sales agent ID ( Optional )"
                     labelClass="font-bold text-[1.125rem]"
                     floatLabel='Enter agent ID'
                     input
                     inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
                     placeholder="Agent ID"
-                    value={props.values.id}
+                    value={props.values.sales_agent}
                     onChange={props.handleChange}
-                    error={(props.errors.id && props.touched.id) ? props.errors.id : ''}
+                    error={(props.errors.sales_agent && props.touched.sales_agent) ? props.errors.sales_agent : ''}
                   />
                   <Button
                     className="my-8 max-w-[25.875rem] btn-Y text-black w-full h-11"
@@ -106,7 +105,7 @@ interface SelectOption {
 }
 
 
-const duration: SelectOption = {
+const paymentMonth: SelectOption = {
   loading: false,
   data: [
     { value: "", label: "Please Select" },

src/components/Dashboard/DashboardHome.tsx

@@ -10,12 +10,14 @@ interface DashboardHomeProps {}
 
 const DashboardHome: FC<DashboardHomeProps> = () => {
   const [step, setStep] = React.useState(1);
+  const [applicationDetails, setApplicationDetails] = React.useState({});
 
-  const handleNextStep = () => {
+  const handleNextStep = (values:{}={}) => {
     if (step < 7) {
       setStep(step + 1);
     }
-  };
+    setApplicationDetails((prev:{}) => ({...prev, ...values}))
+    }
 
   return (
     <div className="w-full">
@@ -24,8 +26,9 @@ const DashboardHome: FC<DashboardHomeProps> = () => {
       {step === 3 && <DashboardHomeDetail handleNextStep={handleNextStep} />}
       {step === 4 && <DashboardHomeEmploymentInfo handleNextStep={handleNextStep} />}
       {step === 5 && <DashboardHomeRefereeInfo handleNextStep={handleNextStep} />}
-      {step === 6 && <DashboardHomeAttestation handleNextStep={handleNextStep} />}
+      {step === 6 && <DashboardHomeAttestation handleNextStep={handleNextStep} applicationDetails={applicationDetails} />}
       {step === 7 && <DashboardHomeIntro step={step} handleNextStep={handleNextStep} />}
+      {/* <DashboardHomeAttestation handleNextStep={handleNextStep} applicationDetails={applicationDetails} /> */}
     </div>
   );
 };

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;
@@ -68,16 +69,17 @@ export const DashBoardCard: React.FC<DashBoardCardProps> = ({
 };
 
 interface DashboardHomeIntroProps {
-  handleNextStep: any;
+  handleNextStep:(value:{})=>any
   step?:number|string
 }
 
 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"
@@ -89,13 +91,13 @@ const DashboardHomeIntro: FC<DashboardHomeIntroProps> = ({ handleNextStep, step
             btnTextClass="w-[11.125rem] h-[2.8125rem] flex justify-center item-center btn-W text-[#FBB700]"
             image={NairaBag}
             imgClass="translate-y-4 -rotate-6"
-            onClick={handleNextStep}
+            onClick={()=>handleNextStep({})}
             />
         </div>
       </>
       :
       <>
-        <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/Dashboard/home/DashboardHomeAttestation.tsx

@@ -2,34 +2,49 @@ import { Button, InputCompOne, Stepper } from '../../shared/index';
 
 import {Formik, Form} from 'formik'
 import * as Yup from "yup";
+import { applyForLoan } from '../../../core/apiRequest';
+
 // import { useNavigate } from "react-router-dom";
 // import { RouteHandler } from '../../../router/routes';
 
 type Props = {
-  handleNextStep:()=>any
+  handleNextStep:(value:{})=>any
+  applicationDetails: {}
 }
 
 const initialValues = {
-  account_number: "",
+  account: "",
   checked: false
 };
 
 // To get the validation schema
 const validationSchema = Yup.object().shape({
-  account_number: Yup.string()
+  account: Yup.string()
     .required("Required"),
   checked: Yup.bool() // use bool instead of boolean
   .oneOf([true], "You must accept the terms and conditions")
 });
 
-export default function DashboardHomeAttestation({handleNextStep}:Props) {
+export default function DashboardHomeAttestation({handleNextStep, applicationDetails}:Props) {
   //     let navigate = useNavigate();
   // const navigateToProfile = () => navigate(RouteHandler.dashboardProfile);
 
-  //FUNCTION TO HANDLE SUBMIT
+  //FUNCTION TO HANDLE LOAN APPLICATION
   const handleSubmit = (values:any) => {
-    console.log(values)
-    handleNextStep()
+    delete values.checked
+    applyForLoan({...applicationDetails, disbursement: values}).then(res=>{
+      console.log('APPLY FOR LOAN', res)
+      handleNextStep({disbursement: values})
+      console.log('ApplicationDetails', {...applicationDetails, disbursement: values})
+    }).catch(err=>{
+      console.log(err)
+    })
+    // applyForLoan(payload).then(res=>{
+    //   console.log('APPLY FOR LOAN', res)
+    //   // handleNextStep({disbursement: values})
+    // }).catch(err=>{
+    //   console.log(err)
+    // })
   };
 
   return (
@@ -50,15 +65,15 @@ export default function DashboardHomeAttestation({handleNextStep}:Props) {
                   <div className="flex items-center gap-[4.125rem]">
                     <InputCompOne
                       parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"
-                      name="account_number"
+                      name="account"
                       floatLabel="Disbursement account number"
                       // labelClass="font-bold text-[1.125rem]"
                       input
                       inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
                       placeholder="0102547896"
-                      value={props.values.account_number}
+                      value={props.values.account}
                       onChange={props.handleChange}
-                      error={(props.errors.account_number && props.touched.account_number) ? props.errors.account_number : ''}
+                      error={(props.errors.account && props.touched.account) ? props.errors.account : ''}
                     />
                   </div>
                   <div className='max-w-[25.875rem]'>
@@ -87,3 +102,46 @@ export default function DashboardHomeAttestation({handleNextStep}:Props) {
     </div>
   );
 }
+
+
+// const payload = {
+//   "loan_amount": "100000",
+//   "payment_month": "18",
+//   "sales_agent": "Testing1234",
+//   "gender": "male",
+//   "address": "World bank housing Estate, Umuahia",
+//   "marital_status": "single",
+//   "state": "abia",
+//   "email": "test5070@gmail.com",
+//   "country": "NG",
+//   "employment": {
+//       "job_title": "Information Officer",
+//       "name": "Testing Testing",
+//       "sector": "private (non academic)",
+//       "industry": "engineering",
+//       "resumption_date": "2024-04-05",
+//       "email": "test50700@gmail.com",
+//       "annual_income": "600000",
+//       "monthly_salary": "50000",
+//       "salary_payment_date": "2024-04-19",
+//       "employment_id": "2555566",
+//       "highest_eductaion": "b.sc + professional qualification"
+//   },
+//   "loan_reference": [
+//       {
+//           "fullname": "John Mike",
+//           "relationship": "Brother",
+//           "phone_number": "07055566611",
+//           "email": "refone@gmail.com",
+//           "bvn": "11111111111"
+//       },
+//       {
+//           "fullname": "Mary Paul",
+//           "relationship": "Brother",
+//           "phone_number": "07055577711",
+//           "email": "reftwo@gmail.com",
+//           "bvn": "22222222222"
+//       }
+//   ],
+//   disbursement:{account: '1122334456'}
+// }

src/components/Dashboard/home/DashboardHomeDetail.tsx

@@ -4,7 +4,7 @@ import {Formik, Form} from 'formik'
 import * as Yup from "yup";
 
 type Props = {
-  handleNextStep:()=>any
+  handleNextStep:(value:{})=>any
 }
 
 const initialValues = {
@@ -12,7 +12,8 @@ const initialValues = {
   address: "",
   marital_status: "",
   state: "",
-  email:""
+  email:"",
+  country:""
 };
 
 // To get the validation schema
@@ -28,14 +29,15 @@ const validationSchema = Yup.object().shape({
   email: Yup.string()
     .email("Invalid")
     .required("Required"),
+  country: Yup.string()
+    .required("Required"),
 });
 
 export default function DashboardHomeDetail({handleNextStep}:Props) {
 
   //FUNCTION TO HANDLE SUBMIT
   const handleSubmit = (values:any) => {
-    console.log(values)
-    handleNextStep()
+    handleNextStep(values)
   };
 
   return (
@@ -103,18 +105,32 @@ export default function DashboardHomeDetail({handleNextStep}:Props) {
                       error={(props.errors.state && props.touched.state) ? props.errors.state : ''}
                     />
                   </div>
-                  <InputCompOne
-                    parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"
-                    name="email"
-                    label="Email address"
-                    labelClass="font-bold text-[1.125rem]"
-                    input
-                    inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
-                    placeholder="johndoe@gmail.com"
-                    value={props.values.email}
-                    onChange={props.handleChange}
-                    error={(props.errors.email && props.touched.email) ? props.errors.email : ''}
-                  />
+                  <div className="flex items-center gap-[4.125rem]">
+                    <InputCompOne
+                      parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"
+                      name="email"
+                      label="Email address"
+                      labelClass="font-bold text-[1.125rem]"
+                      input
+                      inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
+                      placeholder="johndoe@gmail.com"
+                      value={props.values.email}
+                      onChange={props.handleChange}
+                      error={(props.errors.email && props.touched.email) ? props.errors.email : ''}
+                    />
+                    <InputCompOne
+                      parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"
+                      name="country"
+                      label="Select your country"
+                      labelClass="font-bold text-[1.125rem]"
+                      select={true}
+                      selectClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
+                      selectOptions={country}
+                      selectValue={props.values.country}
+                      onChange={props.handleChange}
+                      error={(props.errors.country && props.touched.country) ? props.errors.country : ''}
+                    />
+                  </div>
                   <Button
                     className="my-8 max-w-[25.875rem] btn-Y text-black w-full h-11"
                     text="Next"
@@ -163,4 +179,12 @@ const state: SelectOption = {
     { value: "imo", label: "Imo" },
     { value: "lagos", label: "Lagos" },
   ]
+}
+
+const country: SelectOption = {
+  loading: false,
+  data: [
+    { value: "", label: "Please Select" },
+    { value: "NG", label: "Nigeria" },
+  ]
 }

src/components/Dashboard/home/DashboardHomeEmploymentInfo.tsx

@@ -4,36 +4,36 @@ import {Formik, Form} from 'formik'
 import * as Yup from "yup";
 
 type Props = {
-  handleNextStep:()=>any
+  handleNextStep:(value:{})=>any
 }
 
 const initialValues = {
   job_title: "",
-  employer_name: "",
-  job_sector: "",
+  name: "",
+  sector: "",
   industry: "",
-  date_of_resumption: "",
-  employer_email:"",
+  resumption_date: "",
+  email:"",
   annual_income: "",
   monthly_salary: "",
   salary_payment_date: "",
-  employee_id: "",
-  qualification: ""
+  employment_id: "",
+  highest_eductaion: ""
 };
 
 // To get the validation schema
 const validationSchema = Yup.object().shape({
   job_title: Yup.string()
     .required("Required"),
-  employer_name: Yup.string()
+  name: Yup.string()
     .required("Required"),
-  job_sector: Yup.string()
+  sector: Yup.string()
     .required("Required"),
   industry: Yup.string()
     .required("Required"),
-  date_of_resumption: Yup.string()
+  resumption_date: Yup.string()
     .required("Required"),
-  employer_email: Yup.string()
+  email: Yup.string()
     .email("Invalid")
     .required("Required"),
   annual_income: Yup.string()
@@ -54,9 +54,9 @@ const validationSchema = Yup.object().shape({
     }),
   salary_payment_date: Yup.string()
     .required("Required"),
-  employee_id: Yup.string()
+  employment_id: Yup.string()
     .required("Required"),
-  qualification: Yup.string()
+  highest_eductaion: Yup.string()
     .required("Required"),
 });
 
@@ -65,8 +65,7 @@ export default function DashboardHomeEmploymentInfo({handleNextStep}:Props) {
 
   //FUNCTION TO HANDLE SUBMIT
   const handleSubmit = (values:any) => {
-    console.log(values)
-    handleNextStep()
+    handleNextStep({employment: values})
   };
 
 
@@ -99,29 +98,29 @@ export default function DashboardHomeEmploymentInfo({handleNextStep}:Props) {
                     />
                     <InputCompOne
                       parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"
-                      name="employer_name"
+                      name="name"
                       floatLabel="Employer name"
                       // labelClass="font-bold text-[1.125rem]"
                       input
                       inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
                       placeholder="Mr. Mark John"
-                      value={props.values.employer_name}
+                      value={props.values.name}
                       onChange={props.handleChange}
-                      error={(props.errors.employer_name && props.touched.employer_name) ? props.errors.employer_name : ''}
+                      error={(props.errors.name && props.touched.name) ? props.errors.name : ''}
                     />
                   </div>
                   <div className="flex items-center gap-[4.125rem]">
                     <InputCompOne
                       parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"
-                      name="job_sector"
+                      name="sector"
                       floatLabel="Job Sector"
                       // labelClass="font-bold text-[1.125rem]"
                       select={true}
                       selectClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
                       selectOptions={jobSector}
-                      selectValue={props.values.job_sector}
+                      selectValue={props.values.sector}
                       onChange={props.handleChange}
-                      error={(props.errors.job_sector && props.touched.job_sector) ? props.errors.job_sector : ''}
+                      error={(props.errors.sector && props.touched.sector) ? props.errors.sector : ''}
                     />
                     <InputCompOne
                       parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"
@@ -139,28 +138,28 @@ export default function DashboardHomeEmploymentInfo({handleNextStep}:Props) {
                   <div className="flex items-center gap-[4.125rem]">
                     <InputCompOne
                       parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"
-                      name="date_of_resumption"
+                      name="resumption_date"
                       floatLabel="Date of resumption"
                       // labelClass="font-bold text-[1.125rem]"
                       input
                       inputType='date'
                       inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
                       placeholder="12/12/2015"
-                      value={props.values.date_of_resumption}
+                      value={props.values.resumption_date}
                       onChange={props.handleChange}
-                      error={(props.errors.date_of_resumption && props.touched.date_of_resumption) ? props.errors.date_of_resumption : ''}
+                      error={(props.errors.resumption_date && props.touched.resumption_date) ? props.errors.resumption_date : ''}
                     />
                     <InputCompOne
                       parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"
-                      name="employer_email"
+                      name="email"
                       floatLabel="Employers official email"
                       // labelClass="font-bold text-[1.125rem]"
                       input
                       inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
                       placeholder="example@gmail.com"
-                      value={props.values.employer_email}
+                      value={props.values.email}
                       onChange={props.handleChange}
-                      error={(props.errors.employer_email && props.touched.employer_email) ? props.errors.employer_email : ''}
+                      error={(props.errors.email && props.touched.email) ? props.errors.email : ''}
                     />
                   </div>
                   <div className="flex items-center gap-[4.125rem]">
@@ -205,28 +204,28 @@ export default function DashboardHomeEmploymentInfo({handleNextStep}:Props) {
                     />
                     <InputCompOne
                       parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"
-                      name="employee_id"
+                      name="employment_id"
                       floatLabel="Employee ID"
                       // labelClass="font-bold text-[1.125rem]"
                       input
                       inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
                       placeholder="LS/001/005"
-                      value={props.values.employee_id}
+                      value={props.values.employment_id}
                       onChange={props.handleChange}
-                      error={(props.errors.employee_id && props.touched.employee_id) ? props.errors.employee_id : ''}
+                      error={(props.errors.employment_id && props.touched.employment_id) ? props.errors.employment_id : ''}
                     />
                   </div>
                   <InputCompOne
                     parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"
-                    name="qualification"
+                    name="highest_eductaion"
                     floatLabel="Highest level of education"
                     // labelClass="font-bold text-[1.125rem]"
                     select={true}
                     selectClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
-                    selectOptions={qualification}
-                    selectValue={props.values.qualification}
+                    selectOptions={highestEductaion}
+                    selectValue={props.values.highest_eductaion}
                     onChange={props.handleChange}
-                    error={(props.errors.qualification && props.touched.qualification) ? props.errors.qualification : ''}
+                    error={(props.errors.highest_eductaion && props.touched.highest_eductaion) ? props.errors.highest_eductaion : ''}
                   />
                   <Button
                     className="my-8 max-w-[25.875rem] btn-Y text-black w-full h-11"
@@ -266,7 +265,7 @@ const industry: SelectOption = {
   ]
 }
 
-const qualification: SelectOption = {
+const highestEductaion: SelectOption = {
   loading: false,
   data: [
     { value: "", label: "Please Select" },

src/components/Dashboard/home/DashboardHomeRefereeInfo.tsx

@@ -4,18 +4,18 @@ import {Formik, Form} from 'formik'
 import * as Yup from "yup";
 
 type Props = {
-  handleNextStep:()=>any
+  handleNextStep:(value:{})=>any
 }
 
 const initialValues = {
   ref_name: "",
   ref_email: "",
-  ref_number: "",
+  ref_phone_number: "",
   ref_relationship: "",
   ref_bvn: "",
   ref_two_name: "",
   ref_two_email: "",
-  ref_two_number: "",
+  ref_two_phone_number: "",
   ref_two_relationship: "",
   ref_two_bvn: "",
 };
@@ -27,7 +27,7 @@ const validationSchema = Yup.object().shape({
   ref_email: Yup.string()
     .email("Invalid")
     .required("Required"),
-  ref_number: Yup.string()
+  ref_phone_number: Yup.string()
     .required("Required"),
   ref_relationship: Yup.string()
     .required("Required"),
@@ -46,7 +46,7 @@ const validationSchema = Yup.object().shape({
   ref_two_email: Yup.string()
     .email("Invalid")
     .required("Required"),
-  ref_two_number: Yup.string()
+  ref_two_phone_number: Yup.string()
     .required("Required"),
   ref_two_relationship: Yup.string()
     .required("Required"),
@@ -66,8 +66,21 @@ export default function DashboardHomeRefereeInfo({handleNextStep}:Props) {
 
   //FUNCTION TO HANDLE SUBMIT
   const handleSubmit = (values:any) => {
-    console.log(values)
-    handleNextStep()
+    let refOne = {
+      fullname: values.ref_name,
+      relationship: values.ref_relationship,
+      phone_number:  values.ref_phone_number,
+      email:  values.ref_email,
+      bvn:  values.ref_bvn
+    }
+    let refTwo = {
+      fullname: values.ref_two_name,
+      relationship: values.ref_two_relationship,
+      phone_number:  values.ref_two_phone_number,
+      email:  values.ref_two_email,
+      bvn:  values.ref_two_bvn
+    }
+    handleNextStep({loan_reference:[refOne, refTwo]})
   };
 
 
@@ -115,15 +128,15 @@ export default function DashboardHomeRefereeInfo({handleNextStep}:Props) {
                           />
                           <InputCompOne
                               parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"
-                              name="ref_number"
+                              name="ref_phone_number"
                               floatLabel="Phone number"
                               // labelClass="font-bold text-[1.125rem]"
                               input
                               inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
                               placeholder="07000000000"
-                              value={props.values.ref_number}
+                              value={props.values.ref_phone_number}
                               onChange={props.handleChange}
-                              error={(props.errors.ref_number && props.touched.ref_number) ? props.errors.ref_number : ''}
+                              error={(props.errors.ref_phone_number && props.touched.ref_phone_number) ? props.errors.ref_phone_number : ''}
                           />
                           <InputCompOne
                               parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"
@@ -180,15 +193,15 @@ export default function DashboardHomeRefereeInfo({handleNextStep}:Props) {
                           />
                           <InputCompOne
                               parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"
-                              name="ref_two_number"
+                              name="ref_two_phone_number"
                               floatLabel="Phone number"
                               // labelClass="font-bold text-[1.125rem]"
                               input
                               inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
                               placeholder="07000000000"
-                              value={props.values.ref_two_number}
+                              value={props.values.ref_two_phone_number}
                               onChange={props.handleChange}
-                              error={(props.errors.ref_two_number && props.touched.ref_two_number) ? props.errors.ref_two_number : ''}
+                              error={(props.errors.ref_two_phone_number && props.touched.ref_two_phone_number) ? props.errors.ref_two_phone_number : ''}
                           />
                           <InputCompOne
                               parentClass="max-w-[25.875rem] w-full flex flex-col gap-4"

src/components/LetsGetStated/LetsGetStarted.tsx

@@ -5,6 +5,9 @@ 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";
 
@@ -54,6 +57,7 @@ type ValidBVN = {
 }
 
 const LetsGetStarted: React.FC = () => {
+  const dispatch = useDispatch()
   const navigate = useNavigate()
   // const [pinValues, setPinValues] = React.useState({
   //   bvn: "",
@@ -63,6 +67,8 @@ const LetsGetStarted: React.FC = () => {
 
   const [requestStatusBVN, setRequestStatusBVN] = 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
@@ -91,12 +97,26 @@ const LetsGetStarted: React.FC = () => {
   };
 
   const handleSubmit = (values:any) => {  // 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=>{
-      console.log(res.data)
+      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?.customer[0]?.uid)
+      dispatch(updateUserDetails({ ...res?.data?.customer[0] }));
       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)
     })
   };
 
@@ -159,6 +179,7 @@ const LetsGetStarted: React.FC = () => {
                 Enter
               </button>
               
+              <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">

src/components/shared/Stepper.tsx

@@ -9,7 +9,7 @@ const Stepper: React.FC<StepperProps> = ({ step = 0 }) => {
 
   return (
     <div className="flex justify-between items-center gap-5">
-      {[...Array(6)].map((_, index) => (
+      {[...Array(5)].map((_, index) => (
         <div
           key={index}
           className={`w-[1.875rem] border-[.1875rem] rounded-sm ${(step === index

src/core/apiRequest.ts

@@ -1,12 +1,11 @@
-import { postAuxEnd } from "./axiosCall";
-
+import { postAuxEnd, getAuxEnd } 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)
+    return postAuxEnd('/bvn', reqData)
 }
 
 
@@ -15,5 +14,23 @@ export const verifyOTP = (postData:any) => {
     let reqData = {
         ...postData
     }
-    return postAuxEnd('https://digifi-apidev.chiefsoft.net/digiusers/v1/bvn/verify', reqData)
+    return postAuxEnd('/bvn/verify', reqData)
+}
+
+// FUNCTION TO APPLY FOR LOAN
+export const applyForLoan = (postData:any) => {
+    let reqData = {
+        customer_uid: localStorage.getItem('uid'),
+        ...postData
+    }
+    return postAuxEnd('/loan/apply', reqData)
+}
+
+
+// FUNCTION TO GET USER BY CUSTOMER UID
+export const getUserByID = (uid:string) => {
+    let reqData = {
+        // customer_uid: localStorage.getItem('uid'),
+    }
+    return getAuxEnd(`/profile?uid=${uid}`, reqData)
 }

src/core/axiosCall.ts

@@ -1,49 +1,81 @@
 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) {
+export function postAuxEnd(uri: string, reqData: any): Promise<any> {
+  const endPoint = import.meta.env.VITE_USERS_ENDPOINT + uri;
+  const formData = new FormData();
+  for (let value in reqData) {
+    if (typeof reqData[value] === "object") {
+      // for (let innerValue in reqData[value]) {
+      //   let innerReqData = reqData[value]
+      //   console.log('SAMPLE',innerReqData)
+      //   formData.append(reqData[value][innerValue], reqData[value][innerValue]);
+      // }
+      // formData.append(value, JSON.stringify(reqData[value]));
+      formData.append(value, reqData[value]);
+    } else {
       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-------------------------------------------------------"
-            );
-          }
-        });
   }
+  return axios
+    .post(endPoint, 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-------------------------------------------------------"
+        );
+      }
+    });
+}
 
 
+export function getAuxEnd(uri: string, reqData: any): Promise<any> {
+  const endPoint = import.meta.env.VITE_USERS_ENDPOINT + uri;
+  const formData = new FormData();
+  for (let value in reqData) {
+    formData.append(value, reqData[value]);
+  }
+  return axios
+    .get(endPoint, reqData)
+    .then((response: {}) => {
+      //   if (response.data.internal_return == "-9999") {
+      //     localStorage.clear();
+      //     window.location.href = `/login?sessionExpired=true`;
+      //   }
+      return response;
+    })
+    .catch((error: any) => {
+      console.log(
+        "ERROR3-------------------------------------------------------", error
+      );
+    });
+}

src/core/models.ts

@@ -4,4 +4,15 @@ export interface RequestStatus {
     message?:string
     name?:string
     data?:{}[] | [any] | {}
+}
+
+
+export interface User {
+    firstname?:string
+    lastname?:string
+    last_login?:string
+    message?:string
+    token?:string
+    customer_uid?:string
+    call_return?:string
   }

src/layouts/DashboardLayout/DashboardAuth.tsx

@@ -1,11 +1,61 @@
 
+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 { getUserByID } from '../../core/apiRequest';
+
+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')
+    let uid = localStorage.getItem('uid')
+    if(!token || !uid){
+      navigate(RouteHandler.letsGetStarted, {replace:true})
+      return
+    }
+    const getUser = () => { // FUNCTION TO GET USER BY ID
+      // let data = {firstname:'firstname', lastname:'lastname', uid:'28273737646466464'}
+      getUserByID(uid).then(res=>{
+        if(!res.data.call_return || !Object.keys(res.data.customer).length){
+          navigate(RouteHandler.letsGetStarted, {replace:true})
+          return
+        }
+        setLoading(false)
+        dispatch(updateUserDetails(res.data.customer));
+      }).catch(err=>{
+        navigate(RouteHandler.letsGetStarted, {replace:true})
+        console.log('USER ERROR', err)
+      })
+    }
+    if(!Object.keys(userDetails).length){
+      getUser()
+    }
+  },[])
+
   return (
-  <DashboardLayout>
-    <Outlet />
-  </DashboardLayout>
+    <>
+    {loading && !Object.keys(userDetails).length ?
+      <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

@@ -35,6 +35,7 @@ export default function DashboardLayout({ children }: { children: ReactNode }) {
   // });
 
   const logoutUser = () => {
+    localStorage.clear()
     navigate(RouteHandler.letsGetStarted, {replace:true})
   }
 

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,
+  },
+});