diff --git a/src/components/MainBtn.jsx b/src/components/MainBtn.jsx index 4c770af..78c035e 100644 --- a/src/components/MainBtn.jsx +++ b/src/components/MainBtn.jsx @@ -3,7 +3,7 @@ export default function MainBtn({ className, text, shrinkAside, - icon, + children, loading, disabled }) { @@ -13,7 +13,7 @@ export default function MainBtn({ className={`py-3 px-4 rounded text-12 lg:text-lg ${className || ''} ${(disabled || loading) && 'opacity-60'}`} onClick={onClick} > - {icon && } + {children && children} {shrinkAside ? '' : loading? 'Loading...' : text} ) diff --git a/src/components/breadcrumb/BreadcrumbCom.jsx b/src/components/breadcrumb/BreadcrumbCom.jsx index a95aecc..28ea6b0 100644 --- a/src/components/breadcrumb/BreadcrumbCom.jsx +++ b/src/components/breadcrumb/BreadcrumbCom.jsx @@ -6,7 +6,7 @@ export default function BreadcrumbCom({title, paths}) {

{title}

- + {paths.map((item, index) => (
diff --git a/src/components/layouts/aside/AsideLink.jsx b/src/components/layouts/aside/AsideLink.jsx index eee17d9..fd1cd5f 100644 --- a/src/components/layouts/aside/AsideLink.jsx +++ b/src/components/layouts/aside/AsideLink.jsx @@ -1,6 +1,6 @@ import { Link, useLocation } from "react-router-dom" -export default function AsideLink({shrinkAside, name, to, icon}) { +export default function AsideLink({shrinkAside, name, to, children}) { const {pathname} = useLocation() @@ -9,8 +9,7 @@ export default function AsideLink({shrinkAside, name, to, icon}) { className={`w-full flex items-center gap-2 px-4 py-2 my-1 text-[13px] font-semibold rounded-md hover:text-white-light hover:bg-white/10 ${pathname == to ? 'bg-white/10 text-white-light' : 'text-slate-400'}`} to={to} > - {/* {icon && } */} - {icon && } + {children && children} {shrinkAside ? '' : name} ) diff --git a/src/components/layouts/aside/DashboardAside.jsx b/src/components/layouts/aside/DashboardAside.jsx index 4db2dc7..5764da5 100644 --- a/src/components/layouts/aside/DashboardAside.jsx +++ b/src/components/layouts/aside/DashboardAside.jsx @@ -11,6 +11,7 @@ import { generalLayoutContext } from "../../../context/GeneralLayoutContext"; import { AiOutlineDashboard } from "react-icons/ai"; import { IoPeople } from "react-icons/io5"; import { GoDotFill } from "react-icons/go"; +import { TbLogout2 } from "react-icons/tb"; export default function DashboardAside({shrinkAside=false}) { @@ -44,54 +45,55 @@ export default function DashboardAside({shrinkAside=false}) {
- + shrinkAside={shrinkAside} + name='Dashboard' + > - {shrinkAside ? '' : 'Dashboard'} - +
-

ADMIN

- ADMIN + + shrinkAside={shrinkAside} + name='Users' + > - {shrinkAside ? '' : 'Users'} - +
{/*

LOANS

*/} - + shrinkAside={shrinkAside} + name='Approved' + > - {shrinkAside ? '' : 'Approved'} - - + - - {shrinkAside ? '' : 'Pending'} - + shrinkAside={shrinkAside} + name='Pending' + > + +
- setLogoutModal(true)} - /> + > + +
diff --git a/src/pages/HomePage.jsx b/src/pages/HomePage.jsx index c97deae..22e4ca5 100644 --- a/src/pages/HomePage.jsx +++ b/src/pages/HomePage.jsx @@ -7,13 +7,13 @@ export default function HomePage() {
-
-
-
-
+
+
+
+
-
+