pagination display re-aligned

src/Routers.jsx

@@ -33,6 +33,7 @@ import ReferralPage from "./views/ReferralPage";
 import VerifyLinkPages from "./views/VerifyLinkPages";
 import MyActiveJobsPage from "./views/MyActiveJobsPage";
 import FamilyAccPage from "./views/FamilyAccPage";
+import StartJob from "./components/MyJobs/StartJob";
 
 export default function Routers() {
   return (
@@ -77,6 +78,7 @@ export default function Routers() {
           <Route exact path="/myjobs" element={<MyJobsPage />} />
           <Route exact path="/my-active-jobs"  element={<MyActiveJobsPage />} />
           <Route exact path="/acc-family"  element={<FamilyAccPage />} />
+          <Route exact path="/start-job"  element={<StartJob />} />
           <Route
             exact
             path="/my-collection/collection-item"

src/components/AuthPages/SignUp/index.jsx

@@ -277,24 +277,30 @@ export default function SignUp() {
             </div>
             <div className="flex-1 flex justify-center items-center p-10">
               <div className="flex items-center">
-                <Link
-                  to="#"
+                <a
+                  href="https://www.wrenchboard.com/about-us"
                   className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
+                  target="_blank"
+                  rel="noreferrer"
                 >
                   About
-                </Link>
-                <Link
-                  to="#"
+                </a>
+                <a
+                  href="https://www.wrenchboard.com/service"
                   className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
+                  target="_blank"
+                  rel="noreferrer"
                 >
                   Services
-                </Link>
-                <Link
-                  to="#"
+                </a>
+                <a
+                  href="https://www.wrenchboard.com/contact"
                   className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
+                  target="_blank"
+                  rel="noreferrer"
                 >
                   Contact Us
-                </Link>
+                </a>
               </div>
             </div>
             <div className="flex-1 flex justify-center items-center p-10">

src/components/History/HistoryTable.jsx

@@ -25,7 +25,7 @@ export default function HistoryTable({ className }) {
 
   return (
     <div
-      className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow min-h-[520px] ${
+      className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow ${
         className || ""
       }`}
     >
@@ -43,7 +43,7 @@ export default function HistoryTable({ className }) {
         />
       </div>
       {data.length &&
-      <div className="relative w-full overflow-x-auto sm:rounded-lg">
+      <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
         <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
           <tbody>
             <tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">

src/components/History/index.jsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, {useState, useEffect} from "react";
 import HistoryAnalyticsCard from "../Cards/HistoryAnalyticsCard";
 import SellHistoryMarketVisitorAnalytic from "../Home/SellHistoryMarketVisitorAnalytic";
 import Layout from "../Partials/Layout";
@@ -6,7 +6,59 @@ import HistoryTable from "./HistoryTable";
 import MarketHistorySection from "./MarketHistorySection";
 import TopHxBox from "./TopHxBox";
 
+import usersService from "../../services/UsersService";
+import PurchasesTable from "../MyWallet/WalletComponent/PurchasesTable";
+import RecentActivityTable from "../MyWallet/WalletComponent/RecentActivityTable";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+
 export default function History() {
+
+  const apiCall = new usersService()
+
+    let [paymentHistory, setPaymentHistory] = useState({ // FOR PAYMENT HISTORY
+        loading: true,
+        data: [],
+        error: false
+    })
+
+    let [purchaseHistory, setPurchaseHistory] = useState({ // FOR PURCHASE HISTORY
+        loading: true,
+        data: [],
+        error: false
+    })
+
+    //FUNCTION TO GET PAYMENT HISTORY
+    const getPaymentHistory = ()=>{
+      apiCall.getPaymentHx().then((res)=>{
+          if(res.data.internal_return < 0){ // success but no data
+              setPaymentHistory(prev => ({...prev, loading: false}))
+              return
+          }
+          setPaymentHistory(prev => ({...prev, loading: false, data: res.data.result_list}))
+      }).catch((error)=>{
+          setPaymentHistory(prev => ({...prev, loading: false, error: true}))
+      })
+  }
+
+  //FUNCTION TO GET PURCHASE HISTORY
+  const getPurchaseHistory = ()=>{
+      apiCall.getPurchaseHx().then((res)=>{
+          if(res.data.internal_return < 0){ // success but no data
+              setPurchaseHistory(prev => ({...prev, loading: false}))
+              return
+          }
+          // console.log('purchase',res.data)
+          setPurchaseHistory(prev => ({...prev, loading: false, data: res.data.result_list}))
+      }).catch((error)=>{
+          setPurchaseHistory(prev => ({...prev, loading: false, error: true}))
+      })
+  }
+
+  useEffect(()=>{
+    getPaymentHistory()
+    getPurchaseHistory()
+  }, [])
+
   return (
     <>
       <Layout>
@@ -148,7 +200,35 @@ export default function History() {
               </div>
             </div>
             {/*<MarketHistorySection />*/}
-            <TopHxBox className="mb-11" />
+            {/* <TopHxBox className="mb-11" /> */}
+            <div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
+                {/* PURCHASE SECTION */}
+                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
+                    <div className="wallet w-full md:p-8 p-4 h-full max-h-[700px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
+                        <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Purchases</h2>
+                        {purchaseHistory.loading ? 
+                        <LoadingSpinner size='16' color='sky-blue' />
+                        :
+                        <PurchasesTable purchase={purchaseHistory} />
+                        }
+                    </div>
+                </div>
+                {/* END OF PURCHASE SECTION */}
+
+                {/* RECENT ACTIVITY SECTION */}
+                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
+                    <div className="wallet w-full md:p-8 p-4 h-full max-h-[700px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
+                        <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
+                        {/* <p className='text-base text-slate-500 dark:text-white'>Activity Report</p> */}
+                        {paymentHistory.loading ? 
+                        <LoadingSpinner size='16' color='sky-blue' />
+                        :
+                        <RecentActivityTable payment={paymentHistory} />
+                    }
+                    </div>
+                </div>
+                {/* END OF RECENT ACTIVITY SECTION */}
+            </div>
             <HistoryTable />
           </div>
         </div>

src/components/MarketPlace/index.jsx

@@ -1,19 +1,21 @@
 import React from "react";
-import products from "../../data/marketplace_data.json";
+// import products from "../../data/marketplace_data.json";
 //import CreateNft from "../Home/CreateNft";
 import Layout from "../Partials/Layout";
 import MainSection from "./MainSection";
 import CommonHead from "../UserHeader/CommonHead";
+import { useSelector } from "react-redux";
 
-export default function MarketPlace(props) {
-  const JobList =  props.activeJobList?.result_list;
-    console.log("activeJobList->",props.activeJobList.result_list);
-  const marketProduct = products.data;
+export default function MarketPlace() {
+  let { jobLists } = useSelector((state) => state.jobLists);
+  const marketData = jobLists?.result_list;
+
+  // const marketProduct = products.data;
   return (
     <>
       <Layout>
         <CommonHead />
-        <MainSection marketPlaceProduct={JobList} className="mb-10" />
+        <MainSection marketPlaceProduct={marketData} className="mb-10" />
       </Layout>
     </>
   );

src/components/MyActiveJobs/MyActiveJobTable.jsx

@@ -23,12 +23,12 @@ export default function MyActiveJobTable({MyJobList, className }) {
 
     return (
         <div
-            className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow min-h-[520px] ${
+            className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow ${
                 className || ""
             }`}
         >
             {MyJobList && MyJobList?.result_list &&
-            <div className="relative w-full overflow-x-auto sm:rounded-lg">
+            <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
                 <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
                     <tbody>
                     {/*<tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">*/}

src/components/MyJobs/MyJobTable.jsx

@@ -23,7 +23,7 @@ export default function MyJobTable({MyJobList, className }) {
 
     return (
         <div
-            className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow min-h-[520px] ${
+            className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow ${
                 className || ""
             }`}
         >
@@ -41,7 +41,7 @@ export default function MyJobTable({MyJobList, className }) {
                 />
             </div>
             {MyJobList && MyJobList?.result_list &&
-            <div className="relative w-full overflow-x-auto sm:rounded-lg">
+            <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
                 <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
                     <tbody>
                     <tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">

src/components/MyWallet/AddFund.jsx

@@ -71,9 +71,9 @@ function AddFund({payment}) {
             </div>
     
             <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-                <div className="wallet w-full  md:p-8 p-4 h-full max-h-[600px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
+                <div className="wallet w-full  md:p-8 p-4 h-full max-h-[590px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
                     <h2 className='text-gray-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
-                    <p className='text-base text-gray-600 dark:text-white'>Activity Report</p>
+                    {/* <p className='text-base text-gray-600 dark:text-white'>Activity Report</p> */}
                     {payment.loading ?
                     <LoadingSpinner size='16' color='sky-blue' />
                     :

src/components/MyWallet/Balance.jsx

@@ -5,7 +5,7 @@ import PurchasesTable from './WalletComponent/PurchasesTable'
 import CouponTable from './WalletComponent/CouponTable'
 import LoadingSpinner from '../Spinners/LoadingSpinner'
 
-function Balance({wallet, payment, coupon, purchase}) {
+function Balance({wallet, coupon}) {
     return (
         <div className="content-wrapper">
             <div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
@@ -65,36 +65,6 @@ function Balance({wallet, payment, coupon, purchase}) {
                 {/* END OF WALLET SECTION */}
 
 
-                {/* RECENT ACTIVITY SECTION */}
-                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-                    <div className="wallet w-full md:p-8 p-4 h-full max-h-[500px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
-                        <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
-                        <p className='text-base text-slate-500 dark:text-white'>Activity Report</p>
-                        {payment.loading ? 
-                        <LoadingSpinner size='16' color='sky-blue' />
-                        :
-                        <RecentActivityTable payment={payment} />
-                    }
-                    </div>
-                </div>
-                {/* END OF RECENT ACTIVITY SECTION */}
-            </div>
-            
-            
-            <div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
-                {/* PURCHASE SECTION */}
-                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-                    <div className="wallet w-full md:p-8 p-4 h-full max-h-[500px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
-                        <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Purchases</h2>
-                        {purchase.loading ? 
-                        <LoadingSpinner size='16' color='sky-blue' />
-                        :
-                        <PurchasesTable purchase={purchase} />
-                        }
-                    </div>
-                </div>
-                {/* END OF PURCHASE SECTION */}
-
                 {/* COUPON SECTION */}
                 <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
                     <div className="wallet w-full  md:p-8 p-4 h-full max-h-[500px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
@@ -107,8 +77,7 @@ function Balance({wallet, payment, coupon, purchase}) {
                     </div>
                 </div>
                 {/* END OF COUPON SECTION */}
-            </div>
-            
+            </div>            
         </div>
       )
 }

src/components/MyWallet/ConfirmAddFund.jsx

@@ -117,7 +117,7 @@ function ConfirmAddFund({payment}) {
             <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
                 <div className="wallet w-full  md:p-8 p-4 h-full max-h-[600px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
                     <h2 className='text-gray-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
-                    <p className='text-base text-gray-600 dark:text-white'>Activity Report</p>
+                    {/* <p className='text-base text-gray-600 dark:text-white'>Activity Report</p> */}
                     {payment.loading ?
                     <LoadingSpinner size='16' color='sky-blue' />
                     :

src/components/MyWallet/ConfirmTransfer.jsx

@@ -151,9 +151,9 @@ function ConfirmTransfer({payment, wallet}) {
             }
     
             <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-                <div className="wallet w-full px-4 md:px-8 py-4 h-full max-h-[600px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
+                <div className="wallet w-full px-4 md:px-8 py-4 h-full max-h-[700px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
                     <h2 className='text-gray-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
-                    <p className='text-base text-gray-600 dark:text-white'>Activity Report</p>
+                    {/* <p className='text-base text-gray-600 dark:text-white'>Activity Report</p> */}
                     {payment.loading ?
                     <LoadingSpinner size='16' color='sky-blue' />
                     :

src/components/MyWallet/TransferFund.jsx

@@ -223,9 +223,9 @@ function TransferFund({payment, wallet}) {
             </div>
     
             <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-                <div className="wallet w-full  md:p-8 p-4 h-full max-h-[600px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
+                <div className="wallet w-full  md:p-8 p-4 h-full max-h-[650px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
                     <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
-                    <p className='text-base text-slate-500 dark:text-white'>Activity Report</p>
+                    {/* <p className='text-base text-slate-500 dark:text-white'>Activity Report</p> */}
                     {payment.loading ?
                     <LoadingSpinner size='16' color='sky-blue' />
                     :

src/components/MyWallet/Wallet.jsx

@@ -115,7 +115,7 @@ const WalletRoutes = () => {
                 <Route path='add-fund' element={<AddFund payment={paymentHistory} />} />
                 <Route path='add-fund/confirm-add-fund' element={<ConfirmAddFund payment={paymentHistory} />} />
                 <Route path='transfer-fund' element={<TransferFund payment={paymentHistory} wallet={walletList} />} />
-                <Route index element={<Balance payment={paymentHistory} purchase={purchaseHistory} coupon={couponHistory} wallet={walletList} />} />
+                <Route index element={<Balance coupon={couponHistory} wallet={walletList} />} />
                 <Route path='transfer-fund/add-recipient' element={<AddRecipient />} />
                 <Route path='transfer-fund/confirm-transfer' element={<ConfirmTransfer payment={paymentHistory} wallet={walletList} />} />
                 <Route path='*' element={<Navigate to='/' />} />

src/components/MyWallet/WalletComponent/CouponTable.jsx

@@ -15,7 +15,7 @@ function CouponTable({coupon}) {
     }
 
   return (
-    <>
+    <div className='flex flex-col justify-between h-full'>
     <table className="wallet-activity w-full table-auto border-collapse text-left">
         <thead className='border-b-2'>
             <tr className='text-slate-600'>
@@ -59,7 +59,7 @@ function CouponTable({coupon}) {
     {/* PAGINATION BUTTON */}
     <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= coupon?.data?.length ? true : false} data={coupon?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
     {/* END OF PAGINATION BUTTON */}
-    </>
+    </div>
   )
 }
 

src/components/MyWallet/WalletComponent/PurchasesTable.jsx

@@ -15,7 +15,7 @@ function PurchasesTable({purchase}) {
     }
 
   return (
-    <>
+    <div className='flex flex-col justify-between h-full'>
     <table className="wallet-activity w-full table-auto border-collapse text-left">
         <thead className='border-b-2'>
             <tr className='text-slate-600'>
@@ -59,7 +59,7 @@ function PurchasesTable({purchase}) {
     {/* PAGINATION BUTTON */}
     <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= purchase?.data?.length ? true : false} data={purchase?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
     {/* END OF PAGINATION BUTTON */}
-    </>
+    </div>
   )
 }
 

src/components/MyWallet/WalletComponent/RecentActivityTable.jsx

@@ -15,7 +15,7 @@ function RecentActivityTable({payment}) {
     }
 
   return (
-    <>
+    <div className='flex flex-col justify-between h-full'>
     <table className="wallet-activity w-full table-auto border-collapse text-left">
         <thead className='border-b-2'>
             <tr className='text-slate-600'>
@@ -59,7 +59,7 @@ function RecentActivityTable({payment}) {
     {/* PAGINATION BUTTON */}
     <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= payment?.data?.length ? true : false} data={payment?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
     {/* END OF PAGINATION BUTTON */}
-    </>
+    </div>
   )
 }
 

src/components/MyWallet/WalletComponent/ReferralTable.jsx

@@ -0,0 +1,60 @@
+import React, {useState} from 'react'
+
+import PaginatedList from '../../Pagination/PaginatedList';
+import {handlePagingFunc} from '../../Pagination/HandlePagination';
+
+function ReferralTable({history}) {
+
+    const [currentPage, setCurrentPage] = useState(0);
+    const indexOfFirstItem = Number(currentPage);
+    const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
+    const currentReferral = history?.data?.slice(indexOfFirstItem, indexOfLastItem);
+  
+    const handlePagination = (e) => {
+      handlePagingFunc(e,setCurrentPage)
+    }
+
+  return (
+    <div className='flex flex-col justify-between h-full'>
+        <table className="referral-list w-full table-auto border-collapse text-left">
+            <thead className='border-b-2'>
+                <tr className='text-slate-600'>
+                <th className="p-3">Added/Name</th>
+                <th className="p-3">Email</th>
+                <th className="p-3">Status</th>
+                </tr>
+            </thead>
+            <tbody>
+                {history.data.length ? 
+                currentReferral.map((item, index) => (
+                    <tr key={index} className='text-slate-500'>
+                        <td className="p-3">{item.added_date} / {item.firstname} {item.lastname}</td>
+                        <td className="p-3">{item.email}</td>
+                        <td className="p-3">{item.status}</td>
+                    </tr>
+                ))
+                :
+                (
+                history.error ?
+                <tr className='text-slate-500'>
+                    <td colSpan={3}>Opps! couldn't get referral history. Try reloading the page</td>
+                </tr>
+                :
+                (
+                <tr className='text-slate-500'>
+                    <td colSpan={3}>No Item Found on referral List</td>
+                </tr>
+                )
+                )
+                }
+            </tbody>
+        </table>
+
+        {/* PAGINATION BUTTON */}
+        <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= history?.data?.length ? true : false} data={history?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
+        {/* END OF PAGINATION BUTTON */}
+    </div>
+  )
+}
+
+export default ReferralTable

src/components/Pagination/PaginatedList.jsx

@@ -5,7 +5,7 @@ const PaginatedList = ({ onClick, prev, next, data, start, stop }) => {
 
   if(data.length){
     return (
-      <div className='p-3 flex justify-center items-center space-x-2'>
+      <div className='p-3 flex justify-center items-center space-x-2 border-t-2'>
         {/* Render pagination buttons */}
           {!prev &&
               <button

src/components/Partials/Sidebar.jsx

@@ -4,9 +4,15 @@ import logo from "../../assets/images/wrenchboard.png"; //logo-2.svg";
 import logo3 from "../../assets/images/wrenchboard.png"; //logo-3.svg";
 import DarkModeContext from "../Contexts/DarkModeContext";
 import Icons from "../Helpers/Icons";
+import { useSelector } from "react-redux";
 
 export default function Sidebar({ sidebar, action, logoutModalHandler }) {
   const darkMode = useContext(DarkModeContext);
+
+  let { jobLists } = useSelector((state) => state.jobLists);
+  const marketData = jobLists?.result_list;
+  let noOfJobs = marketData?.length;
+
   useEffect(() => {
     const title = document.querySelectorAll(".menu-setting-items .heading");
     if (sidebar) {
@@ -93,69 +99,20 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
           </div>
           <div className="items">
             <ul className="flex flex-col space-y-6">
-              <li className="item group">
-                <NavLink
-                  className={`nav-item flex items-center ${
-                    ((navData) => (navData.isActive ? "active" : ""),
-                    sidebar ? "justify-start space-x-3.5" : "justify-center")
-                  } `}
-                  to="/"
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="dashboard" />
-                  </span>
-                  <span
-                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                      sidebar ? "active flex-1" : "w-0"
-                    }`}
-                  >
-                    Dashboard
-                  </span>
-                </NavLink>
-              </li>
-              <li className="item group">
-                <NavLink
-                  to="/market"
-                  className={`nav-item flex items-center  ${
-                    ((navData) => (navData.isActive ? "active" : ""),
-                    sidebar ? "justify-start space-x-3.5" : "justify-center")
-                  }`}
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="market" />
-                  </span>
-                  <span
-                    className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${
-                      sidebar ? "active flex-1" : "w-0"
-                    }`}
-                  >
-                   Market
-                    <span className="absolute left-24 -top-1 text-sm flex justify-center items-center w-5 h-5 primary-gradient rounded-full text-white">
-                      0
-                    </span>
-                  </span>
-                </NavLink>
-              </li>
-              <li className="item group">
-                <NavLink
-                    to="/mytask"
-                    className={`nav-item flex items-center  ${
-                        ((navData) => (navData.isActive ? "active" : ""),
-                            sidebar ? "justify-start space-x-3.5" : "justify-center")
-                    }`}
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="active-bids" />
-                  </span>
-                  <span
-                      className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${
-                          sidebar ? "active flex-1" : "w-0"
-                      }`}
-                  >
-                   My Task(s)
-                  </span>
-                </NavLink>
-              </li>
+              {/* Using mini component reduces the bulk amount of html */}
+              {[
+                { name: "Dashboard", path: "/" },
+                { name: "Market", path: "/market", bubble: noOfJobs },
+                { name: "My Task(s)", path: "/mytask" },
+              ].map(({ name, path, bubble }, idx) => (
+                <ListItem
+                  key={idx}
+                  title={name}
+                  route={path}
+                  bubble={bubble}
+                  sidebar
+                />
+              ))}
               {/*<li className="item group">*/}
               {/*  <NavLink*/}
               {/*    to="/notification"*/}
@@ -216,7 +173,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
               {/*    </span>*/}
               {/*  </NavLink>*/}
               {/*</li>*/}
-          
+
               {/*<li className="item group">*/}
               {/*  <NavLink*/}
               {/*    to="/history"*/}
@@ -262,22 +219,22 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
           </div>
         </div>
         <div className="setting-item">
-          <div  class="top-platform bg-pink dark:bg-dark-white   rounded-2xl p-6 2xl:w-[180px] w-full 2xl:mb-10 2xl:border-none  border ">
-            <NavLink
-                to="/acc-family" >
-              <span className="item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium active flex-1">Family Account</span>
+          <div class="top-platform bg-pink dark:bg-dark-white   rounded-2xl p-6 2xl:w-[180px] w-full 2xl:mb-10 2xl:border-none  border ">
+            <NavLink to="/acc-family">
+              <span className="item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium active flex-1">
+                Family Account
+              </span>
             </NavLink>
           </div>
         </div>
         <div className="setting-item">
-          <div
-              className="top-platform bg-pink dark:bg-dark-white   rounded-2xl p-16 2xl:w-[180px] w-full 2xl:mb-10 2xl:border-none  border ">
-            <NavLink
-                to="/start-job" >
-              <span className="item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium active flex-1">Enable Job Post</span>
+          <div className="top-platform bg-pink dark:bg-dark-white   rounded-2xl p-16 2xl:w-[180px] w-full 2xl:mb-10 2xl:border-none  border ">
+            <NavLink to="/start-job">
+              <span className="item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium active flex-1">
+                Enable Job Post
+              </span>
             </NavLink>
           </div>
-
         </div>
         <div className="setting-item">
           <div className="heading mb-5">
@@ -287,41 +244,61 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
             <ul className="flex flex-col space-y-6">
               <li className="item group">
                 <NavLink
-                    to="/myjobs"
-                    className={`nav-item flex items-center ${
-                        ((navData) => (navData.isActive ? "active" : ""),
-                            sidebar ? "justify-start space-x-3.5" : "justify-center")
-                    }`}
+                  to="/myjobs"
+                  className={`nav-item flex items-center ${
+                    ((navData) => (navData.isActive ? "active" : ""),
+                    sidebar ? "justify-start space-x-3.5" : "justify-center")
+                  }`}
                 >
                   <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
                     <Icons name="people-two" />
                   </span>
                   <span
-                      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                          sidebar ? "active flex-1" : "w-0"
-                      }`}
+                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                      sidebar ? "active flex-1" : "w-0"
+                    }`}
                   >
-                    Job List
+                    List
                   </span>
                 </NavLink>
               </li>
               <li className="item group">
                 <NavLink
-                    to="/my-active-jobs"
-                    className={`nav-item flex items-center ${
-                        ((navData) => (navData.isActive ? "active" : ""),
-                            sidebar ? "justify-start space-x-3.5" : "justify-center")
-                    }`}
+                  to="/my-active-jobs"
+                  className={`nav-item flex items-center ${
+                    ((navData) => (navData.isActive ? "active" : ""),
+                    sidebar ? "justify-start space-x-3.5" : "justify-center")
+                  }`}
                 >
                   <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
                     <Icons name="people-two" />
                   </span>
                   <span
-                      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                          sidebar ? "active flex-1" : "w-0"
-                      }`}
+                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                      sidebar ? "active flex-1" : "w-0"
+                    }`}
                   >
-                   Active Jobs
+                    Pending
+                  </span>
+                </NavLink>
+              </li>
+              <li className="item group">
+                <NavLink
+                  to="/my-active-jobs"
+                  className={`nav-item flex items-center ${
+                    ((navData) => (navData.isActive ? "active" : ""),
+                    sidebar ? "justify-start space-x-3.5" : "justify-center")
+                  }`}
+                >
+                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
+                    <Icons name="people-two" />
+                  </span>
+                  <span
+                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                      sidebar ? "active flex-1" : "w-0"
+                    }`}
+                  >
+                    Active
                   </span>
                 </NavLink>
               </li>
@@ -433,3 +410,33 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
     </div>
   );
 }
+
+const ListItem = ({ sidebar, route, title, bubble }) => {
+  return (
+    <li className="item group">
+      <NavLink
+        to={route}
+        className={`nav-item flex items-center  ${
+          ((navData) => (navData.isActive ? "active" : ""),
+          sidebar ? "justify-start space-x-3.5" : "justify-center")
+        }`}
+      >
+        <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
+          <Icons name="market" />
+        </span>
+        <span
+          className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${
+            sidebar ? "active flex-1" : "w-0"
+          }`}
+        >
+          {title && title}
+          {bubble && (
+            <span className="absolute left-24 -top-1 text-sm flex justify-center items-center w-5 h-5 primary-gradient rounded-full text-white">
+              {bubble}
+            </span>
+          )}
+        </span>
+      </NavLink>
+    </li>
+  );
+};

