updated dashboard page

src/RouteLinks.js

@@ -1,15 +1,11 @@
 const RouteLinks = {
     loginPage: '/auth/login',
-    errorPage: '*',
     homePage: '/',
-    usersPage: '/users',
-    approvedLoansPage: '/loans/approved',
-    applicationsLoanPage: '/loans/apply',
-    disbursementsLoanPage: '/loans/disbursements',
-    selectedLoanPage: '/loans/select',
-    loanOffersPage: '/loans/offers',
     loansPage: '/loans',
-    requestPage: '/request',
+    transactionsPage: '/transactions',
+    repaymentsPage: '/repayments',
+    loanChargesPage: '/loan-charges',
+    errorPage: '*',
 }
 
 export default RouteLinks

src/SiteRoutes.jsx

@@ -7,14 +7,11 @@ import PageLoader from './components/PageLoader'
 
 import LoginPage from './pages/LoginPage' // LOGIN PAGE
 import HomePage from './pages/HomePage' // Home PAGE
-import UsersPage from './pages/UsersPage' // Users PAGE
-import ApprovedLoansPage from './pages/ApprovedLoansPage' // APPROVED LOANS PAGE
-import DisbursementsLoanPage from './pages/DisbursementsLoanPage' // DISBURSEMENTS LOANS PAGE
-import ApplicationsLoanPage from './pages/ApplicationsLoanPage' // APPLICATIONS LOANS PAGE
-import SelectedLoanPage from './pages/SelectedLoanPage' // SELECTED LOANS PAGE
-import LoanOffersPage from './pages/LoanOffersPage' // SELECTED LOANS PAGE
 import LoansPage from './pages/LoansPage' // SELECTED LOANS PAGE
-import RequestPage from './pages/RequestPage' // SELECTED LOANS PAGE
+import TransactionsPage from './pages/TransactionsPage' // TRANSACTIONS PAGE
+import RepaymentsPage from './pages/RepaymentsPage' // REPAYMENTS PAGE
+import LoanChargesPage from './pages/LoanChargesPage' // LOAN CHARGES PAGE
+import ErrorPage from './pages/ErrorPage'
 
 
 // const Home = lazy(() => import('./pages/Home'));
