Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7b9d648ae9 | |||
| 4d258a965b | |||
| e20b7e32f1 |
@@ -152,12 +152,12 @@ const DashboardHomeIntro: FC<DashboardHomeIntroProps> = ({ handleNextStep, step
|
|||||||
>
|
>
|
||||||
{(data:any)=>(
|
{(data:any)=>(
|
||||||
<div className="w-full p-4 rounded-lg shadow-lg bg-white overflow-x-auto min-h-[250px] max-h-[450px]">
|
<div className="w-full p-4 rounded-lg shadow-lg bg-white overflow-x-auto min-h-[250px] max-h-[450px]">
|
||||||
<table className="w-full table-auto">
|
<table className="text-[12px] sm:text-base w-full table-auto">
|
||||||
<thead>
|
<thead>
|
||||||
<tr className='text-left border-b-2'>
|
<tr className='text-left border-b-2'>
|
||||||
<th className='px-1 py-4'>Date</th>
|
<th className='px-1 py-4'>Date</th>
|
||||||
<th className='px-1 py-4 text-right'>Amount</th>
|
<th className='px-1 py-4 text-right'>Amount</th>
|
||||||
<th className='px-1 py-4 text-center'>Payment Term</th>
|
<th className='px-1 py-4 text-center min-w-[110px]'>Payment Term</th>
|
||||||
<th className='px-1 py-4 text-center'>Status</th>
|
<th className='px-1 py-4 text-center'>Status</th>
|
||||||
<th className='px-1 py-4'>Action</th>
|
<th className='px-1 py-4'>Action</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@@ -1,31 +1,62 @@
|
|||||||
import { useState } from "react";
|
import { useState, useEffect } from 'react';
|
||||||
import { Link, useLocation } from "react-router-dom";
|
import { Link, useLocation } from 'react-router-dom';
|
||||||
import Logo from "../../assets/icons/logo.svg";
|
import Logo from '../../assets/icons/logo.svg';
|
||||||
import { Icons } from "../../components";
|
import { Icons } from '../../components';
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
asideDisplay?: () => void;
|
asideDisplay?: () => void;
|
||||||
logoutUser: () => void
|
logoutUser: () => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
export default function Aside({ asideDisplay, logoutUser }: Props) {
|
export default function Aside({ asideDisplay, logoutUser }: Props) {
|
||||||
const { pathname } = useLocation();
|
const { pathname } = useLocation();
|
||||||
|
|
||||||
const [openNestedLink, setOpenNestedLink] = useState<{ name: string | null }>(
|
const [openNestedLink, setOpenNestedLink] = useState<{ name: string | null }>(
|
||||||
{ name: "" }
|
{ name: '' }
|
||||||
);
|
);
|
||||||
|
|
||||||
const handleOpenNestedLink = (e: any) => {
|
const handleOpenNestedLink = (e: any) => {
|
||||||
if (!e || !e.target) {
|
if (!e || !e.target) {
|
||||||
return setOpenNestedLink({ name: "" });
|
return setOpenNestedLink({ name: '' });
|
||||||
}
|
}
|
||||||
if (openNestedLink.name && openNestedLink.name == e.target.name) {
|
if (openNestedLink.name && openNestedLink.name == e.target.name) {
|
||||||
setOpenNestedLink({ name: "" });
|
setOpenNestedLink({ name: '' });
|
||||||
} else {
|
} else {
|
||||||
setOpenNestedLink({ name: e.target.name });
|
setOpenNestedLink({ name: e.target.name });
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Track user activity
|
||||||
|
useEffect(() => {
|
||||||
|
let timeout: number;
|
||||||
|
|
||||||
|
const resetTimeout = () => {
|
||||||
|
clearTimeout(timeout);
|
||||||
|
timeout = window.setTimeout(() => {
|
||||||
|
// Logout user after 7 minutes of inactivity
|
||||||
|
logoutUser();
|
||||||
|
}, 7 * 60 * 1000); // 7 minutes in milliseconds
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleUserActivity = () => {
|
||||||
|
resetTimeout();
|
||||||
|
};
|
||||||
|
|
||||||
|
// Attach event listeners to track user activity
|
||||||
|
document.addEventListener('mousemove', handleUserActivity);
|
||||||
|
document.addEventListener('keypress', handleUserActivity);
|
||||||
|
|
||||||
|
// Initialize timeout
|
||||||
|
resetTimeout();
|
||||||
|
|
||||||
|
// Clear timeout and remove event listeners on component unmount
|
||||||
|
return () => {
|
||||||
|
clearTimeout(timeout);
|
||||||
|
document.removeEventListener('mousemove', handleUserActivity);
|
||||||
|
document.removeEventListener('keypress', handleUserActivity);
|
||||||
|
};
|
||||||
|
}, [logoutUser]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="py-5 px-10 flex flex-col h-full bg-inherit">
|
<div className="py-5 px-10 flex flex-col h-full bg-inherit">
|
||||||
<Link to="/">
|
<Link to="/">
|
||||||
@@ -45,8 +76,8 @@ export default function Aside({ asideDisplay, logoutUser }: Props) {
|
|||||||
onClick={(e) => handleOpenNestedLink(e)}
|
onClick={(e) => handleOpenNestedLink(e)}
|
||||||
className={`py-2 pl-2 text-left relative w-full overflow-hidden rounded-lg flex justify-between items-center z-10 bg-inherit ${
|
className={`py-2 pl-2 text-left relative w-full overflow-hidden rounded-lg flex justify-between items-center z-10 bg-inherit ${
|
||||||
allNestedLinks.includes(pathname)
|
allNestedLinks.includes(pathname)
|
||||||
? " text-[#5C2684]"
|
? ' text-[#5C2684]'
|
||||||
: " text-[#585858]"
|
: ' text-[#585858]'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
{link.name}
|
{link.name}
|
||||||
@@ -60,8 +91,8 @@ export default function Aside({ asideDisplay, logoutUser }: Props) {
|
|||||||
<div
|
<div
|
||||||
className={`transition-all duration-300 w-full z-1 ${
|
className={`transition-all duration-300 w-full z-1 ${
|
||||||
openNestedLink.name == link.name
|
openNestedLink.name == link.name
|
||||||
? "relative top-0"
|
? 'relative top-0'
|
||||||
: "absolute -top-[500px]"
|
: 'absolute -top-[500px]'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
{link.nestedLink.map((nextLink, index) => (
|
{link.nestedLink.map((nextLink, index) => (
|
||||||
@@ -70,17 +101,17 @@ export default function Aside({ asideDisplay, logoutUser }: Props) {
|
|||||||
asideDisplay && asideDisplay();
|
asideDisplay && asideDisplay();
|
||||||
}}
|
}}
|
||||||
key={index}
|
key={index}
|
||||||
to={nextLink.link ? nextLink.link : "#"}
|
to={nextLink.link ? nextLink.link : '#'}
|
||||||
className={`w-full my-1 flex items-center gap-2 py-2 pl-5 text-base font-medium ${
|
className={`w-full my-1 flex items-center gap-2 py-2 pl-5 text-base font-medium ${
|
||||||
pathname == nextLink.link
|
pathname == nextLink.link
|
||||||
? " text-[#5C2684]"
|
? ' text-[#5C2684]'
|
||||||
: "text-[#585858]"
|
: 'text-[#585858]'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
<Icons
|
<Icons
|
||||||
name={nextLink.icon}
|
name={nextLink.icon}
|
||||||
fillColor={`${
|
fillColor={`${
|
||||||
pathname == nextLink.link ? "#5C2684" : "#585858"
|
pathname == nextLink.link ? '#5C2684' : '#585858'
|
||||||
}`}
|
}`}
|
||||||
/>
|
/>
|
||||||
{nextLink.name}
|
{nextLink.name}
|
||||||
@@ -96,14 +127,14 @@ export default function Aside({ asideDisplay, logoutUser }: Props) {
|
|||||||
asideDisplay && asideDisplay();
|
asideDisplay && asideDisplay();
|
||||||
}}
|
}}
|
||||||
key={index}
|
key={index}
|
||||||
to={link.link ? link.link : "#"}
|
to={link.link ? link.link : '#'}
|
||||||
className={`w-full my-4 flex items-center gap-2 py-2 pl-5 rounded-lg text-base font-medium ${
|
className={`w-full my-4 flex items-center gap-2 py-2 pl-5 rounded-lg text-base font-medium ${
|
||||||
pathname == link.link ? "text-[#5C2684]" : "text-[#585858]"
|
pathname == link.link ? 'text-[#5C2684]' : 'text-[#585858]'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
<Icons
|
<Icons
|
||||||
name={link.icon}
|
name={link.icon}
|
||||||
fillColor={`${pathname == link.link ? "#5C2684" : "#585858"}`}
|
fillColor={`${pathname == link.link ? '#5C2684' : '#585858'}`}
|
||||||
/>
|
/>
|
||||||
{link.name}
|
{link.name}
|
||||||
</Link>
|
</Link>
|
||||||
@@ -119,7 +150,6 @@ export default function Aside({ asideDisplay, logoutUser }: Props) {
|
|||||||
Log out
|
Log out
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
|
|
||||||
<div className="flex flex-col gap-[.4375rem] text-[.75rem]">
|
<div className="flex flex-col gap-[.4375rem] text-[.75rem]">
|
||||||
<p className="font-extrabold tracking-[3%] text-[#FBB700] underline">
|
<p className="font-extrabold tracking-[3%] text-[#FBB700] underline">
|
||||||
For more enquiries and support
|
For more enquiries and support
|
||||||
@@ -131,7 +161,6 @@ export default function Aside({ asideDisplay, logoutUser }: Props) {
|
|||||||
Email: fcmbloan@support.com
|
Email: fcmbloan@support.com
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
@@ -149,29 +178,34 @@ type AsideLinksType = {
|
|||||||
}[];
|
}[];
|
||||||
|
|
||||||
const asideLinks: AsideLinksType = [
|
const asideLinks: AsideLinksType = [
|
||||||
{ name: "Dashboard", link: "/dashboard/home", icon: "dash-icon", nestedLink: [] },
|
|
||||||
{
|
{
|
||||||
name: "Your Profile",
|
name: 'Dashboard',
|
||||||
link: "/dashboard/profile",
|
link: '/dashboard/home',
|
||||||
icon: "dash-icon",
|
icon: 'dash-icon',
|
||||||
nestedLink: [],
|
nestedLink: [],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Employment Details",
|
name: 'Your Profile',
|
||||||
link: "/dashboard/verification",
|
link: '/dashboard/profile',
|
||||||
icon: "dash-icon",
|
icon: 'dash-icon',
|
||||||
nestedLink: [],
|
nestedLink: [],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Reference Details",
|
name: 'Employment Details',
|
||||||
link: "/dashboard/payments",
|
link: '/dashboard/verification',
|
||||||
icon: "dash-icon",
|
icon: 'dash-icon',
|
||||||
nestedLink: [],
|
nestedLink: [],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Agreements",
|
name: 'Reference Details',
|
||||||
link: "/dashboard/legals",
|
link: '/dashboard/payments',
|
||||||
icon: "dash-icon",
|
icon: 'dash-icon',
|
||||||
|
nestedLink: [],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'Agreements',
|
||||||
|
link: '/dashboard/legals',
|
||||||
|
icon: 'dash-icon',
|
||||||
nestedLink: [],
|
nestedLink: [],
|
||||||
},
|
},
|
||||||
// {name: 'Nested Link', icon: 'home', nestedLink:[
|
// {name: 'Nested Link', icon: 'home', nestedLink:[
|
||||||
|
|||||||
@@ -83,8 +83,8 @@ export default function DashboardLayout({ children }: { children: ReactNode }) {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
<div className="flex p-5 relative">
|
<div className="flex p-2 md:p-5 relative">
|
||||||
<div className="w-full p-5">{children}</div>
|
<div className="w-full p-2 md:p-5">{children}</div>
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user