Merge branch 'master' of https://gitlab.chiefsoft.net/DigiFi/digifi-FirstOffice

src/RouteLinks.js

@@ -5,6 +5,7 @@ const RouteLinks = {
     transactionsPage: '/transactions',
     repaymentsPage: '/repayments',
     loanChargesPage: '/loan-charges',
+    eligibility: '/eligibility',
     offers: '/offers',
     transaction_details_page: '/transaction/details',
     errorPage: '*',

src/SiteRoutes.jsx

@@ -13,7 +13,8 @@ import RepaymentsPage from './pages/RepaymentsPage' // REPAYMENTS PAGE
 import LoanChargesPage from './pages/LoanChargesPage' // LOAN CHARGES PAGE
 import TransactionDetailsPage from './pages/TransactionDetailsPage' // TRANSACTION DETAILS PAGE
 import OffersPage from './pages/OffersPage' // LOAN OFFERS PAGE
-import ErrorPage from './pages/ErrorPage' // ERROR PAGE
+import ErrorPage from './pages/ErrorPage'
+import EligibilityPage from "./pages/EligibilityPage"; // ERROR PAGE
 
 
 // const Home = lazy(() => import('./pages/Home'));
@@ -29,7 +30,9 @@ export default function SiteRoutes() {
                 <Route path={RouteLinks.transactionsPage} element={<TransactionsPage/>}/> {`*/Transactions PAGE*/`}
                 <Route path={RouteLinks.repaymentsPage} element={<RepaymentsPage/>}/> {`*/REPAYMENTS PAGE*/`}
                 <Route path={RouteLinks.loanChargesPage} element={<LoanChargesPage/>}/> {`*/LOAN CHARGES PAGE*/`}
-        <Route path={RouteLinks.transaction_details_page} element={<TransactionDetailsPage />} /> {`*/TRANSACTION PAGE*/`}
+                <Route path={RouteLinks.eligibility} element={<EligibilityPage/>}/> {`*/ELIGIBILITY PAGE*/`}
+                <Route path={RouteLinks.transaction_details_page}
+                       element={<TransactionDetailsPage/>}/> {`*/TRANSACTION PAGE*/`}
                 <Route path={RouteLinks.offers} element={<OffersPage/>}/> {`*/LOAN OFFERS PAGE*/`}
             </Route>
 

src/components/eligibility/EligibilityCom.jsx

@@ -0,0 +1,169 @@
+import {useEffect, useState} from 'react'
+
+import BreadcrumbCom from '../breadcrumb/BreadcrumbCom'
+import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper'
+import Icons from '../Icons'
+import {getLoanCharges} from '../../services/siteServices'
+import getDateFromDateString from '../../helpers/GetDateFromDateString';
+import formatNumber from '../../helpers/formatNumber'
+import Avatar from '../../assets/repay.png'
+
+
+export default function EligibilityCom() {
+
+    const [page, setPage] = useState(1)
+    const [allLoanCharges, setAllLoanCharges] = useState({loading: true, error: '', data: {}})
+
+    const [willFilter, setWillFilter] = useState(false)
+    const [filter, setFilter] = useState({type: '', id: ''})
+    const handleFilter = ({target: {name, value}}) => {
+        setFilter(prev => ({...prev, [name]: value}))
+    }
+
+    const handleFilterByParams = () => {
+        if (filter.type && !filter.id) {
+            return
+        } else if (!filter.type) {
+            setPage(1)
+            setWillFilter(prev => !prev)
+            setFilter({type: '', id: ''})
+        } else {
+            setPage(1)
+            setWillFilter(prev => !prev)
+        }
+    }
+
+    const loanCharges = allLoanCharges?.data?.loan_charges // LOAN CHARGES LIST
+    const pagination = allLoanCharges?.data?.pagination
+    const isFetching = allLoanCharges?.loading
+    const isError = allLoanCharges?.error
+
+    useEffect(() => {
+        setAllLoanCharges(prev => ({...prev, loading: true}))
+        const payload = filter?.type ? {[filter?.type]: filter.id} : {}
+        getLoanCharges({...payload, page}).then(res => {
+            if (res?.status != 200) {
+                setAllLoanCharges(prev => ({...prev, loading: false}))
+                return
+            }
+            setAllLoanCharges({loading: false, error: '', data: res?.data})
+        }).catch(err => {
+            setAllLoanCharges({loading: false, error: 'error occurred', data: {}})
+            console.log('ERR', err)
+        })
+    }, [page, willFilter])
+
+    return (
+        <div className='w-full flex flex-col gap-8'>
+            <BreadcrumbCom title='Eligibility' paths={['Dashboard', 'Eligibility']}/>
+
+            <div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'>
+                {isError ?
+                    <p className='text-red-500'>{allLoanCharges?.error}</p>
+                    :
+                    <>
+                        {/* filter section */}
+                        <div className='px-2 py-2 mb-4 flex flex-col sm:flex-row flex-wrap sm:items-center gap-2'>
+                            <Icons name='filter' className='text-3xl'/>
+                            <div className='w-full sm:max-w-48'>
+                                <select name='type' value={filter?.type} className='h-10 w-full p-2 rounded-md'
+                                        onChange={handleFilter}>
+                                    <option value=''>All</option>
+                                    <option value='transaction_id'>Transaction ID</option>
+                                    <option value='account_id'>Account ID</option>
+                                </select>
+                            </div>
+                            <div className='w-full sm:max-w-48'>
+                                <input name='id' value={filter?.id} disabled={!filter.type}
+                                       className={`h-10 w-full p-2 rounded-md outline-none border border-black-aside ${!filter.type && 'opacity-30'}`}
+                                       onChange={handleFilter}/>
+                            </div>
+                            <button onClick={handleFilterByParams} disabled={filter.type && !filter.id}
+                                    className={`h-10 bg-primary px-2 py-1 rounded-md text-white font-medium sm:self-end ${(filter.type && !filter.id) && 'opacity-50'}`}>Submit
+                            </button>
+                        </div>
+                        {/* end of filter section */}
+
+                        <TablePaginatedWrapper data={loanCharges} isFetching={isFetching} setPage={setPage}
+                                               itemsPerPage={pagination?.limit} pagination={pagination}>
+                            {({data}) => (
+                                <>
+                                    <table className="py-2 w-full text-sm">
+                                        <thead className="py-2 text-sm text-slate-500 text-left">
+                                        <tr>
+                                            <th scope="col" className="px-2 py-2">
+                                                TransactionID/Fee Type
+                                            </th>
+                                            {/* <th scope="col" className="px-2">
+                                            Loan
+                                        </th> */}
+                                            <th scope="col" className="px-2 text-right">
+                                                Amount
+                                            </th>
+                                            <th scope="col" className="px-2 text-right">
+                                                Added
+                                            </th>
+                                            <th scope="col" className="px-2 text-right">
+                                                Action
+                                            </th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        {(data && data.length > 0) ? data?.map((item, index) => (
+                                                <tr key={index} className="py-2 border-t border-dashed border-slate-300">
+                                                    <td className="px-2 py-2">
+                                                        <div
+                                                            className='w-full min-w-48 flex items-center gap-2 whitespace-nowrap'>
+                                                            <img className="w-10 h-10 rounded-md" src={Avatar}
+                                                                 alt="Jese image"/>
+                                                            <div className="text-left">
+                                                                <div
+                                                                    className="text-base font-semibold">{item?.transaction_id || ''}</div>
+                                                                <div
+                                                                    className="font-normal text-gray-500 line-clamp-1">{item?.code}</div>
+                                                            </div>
+                                                        </div>
+                                                    </td>
+                                                    <td className="px-2">
+                                                        <div className="text-right">
+                                                            {/* <div className="text-base font-semibold">{formatNumber(item?.initial_loan_amount)}</div> */}
+                                                            <div
+                                                                className="font-semibold text-green-500">#{formatNumber(item?.amount)}</div>
+                                                        </div>
+                                                    </td>
+                                                    <td className="px-2">
+                                                        <div className="text-right">
+                                                            <div
+                                                                className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)}</div>
+                                                        </div>
+                                                    </td>
+                                                    <td className="px-2 text-right">
+                                                        <div className='flex items-center justify-end gap-3 md:gap-4'>
+                                                            <div
+                                                                className='p-2 flex justify-center items-center text-slate-500 bg-white-body dark:text-white-body dark:bg-black-body rounded-md'>
+                                                                <Icons name='eye'/>
+                                                            </div>
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                            ))
+                                            :
+                                            <tr className="py-2 border-t border-dashed border-slate-300">
+                                                <td className="px-3 py-2" colSpan={4}>
+                                                    <div className="flex justify-center items-center">
+                                                        No Record Found
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        }
+                                        </tbody>
+                                    </table>
+                                </>
+                            )}
+                        </TablePaginatedWrapper>
+                    </>
+                }
+            </div>
+        </div>
+    )
+}