@@ -26,15 +23,10 @@ export default function SiteRoutes() {
 
       <Route element={<UserExist />}>
         <Route path={RouteLinks.homePage} element={<HomePage />} /> {`*/HOME PAGE*/`}
-        <Route path={RouteLinks.usersPage} element={<UsersPage />} /> {`*/USERS PAGE*/`}
-        <Route path={RouteLinks.approvedLoansPage} element={<ApprovedLoansPage />} /> {`*/APPROVED LOANS PAGE*/`}
-        <Route path={RouteLinks.disbursementsLoanPage} element={<DisbursementsLoanPage />} /> {`*/DISBURSEMENTS LOANS PAGE*/`}
-        <Route path={RouteLinks.applicationsLoanPage} element={<ApplicationsLoanPage />} /> {`*/APPLICATIONS LOANS PAGE*/`}
-        <Route path={RouteLinks.selectedLoanPage} element={<SelectedLoanPage />} /> {`*/SELECTED LOANS PAGE*/`}
-        <Route path={RouteLinks.loanOffersPage} element={<LoanOffersPage />} /> {`*/LOANS OFFERS PAGE*/`}
-
         <Route path={RouteLinks.loansPage} element={<LoansPage />} /> {`*/LOANS PAGE*/`}
-        <Route path={RouteLinks.requestPage} element={<RequestPage />} /> {`*/Request PAGE*/`}
+        <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>
 
       {/* ERROR PAGE */}
@@ -42,7 +34,7 @@ export default function SiteRoutes() {
         path={RouteLinks.errorPage} // error page
         element={
           <Suspense fallback={<PageLoader />}>
-            <p>Error Page 1</p>
+            <ErrorPage />
           </Suspense>
         } 
       />

src/components/error/ErrorCom.jsx

@@ -0,0 +1,37 @@
+import React from 'react'
+import { useNavigate } from 'react-router-dom'
+
+import ErrorLogo from '../../assets/404-error.png'
+
+export default function ErrorCom() {
+
+  const navigate = useNavigate()
+  
+  return (
+    <>
+      <div className={`h-screen bg-sky-300 flex flex-col items-center justify-center bg-[url('./assets/login-bg.jpg')] bg-cover bg-center bg-no-repeat`}>
+        <div className='p-4 sm:p-8 w-full max-w-7xl mx-auto grid gap-8 place-content-center'>
+          <div className='w-4/5 md:w-[650px] h-full'>
+                <div className='flex flex-col gap-8 w-full bg-white rounded-xl p-16 sm:px-20 sm:py-16 shadow'>
+                    <div className='w-full flex flex-col gap-1 items-center'>
+                        <h1 className='text-2xl md:text-3xl font-bold text-black-body'>Oops!</h1>
+                        <p className='text-sm font-medium text-slate-500'>We can't find that page.</p>
+                    </div>
+
+                    {/* <div className='relative h-[1px] bg-slate-300/50'>
+                        <p className='absolute left-1/2 -translate-x-1/2 top-1/2 -translate-y-1/2 bg-white p-4 text-12 text-slate-500'>Or with email</p>
+                    </div> */}
+
+                    <div className='flex flex-col items-center gap-6'>
+                        <img src={ErrorLogo} className='w-4/5 md:w-80 h-auto' alt='error logo' />
+                        <div className='h-10 mb-10 flex justify-center'>
+                            <button onClick={()=>navigate('/', {replace:true})} className='px-2 h-full bg-primary text-sm text-white font-medium rounded-md'>Return Home</button>
+                        </div>
+                    </div>
+                </div>
+          </div>
+        </div>
+      </div>
+    </>
+  )
+}

src/components/home/HomeCom.jsx

@@ -1,4 +1,5 @@
 import React from 'react'
+import  {Link} from 'react-router-dom'
 import { useQuery } from "@tanstack/react-query";
 import BreadcrumbCom from '../../components/breadcrumb/BreadcrumbCom'
 import CustomCounter from '../../components/CustomCounter'
@@ -9,6 +10,9 @@ import formatNumber from '../../helpers/formatNumber'
 
 import queryKeys from '../../services/queryKeys'
 import { getDashData } from '../../services/siteServices'
+import getDateFromDateString from '../../helpers/GetDateFromDateString';
+import localImgLoader from '../../helpers/localImageLoader';
+import RouteLinks from '../../RouteLinks';
 
 export default function HomeCom() {
 
@@ -82,81 +86,92 @@ export default function HomeCom() {
               </div> */}
             </div>
 
-            <TableWrapper data={dashData?.recent_transactions} itemsPerPage={10}>
-                {({ data }) => (
+              <table className="py-2 w-full text-sm">
+                  <thead className="py-2 text-sm text-slate-500 text-left font-semibold">
+                      <tr>
+                          <th scope="col" className="px-2 py-2">
+                              Request
+                          </th>
+                          <th scope="col" className="px-2">
+                              Account
+                          </th>
+                          <th scope="col" className="px-2">
+                              Activity
+                          </th>
+                          <th scope="col" className="px-2 text-right">
+                              Action
+                          </th>
+                      </tr>
+                  </thead>
+                  <tbody>
+                    {(dashData?.recent_transactions && dashData?.recent_transactions.length > 0) ? dashData?.recent_transactions?.map((item, index) => {
+                      if(index <= 10) {
+                        return (
+                          <tr key={item?.id} 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={localImgLoader(`loan_icons/${item?.type}.png`)} alt="Icon" />
+                                  <div className="text-left">
+                                      <div className="text-base font-semibold">{item?.transaction_id}</div>
+                                      <div className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)}</div>
+                                  </div>  
+                                </div>
+                              </td>
+                              <td className="px-2">
+                                <div className="text-left">
+                                    <div className="text-base font-semibold">{item?.account_id}</div>
+                                    <div className="font-normal text-gray-500">{item?.type}</div>
+                                </div> 
+                              </td>
+                              <td className="px-2">
+                                <div className="text-left">
+                                    <div className="font-normal text-gray-500">50%</div>
+                                    <div className="relative h-[6px] w-full bg-white-body dark:bg-black-body rounded-full overflow-hidden">
+                                      <div className={`absolute left-0 h-full w-1/2 bg-emerald-600`}></div>
+                                    </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='edit' />
+                                  </div> */}
+                                  <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 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='trash' />
+                                  </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>
+                    }
                     <>
-                        <table className="py-2 w-full text-sm">
-                            <thead className="py-2 text-sm text-slate-500 text-left font-semibold">
-                                <tr>
-                                    <th scope="col" className="px-2 py-2">
-                                        Request
-                                    </th>
-                                    <th scope="col" className="px-2">
-                                        Account
-                                    </th>
-                                    <th scope="col" className="px-2">
-                                        Activity
-                                    </th>
-                                    <th scope="col" className="px-2 text-right">
-                                        Action
-                                    </th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                              {(data && data.length > 0) ? data?.map((item, index) => (
-                                <tr key={item?.id} 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?.account_id}</div>
-                                            <div className="font-normal text-gray-500">{item?.channel}</div>
-                                        </div>  
-                                      </div>
-                                    </td>
-                                    <td className="px-2">
-                                      <div className="text-left">
-                                          <div className="text-base font-semibold">{item?.transaction_id}</div>
-                                          <div className="font-normal text-gray-500">{item?.type}</div>
-                                      </div> 
-                                    </td>
-                                    <td className="px-2">
-                                      <div className="text-left">
-                                          <div className="font-normal text-gray-500">50%</div>
-                                          <div className="relative h-[6px] w-full bg-white-body dark:bg-black-body rounded-full overflow-hidden">
-                                            <div className={`absolute left-0 h-full w-1/2 bg-emerald-600`}></div>
-                                          </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='edit' />
-                                        </div> */}
-                                        <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 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='trash' />
-                                        </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>
+                    {dashData?.recent_transactions.length > 10 &&
+                      <tr className="py-2 border-t border-dashed text-right text-primary border-slate-300">
+                        <td className="px-3 py-2" colSpan={4}>
+                            <Link to={RouteLinks.transactionsPage} className="flex justify-end items-center">
+                                More ...
+                            </Link>
+                        </td>
+                      </tr>
+                    }
                     </>
-                )}
-            </TableWrapper>
+                  </tbody>
+              </table>
+
           </div>
         </div>
       </div>

src/components/layouts/DashboardHeader.jsx

@@ -5,16 +5,15 @@ import { generalLayoutContext } from "../../context/GeneralLayoutContext"
 
 import UserAvatar from '../../assets/user_avatar.jpg'
 import HandBurger from "./HandBurger"
-import { Link, useLocation } from "react-router-dom"
+import { Link } from "react-router-dom"
 import RouteLinks from "../../RouteLinks"
-import { useState } from "react";
 import MainBtn from "../MainBtn";
 import { TbLogout2 } from "react-icons/tb";
 import Icons from "../Icons";
 
 export default function DashboardHeader() {
 
-    let {pathname} = useLocation()
+    // let {pathname} = useLocation()
 
     const {theme, handleTheme, setLogoutModal, activeMenu, handleActiveMenu, showAsideDrawer, setShowAsideDrawer} = generalLayoutContext()
 
@@ -36,11 +35,9 @@ export default function DashboardHeader() {
                     </Link>
 
                     {/* RIGHT DRAWER BUTTON */}
-                    {pathname == '/' &&
                      <div onClick={()=>setShowAsideDrawer('right-aside')} className='large:hidden  w-10 h-10 border border-slate-300 text-slate-500 dark:text-white-body rounded-md px-2 flex justify-center items-center gap-2 cursor-pointer' title='Switch Color Mode'>
                         <Icons name='right-panel' className="text-sm md:text-xl font-bold" />
                     </div>
-                    }
 
                      {/* MESSAGE */}
                      {/* <button onClick={()=>handleDrawer(drawerName.chat)} className="relative px-2 flex justify-center items-center gap-2 cursor-pointer">

src/components/layouts/DashboardLayout.jsx

@@ -1,5 +1,4 @@
-import { useEffect, useState } from 'react'
-import { Outlet, useLocation } from 'react-router-dom'
+import { Outlet } from 'react-router-dom'
 
 import DashboardHeader from './DashboardHeader'
 import { generalLayoutContext } from '../../context/GeneralLayoutContext'
@@ -8,7 +7,7 @@ import RightAsideBar from './rightaside/RightAsideBar'
 
 export default function DashboardLayout() {
 
-    let {pathname} = useLocation()
+    // let {pathname} = useLocation()
 
   const {showAsideDrawer, setShowAsideDrawer} = generalLayoutContext()
   
@@ -18,9 +17,6 @@ export default function DashboardLayout() {
             <DashboardAside />
         </div>
 
-        {/* <div className={`${showAsideDrawer =='aside' ? 'left-0' : '-left-full'} w-4/5 sm:w-72 px-8 py-4 lg:hidden fixed inset-0 z-[999] bg-white-aside dark:bg-black-aside dark:text-white-light`}>
-            <DashboardAside />
-        </div> */}
         <div className={`${showAsideDrawer =='aside' ? 'left-0' : '-left-full'} lg:hidden w-full fixed inset-0 z-[999]`}>
             <div className={`${showAsideDrawer =='aside' ? 'fixed left-0 top-0 inset-0' : '-left-full'} w-full bg-[rgba(0,_0,_0,_0.2)] dark:bg-[rgba(0,_0,_0,_0.4)] transition-all cursor-pointer`} onClick={()=>setShowAsideDrawer('')} ></div>
             <div className={`fixed px-8 py-4 h-full w-4/5 sm:w-[400px] bg-white-aside dark:bg-black-aside dark:text-white-light`}>
@@ -28,7 +24,7 @@ export default function DashboardLayout() {
             </div>
         </div>
 
-        <div className={`main w-full bg-inherit ${pathname == '/' && 'large:mr-[400px]'}`}>
+        <div className={`main w-full bg-inherit large:mr-[400px]`}>
             <div className='fixed top-0 left-0 z-[980] w-full px-8 bg-inherit lg:hidden'>
                 <DashboardHeader />
             </div> 
@@ -45,7 +41,6 @@ export default function DashboardLayout() {
         </div>
 
         {/* Right Aisde */}
-        {pathname == '/' &&
         <>
             <div className={`px-8 py-4 hidden large:flex fixed right-5 top-0 bottom-0 sm:w-[400px] bg-[#192440] dark:bg-[#1E1E2D] text-white-body`}>
                 <RightAsideBar />
@@ -57,7 +52,6 @@ export default function DashboardLayout() {
                 </div>
             </div>
         </>
-        }
     </div>
   )
 }

src/components/layouts/aside/DashboardAside.jsx

@@ -138,13 +138,10 @@ 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: 'Request', status:1, icon: 'dot', to: RouteLinks.requestPage},
+        {name: 'Transactions', status:1, icon: 'dot', to: RouteLinks.transactionsPage},
         {name: 'Loans', status:1, icon: 'dot', to: RouteLinks.loansPage},
-        {name: 'Selected Loans', status:1, icon: 'dot', to: RouteLinks.selectedLoanPage},
-        {name: 'Applications', status:1, icon: 'dot', to: RouteLinks.applicationsLoanPage},
-        {name: 'Approved Loans', status:1, icon: 'dot', to: RouteLinks.approvedLoansPage},
-        {name: 'Disbursements', status:1, icon: 'dot', to: RouteLinks.disbursementsLoanPage},
-        {name: 'Payments', status:1, icon: 'dot', to: ''},
+        {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: 'Loan Offers', status:1, icon: 'dot', to: RouteLinks.loanOffersPage },
             ]

src/components/loan_charges/LoanChargesCom.jsx

@@ -1,29 +1,32 @@
-import React from 'react'
+import React, { useState } from 'react'
 import { useQuery } from "@tanstack/react-query";
-import {Link} from 'react-router-dom'
 
 import BreadcrumbCom from '../breadcrumb/BreadcrumbCom'
-import TableWrapper from '../tableWrapper/TableWrapper'
+import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper'
 import Icons from '../Icons'
 
 import Avatar from '../../assets/user_avatar.jpg'
 import queryKeys from '../../services/queryKeys'
-import { selectLoan } from '../../services/siteServices'
+import { getLoanCharges } from '../../services/siteServices'
 import getDateFromDateString from '../../helpers/GetDateFromDateString';
-import getTimeFromDateString from '../../helpers/GetTimeFromDateString';
 
-export default function RequestCom() {
+export default function LoanChargesCom() {
+
+    const [page, setPage] = useState(1)
 
     const {data, isFetching, isError, error} = useQuery({
-        queryKey: queryKeys.select_loan,
-        queryFn: () => selectLoan()
+        queryKey: [...queryKeys.transactions, page],
+        queryFn: () => getLoanCharges({page}),
+        staleTime: 0,
+        // placeholderData: keepPreviousData,
     })
 
-    const selectUsers = data?.data?.result_data?.data // APPLY LOAN LIST
+    const loanCharges = data?.data?.transactions // LOAN CHARGES LIST
+    const pagination = data?.data?.pagination
 
     return (
         <div className='w-full flex flex-col gap-8'>
-            <BreadcrumbCom title='Request' paths={['Dashboard', 'Request']} />
+            <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 ? 
@@ -33,7 +36,7 @@ export default function RequestCom() {
                 : isError ?
                     <p className='text-red-500'>{error.message}</p>
                 :
-                    <TableWrapper data={selectUsers} itemsPerPage={15}>
+                    <TablePaginatedWrapper data={loanCharges} isFetching={isFetching} setPage={setPage} itemsPerPage={pagination?.limit} pagination={pagination}>
                     {({ data }) => (
                         <>
                             <table className="py-2 w-full text-sm">
@@ -42,9 +45,9 @@ export default function RequestCom() {
                                         <th scope="col" className="px-2 py-2">
                                             Name
                                         </th>
-                                        <th scope="col" className="px-2">
+                                        {/* <th scope="col" className="px-2">
                                             Loan
-                                        </th>
+                                        </th> */}
                                         <th scope="col" className="px-2">
                                             Added
                                         </th>
@@ -55,45 +58,39 @@ export default function RequestCom() {
                                 </thead>
                                 <tbody>
                                     {(data && data.length > 0) ? data?.map((item, index) => (
-                                        <tr className="py-2 border-t border-dashed border-slate-300">
+                                        <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?.name || ''}</div>
-                                                    <div className="font-normal text-gray-500">{item?.bvn}</div>
+                                                    <div className="text-base font-semibold">{item?.account_id || ''}</div>
+                                                    <div className="font-normal text-gray-500">{item?.transaction_id}</div>
                                                 </div>  
                                                 </div>
                                             </td>
-                                            <td className="px-2">
+                                            {/* <td className="px-2">
                                                 <div className="text-left">
                                                     <div className="text-base font-semibold">{item?.loan}</div>
                                                     <div className="font-normal text-gray-500">{item?.description}</div>
                                                 </div> 
-                                            </td>
+                                            </td> */}
                                             <td className="px-2">
                                                 <div className="text-left">
-                                                    <div className="font-normal text-gray-500">{getDateFromDateString(item?.added)} {getTimeFromDateString(item?.added)}</div>
+                                                    <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='edit' />
-                                                </div>
-                                                <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 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='trash' />
-                                                </div>
+                                                    <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}>
+                                        <td className="px-3 py-2" colSpan={3}>
                                             <div className="flex justify-center items-center">
                                                 No Record Found
                                             </div>
@@ -104,7 +101,7 @@ export default function RequestCom() {
                             </table>
                         </>
                     )}
-                    </TableWrapper>
+                    </TablePaginatedWrapper>
                 }
             </div>
         </div>

src/components/loanscom/LoansCom.jsx

@@ -10,7 +10,6 @@ import queryKeys from '../../services/queryKeys'
 import { getLoans } from '../../services/siteServices'
 import getDateFromDateString from '../../helpers/GetDateFromDateString';
 import formatNumber from '../../helpers/formatNumber'
-import getTimeFromDateString from '../../helpers/GetTimeFromDateString';
 
 export default function LoansCom() {
 
@@ -47,6 +46,12 @@ export default function LoansCom() {
                                         <th scope="col" className="px-2 text-right">
                                             Loan Amount
                                         </th>
+                                        <th scope="col" className="px-2 text-right">
+                                            Repay Amount
+                                        </th>
+                                        <th scope="col" className="px-2 text-right">
+                                            Install Amount
+                                        </th>
                                         <th scope="col" className="px-2 text-right">
                                             Added
                                         </th>
@@ -73,6 +78,16 @@ export default function LoansCom() {
                                                     <div className="font-normal text-gray-500">{formatNumber(item?.initial_loan_amount)}</div>
                                                 </div> 
                                             </td>
+                                            <td className="px-2">
+                                                <div className="text-right">
+                                                    <div className="font-normal text-gray-500">{formatNumber(item?.repayment_amount)}</div>
+                                                </div> 
+                                            </td>
+                                            <td className="px-2">
+                                                <div className="text-right">
+                                                    <div className="font-normal text-gray-500">{formatNumber(item?.installment_amount)}</div>
+                                                </div> 
+                                            </td>
                                             <td className="px-2">
                                                 <div className="text-right">
                                                     <div className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)}</div>
@@ -80,15 +95,9 @@ export default function LoansCom() {
                                             </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='edit' />
-                                                </div>
-                                                <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 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='trash' />
-                                                </div>
+                                                    <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>

src/components/repayments/RepaymentsCom.jsx

@@ -0,0 +1,109 @@
+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 { getRepayments } from '../../services/siteServices'
+import getDateFromDateString from '../../helpers/GetDateFromDateString';
+
+export default function RepaymentsCom() {
+
+    const [page, setPage] = useState(1)
+
+    const {data, isFetching, isError, error} = useQuery({
+        queryKey: [...queryKeys.transactions, page],
+        queryFn: () => getRepayments({page}),
+        staleTime: 0,
+        // placeholderData: keepPreviousData,
+    })
+
+    const repayments = data?.data?.repayments // REPAYMENTS LIST
+    const pagination = data?.data?.pagination
+
+    return (
+        <div className='w-full flex flex-col gap-8'>
+            <BreadcrumbCom title='Repayments' paths={['Dashboard', 'Repayments']} />
+
+            <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={repayments} 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">
+                                            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?.customer_id || ''}</div>
+                                                    <div className="font-normal text-gray-500">{item?.transaction_id}</div>
+                                                </div>  
+                                                </div>
+                                            </td>
+                                            {/* <td className="px-2">
+                                                <div className="text-left">
+                                                    <div className="text-base font-semibold">{item?.loan}</div>
+                                                    <div className="font-normal text-gray-500">{item?.description}</div>
+                                                </div> 
+                                            </td> */}
+                                            <td className="px-2">
+                                                <div className="text-left">
+                                                    <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={3}>
+                                            <div className="flex justify-center items-center">
+                                                No Record Found
+                                            </div>
+                                        </td>
+                                    </tr>
+                                    }
+                                </tbody>
+                            </table>
+                        </>
+                    )}
+                    </TablePaginatedWrapper>
+                }
+            </div>
+        </div>
+    )
+}

src/components/tableWrapper/TablePaginatedWrapper.jsx

@@ -0,0 +1,121 @@
+import { useEffect, useState } from "react";
+import MainBtn from "../MainBtn";
+import Icons from "../Icons";
+
+
+export default function TablePaginatedWrapper({
+  data = [],
+  itemsPerPage = 5,
+  pagination,
+  setPage,
+  isFetching,
+  filterItem,
+  children,
+}) {
+  const [isLoading, setIsLoading] = useState(isFetching)
+  const [searchTerm, setSearchTerm] = useState("");
+  const [filteredData, setFilteredData] = useState(data);
+
+  const [currentPage, setCurrentPage] = useState(0);
+  const [newData, setNewData] = useState([]);
+
+  const numberOfSelection = itemsPerPage;
+
+  const handlePrev = () => {
+    setPage(prev => prev - 1)
+  };
+  const handleNext = () => {
+    setPage(prev => prev + 1)
+  };
+
+  const handleSearch = ({ target: { value } }, name) => {
+    setSearchTerm(value);
+    let newFilteredData = data.filter((item) =>
+      item[name].toLowerCase().startsWith(value.toLowerCase())
+    );
+    setFilteredData(newFilteredData);
+    setCurrentPage(0);
+  };
+
+  useEffect(() => {
+    setIsLoading(true)
+    setTimeout(()=>{
+      setNewData(
+        filteredData?.slice(currentPage, numberOfSelection + currentPage)
+      );
+      setIsLoading(false)
+    },1000)
+  }, [currentPage, filteredData, numberOfSelection]);
+
+  useEffect(()=>{
+    setCurrentPage(0)
+  },[itemsPerPage])
+
+  return (
+    <div className="relative w-full">
+      {data.length > 0 && filterItem && (
+        <div className="mb-10 flex justify-end items-center gap-2">
+          {filterItem.map((item, index) => (
+            <label
+              key={index}
+              className="flex flex-col sm:flex-row items-center gap-2 text-slate-600 dark:text-slate-100 transition-all duration-500"
+            >
+              Search by {item[0].toUpperCase() + item.slice(1)}
+              <input
+                name={item}
+                type="text"
+                className="py-1 px-2 text-sm min-w-[100px] text-black dark:text-white bg-white dark:bg-slate-800 rounded-full border-0 outline-none ring-1 ring-slate-300 dark:ring-white transition-all duration-500"
+                value={searchTerm}
+                onChange={(e) => {
+                  handleSearch(e, item);
+                }}
+              />
+            </label>
+          ))}
+        </div>
+      )}
+    
+      <div className="flex flex-col">
+        <div className="w-full overflow-x-auto">
+          {children({ data: newData })}
+        </div>
+
+        <div className='w-full flex flex-col lg:flex-row justify-center items-center gap-3 md:gap-6'>
+            <div className="text-sm text-center lg:text-left font-normal text-gray-500 dark:text-gray-400 block w-full">Showing <span className="font-semibold text-gray-900 dark:text-white">
+              {isLoading ? '----' : `page ${pagination?.current_page}`}</span> of <span className="font-semibold text-gray-900 dark:text-white">{pagination?.total_pages}</span>
+            </div>
+            {(newData.length >= 0) &&
+              <div className='flex items-center gap-3 md:gap-6'>
+                  <MainBtn 
+                      onClick={handlePrev}
+                      // text='Prev' 
+                      className={`${!pagination?.has_prev ? 'bg-primary/50 pointer-events-none' : 'bg-primary'} text-white-light text-center flex justify-center gap-2 items-center`} 
+                      disabled={isLoading || !pagination?.has_prev}
+                  >
+                  <Icons name='prev' />
+                  </MainBtn>
+                  <MainBtn 
+                      onClick={handleNext}
+                      // text='Next' 
+                      className={`${!pagination?.has_next ? 'bg-primary/50 pointer-events-none' : 'bg-primary'} text-white-light text-center flex justify-center gap-2 items-center`} 
+                      disabled={isLoading || !pagination?.has_next}
+                  > 
+                  <Icons name='next' />
+                  </MainBtn>
+              </div>
+            }
+          </div>
+      </div>
+      
+    {isLoading && <TableIsLoading />}
+    </div>
+  );
+}
+
+const TableIsLoading = () => {
+  return (
+    <div className="w-full absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-[991] inset-0 flex justify-center items-center">
+      <p className="rounded-md shadow-md p-4 bg-white/90 dark:bg-gray-900 text-brown dark:text-white">Loading...</p>
+    </div>
+  )
+}

src/components/transactions/TransactionsCom.jsx

@@ -0,0 +1,113 @@
+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 { getTransactions } from '../../services/siteServices'
+import getDateFromDateString from '../../helpers/GetDateFromDateString';
+import localImgLoader from '../../helpers/localImageLoader';
+
+export default function TransactionsCom() {
+
+    const [page, setPage] = useState(1)
+
+    const {data, isFetching, isError, error, isPlaceholderData, isPending} = useQuery({
+        queryKey: [...queryKeys.transactions, page],
+        queryFn: () => getTransactions({page}),
+        staleTime: 0,
+        // placeholderData: keepPreviousData,
+    })
+
+    const transactions = data?.data?.transactions // TRANSACTIONS LIST
+    const pagination = data?.data?.pagination
+
+    return (
+        <div className='w-full flex flex-col gap-8'>
+            <BreadcrumbCom title='Transactions' paths={['Dashboard', 'Transactions']} />
+
+            <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={transactions} 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">
+                                            Request
+                                        </th>
+                                        <th scope="col" className="px-2">
+                                            Account
+                                        </th>
+                                        <th scope="col" className="px-2">
+                                            Activity
+                                        </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={localImgLoader(`loan_icons/${item?.type}.png`)} alt="Icon" />
+                                                <div className="text-left">
+                                                    <div className="text-base font-semibold">{item?.transaction_id}</div>
+                                                    <div className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)}</div>
+                                                </div>  
+                                                </div>
+                                            </td>
+                                            <td className="px-2">
+                                                <div className="text-left">
+                                                    <div className="text-base font-semibold">{item?.account_id}</div>
+                                                    <div className="font-normal text-gray-500">{item?.type}</div>
+                                                </div> 
+                                            </td>
+                                            <td className="px-2">
+                                                <div className="text-left">
+                                                    <div className="font-normal text-gray-500">50%</div>
+                                                    <div className="relative h-[6px] w-full bg-white-body dark:bg-black-body rounded-full overflow-hidden">
+                                                    <div className={`absolute left-0 h-full w-1/2 bg-emerald-600`}></div>
+                                                    </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/helpers/localImageLoader.js

@@ -0,0 +1,2 @@
+const localImgLoader = (location) => require(`../assets/${location}`);
+export default localImgLoader

src/pages/ApplicationsLoanPage.jsx

@@ -1,8 +0,0 @@
-import React from 'react'
-import ApplicationsLoanCom from '../components/applicationsloancom/ApplicationsLoanCom'
-
-export default function ApplicationsLoanPage() {
-  return (
-    <ApplicationsLoanCom />
-  )
-}

src/pages/ApprovedLoansPage.jsx

@@ -1,8 +0,0 @@
-import React from 'react'
-import ApprovedLoanCom from '../components/approvedloancom/ApprovedLoanCom'
-
-export default function ApprovedLoansPage() {
-  return (
-    <ApprovedLoanCom />
-  )
-}

src/pages/DisbursementsLoanPage.jsx

@@ -1,8 +0,0 @@
-import React from 'react'
-import DisbursementsLoanCom from '../components/disbursementsloancom/DisbursementsLoanCom'
-
-export default function DisbursementsLoanPage() {
-    return (
-      <DisbursementsLoanCom />
-    )
-}

src/pages/ErrorPage.jsx

@@ -0,0 +1,8 @@
+import React from 'react'
+import ErrorCom from '../components/error/ErrorCom'
+
+export default function ErrorPage() {
+  return (
+    <ErrorCom />
+  )
+}

src/pages/LoanChargesPage.jsx

@@ -0,0 +1,8 @@
+import React from 'react'
+import LoanChargesCom from '../components/loan_charges/LoanChargesCom'
+
+export default function LoanChargesPage() {
+  return (
+    <LoanChargesCom />
+  )
+}

src/pages/LoanOffersPage.jsx

@@ -1,8 +0,0 @@
-import React from 'react'
-import LoanOffersCom from '../components/loanofferscom/LoanOffersCom'
-
-export default function LoanOffersPage() {
-  return (
-    <LoanOffersCom />
-  )
-}

src/pages/RepaymentsPage.jsx

@@ -0,0 +1,8 @@
+import React from 'react'
+import RepaymentsCom from '../components/repayments/RepaymentsCom'
+
+export default function RepaymentsPage() {
+  return (
+    <RepaymentsCom />
+  )
+}

src/pages/RequestPage.jsx

@@ -1,8 +0,0 @@
-import React from 'react'
-import RequestCom from '../components/request/RequestCom'
-
-export default function RequestPage() {
-  return (
-    <RequestCom/>
-  )
-}

src/pages/SelectedLoanPage.jsx

@@ -1,8 +0,0 @@
-import React from 'react'
-import SelectedLoanCom from '../components/selectedloancom/SelectedLoanCom'
-
-export default function SelectedLoanPage() {
-  return (
-    <SelectedLoanCom />
-  )
-}

src/pages/TransactionsPage.jsx

@@ -0,0 +1,8 @@
+import React from 'react'
+import TransactionsCom from '../components/transactions/TransactionsCom'
+
+export default function TransactionsPage() {
+  return (
+    <TransactionsCom />
+  )
+}

src/pages/UsersPage.jsx

@@ -1,13 +0,0 @@
-import React from 'react'
-import BreadcrumbCom from '../components/breadcrumb/BreadcrumbCom'
-
-export default function UsersPage() {
-  return (
-    <div className='w-full'>
-      <BreadcrumbCom title='Users' paths={['Dashboard', 'Users']} />
-      <p className=''>
-        coming soon ...
-      </p>
-    </div>
-  )
-}

src/services/queryKeys.js

@@ -1,6 +1,7 @@
 const queryKeys = {
     dashboard: ['dashboard'],
     loans: ['loans'],
+    transactions: ['transactions'],
     apply_loan: ['apply'],
     select_loan: ['select-loan'],
     approved_loan: ['approved-loan'],

src/services/siteServices.js

@@ -56,35 +56,26 @@ export const getDashData = (reqData) => {
     return getAuxEnd(`/dashboard`, postData)
 }
 
-// FUNCTION TO GET APPLIED LOANS TABLE
+// FUNCTION TO GET LOANS TABLE
 export const getLoans = (reqData) => {
     const postData = { ...reqData }
     return getAuxEnd(`/loans`, postData)
 }
 
-
-
-
-// FUNCTION TO GET APPLIED LOANS TABLE
-export const applyLoan = (reqData) => {
+// FUNCTION TO GET TRANSACTIONS TABLE
+export const getTransactions = (reqData) => {
     const postData = { ...reqData }
-    return getAuxEnd(`/office/loan/apply`, postData)
+    return getAuxEnd(`/transactions`, postData)
 }
 
-// FUNCTION TO GET APPLIED LOANS TABLE
-export const loanOffers = (reqData) => {
+// FUNCTION TO GET REPAYMENTS TABLE
+export const getRepayments = (reqData) => {
     const postData = { ...reqData }
-    return getAuxEnd(`/office/offers`, postData)
+    return getAuxEnd(`/repayments`, postData)
 }
 
-// FUNCTION TO GET APPLIED LOANS TABLE
-export const selectLoan = (reqData) => {
+// FUNCTION TO GET LOAN CHARGES TABLE
+export const getLoanCharges = (reqData) => {
     const postData = { ...reqData }
-    return getAuxEnd(`/office/loan/select`, postData)
-}
-
-// FUNCTION TO GET APPLIED LOANS TABLE
-export const approvedLoan = (reqData) => {
-    const postData = { ...reqData }
-    return getAuxEnd(`/office/loan/approved`, postData)
+    return getAuxEnd(`/transactions`, postData)
 }