diff --git a/src/RouteLinks.js b/src/RouteLinks.js index b99e3e9..7e70dd0 100644 --- a/src/RouteLinks.js +++ b/src/RouteLinks.js @@ -3,6 +3,8 @@ const RouteLinks = { errorPage: '*', homePage: '/', usersPage: '/users', + approvedLoans: '/loans/approved', + pendingLoans: '/loans/pending', } export default RouteLinks \ No newline at end of file diff --git a/src/SiteRoutes.jsx b/src/SiteRoutes.jsx index a0a20eb..c87e473 100644 --- a/src/SiteRoutes.jsx +++ b/src/SiteRoutes.jsx @@ -8,6 +8,8 @@ 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 PendingLoansPage from './pages/PendingLoansPage' // PENDING LOANS PAGE // const Home = lazy(() => import('./pages/Home')); @@ -20,6 +22,8 @@ export default function SiteRoutes() { }> } /> {`*/HOME PAGE*/`} } /> {`*/USERS PAGE*/`} + } /> {`*/APPROVED LOANS PAGE*/`} + } /> {`*/PENDING LOANS PAGE*/`} {/* ERROR PAGE */} diff --git a/src/components/DummyLogo.jsx b/src/components/DummyLogo.jsx index 8d3f36d..518aa4d 100644 --- a/src/components/DummyLogo.jsx +++ b/src/components/DummyLogo.jsx @@ -2,7 +2,7 @@ export default function DummyLogo() { return (

digiFI

-

Admin

+

Logo

) } diff --git a/src/components/breadcrumb/BreadcrumbCom.jsx b/src/components/breadcrumb/BreadcrumbCom.jsx index 16191c0..a95aecc 100644 --- a/src/components/breadcrumb/BreadcrumbCom.jsx +++ b/src/components/breadcrumb/BreadcrumbCom.jsx @@ -4,13 +4,13 @@ import { TiHomeOutline } from 'react-icons/ti' export default function BreadcrumbCom({title, paths}) { return (
-

{title}

-
+

{title}

+
{paths.map((item, index) => ( -
+
-

{item}

+

{item}

))}
diff --git a/src/components/layouts/DashboardLayout.jsx b/src/components/layouts/DashboardLayout.jsx index 09481ca..7534508 100644 --- a/src/components/layouts/DashboardLayout.jsx +++ b/src/components/layouts/DashboardLayout.jsx @@ -55,7 +55,7 @@ export default function DashboardLayout() {
{/* FOOTER SECTION */} -
+

Copyright @ {new Date().getFullYear()} - Developed by digiFi. All Rights Reserved

diff --git a/src/components/layouts/LogoutModal.jsx b/src/components/layouts/LogoutModal.jsx index 06c5f7b..e20d219 100644 --- a/src/components/layouts/LogoutModal.jsx +++ b/src/components/layouts/LogoutModal.jsx @@ -21,7 +21,7 @@ export default function LogoutModal({close}) { return ( -
+
{/* */}

diff --git a/src/components/layouts/aside/AsideLinkWithSubLinks.jsx b/src/components/layouts/aside/AsideLinkWithSubLinks.jsx index aa965c1..2c72070 100644 --- a/src/components/layouts/aside/AsideLinkWithSubLinks.jsx +++ b/src/components/layouts/aside/AsideLinkWithSubLinks.jsx @@ -1,5 +1,5 @@ -import { ReactNode } from "react" -// import { useLocation } from "react-router-dom" +import { FaCaretDown } from "react-icons/fa"; +import { FaRegMoneyBill1 } from "react-icons/fa6"; export default function AsideLinkWithSubLinks({shrinkAside, name, icon, hideSubMenu, setHideSubMenu, children}) { @@ -11,19 +11,12 @@ export default function AsideLinkWithSubLinks({shrinkAside, name, icon, hideSubM // const [hideSubMenu, setHideSubMenu] = useState(true) return ( - // - // {icon && } - // {shrinkAside ? '' : name} - //
{children} diff --git a/src/components/layouts/aside/DashboardAside.jsx b/src/components/layouts/aside/DashboardAside.jsx index c30ecaa..4db2dc7 100644 --- a/src/components/layouts/aside/DashboardAside.jsx +++ b/src/components/layouts/aside/DashboardAside.jsx @@ -10,6 +10,7 @@ import { generalLayoutContext } from "../../../context/GeneralLayoutContext"; import { AiOutlineDashboard } from "react-icons/ai"; import { IoPeople } from "react-icons/io5"; +import { GoDotFill } from "react-icons/go"; export default function DashboardAside({shrinkAside=false}) { @@ -44,7 +45,7 @@ export default function DashboardAside({shrinkAside=false}) {
@@ -52,7 +53,7 @@ export default function DashboardAside({shrinkAside=false}) {
-

Admin

+

ADMIN

- {/*
-

Admin

- - - - - - +
+ {/*

LOANS

*/} + + + + {shrinkAside ? '' : 'Approved'} + + + + {shrinkAside ? '' : 'Pending'} + - -
*/} - - {/*
-

Admin

- - -
*/} +
-
+
+ +

+ coming soon ... +

+
+ ) +} \ No newline at end of file diff --git a/src/pages/HomePage.jsx b/src/pages/HomePage.jsx index 2ab360c..c97deae 100644 --- a/src/pages/HomePage.jsx +++ b/src/pages/HomePage.jsx @@ -3,11 +3,19 @@ import BreadcrumbCom from '../components/breadcrumb/BreadcrumbCom' export default function HomePage() { return ( -
+
-

- coming soon ... -

+
+
+
+
+
+
+
+
+
+
+
) } diff --git a/src/pages/PendingLoansPage.jsx b/src/pages/PendingLoansPage.jsx new file mode 100644 index 0000000..855c3d2 --- /dev/null +++ b/src/pages/PendingLoansPage.jsx @@ -0,0 +1,13 @@ +import React from 'react' +import BreadcrumbCom from '../components/breadcrumb/BreadcrumbCom' + +export default function PendingLoansPage() { + return ( +
+ +

+ coming soon ... +

+
+ ) +} diff --git a/tailwind.config.js b/tailwind.config.js index e496ae3..59a1f14 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -9,7 +9,7 @@ module.exports = { DEFAULT: '#393536', }, black:{ - DEFAULT: '#2c2e3e', + DEFAULT: '#222', gray: '#a6a9b7' }, primary: {