From 584225e08b7ac2141972badc2867bfc30d1b4d71 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Mon, 22 Sep 2025 15:37:51 +0100 Subject: [PATCH] account view endpoint added --- .../account_view/AccountViewCom.jsx | 45 +++++++++++++++++-- src/components/customer/CustomerCom.jsx | 2 +- src/components/products/CustomTemplates.jsx | 16 +++---- src/components/products/ProductTemplates.jsx | 14 +++--- src/services/queryKeys.js | 3 ++ src/services/siteServices.js | 16 ++++++- 6 files changed, 76 insertions(+), 20 deletions(-) diff --git a/src/components/account_view/AccountViewCom.jsx b/src/components/account_view/AccountViewCom.jsx index f573961..e97b57d 100644 --- a/src/components/account_view/AccountViewCom.jsx +++ b/src/components/account_view/AccountViewCom.jsx @@ -1,16 +1,55 @@ import {useEffect, useState} from 'react' -import {Link} from 'react-router-dom' +import { useQuery } from '@tanstack/react-query' + +import {useLocation, useNavigate, Link} from 'react-router-dom' import BreadcrumbCom from '../breadcrumb/BreadcrumbCom' +import RouteLinks from '../../RouteLinks' +import { getAccountView } from '../../services/siteServices' +import queryKeys from '../../services/queryKeys' export default function AccountViewCom() { + const {state:{memberUID}} = useLocation() + const navigate = useNavigate() + + useEffect(()=>{ + if(!memberUID){ + navigate(RouteLinks.customerPage, {replace: true}) + } + },[]) + + const {data, isFetching, isError, error} = useQuery({ + queryKey: queryKeys.account_view, + queryFn: () => { + // const filterData = filter?.type ? {[filter?.type]: filter.id} : {} + const reqData = { + member_uid: memberUID + // page, + // ...filterData + } + return getAccountView(reqData) + }, + staleTime: 0 //0 mins + }) + const accountsViewData = data?.data?.products // ACCOUNT VIEW DATA + const pagination = data?.data?.pagination + console.log('DATA', data?.data) + return (
- +
- + {isFetching ? + <> +

Loading...

+ + : isError ? +

{error.message}

+ : +

coming soon

+ }
diff --git a/src/components/customer/CustomerCom.jsx b/src/components/customer/CustomerCom.jsx index 0fafef7..8d7143c 100644 --- a/src/components/customer/CustomerCom.jsx +++ b/src/components/customer/CustomerCom.jsx @@ -134,7 +134,7 @@ export default function CustomerCom() {
+ state={{customerID: item?.id, memberUID: item?.member_uid}}>
diff --git a/src/components/products/CustomTemplates.jsx b/src/components/products/CustomTemplates.jsx index 6e53d97..678eaf0 100644 --- a/src/components/products/CustomTemplates.jsx +++ b/src/components/products/CustomTemplates.jsx @@ -5,7 +5,7 @@ import queryKeys from '../../services/queryKeys' import BreadcrumbCom from '../breadcrumb/BreadcrumbCom' import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper' import Icons from '../Icons' -import { getProducts } from '../../services/siteServices' +import { getCustomTemplate } from '../../services/siteServices' import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString' export default function CustomTemplates() { @@ -32,18 +32,18 @@ export default function CustomTemplates() { } const {data, isFetching, isError, error} = useQuery({ - queryKey: [...queryKeys.products, page, willFilter], + queryKey: [...queryKeys.custom_template, page, willFilter], queryFn: () => { const filterData = filter?.type ? {[filter?.type]: filter.id} : {} const reqData = { page, ...filterData } - return getProducts(reqData) + return getCustomTemplate(reqData) }, staleTime: 0 //0 mins }) - const productsData = data?.data?.products // PRODUCTS LIST + const customTemData = data?.data?.products // CUSTOM TEMPLATE LIST const pagination = data?.data?.pagination // console.log('DATA', data?.data) @@ -72,20 +72,20 @@ export default function CustomTemplates() { {/* end of filter section */} - + {({ data }) => ( <>
- Added + ID - Name + Custom ID - Product ID + Provision Name Status diff --git a/src/components/products/ProductTemplates.jsx b/src/components/products/ProductTemplates.jsx index 56312f1..ec09282 100644 --- a/src/components/products/ProductTemplates.jsx +++ b/src/components/products/ProductTemplates.jsx @@ -5,7 +5,7 @@ import queryKeys from '../../services/queryKeys' import BreadcrumbCom from '../breadcrumb/BreadcrumbCom' import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper' import Icons from '../Icons' -import { getProducts } from '../../services/siteServices' +import { getProductsTemplate } from '../../services/siteServices' import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString' export default function ProductTemplates() { @@ -32,18 +32,18 @@ export default function ProductTemplates() { } const {data, isFetching, isError, error} = useQuery({ - queryKey: [...queryKeys.products, page, willFilter], + queryKey: [...queryKeys.products_template, page, willFilter], queryFn: () => { const filterData = filter?.type ? {[filter?.type]: filter.id} : {} const reqData = { page, ...filterData } - return getProducts(reqData) + return getProductsTemplate(reqData) }, staleTime: 0 //0 mins }) - const productsData = data?.data?.products // PRODUCTS LIST + const productsTemData = data?.data?.products // PRODUCTS TEMPLATE LIST const pagination = data?.data?.pagination // console.log('DATA', data?.data) @@ -72,20 +72,20 @@ export default function ProductTemplates() { {/* end of filter section */} - + {({ data }) => ( <>
- Added + Product ID Name - Product ID + Provision Name Status diff --git a/src/services/queryKeys.js b/src/services/queryKeys.js index eeeaa17..887a02f 100644 --- a/src/services/queryKeys.js +++ b/src/services/queryKeys.js @@ -17,6 +17,9 @@ const queryKeys = { right_sidebar: ['right_sidebar'], recent_signup: ['recent_signup'], products: ['products'], + products_template: ['products_template'], + custom_template: ['custom_template'], + account_view: ['account_view'], users_admin: ['users_admin'], } diff --git a/src/services/siteServices.js b/src/services/siteServices.js index 1198577..7992933 100644 --- a/src/services/siteServices.js +++ b/src/services/siteServices.js @@ -98,9 +98,23 @@ export const getUsers = (reqData) => { return getAuxEnd(`/users`, postData) } +// FUNCTION TO GET PRODUCTS TEMPLATE DATA +export const getProductsTemplate = (reqData) => { + const postData = { ...reqData } + return getAuxEnd(`/products-template`, postData) +} +// FUNCTION TO GET CUSTOM TEMPLATE DATA +export const getCustomTemplate = (reqData) => { + const postData = { ...reqData } + return getAuxEnd(`/custom-template`, postData) +} - +// FUNCTION TO VIEW SELECTED ACCOUNT DATA +export const getAccountView = (reqData) => { + const postData = { ...reqData } + return getAuxEnd(`/account-view`, postData) +} -- 2.34.1