src/components/Referral/ReferralDisplay.jsx

@@ -7,6 +7,7 @@ import LoadingSpinner from '../Spinners/LoadingSpinner';
 
 import {Formik, Form} from 'formik'
 import * as Yup from 'yup'
+import ReferralTable from '../MyWallet/WalletComponent/ReferralTable';
 
 const validationSchema = Yup.object().shape({
     email: Yup.string()
@@ -161,7 +162,7 @@ function ReferralDisplay() {
         </div>
 
         <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-            <div className="referral w-full md:p-8 p-4 h-full max-h-[500px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
+            <div className="referral w-full md:p-8 p-4 h-full max-h-[700px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
                 <h2 className='mb-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Referral List</h2>
                 {referralList.loading ? 
                 (
@@ -169,39 +170,7 @@ function ReferralDisplay() {
                 )
                 :
                 (
-                <table className="referral-list w-full table-auto border-collapse text-left">
-                    <thead className='border-b-2'>
-                        <tr className='text-slate-600'>
-                        <th className="p-3">Added/Name</th>
-                        <th className="p-3">Email</th>
-                        <th className="p-3">Status</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {referralList.data.length ? 
-                        referralList.data.map((item, index) => (
-                            <tr key={index} className='text-slate-500'>
-                                <td className="p-3">{item.added_date} / {item.firstname} {item.lastname}</td>
-                                <td className="p-3">{item.email}</td>
-                                <td className="p-3">{item.status}</td>
-                            </tr>
-                        ))
-                        :
-                        (
-                        referralList.error ?
-                        <tr className='text-slate-500'>
-                            <td colSpan={3}>Opps! couldn't get referral history. Try reloading the page</td>
-                        </tr>
-                        :
-                        (
-                        <tr className='text-slate-500'>
-                            <td colSpan={3}>No Item Found on referral List</td>
-                        </tr>
-                        )
-                        )
-                        }
-                    </tbody>
-                </table>
+                <ReferralTable history={referralList} />
                 )
                 }
             </div>

src/middleware/AuthRoute.jsx

@@ -1,84 +1,102 @@
-import { useEffect, useState, useCallback } from "react";
+import { useEffect, useState, useCallback, useMemo } from "react";
 import { Navigate, Outlet, useLocation, useNavigate } from "react-router-dom";
-import usersService from '../services/UsersService'
-import LoadingSpinner from '../components/Spinners/LoadingSpinner'
-import WrenchBoard from "../assets/images/wrenchboard.png"
+import usersService from "../services/UsersService";
+import LoadingSpinner from "../components/Spinners/LoadingSpinner";
 import { useDispatch, useSelector } from "react-redux";
-import {updateUserDetails} from '../store/UserDetails'
-
+import { updateUserDetails } from "../store/UserDetails";
+import { updateJobs } from "../store/jobLists";
 
 const AuthRoute = ({ redirectPath = "/login", children }) => {
-  const apiCall = new usersService()
-
-  const dispatch = useDispatch()
-
+  const apiCall = useMemo(() => new usersService(), []);
+  const dispatch = useDispatch();
   const [lastActivityTime, setLastActivityTime] = useState(Date.now());
-  let [isLogin, setIsLogin] = useState({loading: true, status: false})
-
+  const [isLogin, setIsLogin] = useState({ loading: true, status: false });
   const navigate = useNavigate();
-
-  //Removing Data stored at localStorage after session expires
-  const expireSession = () => {
-    localStorage.removeItem('session_token');
-    localStorage.removeItem('member_id');
-    localStorage.removeItem('uid');
-    localStorage.removeItem('session');
-    navigate("/login", { replace: true }); // redirects user to login page after session expires
-  };
-
-  // Reset last activity time on user input
-  const resetTime = () => {
-    setLastActivityTime(Date.now());
-  }
-  window.addEventListener('mousemove', resetTime)
-  window.addEventListener('keydown', resetTime)
-
-  const loadProfile = ()=>{ // function to load user profile
-    setIsLogin({loading: true, status: false})
-    apiCall.loadProfile().then((res)=>{
-      if(res.data.internal_return < 0){
-        setIsLogin({loading: false, status: false})
-        return
-      }
-      dispatch(updateUserDetails(res.data))
-      setIsLogin({loading: false, status: true})
-    }).catch(error =>{
-      setIsLogin({loading: false, status: false})
-    })
-  }
   
   useEffect(() => {
-    if(!isLogin.status){
-      loadProfile() // LOADS USER PROFILE DETAILS AND CALLS DISPATCH UPDATEUSERDETAILS TO UPDATE USERDETAILS SLICE IN STORE
-    }
+    //Removing Data stored at localStorage after session expires
+    const expireSession = () => {
+      localStorage.clear();
+      navigate("/login", { replace: true }); // redirects user to login page after session expires
+    };
 
     const checkInactivity = setInterval(() => {
-      if (Date.now() - lastActivityTime > process.env.REACT_APP_SESSION_EXPIRE_MINUTES) {
-        expireSession()
+      if (
+        Date.now() - lastActivityTime >
+        process.env.REACT_APP_SESSION_EXPIRE_MINUTES
+      ) {
+        expireSession();
       }
-    }, process.env.REACT_APP_SESSION_EXPIRE_CHECKER) // Checks for inactivity every minute
+    }, process.env.REACT_APP_SESSION_EXPIRE_CHECKER); // Checks for inactivity every minute
 
     // cleaning up listeners
     return () => {
-      clearInterval(checkInactivity)
-      window.removeEventListener('mousemove', resetTime)
-      window.removeEventListener('keydown', resetTime)
-    }
-  }, [lastActivityTime])
+      clearInterval(checkInactivity);
+    };
+  }, [lastActivityTime, navigate]);
 
-  return (
-    isLogin.loading ?
-      <LoadingSpinner size='32' color='sky-blue' height='h-screen' />
-      // Stills needs fixing
-      // <div className="h-screen m-auto">
-      //   <img src={WrenchBoard} alt="wrenchboard" className="h-10" />
-      // </div>
-      :
-      !isLogin.status ?
-      <Navigate to={redirectPath} replace />
-      :
-      (children || <Outlet />)
-  )
+  // Reset last activity time on user input
+  const resetTime = useCallback(() => {
+    setLastActivityTime(Date.now());
+  }, []);
+
+  useEffect(() => {
+    window.addEventListener("mousemove", resetTime);
+    window.addEventListener("keydown", resetTime);
+
+    return () => {
+      window.removeEventListener("mousemove", resetTime);
+      window.removeEventListener("keydown", resetTime);
+    };
+  }, [resetTime]);
+
+  useEffect(() => {
+    if (!isLogin.status) {
+      const loadProfile = () => {
+        // function to load user profile
+        setIsLogin({ loading: true, status: false });
+        apiCall
+          .loadProfile()
+          .then((res) => {
+            if (res.data.internal_return < 0) {
+              setIsLogin({ loading: false, status: false });
+              return;
+            }
+            dispatch(updateUserDetails(res.data));
+            setIsLogin({ loading: false, status: true });
+          })
+          .catch((error) => {
+            setIsLogin({ loading: false, status: false });
+          });
+      };
+      loadProfile();
+    }
+  }, []);
+
+  useEffect(() => {
+    // Getting market data
+    const getMarketActiveJobList = async () => {
+      try {
+        const res = await apiCall.getActiveJobList();
+        dispatch(updateJobs(res.data));
+      } catch (error) {
+        console.log("Error getting mode");
+      }
+    };
+    getMarketActiveJobList();
+  }, [apiCall, dispatch]);
+
+  return isLogin.loading ? (
+    <LoadingSpinner size="32" color="sky-blue" height="h-screen" />
+  ) : // Stills needs fixing
+  // <div className="h-screen m-auto">
+  //   <img src={WrenchBoard} alt="wrenchboard" className="h-10" />
+  // </div>
+  !isLogin.status ? (
+    <Navigate to={redirectPath} replace />
+  ) : (
+    children || <Outlet />
+  );
 };
 
