diff --git a/src/components/account_view/AccountViewCom.jsx b/src/components/account_view/AccountViewCom.jsx index ae3720d..30dc169 100644 --- a/src/components/account_view/AccountViewCom.jsx +++ b/src/components/account_view/AccountViewCom.jsx @@ -1,5 +1,5 @@ import {useEffect, useState} from 'react' -import { useQuery } from '@tanstack/react-query' +import { useQuery, useQueryClient } from '@tanstack/react-query' import {useLocation, useNavigate, Link} from 'react-router-dom' @@ -14,6 +14,8 @@ import CustomerPaymentsView from "./CustomerPaymentsView"; export default function AccountViewCom() { + const queryClient = useQueryClient() + const {state} = useLocation() const navigate = useNavigate() @@ -43,6 +45,14 @@ export default function AccountViewCom() { const payments = accountsViewData?.payments // console.log('DATA', payments, subscriptions) + useEffect(()=>{ + queryClient.refetchQueries({ + queryKey: [...queryKeys.account_view], + // type: 'active', + // exact: true, + }) + },[state?.memberUID]) + return (
diff --git a/src/components/layouts/rightaside/RecentPaymentsBar.jsx b/src/components/layouts/rightaside/RecentPaymentsBar.jsx index 9000522..a352b86 100644 --- a/src/components/layouts/rightaside/RecentPaymentsBar.jsx +++ b/src/components/layouts/rightaside/RecentPaymentsBar.jsx @@ -61,19 +61,22 @@ export default function RecentPaymentsBar({data, isFetching, isError, error}) { :
{recentLogin.map((item, index)=> { - if(index < 5){ - return ( -
-
- Order -
-
-

{item.firstname} {item.lastname}

-

{item.username}

-
+ return ( + +
+ Order
- ) - } +
+

{item.firstname} {item.lastname}

+

{item.username}

+
+ + ) } )}
diff --git a/src/components/layouts/rightaside/Tickets.jsx b/src/components/layouts/rightaside/Tickets.jsx index dcd885c..42f5996 100644 --- a/src/components/layouts/rightaside/Tickets.jsx +++ b/src/components/layouts/rightaside/Tickets.jsx @@ -1,13 +1,16 @@ import React from 'react' +import {Link} from 'react-router-dom' 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 + const recentSignup = data?.data?.recent_signup + return ( -
+

Recent Deployments

{isFetching ? @@ -46,7 +49,7 @@ export default function Tickets({data, isFetching, isError, error}) {
}
-
+

Recent Signup

{isFetching ?
@@ -57,42 +60,25 @@ export default function Tickets({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

-
-
+ {recentSignup.map((item, index)=> { + return ( + +
+ Order +
+
+

{item.firstname} {item.lastname}

+

{item.username}

+
+ + ) + } + )}
}