Compare commits

..

7 Commits

Author SHA1 Message Date
victorAnumudu 584225e08b account view endpoint added 2025-09-22 15:37:51 +01:00
CHIEFSOFT\ameye f33a945384 Product and custom templates pages 2025-09-21 09:08:27 -04:00
CHIEFSOFT\ameye a08ee7187c Template congigs pages 2025-09-21 08:58:55 -04:00
CHIEFSOFT\ameye 403e7df2b8 Added new back offcie itesm 2025-09-20 09:27:57 -04:00
ameye 90390a77b3 Merge branch 'user-endpoint-fix' of MERMS/MermsFirstOffice into master 2025-09-19 08:08:48 +00:00
victorAnumudu 01c1c62bf0 fixed user endpoint data 2025-09-18 17:35:52 +01:00
ameye db4ecdd55b Merge branch 'login-input-length' of MERMS/MermsFirstOffice into master 2025-09-14 21:17:12 +00:00
13 changed files with 460 additions and 81 deletions
+3
View File
@@ -2,6 +2,7 @@ const RouteLinks = {
loginPage: '/auth/login',
homePage: '/',
customerPage: '/customer',
accountDetails: '/account-view/*',
subscriptions: '/subscriptions',
billings: '/billings',
recentSignup: '/recent-signup',
@@ -9,6 +10,8 @@ const RouteLinks = {
transactionsPage: '/transactions',
products: '/products',
usersAdmin: '/users-admin',
productTemplates: '/products-template',
customTemplates: '/custom-template',
transaction_details_page: '/transaction/details',
errorPage: '*',
}
+37 -30
View File
@@ -1,5 +1,5 @@
import { Suspense } from 'react'
import { Routes, Route } from 'react-router-dom'
import {Suspense} from 'react'
import {Routes, Route} from 'react-router-dom'
import RouteLinks from './RouteLinks'
import UserExist from './authorization/UserExist'
@@ -16,39 +16,46 @@ import ProductsPage from './pages/ProductsPage' // PRODUCTS PAGE
import ErrorPage from './pages/ErrorPage';
import LoansPage from './pages/LoansPage' // SELECTED LOANS PAGE
import TransactionDetailsPage from './pages/TransactionDetailsPage' // TRANSACTION DETAILS PAGE
import TransactionDetailsPage from './pages/TransactionDetailsPage'
import AccountDetailsPage from "./pages/AccountDetailsPage";
import ProductTemplatePage from "./pages/ProductTemplatePage";
import CustomTemplatePage from "./pages/CustomTemplatePage"; // TRANSACTION DETAILS PAGE
// const Home = lazy(() => import('./pages/Home'));
export default function SiteRoutes() {
return (
<Routes>
<Route path={RouteLinks.loginPage} element={<LoginPage />} /> {`*/LOGIN PAGE*/`}
return (
<Routes>
<Route path={RouteLinks.loginPage} element={<LoginPage/>}/> {`*/LOGIN PAGE*/`}
<Route element={<UserExist />}>
<Route path={RouteLinks.homePage} element={<HomePage />} /> {`*/HOME PAGE*/`}
<Route path={RouteLinks.recentSignup} element={<RecentSignupPage />} /> {`*/RECENT SIGNUP PAGE*/`}
<Route path={RouteLinks.subscriptions} element={<SubscriptionsPage />} /> {`*/SUBSCRIPTIONS PAGE*/`}
<Route path={RouteLinks.customerPage} element={<CustomerPage />} /> {`*/CUSTOMER PAGE*/`}
<Route path={RouteLinks.billings} element={<BillingsPage />} /> {`*/BILLINGS PAGE*/`}
<Route path={RouteLinks.products} element={<ProductsPage />} /> {`*/PRODUCTS PAGE*/`}
<Route path={RouteLinks.usersAdmin} element={<UsersAdminPage />} /> {`*/ADMIN USERS PAGE*/`}
<Route path={RouteLinks.loansPage} element={<LoansPage />} /> {`*/LOANS PAGE*/`}
<Route path={RouteLinks.transaction_details_page} element={<TransactionDetailsPage />} /> {`*/TRANSACTION PAGE*/`}
</Route>
<Route element={<UserExist/>}>
<Route path={RouteLinks.homePage} element={<HomePage/>}/> {`*/HOME PAGE*/`}
<Route path={RouteLinks.recentSignup} element={<RecentSignupPage/>}/> {`*/RECENT SIGNUP PAGE*/`}
<Route path={RouteLinks.subscriptions} element={<SubscriptionsPage/>}/> {`*/SUBSCRIPTIONS PAGE*/`}
<Route path={RouteLinks.customerPage} element={<CustomerPage/>}/> {`*/CUSTOMER PAGE*/`}
<Route path={RouteLinks.accountDetails} element={<AccountDetailsPage/>}/> {`*/CUSTOMER PAGE*/`}
<Route path={RouteLinks.billings} element={<BillingsPage/>}/> {`*/BILLINGS PAGE*/`}
<Route path={RouteLinks.products} element={<ProductsPage/>}/> {`*/PRODUCTS PAGE*/`}
<Route path={RouteLinks.usersAdmin} element={<UsersAdminPage/>}/> {`*/ADMIN USERS PAGE*/`}
{/* ERROR PAGE */}
<Route
path={RouteLinks.errorPage} // error page
element={
<Suspense fallback={<PageLoader />}>
<ErrorPage />
</Suspense>
}
/>
</Routes>
)
<Route path={RouteLinks.productTemplates} element={<ProductTemplatePage/>}/> {`*/PRODUCTS TEMPLATE PAGE*/`}
<Route path={RouteLinks.customTemplates} element={<CustomTemplatePage/>}/> {`*/CUSTOM TEMPLATES PAGE*/`}
<Route path={RouteLinks.loansPage} element={<LoansPage/>}/> {`*/LOANS PAGE*/`}
<Route path={RouteLinks.transaction_details_page}
element={<TransactionDetailsPage/>}/> {`*/TRANSACTION PAGE*/`}
</Route>
{/* ERROR PAGE */}
<Route
path={RouteLinks.errorPage} // error page
element={
<Suspense fallback={<PageLoader/>}>
<ErrorPage/>
</Suspense>
}
/>
</Routes>
)
}
@@ -0,0 +1,57 @@
import {useEffect, useState} from 'react'
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 (
<div className='w-full flex flex-col gap-8'>
<BreadcrumbCom title={`Account View [${memberUID}]`} paths={['Dashboard', 'Account View']}/>
<div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'>
{isFetching ?
<>
<p className='text-slate-800'>Loading...</p>
</>
: isError ?
<p className='text-red-500'>{error.message}</p>
:
<p className='text-slate-800'>coming soon</p>
}
</div>
</div>
)
}
+2 -1
View File
@@ -133,7 +133,8 @@ export default function CustomerCom() {
<div className='flex items-center justify-end gap-3 md:gap-4'>
<div
className='p-2 flex justify-center items-center text-slate-500 bg-white-body dark:text-white-body dark:bg-black-body rounded-md'>
<Link to={''} state={{customerID: item?.id}}>
<Link to={`/account-view/${item?.member_uid}`}
state={{customerID: item?.id, memberUID: item?.member_uid}}>
<Icons name='eye'/>
</Link>
</div>
@@ -158,6 +158,8 @@ const asideNavLinks = [
{
name: 'Configurations', status: 1, icon: 'arrow-right', subLinks: [
{name: 'Product Settings', status: 1, icon: 'dot', to: RouteLinks.products},
{name: 'Product Templates', status: 1, icon: 'dot', to: RouteLinks.productTemplates},
{name: 'Custom Templates', status: 1, icon: 'dot', to: RouteLinks.customTemplates},
{name: 'Admin Manager', status: 1, icon: 'dot', to: RouteLinks.usersAdmin},
]
},
+141
View File
@@ -0,0 +1,141 @@
import { useState } from 'react'
import { useQuery } from '@tanstack/react-query'
import queryKeys from '../../services/queryKeys'
import BreadcrumbCom from '../breadcrumb/BreadcrumbCom'
import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper'
import Icons from '../Icons'
import { getCustomTemplate } from '../../services/siteServices'
import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString'
export default function CustomTemplates() {
const [page, setPage] = useState(1)
const [filter, setFilter] = useState({type: '', id: ''})
const [willFilter, setWillFilter] = useState(false)
const handleFilter = ({target:{name, value}}) => {
setFilter(prev => ({...prev, [name]:value}))
}
const handleFilterByParams = () => {
if(filter.type && !filter.id){
return
}else if(!filter.type){
setPage(1)
setWillFilter(prev => !prev)
setFilter({type: '', id: ''})
}else{
setPage(1)
setWillFilter(prev => !prev)
}
}
const {data, isFetching, isError, error} = useQuery({
queryKey: [...queryKeys.custom_template, page, willFilter],
queryFn: () => {
const filterData = filter?.type ? {[filter?.type]: filter.id} : {}
const reqData = {
page,
...filterData
}
return getCustomTemplate(reqData)
},
staleTime: 0 //0 mins
})
const customTemData = data?.data?.products // CUSTOM TEMPLATE LIST
const pagination = data?.data?.pagination
// console.log('DATA', data?.data)
return (
<div className='w-full flex flex-col gap-8'>
<BreadcrumbCom title='Custom Templates' paths={['Dashboard', 'Custom Templates']} />
<div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'>
{ isError ?
<p className='text-red-500'>{error?.message}</p>
:
<>
{/* filter section */}
<div className='px-2 py-2 mb-4 flex flex-col sm:flex-row flex-wrap sm:items-center gap-2'>
<Icons name='filter' className='text-3xl' />
<div className='w-full sm:max-w-48'>
<select name='type' value={filter?.type} className='h-10 w-full p-2 rounded-md' onChange={handleFilter}>
<option value=''>All</option>
<option value='name'>Name</option>
</select>
</div>
<div className='w-full sm:max-w-48'>
<input name='id' value={filter?.id} disabled={!filter.type} className={`h-10 w-full p-2 rounded-md outline-none border border-black-aside ${!filter.type && 'opacity-30'}`} onChange={handleFilter} />
</div>
<button onClick={handleFilterByParams} disabled={filter.type && !filter.id} className={`h-10 bg-primary px-2 py-1 rounded-md text-white font-medium sm:self-end ${(filter.type && !filter.id) && 'opacity-50'}`}>Submit</button>
</div>
{/* end of filter section */}
<TablePaginatedWrapper data={customTemData} isFetching={isFetching} setPage={setPage} itemsPerPage={pagination?.limit} pagination={pagination}>
{({ data }) => (
<>
<table className="py-2 w-full text-sm">
<thead className="py-2 text-sm text-slate-500 text-left">
<tr>
<th scope="col" className="px-2 py-2">
ID
</th>
<th scope="col" className="px-2">
Custom ID
</th>
<th scope="col" className="px-2">
Provision Name
</th>
<th scope="col" className="px-2 text-right">
Status
</th>
</tr>
</thead>
<tbody>
{(data && data.length > 0) ? data?.map((item, index) => (
<tr key={index} className="py-2 border-t border-dashed border-slate-300">
<td className="px-2 py-2">
<div className='w-full min-w-48 flex items-center gap-2 whitespace-nowrap'>
<div className="text-left">
<div className="text-base font-semibold">{getDateTimeFromDateString(item?.added)}</div>
</div>
</div>
</td>
<td className="px-2">
<div className="text-left">
<div className="text-base font-semibold">{item?.name}</div>
</div>
</td>
<td className="px-2">
<div className="text-left">
<div className="text-base font-semibold">{item?.product_id}</div>
</div>
</td>
<td className="px-2">
<div className="text-right">
<div className="text-base font-semibold">{item?.status}</div>
</div>
</td>
</tr>
))
:
<tr className="py-2 border-t border-dashed border-slate-300">
<td className="px-3 py-2" colSpan={4}>
<div className="flex justify-center items-center">
No Record Found
</div>
</td>
</tr>
}
</tbody>
</table>
</>
)}
</TablePaginatedWrapper>
</>
}
</div>
</div>
)
}
@@ -0,0 +1,141 @@
import { useState } from 'react'
import { useQuery } from '@tanstack/react-query'
import queryKeys from '../../services/queryKeys'
import BreadcrumbCom from '../breadcrumb/BreadcrumbCom'
import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper'
import Icons from '../Icons'
import { getProductsTemplate } from '../../services/siteServices'
import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString'
export default function ProductTemplates() {
const [page, setPage] = useState(1)
const [filter, setFilter] = useState({type: '', id: ''})
const [willFilter, setWillFilter] = useState(false)
const handleFilter = ({target:{name, value}}) => {
setFilter(prev => ({...prev, [name]:value}))
}
const handleFilterByParams = () => {
if(filter.type && !filter.id){
return
}else if(!filter.type){
setPage(1)
setWillFilter(prev => !prev)
setFilter({type: '', id: ''})
}else{
setPage(1)
setWillFilter(prev => !prev)
}
}
const {data, isFetching, isError, error} = useQuery({
queryKey: [...queryKeys.products_template, page, willFilter],
queryFn: () => {
const filterData = filter?.type ? {[filter?.type]: filter.id} : {}
const reqData = {
page,
...filterData
}
return getProductsTemplate(reqData)
},
staleTime: 0 //0 mins
})
const productsTemData = data?.data?.products // PRODUCTS TEMPLATE LIST
const pagination = data?.data?.pagination
// console.log('DATA', data?.data)
return (
<div className='w-full flex flex-col gap-8'>
<BreadcrumbCom title='Product Templates' paths={['Dashboard', 'Product Templates']} />
<div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'>
{ isError ?
<p className='text-red-500'>{error?.message}</p>
:
<>
{/* filter section */}
<div className='px-2 py-2 mb-4 flex flex-col sm:flex-row flex-wrap sm:items-center gap-2'>
<Icons name='filter' className='text-3xl' />
<div className='w-full sm:max-w-48'>
<select name='type' value={filter?.type} className='h-10 w-full p-2 rounded-md' onChange={handleFilter}>
<option value=''>All</option>
<option value='name'>Name</option>
</select>
</div>
<div className='w-full sm:max-w-48'>
<input name='id' value={filter?.id} disabled={!filter.type} className={`h-10 w-full p-2 rounded-md outline-none border border-black-aside ${!filter.type && 'opacity-30'}`} onChange={handleFilter} />
</div>
<button onClick={handleFilterByParams} disabled={filter.type && !filter.id} className={`h-10 bg-primary px-2 py-1 rounded-md text-white font-medium sm:self-end ${(filter.type && !filter.id) && 'opacity-50'}`}>Submit</button>
</div>
{/* end of filter section */}
<TablePaginatedWrapper data={productsTemData} isFetching={isFetching} setPage={setPage} itemsPerPage={pagination?.limit} pagination={pagination}>
{({ data }) => (
<>
<table className="py-2 w-full text-sm">
<thead className="py-2 text-sm text-slate-500 text-left">
<tr>
<th scope="col" className="px-2 py-2">
Product ID
</th>
<th scope="col" className="px-2">
Name
</th>
<th scope="col" className="px-2">
Provision Name
</th>
<th scope="col" className="px-2 text-right">
Status
</th>
</tr>
</thead>
<tbody>
{(data && data.length > 0) ? data?.map((item, index) => (
<tr key={index} className="py-2 border-t border-dashed border-slate-300">
<td className="px-2 py-2">
<div className='w-full min-w-48 flex items-center gap-2 whitespace-nowrap'>
<div className="text-left">
<div className="text-base font-semibold">{getDateTimeFromDateString(item?.added)}</div>
</div>
</div>
</td>
<td className="px-2">
<div className="text-left">
<div className="text-base font-semibold">{item?.name}</div>
</div>
</td>
<td className="px-2">
<div className="text-left">
<div className="text-base font-semibold">{item?.product_id}</div>
</div>
</td>
<td className="px-2">
<div className="text-right">
<div className="text-base font-semibold">{item?.status}</div>
</div>
</td>
</tr>
))
:
<tr className="py-2 border-t border-dashed border-slate-300">
<td className="px-3 py-2" colSpan={4}>
<div className="flex justify-center items-center">
No Record Found
</div>
</td>
</tr>
}
</tbody>
</table>
</>
)}
</TablePaginatedWrapper>
</>
}
</div>
</div>
)
}
+36 -49
View File
@@ -6,7 +6,8 @@ import BreadcrumbCom from '../breadcrumb/BreadcrumbCom'
import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper'
import Icons from '../Icons'
import { getUsers } from '../../services/siteServices'
import formatNumber from '../../helpers/formatNumber'
import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString'
// import formatNumber from '../../helpers/formatNumber'
// import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString';
// import formatNumber from '../../helpers/formatNumber'
// import Avatar from '../../assets/user_avatar.jpg'
@@ -47,9 +48,9 @@ export default function UsersAdmin() {
},
staleTime: 0 //0 mins
})
const usersData = data?.data?.payments // BILLINGS LIST
const usersData = data?.data?.office_users // USERS LIST
const pagination = data?.data?.pagination
// console.log('DATA', data?.data)
console.log('DATA', data?.data)
return (
<div className='w-full flex flex-col gap-8'>
@@ -61,12 +62,13 @@ export default function UsersAdmin() {
:
<>
{/* filter section */}
<div className='px-2 py-2 mb-4 flex flex-col sm:flex-row flex-wrap sm:items-center gap-2'>
<div className='px-2 py-2 mb-4 flex flex-col sm:flex-row flex-wrap sm:items-center gap-2' >
<Icons name='filter' className='text-3xl' />
<div className='w-full sm:max-w-48'>
<select name='type' value={filter?.type} className='h-10 w-full p-2 rounded-md' onChange={handleFilter}>
<option value=''>All</option>
<option value='name'>Name</option>
<option value='username'>Username</option>
</select>
</div>
<div className='w-full sm:max-w-48'>
@@ -83,25 +85,22 @@ export default function UsersAdmin() {
<thead className="py-2 text-sm text-slate-500 text-left">
<tr>
<th scope="col" className="px-2 py-2">
Name
ID
</th>
<th scope="col" className="px-2 text-right">
Interest Rate
<th scope="col" className="px-2">
Added
</th>
<th scope="col" className="px-2 text-right">
Insurance Rate
<th scope="col" className="px-2">
Firstname
</th>
<th scope="col" className="px-2 text-right">
Mgt. Rate
<th scope="col" className="px-2">
Lastname
</th>
<th scope="col" className="px-2 text-right">
Max/Min Amount
<th scope="col" className="px-2">
Username
</th>
<th scope="col" className="px-2 text-right">
Tenor
</th>
<th scope="col" className="px-2 text-right">
Action
<th scope="col" className="px-2">
Acct. Level
</th>
</tr>
</thead>
@@ -109,52 +108,40 @@ export default function UsersAdmin() {
{(data && data.length > 0) ? data?.map((item, index) => (
<tr key={index} className="py-2 border-t border-dashed border-slate-300">
<td className="px-2 py-2">
<div className='w-full min-w-48 flex items-center gap-2 whitespace-nowrap'>
{/* <img className="w-10 h-10 rounded-md" src={Avatar} alt="Jese" /> */}
<div className="text-left">
<div className="text-base font-semibold">{item?.product_id || ''}</div>
{/* <div className="font-normal text-gray-500 line-clamp-1">{item?.description}</div> */}
</div>
</div>
<div className="text-left">
<div className="text-base font-semibold">{item?.id}</div>
</div>
</td>
<td className="px-2">
<div className="text-right">
<div className="font-normal text-gray-500">{formatNumber(item?.interest_rate)}</div>
</div>
<div className="">
<div className="text-base font-semibold">{getDateTimeFromDateString(item?.added)}</div>
</div>
</td>
<td className="px-2">
<div className="text-right">
<div className="font-normal text-gray-500">{formatNumber(item?.insurance_rate)}</div>
</div>
<div className="text-left">
<div className="text-base font-semibold">{item?.firstname}</div>
</div>
</td>
<td className="px-2">
<div className="text-right">
<div className="font-normal text-gray-500">{formatNumber(item?.management_rate)}</div>
</div>
<div className="">
<div className="text-base font-semibold">{item?.lastname}</div>
</div>
</td>
<td className="px-2">
<div className="text-right">
<div className="font-normal text-gray-500">{formatNumber(item?.maximum_amount)}</div>
<div className="font-normal text-gray-500">{formatNumber(item?.minimum_amount)}</div>
</div>
<div className="text-left">
<div className="text-base font-semibold">{item?.username}</div>
</div>
</td>
<td className="px-2">
<div className="text-right">
<div className="font-normal text-gray-500">{item?.tenor}</div>
</div>
</td>
<td className="px-2 text-right">
<div className='flex items-center justify-end gap-3 md:gap-4'>
<div className='p-2 flex justify-center items-center text-slate-500 bg-white-body dark:text-white-body dark:bg-black-body rounded-md'>
<Icons name='eye' />
</div>
</div>
<div className="text-left">
<div className="text-base font-semibold">{item?.acc_level}</div>
</div>
</td>
</tr>
))
:
<tr className="py-2 border-t border-dashed border-slate-300">
<td className="px-3 py-2" colSpan={7}>
<td className="px-3 py-2" colSpan={6}>
<div className="flex justify-center items-center">
No Record Found
</div>
+7
View File
@@ -0,0 +1,7 @@
import React from 'react'
import AccountViewCom from "../components/account_view/AccountViewCom";
export default function AccountDetailsPage() {
return (
<AccountViewCom />
)
}
+8
View File
@@ -0,0 +1,8 @@
import React from 'react'
import CustomTemplates from "../components/products/CustomTemplates";
export default function CustomTemplatePage() {
return (
<CustomTemplates />
)
}
+8
View File
@@ -0,0 +1,8 @@
import React from 'react'
import ProductTemplates from "../components/products/ProductTemplates";
export default function ProductTemplatePage() {
return (
<ProductTemplates />
)
}
+3
View File
@@ -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'],
}
+15 -1
View File
@@ -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)
}