-export default AuthRoute;
+export default AuthRoute;

src/services/UsersService.js

@@ -307,6 +307,50 @@ class usersService {
         return this.postAuxEnd("/loadprofile", postData);
     }
 
+    getFamilyList(){
+        var postData = {
+            uuid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            page:0,
+            limit :100
+        };
+        return this.postAuxEnd("/familylist", postData);
+    }
+
+    getFamilyAdd(){
+        var postData = {
+            uuid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            page:0,
+            limit :100
+        };
+        return this.postAuxEnd("/familyadd", postData);
+    }
+
+    getFamilyUpdate(){
+        var postData = {
+            uuid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            page:0,
+            limit :100
+        };
+        return this.postAuxEnd("/familyupdate", postData);
+    }
+
+    getFamilyManage(){
+        var postData = {
+            uuid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            page:0,
+            limit :100
+        };
+        return this.postAuxEnd("/familymanage", postData);
+    }
+    
      //END POINT CALL FOR ACCOUNT TOP
      startTopUp(post){
         var postData = {

src/store/jobLists.js

@@ -0,0 +1,19 @@
+import { createSlice } from "@reduxjs/toolkit";
+
+const initialState = {
+  jobLists: {}
+};
+
+export const jobSlice = createSlice({
+  name: "jobLists",
+  initialState,
+  reducers: {
+    updateJobs: (state, payload) => {
+      state.jobLists = { ...payload.payload };
+    },
+  },
+});
+
+export const { updateJobs } = jobSlice.actions;
+
+export default jobSlice.reducer;

src/store/store.js

@@ -2,10 +2,12 @@ import { configureStore } from "@reduxjs/toolkit";
 import drawerReducer from "./drawer";
 
 import userDetailReducer from "./UserDetails";
+import jobReducer from "./jobLists";
 
 export default configureStore({
   reducer: {
     drawer: drawerReducer,
     userDetails: userDetailReducer,
+    jobLists: jobReducer
   },
 });

src/views/MarketPlacePage.jsx

@@ -1,29 +1,9 @@
-import React, {useState, useEffect} from 'react'
 import MarketPlace from "../components/MarketPlace";
-import usersService from "../services/UsersService";
 
 export default function MarketPlacePage() {
-   // const userApi = new usersService();
-   // const activeJobList  = userApi.getActiveJobList();
-   // console.log("activeJobList->",activeJobList);
-
-    const [marketActiveJobList, setMarketActiveJobList] = useState([]);
-    const api = new usersService();
-
-    const getMarketActiveJobList = async () => {
-        try {
-            const res = await api.getActiveJobList();
-            setMarketActiveJobList(res.data);
-        } catch (error) {
-            console.log("Error getting mode");
-        }
-    };
-    useEffect(() => {
-        getMarketActiveJobList();
-    }, []);
   return (
     <>
-      <MarketPlace activeJobList={marketActiveJobList} />
+      <MarketPlace />
     </>
   );
 }