Compare commits

...

4 Commits

Author SHA1 Message Date
victorAnumudu 1c1af302aa all states added 2024-09-03 17:41:53 +01:00
ameye 945a5425f0 Merge branch 'employment-detail' of DigiFi/digifi-www into master 2024-08-06 20:05:36 +00:00
victorAnumudu 25545ad47e loan detail page added 2024-08-06 21:04:14 +01:00
ameye 5efc935f05 Merge branch 'add-card-API' of DigiFi/digifi-www into master 2024-08-05 19:12:05 +00:00
9 changed files with 720 additions and 15 deletions
@@ -1,5 +1,6 @@
import React, { FC, useState, useEffect } from 'react';
import NairaBag from '../../assets/images/dashboard/naira-bag.png';
import {useNavigate} from 'react-router-dom'
import { Button, Icons } from '../';
import { useSelector } from 'react-redux';
import PendingList from '../paginated-list/PendingList';
@@ -8,6 +9,7 @@ import { NewDateTimeFormatter } from '../../lib/NewDateTimeFormatter';
import { getUserPendingLoanList } from '../../core/apiRequest';
import {FormatAmount} from '../../lib/FormatAmount'
import PendingLoanPopout from './PendingLoanPopout';
import { RouteHandler } from '../../router/routes';
export interface DashBoardCardProps {
title?: string;
@@ -88,6 +90,8 @@ const DashboardHomeIntro: FC<DashboardHomeIntroProps> = ({
handleNextStep,
step,
}) => {
const navigate = useNavigate()
const { userDetails } = useSelector((state: any) => state?.userDetails); // CHECKS IF USER Details are avaliable
const [loanPopout, setLoanPopout] = useState<PopoutProps<PendingTableList>>({show:false, data:{}})
@@ -205,7 +209,7 @@ const DashboardHomeIntro: FC<DashboardHomeIntroProps> = ({
</button>
</td>
<td className="flex justify-end px-1 py-2 text-right">
<button className="flex flex-nowrap items-center px-2 py-1 border-2 border-black">
<button className="flex flex-nowrap items-center px-2 py-1 border-2 border-black" onClick={()=>navigate(RouteHandler.dashboardPayments, {state:{application_uid: item?.application_uid}})}>
View
<Icons name="arrow-right" />
</button>
@@ -0,0 +1,373 @@
import {useState, useEffect} from 'react'
import { Button, InputCompOne } from '../../shared/index';
import {Formik, Form} from 'formik'
import * as Yup from "yup";
import { getEmployer } from '../../../core/apiRequest';
import CustomSpinner from '../../CustomSpinner';
import { FormatAmount } from '../../../lib/FormatAmount';
type Props = {
handleNextStep?:(value:{})=>any
}
// type EmployerProps = {
// loading?: boolean,
// data?: Array<{[index:string]: string}> | {[index:string]: Array<{[index:string]: string}> }
// }
const initialValues = {
job_title: "",
name: "",
job_sector: "",
industry: "",
start_date: "",
official_email:"",
annual_salary: "",
net_montlty: "",
salary_date: "",
employee_id: "",
highest_eductaion: "",
employer_uid: "",
isChecked: true
};
// To get the validation schema
const validationSchema = Yup.object().shape({
isChecked: Yup.bool(), // use bool instead of boolean
// .oneOf([true, false], "You must accept the terms and conditions"),
job_title: Yup.string()
.required("Required"),
name: Yup.string().when('isChecked', {
is: true,
then: () => Yup.string().required('required'),
otherwise: () => Yup.string(),
}),
job_sector: Yup.string().when('isChecked', {
is: true,
then: () => Yup.string().required('required'),
}),
industry: Yup.string().when('isChecked', {
is: true,
then: () => Yup.string().required('required'),
}),
start_date: Yup.string()
.required("Required"),
official_email : Yup.string().when('isChecked', {
is: true,
then: () => Yup.string().required('required'),
})
.email("Invalid"),
annual_salary: Yup.string()
.required("Required")
.test("no-e", "Invalid", (value:any) => {
if (value && /^[0-9]*$/.test(value) == false) {
return false;
}
return true;
}),
net_montlty: Yup.string()
.required("Required")
.test("no-e", "Invalid", (value:any) => {
if (value && /^[0-9]*$/.test(value) == false) {
return false;
}
return true;
}),
salary_date: Yup.string()
.required("Required"),
employee_id: Yup.string()
.required("Required"),
highest_eductaion: Yup.string()
.required("Required"),
employer_uid: Yup.string().when('isChecked', {
is: false,
then: () => Yup.string().required('required'),
}),
});
export default function EmploymentDetail({handleNextStep}:Props) {
const [employerList, setEmployerList] = useState<any>({
loading: true,
data: {}
})
//FUNCTION TO HANDLE SUBMIT
const handleSubmit = (values:any) => {
// if(values.employer_uid){
// let employer_uid = values.employer_uid
// delete values.employer_uid
// handleNextStep({employer_uid, employment: values})
// }else{
// handleNextStep({employment: values})
// }
console.log('good')
};
useEffect(()=>{
getEmployer().then(res => {
setEmployerList({loading:false, data:res?.data?.employer})
// console.log('RES', res)
}).catch(err => {
console.log(err)
setEmployerList({loading:false, data:{}})
})
},[])
const formInitialValue = (employerList.loading || Object.keys(employerList?.data)?.length < 1) ? initialValues : {...initialValues, ...employerList?.data}
return (
<>
{employerList.loading ?
<div className='flex flex-col justify-center items-center h-96'>
<CustomSpinner width='w-8' height='h-8' />
</div>
:
<div className="w-full">
<Formik
initialValues={formInitialValue}
validationSchema={validationSchema}
onSubmit={handleSubmit}
>
{(props)=>(
<Form>
<div className="mt-[3.25rem] flex flex-col gap-9">
<p className='text-red-500 text-lg md:text-2xl'>Employment Informaton</p>
<div className="flex flex-col lg:flex-row items-start gap-[2rem]">
<div className='w-full lg:max-w-[30rem] flex flex-col'>
{/* <div className='w-full gap-[2rem]'>
<InputCompOne
parentClass="w-full"
name="employer_uid"
floatLabel="Employer Name"
// labelClass="font-bold text-[1.125rem]"
select={true}
selectClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
selectOptions={{loading:employersList?.loading, data: employersList?.data?.records}}
selectValue={props.values.employer_uid}
onChange={props.handleChange}
error={(props.errors.employer_uid && props.touched.employer_uid) ? props.errors.employer_uid : ''}
disabled={props.values.isChecked}
/>
<div className='flex gap-4 items-start my-2'>
<input
type='checkbox'
name="isChecked"
className='w-4 h-4 p-2 accent-purple-600 text-purple-600 bg-gray-100 border-gray-300 rounded focus:ring-purple-500'
onChange={props.handleChange}
checked={props.values.isChecked}
/>
<p className='text-[12px] text-justify'>Check here if employer is not on the list</p>
</div>
<div className={`hidden p-4 ${props.values.isChecked && 'hidden'}`}>
Name: {'Name'}
</div>
</div> */}
<div className={`w-full flex flex-col gap-[2rem] ${!props.values.isChecked && 'hidden'}`}>
<InputCompOne
parentClass="w-full"
name="name"
floatLabel="Employer name"
// labelClass="font-bold text-[1.125rem]"
input
disabled={true}
inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
placeholder="Mr. Mark John"
value={props.values.name}
onChange={props.handleChange}
error={(props.errors.name && props.touched.name) ? props.errors.name : ''}
/>
<InputCompOne
parentClass="w-full"
name="official_email"
floatLabel="Employers official email"
// labelClass="font-bold text-[1.125rem]"
input
disabled={true}
inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
placeholder="example@gmail.com"
value={props.values.official_email}
onChange={props.handleChange}
error={(props.errors.official_email && props.touched.official_email) ? props.errors.official_email : ''}
/>
<InputCompOne
parentClass="w-full"
name="industry"
floatLabel="Select your industry"
// labelClass="font-bold text-[1.125rem]"
select={true}
disabled={true}
selectClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
selectOptions={props.values.industry}
selectValue={props.values.industry}
onChange={props.handleChange}
error={(props.errors.industry && props.touched.industry) ? props.errors.industry : ''}
/>
<InputCompOne
parentClass="w-full"
name="job_sector"
floatLabel="Job Sector"
// labelClass="font-bold text-[1.125rem]"
select={true}
disabled={true}
selectClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
selectOptions={props.values.job_sector}
selectValue={props.values.job_sector}
onChange={props.handleChange}
error={(props.errors.job_sector && props.touched.job_sector) ? props.errors.job_sector : ''}
/>
</div>
</div>
<div className='w-full lg:max-w-[30rem] flex flex-col gap-[2rem]'>
<InputCompOne
parentClass="w-full"
name="job_title"
floatLabel="Job Title"
// labelClass="font-bold text-[1.125rem]"
input
disabled={true}
inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
placeholder="Software Engineer"
value={props.values.job_title}
onChange={props.handleChange}
error={(props.errors.job_title && props.touched.job_title) ? props.errors.job_title : ''}
/>
<InputCompOne
parentClass="w-full"
name="highest_eductaion"
floatLabel="Highest level of education"
// labelClass="font-bold text-[1.125rem]"
select={true}
disabled={true}
selectClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
selectOptions={highestEductaion}
selectValue={props.values.highest_eductaion}
onChange={props.handleChange}
error={(props.errors.highest_eductaion && props.touched.highest_eductaion) ? props.errors.highest_eductaion : ''}
/>
<div className="w-full flex flex-col sm:flex-row items-center gap-4">
<InputCompOne
parentClass="w-full"
name="start_date"
floatLabel="Date of resumption"
// labelClass="font-bold text-[1.125rem]"
input
disabled={true}
inputType='text'
inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
placeholder="12/12/2015"
value={props.values.start_date}
onChange={props.handleChange}
error={(props.errors.start_date && props.touched.start_date) ? props.errors.start_date : ''}
/>
<InputCompOne
parentClass="w-full"
name="salary_date"
floatLabel="Salary payment date"
// labelClass="font-bold text-[1.125rem]"
input
disabled={true}
inputType='text'
inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
placeholder="30th of every month"
value={(props.values.salary_date)}
onChange={props.handleChange}
error={(props.errors.salary_date && props.touched.salary_date) ? props.errors.salary_date : ''}
/>
</div>
<div className="w-full flex flex-col sm:flex-row items-center gap-4">
<InputCompOne
parentClass="w-full"
name="annual_salary"
floatLabel="Annual Income"
// labelClass="font-bold text-[1.125rem]"
input
disabled={true}
inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem] text-right"
placeholder="1,200,000"
value={FormatAmount(props.values.annual_salary)}
onChange={props.handleChange}
error={(props.errors.annual_salary && props.touched.annual_salary) ? props.errors.annual_salary : ''}
/>
<InputCompOne
parentClass="w-full"
name="net_montlty"
floatLabel="Net monthly salary"
// labelClass="font-bold text-[1.125rem]"
input
disabled={true}
inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem] text-right"
placeholder="100,000"
value={FormatAmount(props.values.net_montlty)}
onChange={props.handleChange}
error={(props.errors.net_montlty && props.touched.net_montlty) ? props.errors.net_montlty : ''}
/>
</div>
<InputCompOne
parentClass="w-full"
name="employee_id"
floatLabel="Employee ID"
// labelClass="font-bold text-[1.125rem]"
input
disabled={true}
inputClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
placeholder="LS/001/005"
value={props.values.employee_id}
onChange={props.handleChange}
error={(props.errors.employee_id && props.touched.employee_id) ? props.errors.employee_id : ''}
/>
<div className="hidden w-full">
<Button
className="my-4 btn-Y text-black w-full h-11"
text="Next"
type="submit"
/>
</div>
</div>
</div>
</div>
</Form>
)}
</Formik>
</div>
}
</>
);
}
interface SelectOption {
loading: boolean;
data: {value: string;
label: string}[]
}
const jobSector: SelectOption = {
loading: false,
data: [
{ value: "", label: "Please Select" },
{ value: "private (non academic)", label: "Private (non academic)" },
]
}
const industry: SelectOption = {
loading: false,
data: [
{ value: "", label: "Please Select" },
{ value: "engineering", label: "Engineering" },
]
}
const highestEductaion: SelectOption = {
loading: false,
data: [
{ value: "", label: "Please Select" },
{ value: "b.sc + professional qualification", label: "B.Sc + Professional Qualification" },
]
}
@@ -1,5 +1,7 @@
import { Button, InputCompOne, Stepper } from '../../shared/index';
import { state } from '../../../utils/states';
import {Formik, Form} from 'formik'
import * as Yup from "yup";
@@ -13,7 +15,7 @@ const initialValues = {
marital_status: "",
state: "",
email:"",
country:""
country:"NG"
};
// To get the validation schema
@@ -171,16 +173,6 @@ const maritalStatus: SelectOption = {
]
}
const state: SelectOption = {
loading: false,
data: [
{ value: "", label: "Please Select" },
{ value: "abia", label: "Abia" },
{ value: "imo", label: "Imo" },
{ value: "lagos", label: "Lagos" },
]
}
const country: SelectOption = {
loading: false,
data: [
@@ -0,0 +1,149 @@
import {useEffect, useState} from 'react'
import {useLocation, useNavigate} from 'react-router-dom'
import { Button, InputCompOne } from "../../shared";
import {Formik, Form} from 'formik'
import * as Yup from "yup";
import { RouteHandler } from '../../../router/routes';
import { getLoanDetail } from '../../../core/apiRequest';
import CustomSpinner from '../../CustomSpinner';
const initialValues = {
loan_amount: "",
payment_month: "",
sales_agent: "",
};
// To get the validation schema
const validationSchema = Yup.object().shape({
payment_month: Yup.string()
.required("Required"),
loan_amount: Yup.string()
.required("Required")
.test("no-e", "Invalid", (value:any) => {
if (value && /^[0-9]*$/.test(value) == false) {
return false;
}
return true;
}),
sales_agent: Yup.string()
});
export default function ReferenceDetails() {
const location = useLocation()
const navigate = useNavigate()
const applicationUID = location?.state?.application_uid
//FUNCTION TO HANDLE SUBMIT
const handleSubmit = (values:{}) => {
// handleNextStep(values)
};
const [loanDetail, setLoanDetail] = useState<any>({
loading: true,
data: {}
})
useEffect(()=>{
if(!applicationUID){
navigate(RouteHandler.dashboardHome)
}
getLoanDetail({application_uid:applicationUID}).then(res => {
setLoanDetail({loading:false, data:res?.data?.loan})
}).catch(err => {
console.log(err)
setLoanDetail({loading:false, data:{}})
})
},[])
const formInitialValue = (loanDetail.loading || Object.keys(loanDetail?.data)?.length < 1) ? initialValues : loanDetail?.data
return (
<>
{loanDetail.loading ?
<div className='flex flex-col justify-center items-center h-96'>
<CustomSpinner width='w-8' height='h-8' />
</div>
:
<div className="w-full">
<Formik
initialValues={formInitialValue}
validationSchema={validationSchema}
onSubmit={handleSubmit}
>
{(props)=>(
<Form>
<div className="mt-[3.25rem] flex flex-col gap-9">
<p className='text-red-500 text-lg md:text-2xl'>Loan Details</p>
<div className='w-full flex flex-wrap items-center gap-4'>
<InputCompOne
parentClass="w-full sm:max-w-[10rem] flex flex-col gap-4"
name="loan_amount"
label="Amount"
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.loan_amount}
onChange={props.handleChange}
error={(props.errors.loan_amount && props.touched.loan_amount) ? props.errors.loan_amount : ''}
/>
<InputCompOne
parentClass="w-full sm:max-w-[10rem] flex flex-col gap-4"
name="payment_month"
label="Months?"
labelClass="font-bold text-[1.125rem]"
select={true}
selectClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
selectOptions={paymentMonth}
selectValue={props.values.payment_month}
onChange={props.handleChange}
error={(props.errors.payment_month && props.touched.payment_month) ? props.errors.payment_month : ''}
/>
<InputCompOne
parentClass="w-full sm:max-w-[10rem] flex flex-col gap-4"
name="sales_agent"
label="agent ID"
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.sales_agent}
onChange={props.handleChange}
error={(props.errors.sales_agent && props.touched.sales_agent) ? props.errors.sales_agent : ''}
/>
</div>
<Button
className="hidden my-8 max-w-[25.875rem] btn-Y text-black w-full h-11"
text="Next"
type="submit"
/>
</div>
</Form>
)}
</Formik>
</div>
}
</>
);
}
interface SelectOption {
loading: boolean;
data: {value: string;
label: string}[]
}
const paymentMonth: SelectOption = {
loading: false,
data: [
{ value: "", label: "Please Select" },
{ value: "6", label: "6 Months" },
{ value: "12", label: "12 Months" },
{ value: "18", label: "18 Months" },
{ value: "24", label: "24 Months" },
]
}
+3 -1
View File
@@ -103,7 +103,9 @@ const InputCompOne = forwardRef<HTMLInputElement, InputCompOneProps>(
onChange={onChange}
disabled={disabled}
>
{selectOptions.loading ?
{typeof(selectOptions) == 'string' ?
<option value={selectValue}>{selectValue}</option>
:selectOptions.loading ?
<option value=''>Loading...</option>
: selectOptions.data.length && name == 'employer_uid' ?
<>
+17
View File
@@ -50,6 +50,23 @@ export const getEmployersList = () => {
return getAuxEnd(`/employers`, reqData)
}
// FUNCTION TO GET USER EMPLOYER
export const getEmployer = () => {
let reqData = {
uid: localStorage.getItem('uid'),
}
return getAuxEnd(`/dash/employer?uid=${reqData?.uid}`, null)
}
// FUNCTION TO GET LOAN DETAILS
export const getLoanDetail = (postData:any) => {
let reqData = {
uid: localStorage.getItem('uid'),
...postData
}
return getAuxEnd(`/loan/loandetail?uid=${reqData?.uid}&application_uid=${reqData?.application_uid}`, null)
}
// FUNCTION TO ADD CARD
export const addCard = (postData:any) => {
let reqData = {
+5 -1
View File
@@ -1,5 +1,9 @@
import ReferenceDetails from "../components/Dashboard/referenceDetails/ReferenceDetails";
export default function DashboardpaymentsPage() {
return (
<div>Dashboardpayments</div>
<>
<ReferenceDetails />
</>
)
}
+5 -1
View File
@@ -1,5 +1,9 @@
import EmploymentDetail from "../components/Dashboard/employmentDetails/EmploymentDetails";
export default function DashboardVerificationPage() {
return (
<div>DashboardVerification</div>
<>
<EmploymentDetail />
</>
)
}
+160
View File
@@ -0,0 +1,160 @@
interface SelectOption {
loading: boolean;
data: {value: string;
label: string}[]
}
export const state: SelectOption = {
loading: false,
data: [
{ value: "", label: "Please Select" },
{
"value": "abia",
"label": "Abia"
},
{
"value": "adamawa",
"label": "Adamawa"
},
{
"value": "akwa ibom",
"label": "Akwa Ibom"
},
{
"value": "anambra",
"label": "Anambra"
},
{
"value": "bauchi",
"label": "Bauchi"
},
{
"value": "bayelsa",
"label": "Bayelsa"
},
{
"value": "benue",
"label": "Benue"
},
{
"value": "borno",
"label": "Borno"
},
{
"value": "cross river",
"label": "Cross River"
},
{
"value": "delta",
"label": "Delta"
},
{
"value": "ebonyi",
"label": "Ebonyi"
},
{
"value": "edo",
"label": "Edo"
},
{
"value": "ekiti",
"label": "Ekiti"
},
{
"value": "enugu",
"label": "Enugu"
},
{
"value": "fct - abuja",
"label": "FCT - Abuja"
},
{
"value": "gombe",
"label": "Gombe"
},
{
"value": "imo",
"label": "Imo"
},
{
"value": "jigawa",
"label": "Jigawa"
},
{
"value": "kaduna",
"label": "Kaduna"
},
{
"value": "kano",
"label": "Kano"
},
{
"value": "katsina",
"label": "Katsina"
},
{
"value": "kebbi",
"label": "Kebbi"
},
{
"value": "kogi",
"label": "Kogi"
},
{
"value": "kwara",
"label": "Kwara"
},
{
"value": "lagos",
"label": "Lagos"
},
{
"value": "nasarawa",
"label": "Nasarawa"
},
{
"value": "niger",
"label": "Niger"
},
{
"value": "ogun",
"label": "Ogun"
},
{
"value": "ondo",
"label": "Ondo"
},
{
"value": "osun",
"label": "Osun"
},
{
"value": "oyo",
"label": "Oyo"
},
{
"value": "plateau",
"label": "Plateau"
},
{
"value": "rivers",
"label": "Rivers"
},
{
"value": "sokoto",
"label": "Sokoto"
},
{
"value": "taraba",
"label": "Taraba"
},
{
"value": "yobe",
"label": "Yobe"
},
{
"value": "zamfara",
"label": "Zamfara"
}
]
}