diff --git a/src/components/Dashboard/DashboardHomeIntro.tsx b/src/components/Dashboard/DashboardHomeIntro.tsx index ba39366..26648f5 100644 --- a/src/components/Dashboard/DashboardHomeIntro.tsx +++ b/src/components/Dashboard/DashboardHomeIntro.tsx @@ -1,11 +1,11 @@ -import React, { FC, useState, useEffect } from "react"; -import NairaBag from "../../assets/images/dashboard/naira-bag.png"; -import { Button, Icons } from "../"; -import { useSelector } from "react-redux"; -import PendingList from "../paginated-list/PendingList"; -import { PendingTableList } from "../../core/models"; -import { NewDateTimeFormatter } from "../../lib/NewDateTimeFormatter"; -import { getUserPendingLoanList } from "../../core/apiRequest"; +import React, { FC, useState, useEffect } from 'react'; +import NairaBag from '../../assets/images/dashboard/naira-bag.png'; +import { Button, Icons } from '../'; +import { useSelector } from 'react-redux'; +import PendingList from '../paginated-list/PendingList'; +import { PendingTableList } from '../../core/models'; +import { NewDateTimeFormatter } from '../../lib/NewDateTimeFormatter'; +import { getUserPendingLoanList } from '../../core/apiRequest'; export interface DashBoardCardProps { title?: string; @@ -55,7 +55,7 @@ export const DashBoardCard: React.FC = ({ )} {desc && (

- {desc}{" "} + {desc}{' '} {descSpan && ( {descSpan} @@ -73,117 +73,137 @@ export const DashBoardCard: React.FC = ({ }; interface DashboardHomeIntroProps { - handleNextStep:(value:{})=>any - step?:number|string + handleNextStep: (value: {}) => any; + step?: number | string; } -const DashboardHomeIntro: FC = ({ handleNextStep, step }) => { - const { userDetails } = useSelector((state:any) => state?.userDetails); // CHECKS IF USER Details are avaliable +const DashboardHomeIntro: FC = ({ + 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 uid = localStorage.getItem('uid') - if(!token || !uid){ - return + useEffect(() => { + let token = localStorage.getItem('token'); + let uid = localStorage.getItem('uid'); + if (!token || !uid) { + return; } - getUserPendingLoanList(uid).then(res => { - console.log('RES', res) - console.log('RES', userLoanList) - if(!res || !res.data.loans){ - setUserLoanList({loading:false, data:[]}) - return - } - setUserLoanList({loading:false, data:res?.data?.loans}) - }).catch(err => { - console.log(err) - setUserLoanList({loading:false, data:[]}) - }) - },[]) + getUserPendingLoanList(uid) + .then((res) => { + console.log('RES', res); + console.log('RES', userLoanList); + if (!res || !res.data.loans) { + setUserLoanList({ loading: false, data: [] }); + return; + } + setUserLoanList({ loading: false, data: res?.data?.loans }); + }) + .catch((err) => { + console.log(err); + setUserLoanList({ loading: false, data: [] }); + }); + }, []); return ( -

- {step == 1 ? - <> -

Hello, {userDetails.firstname}

-
- handleNextStep({})} +
+ {step == 1 ? ( + <> +

+ Hello, {userDetails.firstname} +

+
+ handleNextStep({})} /> -
- - : - <> -

Welcome Back, {userDetails.firstname}

-
- + + ) : ( + <> +

+ Welcome Back, {userDetails.firstname} +

+
+ -
- - } - {userLoanList.loading ? - null - : -
- - {(data:any)=>( -
- - - - - - - - - - - - {data.map((item:any, index:any) =>( - - - - - - + + + )} + {userLoanList.loading ? null : ( +
+ + {(data: any) => ( +
+
DateAmountPayment TermStatusAction
{NewDateTimeFormatter(item?.added)}{item?.loan_amount}{item?.payment_month}{item?.status} - -
+ + + + + + + - ))} - -
DateAmount + Payment Term + StatusAction
-
- )} -
-
- } + + + {data.map((item: any, index: any) => ( + + + {NewDateTimeFormatter(item?.added)} + + + {item?.loan_amount} + + + {item?.payment_month} + + + {item?.status} + + + + + + ))} + + +
+ )} + +
+ )}
); };