Compare commits

...

5 Commits

Author SHA1 Message Date
victorAnumudu f2671c44a2 fixed use context error 2025-09-09 17:40:41 +01:00
CHIEFSOFT\ameye 59184d38aa Text xhANGES 2025-09-09 12:05:18 -04:00
CHIEFSOFT\ameye 73bc359a77 fix data 2025-09-02 17:03:43 -04:00
CHIEFSOFT\ameye 80fdd6e817 Fix text 2025-09-02 16:52:15 -04:00
ameye 0efa3ffa27 Merge branch 'bug-fix' of MERMS/MermsFirstOffice into master 2025-09-02 20:41:04 +00:00
15 changed files with 30 additions and 28 deletions
+2 -1
View File
@@ -22,7 +22,8 @@
}, },
"scripts": { "scripts": {
"start": "react-scripts start", "start": "react-scripts start",
"build": "react-scripts build", "build_RE": "react-scripts build",
"build": "GENERATE_SOURCEMAP=false react-scripts build -e .env.production",
"test": "react-scripts test", "test": "react-scripts test",
"eject": "react-scripts eject" "eject": "react-scripts eject"
}, },
+1 -1
View File
@@ -7,7 +7,7 @@
<meta name="theme-color" content="#000000" /> <meta name="theme-color" content="#000000" />
<meta <meta
name="description" name="description"
content="digiFi global back office systems" content="MERMS BackOffice Systems"
/> />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!-- <!--
+2 -2
View File
@@ -4,7 +4,7 @@ import { QueryClientProvider, QueryClient } from '@tanstack/react-query'
import SiteRoutes from './SiteRoutes'; import SiteRoutes from './SiteRoutes';
import LogoutModal from './components/layouts/LogoutModal'; import LogoutModal from './components/layouts/LogoutModal';
import { generalLayoutContext } from './context/GeneralLayoutContext'; import { GeneralLayoutContext } from './context/GeneralLayoutContext';
import './App.css'; import './App.css';
@@ -24,7 +24,7 @@ function App() {
const {pathname} = useLocation() const {pathname} = useLocation()
const {logoutModal, setLogoutModal} = generalLayoutContext() const {logoutModal, setLogoutModal} = GeneralLayoutContext()
useEffect(()=>{ useEffect(()=>{
window.scrollTo(0,0) window.scrollTo(0,0)
+2 -2
View File
@@ -1,7 +1,7 @@
import { LuSunDim } from "react-icons/lu"; import { LuSunDim } from "react-icons/lu";
import { IoMdSunny } from "react-icons/io"; import { IoMdSunny } from "react-icons/io";
import { generalLayoutContext } from "../../context/GeneralLayoutContext" import { GeneralLayoutContext } from "../../context/GeneralLayoutContext"
import UserAvatar from '../../assets/user_avatar.jpg' import UserAvatar from '../../assets/user_avatar.jpg'
import HandBurger from "./HandBurger" import HandBurger from "./HandBurger"
@@ -15,7 +15,7 @@ export default function DashboardHeader() {
// let {pathname} = useLocation() // let {pathname} = useLocation()
const {theme, handleTheme, setLogoutModal, activeMenu, handleActiveMenu, showAsideDrawer, setShowAsideDrawer} = generalLayoutContext() const {theme, handleTheme, setLogoutModal, activeMenu, handleActiveMenu, showAsideDrawer, setShowAsideDrawer} = GeneralLayoutContext()
return ( return (
<> <>
+2 -2
View File
@@ -1,7 +1,7 @@
import { Outlet } from 'react-router-dom' import { Outlet } from 'react-router-dom'
import DashboardHeader from './DashboardHeader' import DashboardHeader from './DashboardHeader'
import { generalLayoutContext } from '../../context/GeneralLayoutContext' import { GeneralLayoutContext } from '../../context/GeneralLayoutContext'
import DashboardAside from './aside/DashboardAside' import DashboardAside from './aside/DashboardAside'
import RightAsideBar from './rightaside/RightAsideBar' import RightAsideBar from './rightaside/RightAsideBar'
@@ -9,7 +9,7 @@ export default function DashboardLayout() {
// let {pathname} = useLocation() // let {pathname} = useLocation()
const {showAsideDrawer, setShowAsideDrawer} = generalLayoutContext() const {showAsideDrawer, setShowAsideDrawer} = GeneralLayoutContext()
return ( return (
<div className='w-full flex gap-10 relative m-auto h-screen overflow-x-hidden overflow-y-auto bg-white-body dark:bg-black-body p-8 pt-0 lg:p-10'> <div className='w-full flex gap-10 relative m-auto h-screen overflow-x-hidden overflow-y-auto bg-white-body dark:bg-black-body p-8 pt-0 lg:p-10'>
@@ -4,7 +4,6 @@ import { FaArrowRight, FaArrowLeft } from "react-icons/fa6";
import DashboardAside from './aside/DashboardAside' import DashboardAside from './aside/DashboardAside'
import DashboardHeader from './DashboardHeader' import DashboardHeader from './DashboardHeader'
import { generalLayoutContext } from '../../context/GeneralLayoutContext'
export default function DashboardLayout() { export default function DashboardLayout() {
const [shrinkAside, setShrinkAside] = useState(false) const [shrinkAside, setShrinkAside] = useState(false)
+2 -2
View File
@@ -1,10 +1,10 @@
import { Link, useLocation } from "react-router-dom" import { Link, useLocation } from "react-router-dom"
import Icons from "../../Icons" import Icons from "../../Icons"
import { generalLayoutContext } from "../../../context/GeneralLayoutContext" import { GeneralLayoutContext } from "../../../context/GeneralLayoutContext"
export default function AsideLink({name, to, icon}) { export default function AsideLink({name, to, icon}) {
const {shrinkAside, setShowAsideDrawer} = generalLayoutContext() const {shrinkAside, setShowAsideDrawer} = GeneralLayoutContext()
const {pathname} = useLocation() const {pathname} = useLocation()
@@ -2,12 +2,12 @@ import { useState } from "react";
import { useLocation } from "react-router-dom" import { useLocation } from "react-router-dom"
import { FaCaretDown } from "react-icons/fa"; import { FaCaretDown } from "react-icons/fa";
import Icons from "../../Icons"; import Icons from "../../Icons";
import { generalLayoutContext } from "../../../context/GeneralLayoutContext"; import { GeneralLayoutContext } from "../../../context/GeneralLayoutContext";
export default function AsideLinkWithSubLinks({name, icon, to, children, isOpen}) { export default function AsideLinkWithSubLinks({name, icon, to, children, isOpen}) {
const {shrinkAside} = generalLayoutContext() const {shrinkAside} = GeneralLayoutContext()
const {pathname} = useLocation() const {pathname} = useLocation()
@@ -5,7 +5,7 @@ import MainBtn from "../../MainBtn";
import AsideLink from "./AsideLink"; import AsideLink from "./AsideLink";
import AsideLinkWithSubLinks from "./AsideLinkWithSubLinks"; import AsideLinkWithSubLinks from "./AsideLinkWithSubLinks";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { generalLayoutContext } from "../../../context/GeneralLayoutContext"; import { GeneralLayoutContext } from "../../../context/GeneralLayoutContext";
import { TbLogout2 } from "react-icons/tb"; import { TbLogout2 } from "react-icons/tb";
import UserAvatar from '../../../assets/user_avatar.jpg' import UserAvatar from '../../../assets/user_avatar.jpg'
import Icons from "../../Icons"; import Icons from "../../Icons";
@@ -14,7 +14,7 @@ export default function DashboardAside() {
const {pathname} = useLocation() const {pathname} = useLocation()
const {setLogoutModal, activeMenu, handleActiveMenu} = generalLayoutContext() const {setLogoutModal, activeMenu, handleActiveMenu} = GeneralLayoutContext()
const {userDetails} = useSelector((state) => state.userDetails) // GETS LOGGED IN USER ROLE DETAILS const {userDetails} = useSelector((state) => state.userDetails) // GETS LOGGED IN USER ROLE DETAILS
const {role}= userDetails const {role}= userDetails
@@ -139,7 +139,7 @@ const asideNavLinks = [
{name:'Dashboard', status:1, icon: 'dashboard', to: RouteLinks.homePage}, {name:'Dashboard', status:1, icon: 'dashboard', to: RouteLinks.homePage},
{name:'Deployments', title:'Activities', status:1, icon: 'arrow-right', subLinks: [ {name:'Deployments', title:'Activities', status:1, icon: 'arrow-right', subLinks: [
{name: 'Active', status:1, icon: 'dot', to: RouteLinks.transactionsPage}, {name: 'Active', status:1, icon: 'dot', to: RouteLinks.transactionsPage},
{name: 'Subscriptions', status:1, icon: 'dot', to: RouteLinks.subscriptions}, {name: 'Provisions', status:1, icon: 'dot', to: RouteLinks.subscriptions},
{name: 'Customers', status:1, icon: 'dot', to: RouteLinks.customerPage}, {name: 'Customers', status:1, icon: 'dot', to: RouteLinks.customerPage},
{name: 'Billings', status:1, icon: 'dot', to: RouteLinks.billings}, {name: 'Billings', status:1, icon: 'dot', to: RouteLinks.billings},
{name: 'Configurations', status:1, icon: 'arrow-right', subLinks: [ {name: 'Configurations', status:1, icon: 'arrow-right', subLinks: [
@@ -6,7 +6,7 @@ import MainBtn from "../../MainBtn";
import AsideLink from "./AsideLink"; import AsideLink from "./AsideLink";
import AsideLinkWithSubLinks from "./AsideLinkWithSubLinks"; import AsideLinkWithSubLinks from "./AsideLinkWithSubLinks";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { generalLayoutContext } from "../../../context/GeneralLayoutContext"; import { GeneralLayoutContext } from "../../../context/GeneralLayoutContext";
import { TbLogout2 } from "react-icons/tb"; import { TbLogout2 } from "react-icons/tb";
@@ -14,7 +14,7 @@ export default function DashboardAside({shrinkAside=false}) {
const {pathname} = useLocation() const {pathname} = useLocation()
const {setLogoutModal} = generalLayoutContext() const {setLogoutModal} = GeneralLayoutContext()
const {userDetails} = useSelector((state) => state.userDetails) // GETS LOGGED IN USER ROLE DETAILS const {userDetails} = useSelector((state) => state.userDetails) // GETS LOGGED IN USER ROLE DETAILS
const {role}= userDetails const {role}= userDetails
@@ -6,7 +6,7 @@ import MainBtn from "../../MainBtn";
import AsideLink from "./AsideLink"; import AsideLink from "./AsideLink";
import AsideLinkWithSubLinks from "./AsideLinkWithSubLinks"; import AsideLinkWithSubLinks from "./AsideLinkWithSubLinks";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { generalLayoutContext } from "../../../context/GeneralLayoutContext"; import { GeneralLayoutContext } from "../../../context/GeneralLayoutContext";
import { TbLogout2 } from "react-icons/tb"; import { TbLogout2 } from "react-icons/tb";
@@ -14,7 +14,7 @@ export default function DashboardAside({shrinkAside=false}) {
const {pathname} = useLocation() const {pathname} = useLocation()
const {setLogoutModal} = generalLayoutContext() const {setLogoutModal} = GeneralLayoutContext()
const {userDetails} = useSelector((state) => state.userDetails) // GETS LOGGED IN USER ROLE DETAILS const {userDetails} = useSelector((state) => state.userDetails) // GETS LOGGED IN USER ROLE DETAILS
const {role}= userDetails const {role}= userDetails
+5 -3
View File
@@ -65,6 +65,8 @@ export default function BillingsCom() {
<select name='type' value={filter?.type} className='h-10 w-full p-2 rounded-md' onChange={handleFilter}> <select name='type' value={filter?.type} className='h-10 w-full p-2 rounded-md' onChange={handleFilter}>
<option value=''>All</option> <option value=''>All</option>
<option value='option_name'>Option Name</option> <option value='option_name'>Option Name</option>
<option value='member_id'>Member ID</option>
</select> </select>
</div> </div>
<div className='w-full sm:max-w-48'> <div className='w-full sm:max-w-48'>
@@ -87,7 +89,7 @@ export default function BillingsCom() {
Option Name Option Name
</th> </th>
<th scope="col" className="px-2"> <th scope="col" className="px-2">
Product ID Member ID
</th> </th>
<th scope="col" className="px-2 text-right"> <th scope="col" className="px-2 text-right">
Amount Amount
@@ -114,12 +116,12 @@ export default function BillingsCom() {
</td> </td>
<td className="px-2"> <td className="px-2">
<div className="text-left"> <div className="text-left">
<div className="text-base font-semibold">{item?.product_id}</div> <div className="text-base font-semibold">{item?.member_id}</div>
</div> </div>
</td> </td>
<td className="px-2"> <td className="px-2">
<div className="text-right"> <div className="text-right">
<div className="text-base font-semibold">{item?.amount}</div> <div className="text-base font-semibold">${item?.amount}</div>
{/* <div className="font-normal text-gray-500">{item?.external_url}</div> */} {/* <div className="font-normal text-gray-500">{item?.external_url}</div> */}
</div> </div>
</td> </td>
@@ -51,7 +51,7 @@ export default function SubscriptionsCom() {
return ( return (
<div className='w-full flex flex-col gap-8'> <div className='w-full flex flex-col gap-8'>
<BreadcrumbCom title='Subscriptions' paths={['Dashboard', 'Subscriptions']} /> <BreadcrumbCom title='Provisions' paths={['Dashboard', 'Provisions']} />
<div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'> <div className='box bg-white dark:bg-black-box text-black-body dark:text-white-body'>
{ isError ? { isError ?
+1 -1
View File
@@ -108,6 +108,6 @@ export default function GeneralLayoutContextInt({children}) {
} }
export const generalLayoutContext = () => { export const GeneralLayoutContext = () => {
return useContext(GeneralContextProviderInt) return useContext(GeneralContextProviderInt)
} }
+3 -3
View File
@@ -6,7 +6,7 @@ import { Provider } from "react-redux";
import './index.css'; import './index.css';
import App from './App'; import App from './App';
import store from './store/store.js' import store from './store/store.js'
import GeneralLayoutContext from './context/GeneralLayoutContext.jsx'; import GeneralLayoutContextInt from './context/GeneralLayoutContext.jsx';
const root = ReactDOM.createRoot(document.getElementById('root')); const root = ReactDOM.createRoot(document.getElementById('root'));
@@ -14,9 +14,9 @@ root.render(
<React.StrictMode> <React.StrictMode>
<BrowserRouter> <BrowserRouter>
<Provider store={store}> <Provider store={store}>
<GeneralLayoutContext> <GeneralLayoutContextInt>
<App /> <App />
</GeneralLayoutContext> </GeneralLayoutContextInt>
</Provider> </Provider>
</BrowserRouter> </BrowserRouter>
</React.StrictMode> </React.StrictMode>