diff --git a/src/App.js b/src/App.js index fe9f8ef..b4acaa9 100644 --- a/src/App.js +++ b/src/App.js @@ -23,8 +23,9 @@ function App() { queries: { refetchOnWindowFocus: false, retry: 3, + staleTime: 300000 //5 mins // refetchOnMount: false, - staleTime: Infinity // can also be a number in millisecond + // staleTime: Infinity // can also be a number in millisecond }, }, }) diff --git a/src/components/home/HomeCom.jsx b/src/components/home/HomeCom.jsx index e6314f0..3a8e5ce 100644 --- a/src/components/home/HomeCom.jsx +++ b/src/components/home/HomeCom.jsx @@ -14,7 +14,7 @@ export default function HomeCom() { const {data, isFetching, isError, error} = useQuery({ queryKey: queryKeys.dashboard, - queryFn: () => getDashData() + queryFn: () => getDashData(), }) const dashData = data?.data // DASHBOARD DATA diff --git a/src/components/layouts/aside/DashboardAside.jsx b/src/components/layouts/aside/DashboardAside.jsx index 6c4c93c..5b1f9cd 100644 --- a/src/components/layouts/aside/DashboardAside.jsx +++ b/src/components/layouts/aside/DashboardAside.jsx @@ -32,7 +32,7 @@ export default function DashboardAside() { let hasSubLinks = (link.subLinks && link.subLinks.length > 0) ? true : false if(active && !hasSubLinks){ return ( -
+
) @@ -49,7 +49,7 @@ export default function DashboardAside() { } }) return ( -
+
{link.title &&

{link.title}

} @@ -60,8 +60,8 @@ export default function DashboardAside() { let hasSubLinks = (subItem.subLinks && subItem.subLinks.length > 0) ? true : false if(active && !hasSubLinks){ return ( -
- +
+
) }else if(active && hasSubLinks){ @@ -71,7 +71,7 @@ export default function DashboardAside() { } }) return( - + <> {subItem.subLinks.map((item, index)=>{ let active = item.status == 1 ? true : false diff --git a/src/components/loanscom/LoansCom.jsx b/src/components/loanscom/LoansCom.jsx index 365a4da..7c71b41 100644 --- a/src/components/loanscom/LoansCom.jsx +++ b/src/components/loanscom/LoansCom.jsx @@ -1,6 +1,5 @@ import React from 'react' import { useQuery } from "@tanstack/react-query"; -import {Link} from 'react-router-dom' import BreadcrumbCom from '../breadcrumb/BreadcrumbCom' import TableWrapper from '../tableWrapper/TableWrapper' @@ -8,18 +7,21 @@ import Icons from '../Icons' import Avatar from '../../assets/user_avatar.jpg' import queryKeys from '../../services/queryKeys' -import { selectLoan } from '../../services/siteServices' +import { getLoans } from '../../services/siteServices' import getDateFromDateString from '../../helpers/GetDateFromDateString'; +import formatNumber from '../../helpers/formatNumber' import getTimeFromDateString from '../../helpers/GetTimeFromDateString'; export default function LoansCom() { - const {data, isFetching, isError, error} = useQuery({ - queryKey: queryKeys.select_loan, - queryFn: () => selectLoan() + const {data:allLoans, isFetching, isError, error} = useQuery({ + queryKey: queryKeys.loans, + queryFn: () => getLoans() }) - const selectUsers = data?.data?.result_data?.data // APPLY LOAN LIST + const loans = allLoans?.data?.loans // LOANS LIST + const loansCount = allLoans?.data?.count // LOANS LIST COUNT + // console.log('LOANS', loans) return (
@@ -33,19 +35,19 @@ export default function LoansCom() { : isError ?

{error.message}

: - + {({ data }) => ( <> - +
- - {(data && data.length > 0) ? data?.map((item, index) => ( - +
Name - Loan + + Loan Amount + Added @@ -55,25 +57,25 @@ export default function LoansCom() {
Jese image
-
{item?.name || ''}
-
{item?.bvn}
+
{item?.account_id || ''}
+
{item?.customer_id}
-
-
{item?.loan}
-
{item?.description}
+
+ {/*
{formatNumber(item?.initial_loan_amount)}
*/} +
{formatNumber(item?.initial_loan_amount)}
-
-
{getDateFromDateString(item?.added)} {getTimeFromDateString(item?.added)}
+
+
{getDateFromDateString(item?.created_at)}
diff --git a/src/services/queryKeys.js b/src/services/queryKeys.js index 17fab73..f9100ae 100644 --- a/src/services/queryKeys.js +++ b/src/services/queryKeys.js @@ -1,5 +1,6 @@ const queryKeys = { dashboard: ['dashboard'], + loans: ['loans'], apply_loan: ['apply'], select_loan: ['select-loan'], approved_loan: ['approved-loan'], diff --git a/src/services/siteServices.js b/src/services/siteServices.js index 1a9ef4f..76b3b51 100644 --- a/src/services/siteServices.js +++ b/src/services/siteServices.js @@ -8,7 +8,7 @@ axios.interceptors.request.use( "Access-Control-Allow-Origin": "*", // "Access-Control-Expose-Headers": "Access-Control-Allow-Origin", // "Access-Control-Allow-Headers": "Origin, X-API-KEY, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method, Access-Control-Allow-Headers, Authorization, observe, enctype, Content-Length, X-Csrf-Token", - "Content-Type": "application/json;charset=UTF-8", + // "Content-Type": "application/json;charset=UTF-8", 'Authorization': (localStorage && localStorage.getItem('token')) ? `Bearer ${localStorage.getItem('token')}` : '' }; // config.headers['Authorization'] = `Bearer ${localStorage.getItem('token')}`; @@ -56,6 +56,15 @@ export const getDashData = (reqData) => { return getAuxEnd(`/dashboard`, postData) } +// FUNCTION TO GET APPLIED LOANS TABLE +export const getLoans = (reqData) => { + const postData = { ...reqData } + return getAuxEnd(`/loans`, postData) +} + + + + // FUNCTION TO GET APPLIED LOANS TABLE export const applyLoan = (reqData) => { const postData = { ...reqData }