MERMS/MermsFirstOffice
1
0
Fork 0
Code Issues Pull Requests 1 Releases Activity

Added recent signup data #31

Merged
ameye merged 1 commits from recent-signup into master 2025-10-17 18:17:36 +00:00
Conversation 0 Commits 1 Files Changed 3
+50 -51
3 changed files with 50 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/account_view/AccountViewCom.jsx
+11 -1
View File
@@ -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 (
<div className='w-full flex flex-col gap-8'>
<BreadcrumbCom title={`Account View [${state?.memberUID}]`} paths={['Dashboard', 'Account View']}/>
src/components/layouts/rightaside/RecentPaymentsBar.jsx
+15 -12
View File
@@ -61,19 +61,22 @@ export default function RecentPaymentsBar({data, isFetching, isError, error}) {
:
<div className='flex flex-col gap-4'>
{recentLogin.map((item, index)=> {
if(index < 5){
return (
<div key={index} className='flex gap-3 items-center'>
<div className='px-4 py-2 bg-[#0E172E] rounded-md'>
<img src={Img} className='w-8' alt="Order" />
</div>
<div className='flex-col'>
<p className='text-base font-bold text-white-body'>{item.firstname} {item.lastname}</p>
<p className='text-sm text-slate-500'>{item.username}</p>
</div>
return (
<Link
to={`/account-view/${item?.member_uid}`}
state={{customerID: item?.id, memberUID: item?.member_uid}}
key={index}
className='flex gap-3 items-center'
>
<div className='px-4 py-2 bg-[#0E172E] rounded-md'>
<img src={Img} className='w-8' alt="Order" />
</div>
)
}
<div className='flex-col'>
<p className='text-base font-bold text-white-body'>{item.firstname} {item.lastname}</p>
<p className='text-sm text-slate-500'>{item.username}</p>
</div>
</Link>
)
}
)}
</div>
src/components/layouts/rightaside/Tickets.jsx
+24 -38
View File
@@ -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 (
<div className='h-full p-2 sm:p-4 large:p-8 flex flex-col gap-16 overflow-y-auto aside-scroll-design'>
<div className='h-full p-2 sm:p-4 large:p-8 flex flex-col gap-16 aside-scroll-design'>
<div className='flex flex-col gap-4'>
<p className='text-base text-white-body font-bold'>Recent Deployments</p>
{isFetching ?
@@ -46,7 +49,7 @@ export default function Tickets({data, isFetching, isError, error}) {
</div>
}
</div>
<div className='flex flex-col gap-4'>
<div className='overflow-y-auto h-full flex flex-col gap-4'>
<p className='text-base text-white-body font-bold'>Recent Signup</p>
{isFetching ?
<div className='w-full flex justify-center'>
@@ -57,42 +60,25 @@ export default function Tickets({data, isFetching, isError, error}) {
<p className='text-base text-white-body font-bold'>{error?.message}</p>
:
<div className='flex flex-col gap-4'>
<div className='flex gap-3 items-center'>
<div className='px-4 py-2 bg-[#0E172E] rounded-md'>
<img src={Img} className='w-8' alt="Order" />
</div>
<div className='flex-col'>
<p className='text-base font-bold text-white-body'>Project Briefing</p>
<p className='text-sm text-slate-500'>Project Manager</p>
</div>
</div>
<div className='flex gap-3 items-center'>
<div className='px-4 py-2 bg-[#0E172E] rounded-md'>
<img src={Img} className='w-8' alt="Order" />
</div>
<div className='flex-col'>
<p className='text-base font-bold text-white-body'>Project Briefing</p>
<p className='text-sm text-slate-500'>Project Manager</p>
</div>
</div>
<div className='flex gap-3 items-center'>
<div className='px-4 py-2 bg-[#0E172E] rounded-md'>
<img src={Img} className='w-8' alt="Order" />
</div>
<div className='flex-col'>
<p className='text-base font-bold text-white-body'>Project Briefing</p>
<p className='text-sm text-slate-500'>Project Manager</p>
</div>
</div>
<div className='flex gap-3 items-center'>
<div className='px-4 py-2 bg-[#0E172E] rounded-md'>
<img src={Img} className='w-8' alt="Order" />
</div>
<div className='flex-col'>
<p className='text-base font-bold text-white-body'>Project Briefing</p>
<p className='text-sm text-slate-500'>Project Manager</p>
</div>
</div>
{recentSignup.map((item, index)=> {
return (
<Link
to={`/account-view/${item?.member_uid}`}
state={{customerID: item?.id, memberUID: item?.member_uid}}
key={index}
className='flex gap-3 items-center'
>
<div className='px-4 py-2 bg-[#0E172E] rounded-md'>
<img src={Img} className='w-8' alt="Order" />
</div>
<div className='flex-col'>
<p className='text-base font-bold text-white-body'>{item.firstname} {item.lastname}</p>
<p className='text-sm text-slate-500'>{item.username}</p>
</div>
</Link>
)
}
)}
</div>
}
</div>