diff --git a/src/RouteLinks.js b/src/RouteLinks.js index e8ff6b3..2b0811e 100644 --- a/src/RouteLinks.js +++ b/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 \ No newline at end of file diff --git a/src/SiteRoutes.jsx b/src/SiteRoutes.jsx index f88ad7f..dc89a2d 100644 --- a/src/SiteRoutes.jsx +++ b/src/SiteRoutes.jsx @@ -7,14 +7,10 @@ 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' // const Home = lazy(() => import('./pages/Home')); @@ -26,15 +22,10 @@ export default function SiteRoutes() { }> } /> {`*/HOME PAGE*/`} - } /> {`*/USERS PAGE*/`} - } /> {`*/APPROVED LOANS PAGE*/`} - } /> {`*/DISBURSEMENTS LOANS PAGE*/`} - } /> {`*/APPLICATIONS LOANS PAGE*/`} - } /> {`*/SELECTED LOANS PAGE*/`} - } /> {`*/LOANS OFFERS PAGE*/`} - } /> {`*/LOANS PAGE*/`} - } /> {`*/Request PAGE*/`} + } /> {`*/Transactions PAGE*/`} + } /> {`*/REPAYMENTS PAGE*/`} + } /> {`*/LOAN CHARGES PAGE*/`} {/* ERROR PAGE */} diff --git a/src/components/applicationsloancom/ApplicationsLoanCom.jsx b/src/components/_applicationsloancom/ApplicationsLoanCom.jsx similarity index 100% rename from src/components/applicationsloancom/ApplicationsLoanCom.jsx rename to src/components/_applicationsloancom/ApplicationsLoanCom.jsx diff --git a/src/components/approvedloancom/ApprovedLoanCom.jsx b/src/components/_approvedloancom/ApprovedLoanCom.jsx similarity index 100% rename from src/components/approvedloancom/ApprovedLoanCom.jsx rename to src/components/_approvedloancom/ApprovedLoanCom.jsx diff --git a/src/components/disbursementsloancom/DisbursementsLoanCom.jsx b/src/components/_disbursementsloancom/DisbursementsLoanCom.jsx similarity index 100% rename from src/components/disbursementsloancom/DisbursementsLoanCom.jsx rename to src/components/_disbursementsloancom/DisbursementsLoanCom.jsx diff --git a/src/components/loanofferscom/LoanOffersCom.jsx b/src/components/_loanofferscom/LoanOffersCom.jsx similarity index 100% rename from src/components/loanofferscom/LoanOffersCom.jsx rename to src/components/_loanofferscom/LoanOffersCom.jsx diff --git a/src/components/selectedloancom/SelectedLoanCom.jsx b/src/components/_selectedloancom/SelectedLoanCom.jsx similarity index 100% rename from src/components/selectedloancom/SelectedLoanCom.jsx rename to src/components/_selectedloancom/SelectedLoanCom.jsx diff --git a/src/components/layouts/DashboardHeader.jsx b/src/components/layouts/DashboardHeader.jsx index 60e091f..67c0190 100644 --- a/src/components/layouts/DashboardHeader.jsx +++ b/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() { {/* RIGHT DRAWER BUTTON */} - {pathname == '/' &&
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'>
- } {/* MESSAGE */} {/*