diff --git a/src/components/layouts/rightaside/RecentPaymentsBar.jsx b/src/components/layouts/rightaside/RecentPaymentsBar.jsx index d93d72d..9000522 100644 --- a/src/components/layouts/rightaside/RecentPaymentsBar.jsx +++ b/src/components/layouts/rightaside/RecentPaymentsBar.jsx @@ -1,10 +1,16 @@ import React from 'react' +import {Link} from 'react-router-dom' import Img from '../../../assets/user_avatar.jpg' import CustomCounter from '../../CustomCounter' +import RouteLinks from '../../../RouteLinks' export default function RecentPaymentsBar({data, isFetching, isError, error}) { + + const recentPayment = data?.data?.recent_payment_summary + const recentLogin = data?.data?.recent_login + return ( -
+

Recent Payments [7 days]

{isFetching ? @@ -18,32 +24,32 @@ export default function RecentPaymentsBar({data, isFetching, isError, error}) {

- +

Approved

- +

Verified

- +

Failed

- +

Total

}
-
+

Recent Login

{isFetching ?
@@ -54,42 +60,22 @@ export default function RecentPaymentsBar({data, isFetching, isError, error}) {

{error?.message}

:
-
-
- Order -
-
-

Project Briefing

-

Project Manager

-
-
-
-
- Order -
-
-

Project Briefing

-

Project Manager

-
-
-
-
- Order -
-
-

Project Briefing

-

Project Manager

-
-
-
-
- Order -
-
-

Project Briefing

-

Project Manager

-
-
+ {recentLogin.map((item, index)=> { + if(index < 5){ + return ( +
+
+ Order +
+
+

{item.firstname} {item.lastname}

+

{item.username}

+
+
+ ) + } + } + )}
}
diff --git a/src/components/layouts/rightaside/RightAsideBar.jsx b/src/components/layouts/rightaside/RightAsideBar.jsx index 0bbe2f0..853629b 100644 --- a/src/components/layouts/rightaside/RightAsideBar.jsx +++ b/src/components/layouts/rightaside/RightAsideBar.jsx @@ -29,14 +29,9 @@ export default function RightAsideBar() { }, // staleTime: 0 //0 mins }) - const recentData = [] // RECENT LIST - - // const recentData = data?.data // RECENT LIST - // const pagination = data?.data?.pagination - // console.log('RIGHT', data?.data) return ( -
+
{/* Menu */}
{/* Body */} - {active === 'orders' && } - {active === 'tickets' && } - {active === 'tasks' && } + {active === 'orders' && } + {active === 'tickets' && } + {active === 'tasks' && }
) } diff --git a/src/components/layouts/rightaside/Tickets.jsx b/src/components/layouts/rightaside/Tickets.jsx index 3512c0a..5edf733 100644 --- a/src/components/layouts/rightaside/Tickets.jsx +++ b/src/components/layouts/rightaside/Tickets.jsx @@ -3,6 +3,9 @@ import Img from '../../../assets/user_avatar.jpg' import CustomCounter from '../../CustomCounter' export default function Tickets({data, isFetching, isError, error}) { + + const recentDeployment = data?.data?.recent_deployment_summary + return (
@@ -18,25 +21,25 @@ export default function Tickets({data, isFetching, isError, error}) {

- +

Pending

- +

Started

- +

Stuck

- +

Completed