src/components/eligibility/_LoanChargesCom.jsx

@@ -0,0 +1,119 @@
+import React, {useState} from 'react'
+import {useQuery} from "@tanstack/react-query";
+
+import BreadcrumbCom from '../breadcrumb/BreadcrumbCom'
+import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper'
+import Icons from '../Icons'
+
+import Avatar from '../../assets/user_avatar.jpg'
+import queryKeys from '../../services/queryKeys'
+import {getLoanCharges} from '../../services/siteServices'
+import getDateFromDateString from '../../helpers/GetDateFromDateString';
+import formatNumber from '../../helpers/formatNumber';
+
+export default function LoanChargesCom() {
+
+    const [page, setPage] = useState(1)
+
+    const {data, isFetching, isError, error} = useQuery({
+        queryKey: [...queryKeys.loan_charges, page],
+        queryFn: () => getLoanCharges({page}),
+        staleTime: 0,
+        // placeholderData: keepPreviousData,
+    })
+
+    const loanCharges = data?.data?.loan_charges // LOAN CHARGES LIST
+    const pagination = data?.data?.pagination
+
+    return (
+        <div className='w-full flex flex-col gap-8' style={{backgroundColor: 'aliceblue'}}>
+            <BreadcrumbCom title='Loan Charges' paths={['Dashboard', 'Loan Charges']}/>
+
+            <div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'>
+                {isFetching ?
+                    <>
+                        <p className='text-slate-800'>Loading...</p>
+                    </>
+                    : isError ?
+                        <p className='text-red-500'>{error.message}</p>
+                        :
+                        <TablePaginatedWrapper data={loanCharges} isFetching={isFetching} setPage={setPage}
+                                               itemsPerPage={pagination?.limit} pagination={pagination}>
+                            {({data}) => (
+                                <>
+                                    <table className="py-2 w-full text-sm">
+                                        <thead className="py-2 text-sm text-slate-500 text-left">
+                                        <tr>
+                                            <th scope="col" className="px-2 py-2">
+                                                Name
+                                            </th>
+                                            {/* <th scope="col" className="px-2">
+                                            Loan
+                                        </th> */}
+                                            <th scope="col" className="px-2 text-right">
+                                                Amount
+                                            </th>
+                                            <th scope="col" className="px-2 text-right">
+                                                Added
+                                            </th>
+                                            <th scope="col" className="px-2 text-right">
+                                                Action
+                                            </th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        {(data && data.length > 0) ? data?.map((item, index) => (
+                                                <tr key={index} className="py-2 border-t border-dashed border-slate-300">
+                                                    <td className="px-2 py-2">
+                                                        <div
+                                                            className='w-full min-w-48 flex items-center gap-2 whitespace-nowrap'>
+                                                            <div className="text-left">
+                                                                <div
+                                                                    className="text-base font-semibold">{item?.transaction_id || ''}</div>
+                                                                <div
+                                                                    className="font-normal text-gray-500 line-clamp-1">{item?.code}</div>
+                                                            </div>
+                                                        </div>
+                                                    </td>
+                                                    <td className="px-2">
+                                                        <div className="text-right">
+                                                            {/* <div className="text-base font-semibold">{formatNumber(item?.initial_loan_amount)}</div> */}
+                                                            <div
+                                                                className="font-normal text-gray-500">{formatNumber(item?.amount)}</div>
+                                                        </div>
+                                                    </td>
+                                                    <td className="px-2">
+                                                        <div className="text-right">
+                                                            <div
+                                                                className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)}</div>
+                                                        </div>
+                                                    </td>
+                                                    <td className="px-2 text-right">
+                                                        <div className='flex items-center justify-end gap-3 md:gap-4'>
+                                                            <div
+                                                                className='p-2 flex justify-center items-center text-slate-500 bg-white-body dark:text-white-body dark:bg-black-body rounded-md'>
+                                                                <Icons name='eye'/>
+                                                            </div>
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                            ))
+                                            :
+                                            <tr className="py-2 border-t border-dashed border-slate-300">
+                                                <td className="px-3 py-2" colSpan={4}>
+                                                    <div className="flex justify-center items-center">
+                                                        No Record Found
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        }
+                                        </tbody>
+                                    </table>
+                                </>
+                            )}
+                        </TablePaginatedWrapper>
+                }
+            </div>
+        </div>
+    )
+}

