added table filter

src/components/Icons.jsx

@@ -11,7 +11,7 @@ import { LuPanelRight } from "react-icons/lu";
 import { FcGoogle } from "react-icons/fc";
 import { IoLogoApple } from "react-icons/io5";
 import { FcSalesPerformance } from "react-icons/fc";
-import { FaLongArrowAltRight } from "react-icons/fa";
+import { FaLongArrowAltRight, FaFilter } from "react-icons/fa";
 
 export default function Icons({name, className}) {
   return (
@@ -50,6 +50,8 @@ export default function Icons({name, className}) {
     <FcSalesPerformance className={`text-base ${className}`} />
     :name.toLowerCase() == 'arrow-right' ?
     <FaLongArrowAltRight className={`text-base ${className}`} />
+    :name.toLowerCase() == 'filter' ?
+    <FaFilter className={`text-base ${className}`} />
     :
     null
     }

src/components/breadcrumb/BreadcrumbCom.jsx

@@ -8,8 +8,6 @@ export default function BreadcrumbCom({title, span, paths}) {
   const [stickNav, setStickNav] = useState(false)
 
   useEffect(()=>{
-    console.log('tru')
-
       // var rect = navRef?.current?.getBoundingClientRect()?.bottom;
       var rect = 10;
       window.addEventListener('scroll', ()=>{

src/components/home/HomeCom.jsx

@@ -9,6 +9,7 @@ import formatNumber from '../../helpers/formatNumber'
 import queryKeys from '../../services/queryKeys'
 import { getDashData } from '../../services/siteServices'
 import getDateFromDateString from '../../helpers/GetDateFromDateString';
+import getTimeFromDateString from '../../helpers/GetTimeFromDateString';
 import localImgLoader from '../../helpers/localImageLoader';
 import RouteLinks from '../../RouteLinks';
 
@@ -111,7 +112,7 @@ export default function HomeCom() {
                                   <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 className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)} {getTimeFromDateString(item?.created_at)}</div>
                                   </div>  
                                 </div>
                               </td>

src/components/layouts/rightaside/Orders.jsx

@@ -6,7 +6,7 @@ export default function Orders() {
     return (
         <div className='h-full p-2 sm:p-4 large:p-8 flex flex-col gap-16 overflow-y-auto aside-scroll-design'>
             <div className='flex flex-col gap-4'>
-                <p className='text-base text-white-body font-bold'>Support Ticket</p>
+                <p className='text-base text-white-body font-bold'>Recent Eligibility</p>
                 <div className='grid grid-cols-2 gap-4 sm:gap-6 large:gap-8'>
                     <div className='p-2 sm:p-3 large:p-4 flex flex-col border border-slate-500 border-dashed'>
                         <p className='text-base font-bold text-white-body'>
@@ -35,7 +35,7 @@ export default function Orders() {
                 </div>
             </div>
             <div className='flex flex-col gap-4'>
-                <p className='text-base text-white-body font-bold'>Best Ticket</p>
+                <p className='text-base text-white-body font-bold'>Recent Loans</p>
                 <div className='flex flex-col gap-4'>
                     <div className='flex gap-3 items-center'>
                         <div className='px-4 py-2 bg-[#0E172E] rounded-md'>

src/components/layouts/rightaside/Tickets.jsx

@@ -6,7 +6,7 @@ export default function Tickets() {
   return (
     <div className='h-full p-2 sm:p-4 large:p-8 flex flex-col gap-16 overflow-y-auto aside-scroll-design'>
         <div className='flex flex-col gap-4'>
-            <p className='text-base text-white-body font-bold'>Support Ticket</p>
+            <p className='text-base text-white-body font-bold'>Recent Repayment</p>
             <div className='grid grid-cols-2 gap-4 sm:gap-6 large:gap-8'>
                 <div className='p-2 sm:p-3 large:p-4 flex flex-col border border-slate-500 border-dashed'>
                     <p className='text-base font-bold text-white-body'>
@@ -35,7 +35,7 @@ export default function Tickets() {
             </div>
         </div>
         <div className='flex flex-col gap-4'>
-            <p className='text-base text-white-body font-bold'>Best Ticket</p>
+            <p className='text-base text-white-body font-bold'>Tracked Errors</p>
             <div className='flex flex-col gap-4'>
                 <div className='flex gap-3 items-center'>
                     <div className='px-4 py-2 bg-[#0E172E] rounded-md'>

src/components/loan_charges/LoanChargesCom.jsx

@@ -68,7 +68,7 @@ export default function LoanChargesCom() {
                                                 <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?.description}</div>
+                                                    <div className="font-normal text-gray-500 line-clamp-1">{item?.code}</div>
                                                 </div>  
                                                 </div>
                                             </td>

src/components/loanscom/LoansCom.jsx

@@ -1,9 +1,10 @@
-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 TableWrapper from '../tableWrapper/TableWrapper'
+import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper';
 import Icons from '../Icons'
 
 import Avatar from '../../assets/user_avatar.jpg'
@@ -15,14 +16,16 @@ import RouteLinks from '../../RouteLinks';
 
 export default function LoansCom() {
 
+    const [page, setPage] = useState(1)
+
     const {data:allLoans, isFetching, isError, error} = useQuery({
-        queryKey: queryKeys.loans,
-        queryFn: () => getLoans()
+        queryKey: [...queryKeys.loans, page],
+        queryFn: () => getLoans({page}),
+        staleTime: 0,
     })
 
     const loans = allLoans?.data?.loans // LOANS LIST
-    const loansCount = allLoans?.data?.count // LOANS LIST COUNT
-    // console.log('LOANS', loans)
+    const pagination = allLoans?.data?.pagination
 
     return (
         <div className='w-full flex flex-col gap-8'>
@@ -36,7 +39,7 @@ export default function LoansCom() {
                 : isError ?
                     <p className='text-red-500'>{error.message}</p>
                 :
-                    <TableWrapper data={loans} itemsPerPage={15}>
+                    <TablePaginatedWrapper data={loans} isFetching={isFetching} setPage={setPage} itemsPerPage={pagination?.limit} pagination={pagination}>
                     {({ data }) => (
                         <>
                             <table className="table-auto py-2 w-full text-sm">
@@ -83,7 +86,7 @@ export default function LoansCom() {
                                             <td className="px-2">
                                                 <div className="text-right">
                                                     <div className="font-normal text-gray-500">{formatNumber(item?.product_id)}</div>
-                                                    <div className="font-normal text-gray-500">{formatNumber(0)}</div>
+                                                    <div className="font-normal text-gray-500">{item?.tenor} days</div>
                                                 </div> 
                                             </td>
                                             <td className="px-2">
@@ -121,7 +124,7 @@ export default function LoansCom() {
                             </table>
                         </>
                     )}
-                    </TableWrapper>
+                    </TablePaginatedWrapper>
                 }
             </div>
         </div>

src/components/offers/OffersCom.jsx

@@ -102,7 +102,7 @@ export default function OffersCom() {
                                             </td>
                                             <td className="px-2">
                                                 <div className="text-right">
-                                                    <div className="font-normal text-gray-500">{getDateFromDateString(item?.tenor)}</div>
+                                                    <div className="font-normal text-gray-500">{item?.tenor}</div>
                                                 </div> 
                                             </td>
                                             <td className="px-2 text-right">

src/components/repayments/RepaymentsCom.jsx

@@ -64,7 +64,7 @@ export default function RepaymentsCom() {
                                                 <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 className="font-normal text-gray-500">{item?.loan_id} : {item?.transaction_id}</div>
                                                 </div>  
                                                 </div>
                                             </td>

src/components/tableWrapper/TablePaginatedWrapper.jsx

@@ -1,25 +1,15 @@
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import MainBtn from "../MainBtn";
 import Icons from "../Icons";
 
 
 export default function TablePaginatedWrapper({
   data = [],
-  itemsPerPage = 5,
+  isFetching,
   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)
@@ -27,70 +17,24 @@ export default function TablePaginatedWrapper({
   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])
-
+console.log('isFetching', isFetching)
   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 })}
+          {children({ data })}
         </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>
+              {isFetching ? '----' : `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}
+                      disabled={isFetching || !pagination?.has_prev}
                   >
                   <Icons name='prev' />
                   </MainBtn>
@@ -98,23 +42,22 @@ export default function TablePaginatedWrapper({
                       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}
+                      disabled={isFetching || !pagination?.has_next}
                   > 
                   <Icons name='next' />
                   </MainBtn>
               </div>
-            }
           </div>
       </div>
       
-    {isLoading && <TableIsLoading />}
+    {isFetching && <TableIsLoading />}
     </div>
   );
 }
 
-const TableIsLoading = () => {
+export 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">
+    <div className="w-full fixed z-[991] inset-0 flex justify-center items-center bg-black/10">
       <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/transactionDetails/LoanChargeDetails.jsx

@@ -48,9 +48,9 @@ export default function LoanChargeDetails({transactionID}) {
                             <th scope="col" className="px-2 text-right">
                                 Added
                             </th>
-                            <th scope="col" className="px-2 text-right">
+                            {/* <th scope="col" className="px-2 text-right">
                                 Action
-                            </th>
+                            </th> */}
                         </tr>
                     </thead>
                     <tbody>
@@ -74,21 +74,21 @@ export default function LoanChargeDetails({transactionID}) {
                                 </td>
                                 <td className="px-2">
                                     <div className="text-right">
-                                        <div className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)}</div>
+                                        <div className="font-normal text-gray-500">{item?.created_at ? getDateFromDateString(item?.created_at) : 'Not available'}</div>
                                     </div> 
                                 </td>
-                                <td className="px-2 text-right">
+                                {/* <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>
+                                </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>

src/components/transactionDetails/LoanDetails.jsx

@@ -41,16 +41,16 @@ export default function LoanDetails({transactionID}) {
                                 Name
                             </th>
                             <th scope="col" className="px-2 text-right">
-                                Loan Amount
+                                Loan/Eligible Amount
                             </th>
                             <th scope="col" className="px-2 text-right">
                                 Product/Tenor
                             </th>
                             <th scope="col" className="px-2 text-right">
-                                Repay/Install Amount
+                                Repay/Install Amount.
                             </th>
                             <th scope="col" className="px-2 text-right">
-                                Added
+                                Added/Due
                             </th>
                             <th scope="col" className="px-2 text-right">
                                 Action
@@ -66,6 +66,8 @@ export default function LoanDetails({transactionID}) {
                                     <div className="text-left">
                                         <div className="text-base font-semibold">{item?.account_id || ''}</div>
                                         <div className="font-normal text-gray-500">{item?.id} : {item?.transaction_id}</div>
+                                        <div className="font-semibold text-red-500">ORIGIN : {item?.original_transaction}</div>
+                                        <div className="font-bold text-blue-500">OFFER : {item?.offer_id}</div>
                                     </div>  
                                     </div>
                                 </td>
@@ -73,12 +75,14 @@ export default function LoanDetails({transactionID}) {
                                     <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?.initial_loan_amount)}</div>
+                                        <div className="font-semibold text-red-500">{formatNumber(item?.eligible_amount)}</div>
+
                                     </div> 
                                 </td>
                                 <td className="px-2">
                                     <div className="text-right">
                                         <div className="font-normal text-gray-500">{formatNumber(item?.product_id)}</div>
-                                        <div className="font-normal text-gray-500">{formatNumber(0)}</div>
+                                        <div className="font-normal text-gray-500">{item?.tenor} days</div>
                                     </div> 
                                 </td>
                                 <td className="px-2">
@@ -90,6 +94,7 @@ export default function LoanDetails({transactionID}) {
                                 <td className="px-2">
                                     <div className="text-right">
                                         <div className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)}</div>
+                                        <div className="font-semibold text-red-500">{getDateFromDateString(item?.due_date)}</div>
                                     </div> 
                                 </td>
                                 <td className="px-2 text-right">

src/components/transactionDetails/RepaymentScheduleDetails.jsx

@@ -55,6 +55,9 @@ export default function RepaymentScheduleDetails({transactionID}) {
                             <th scope="col" className="px-2 text-right">
                                 Due Date
                             </th>
+                            <th scope="col" className="px-2 text-right">
+                                Paid Date
+                            </th>
                             <th scope="col" className="px-2 text-right">
                                 Action
                             </th>
@@ -87,6 +90,11 @@ export default function RepaymentScheduleDetails({transactionID}) {
                                         <div className="font-normal text-gray-500">{getDateFromDateString(item?.due_date)}</div>
                                     </div> 
                                 </td>
+                                <td className="px-2">
+                                    <div className="text-right">
+                                        <div className="font-normal text-gray-500">{item?.paid_at ? getDateFromDateString(item?.paid_at) : 'Not available'}</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'>
@@ -98,7 +106,7 @@ export default function RepaymentScheduleDetails({transactionID}) {
                         ))
                         :
                         <tr className="py-2 border-t border-dashed border-slate-300">
-                            <td className="px-3 py-2" colSpan={5}>
+                            <td className="px-3 py-2" colSpan={6}>
                                 <div className="flex justify-center items-center">
                                     No Record Found
                                 </div>

src/components/transactionDetails/TransactionDetails.jsx

@@ -6,6 +6,7 @@ import Icons from '../Icons'
 import queryKeys from '../../services/queryKeys'
 import { getTransactions } from '../../services/siteServices'
 import getDateFromDateString from '../../helpers/GetDateFromDateString';
+import getTimeFromDateString from '../../helpers/GetTimeFromDateString';
 import localImgLoader from '../../helpers/localImageLoader';
 
 export default function TransactionDetails({transactionID}) {
@@ -57,7 +58,7 @@ export default function TransactionDetails({transactionID}) {
                                     <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 className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)} {getTimeFromDateString(item?.created_at)}</div>
                                     </div>  
                                     </div>
                                 </td>

src/components/transactions/TransactionsCom.jsx

@@ -1,44 +1,88 @@
-import React, { useState } from 'react'
-import { useQuery } from "@tanstack/react-query";
+import { useEffect, useState } from 'react'
 import {Link} from 'react-router-dom'
 
 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 getTimeFromDateString from '../../helpers/GetTimeFromDateString';
 import localImgLoader from '../../helpers/localImageLoader';
 import RouteLinks from '../../RouteLinks';
 
 export default function TransactionsCom() {
 
     const [page, setPage] = useState(1)
+    const [allTransactions, setAllTransaction] = useState({loading:true, error:'', data:{}})
 
-    const {data, isFetching, isError, error, isPlaceholderData, isPending} = useQuery({
-        queryKey: [...queryKeys.transactions, page],
-        queryFn: () => getTransactions({page}),
-        staleTime: 0,
-        // placeholderData: keepPreviousData,
-    })
+    const [willFilter, setWillFilter] = useState(false)
+    const [filter, setFilter] = useState({transaction_id: '', account_id: ''})
+    const handleFilter = ({target:{name, value}}) => {
+        setFilter(prev => ({...prev, [name]:value}))
+    }
 
-    const transactions = data?.data?.transactions // TRANSACTIONS LIST
-    const pagination = data?.data?.pagination
+    const handleFilterByParams = () => {
+        setPage(1)
+        setWillFilter(prev => !prev)
+    }
+
+    const transactions = allTransactions?.data?.transactions // TRANSACTIONS LIST
+    const pagination = allTransactions?.data?.pagination
+    const isFetching = allTransactions?.loading
+    const isError = allTransactions?.error
+
+    useEffect(()=>{
+        setAllTransaction(prev => ({...prev, loading:true}))
+        getTransactions({...filter, page}).then(res => {
+            if(res?.status != 200){
+                setAllTransaction(prev => ({...prev, loading:false}))
+                return
+            }
+            setAllTransaction({loading:false, error:'', data:res?.data})
+        }).catch(err => {
+            setAllTransaction({loading:false, error:'error occurred', data:{}})
+            console.log('ERR', err)
+        })
+    },[page, willFilter])
 
     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>
+                { isError ?
+                    <p className='text-red-500'>{allTransactions?.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'>
+                            <p>Transaction ID</p>
+                            <select name='transaction_id' value={filter?.transaction_id} className='h-10 w-full p-2 rounded-md' onChange={handleFilter}>
+                                <option value=''>All</option>
+                                <>
+                                {transactions?.map((item, index) => (
+                                    <option key={index} value={item?.transaction_id}>{item?.transaction_id}</option>
+                                ))}
+                                </>
+                            </select>
+                        </div>
+                        <div className='w-full sm:max-w-48'>
+                            <p>Account ID</p>
+                            <select name='account_id' value={filter?.account_id} className='h-10 w-full p-2 rounded-md' onChange={handleFilter}>
+                                <option value=''>All</option>
+                                <>
+                                {transactions?.map((item, index) => (
+                                    <option key={index} value={item?.account_id}>{item?.account_id}</option>
+                                ))}
+                                </>
+                            </select>
+                        </div>
+                        <button onClick={handleFilterByParams} className={`h-10 bg-primary px-2 py-1 rounded-md text-white font-medium sm:self-end`}>Submit</button>
+                    </div>
+                     {/* end of filter section */}
+
                     <TablePaginatedWrapper data={transactions} isFetching={isFetching} setPage={setPage} itemsPerPage={pagination?.limit} pagination={pagination}>
                     {({ data }) => (
                         <>
@@ -67,7 +111,7 @@ export default function TransactionsCom() {
                                                 <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 className="font-normal text-gray-500">{getDateFromDateString(item?.created_at)} {getTimeFromDateString(item?.created_at)}</div>
                                                 </div>  
                                                 </div>
                                             </td>
@@ -110,6 +154,7 @@ export default function TransactionsCom() {
                         </>
                     )}
                     </TablePaginatedWrapper>
+                </>
                 }
             </div>
         </div>

src/components/transactions/_TransactionsCom.jsx

@@ -0,0 +1,163 @@
+import React, { useState } from 'react'
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import {Link} from 'react-router-dom'
+
+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 getTimeFromDateString from '../../helpers/GetTimeFromDateString';
+import localImgLoader from '../../helpers/localImageLoader';
+import RouteLinks from '../../RouteLinks';
+
+export default function TransactionsCom() {
+
+    const queryClient = useQueryClient()
+
+    const [page, setPage] = useState(1)
+
+    const [filter, setFilter] = useState({transaction_id: '', account_id: ''})
+    const handleFilter = ({target:{name, value}}) => {
+        setFilter(prev => ({...prev, [name]:value}))
+    }
+
+    const handleFilterByParams = () => {
+        // setPage(1)
+        queryClient.invalidateQueries({ queryKey: [...queryKeys.transactions] })
+    }
+
+    const {data, isFetching, isError, error, isPlaceholderData, isPending} = useQuery({
+        queryKey: [...queryKeys.transactions, page],
+        queryFn: () => getTransactions({...filter, 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>
+                :
+                <>
+                    {/* filter section */}
+                    <div className='px-2 py-2 mb-4 flex items-end gap-2'>
+                        <Icons name='filter' className='text-3xl' />
+                        <div className='flex gap-4 items-center'>
+                            <div className=''>
+                                <p>Transaction ID</p>
+                                <select name='transaction_id' value={filter?.transaction_id} className='p-2' onChange={handleFilter}>
+                                    <option value=''>select</option>
+                                    <>
+                                    {transactions.map((item, index) => (
+                                        <option key={index} value={item?.transaction_id}>{item?.transaction_id}</option>
+                                    ))}
+                                    </>
+                                </select>
+                            </div>
+                            <div className=''>
+                                <p>Account ID</p>
+                                <select name='account_id' value={filter?.account_id} className='p-2' onChange={handleFilter}>
+                                    <option value=''>select</option>
+                                    <>
+                                    {transactions.map((item, index) => (
+                                        <option key={index} value={item?.account_id}>{item?.account_id}</option>
+                                    ))}
+                                    </>
+                                </select>
+                            </div>
+                        </div>
+                        <button onClick={handleFilterByParams} className={`bg-primary px-2 py-1 rounded-md text-white font-medium`}>Submit</button>
+                    </div>
+                     {/* end of filter section */}
+
+                    <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)} {getTimeFromDateString(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'>
+                                                        <Link to={RouteLinks.transaction_details_page} state={{transactionID: item?.transaction_id}}>
+                                                            <Icons name='eye' />
+                                                        </Link>
+                                                    </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/index.css

@@ -29,7 +29,7 @@ code {
     @apply [&::-webkit-scrollbar]:w-2 [&::-webkit-scrollbar-track]:bg-gray-100 [&::-webkit-scrollbar-thumb]:bg-gray-300 dark:[&::-webkit-scrollbar-track]:bg-neutral-700 dark:[&::-webkit-scrollbar-thumb]:bg-neutral-500 [&::-webkit-scrollbar-track]:rounded-full [&::-webkit-scrollbar-thumb]:rounded-full
   }
   .box {
-    @apply flex flex-col w-full p-8 cursor-pointer rounded-lg h-full border-[1px] border-[#F1F1F4] dark:border-[#1E2027] shadow-[0px_3px_4px_0px_rgba(0,_0,_0,_0.03)]
+    @apply flex flex-col w-full p-8 rounded-lg h-full border-[1px] border-[#F1F1F4] dark:border-[#1E2027] shadow-[0px_3px_4px_0px_rgba(0,_0,_0,_0.03)]
   }
 }