src/components/layouts/aside/DashboardAside.jsx

@@ -55,7 +55,8 @@ export default function DashboardAside() {
                                 {link.title &&
                                     <h1 className="px-4 py-2 text-sm sm:text-sm text-slate-500 dark:text-white font-semibold uppercase mt-3 mb-1 border-b border-slate-500 dark:border-white">{link.title}</h1>
                                 }
-                        <AsideLinkWithSubLinks name={link.name} icon={link.icon} isOpen={subLinkList.includes(pathname) || index==1} >
+                                <AsideLinkWithSubLinks name={link.name} icon={link.icon}
+                                                       isOpen={subLinkList.includes(pathname) || index == 1}>
                                     <>
                                         {link.subLinks.map((subItem, index) => {
                                             let active = subItem.status == 1 ? true : false
@@ -63,7 +64,8 @@ export default function DashboardAside() {
                                             if (active && !hasSubLinks) {
                                                 return (
                                                     <div key={subItem.name}>
-                                        <AsideLink to={subItem.to} name={subItem.name} icon={subItem.icon} />
+                                                        <AsideLink to={subItem.to} name={subItem.name}
+                                                                   icon={subItem.icon}/>
                                                     </div>
                                                 )
                                             } else if (active && hasSubLinks) {
@@ -73,14 +75,18 @@ export default function DashboardAside() {
                                                     }
                                                 })
                                                 return (
-                                        <AsideLinkWithSubLinks key={subItem.name} name={subItem.name} icon={subItem.icon} isOpen={subLinkList.includes(pathname)}>
+                                                    <AsideLinkWithSubLinks key={subItem.name} name={subItem.name}
+                                                                           icon={subItem.icon}
+                                                                           isOpen={subLinkList.includes(pathname)}>
                                                         <>
                                                             {subItem.subLinks.map((item, index) => {
                                                                 let active = item.status == 1 ? true : false
                                                                 if (active) {
                                                                     return (
                                                                         <div key={index}>
-                                                        <AsideLink key={index} to={item.to} name={item.name} icon={item.icon} />
+                                                                            <AsideLink key={index} to={item.to}
+                                                                                       name={item.name}
+                                                                                       icon={item.icon}/>
                                                                         </div>
                                                                     )
                                                                 }
@@ -109,10 +115,12 @@ export default function DashboardAside() {
                             <p className="text-12 text-black-box/90 dark:text-white-body/80">username@gmail.com</p>
                         </div>
                     </div>
-                <button onClick={()=>handleActiveMenu('settings')}  className="peer text-slate-500 dark:text-white-body">
+                    <button onClick={() => handleActiveMenu('settings')}
+                            className="peer text-slate-500 dark:text-white-body">
                         <Icons name='settings' className='text-3xl'/>
                     </button>
-                <div className="hidden group-hover:block pop-modal-down absolute p-4 w-full bg-white dark:bg-black-box left-0 bottom-[60%] rounded shadow-round_black dark:shadow-round_white">
+                    <div
+                        className="hidden group-hover:block pop-modal-down absolute p-4 w-full bg-white dark:bg-black-box left-0 bottom-[60%] rounded shadow-round_black dark:shadow-round_white">
                         <div className="w-full min-h-48 flex flex-col justify-between gap-4">
                             <div className="w-full h-full">
                                 <div className="flex flex-col text-black dark:text-white text-base sm:text-lg">
@@ -139,12 +147,15 @@ export default function DashboardAside() {
 
 const asideNavLinks = [
     {name: 'Dashboard', status: 1, icon: 'dashboard', to: RouteLinks.homePage},
-    {name:'First Advance', title:'Loan', status:1, icon: 'arrow-right', subLinks: [
+    {
+        name: 'First Advance', title: 'Loan', status: 1, icon: 'arrow-right', subLinks: [
             {name: 'Transactions', status: 1, icon: 'dot', to: RouteLinks.transactionsPage},
             {name: 'Loans', status: 1, icon: 'dot', to: RouteLinks.loansPage},
             {name: 'Repayments', status: 1, icon: 'dot', to: RouteLinks.repaymentsPage},
             {name: 'Loan Charges', status: 1, icon: 'dot', to: RouteLinks.loanChargesPage},
-        {name: 'Configurations', status:1, icon: 'arrow-right', subLinks: [
+            {name: 'Eligibility', status: 1, icon: 'dot', to: RouteLinks.eligibility},
+            {
+                name: 'Configurations', status: 1, icon: 'arrow-right', subLinks: [
                     {name: 'Loan Offers', status: 1, icon: 'dot', to: RouteLinks.offers},
                 ]
             },

src/pages/EligibilityPage.jsx

@@ -0,0 +1,9 @@
+import React from 'react'
+import EligibilityCom from '../components/eligibility/EligibilityCom';
+
+
+export default function EligibilityPage() {
+  return (
+    <EligibilityCom />
+  )
+}