Compare commits

...

4 Commits

Author SHA1 Message Date
victorAnumudu 5b1e24a299 bug fixed 2024-09-07 12:16:54 +01:00
ameye 021e80c0e9 Merge branch 'help-page' of DigiFi/digifi-bko into master 2024-09-05 18:41:21 +00:00
victorAnumudu 9b2e0a6857 help page fixed 2024-09-05 19:31:03 +01:00
ameye 724e846826 Merge branch 'rounded-radius' of DigiFi/digifi-bko into master 2024-09-05 17:26:39 +00:00
6 changed files with 22 additions and 7 deletions
@@ -2,12 +2,17 @@ import {useIntl} from 'react-intl'
import {MenuItem} from './MenuItem'
import {MenuInnerWithSub} from './MenuInnerWithSub'
import {MegaMenu} from './MegaMenu'
import { useLocation } from 'react-router-dom'
export function MenuInner() {
const intl = useIntl()
const {pathname} = useLocation()
const isHelpPath = pathname == '/help'
return (
<>
<MenuItem title={intl.formatMessage({id: 'MENU.DASHBOARD'})} to='/dashboard' />
{/* <MenuItem title={intl.formatMessage({id: 'MENU.DASHBOARD'})} to='/dashboard' /> */}
<MenuItem title={`${isHelpPath ? 'Help' : 'Dashboard'}`} to={`${isHelpPath ? '/help' : '/dashboard'}`} />
{/* <MenuItem title='Layout Builder' to='/builder' /> */}
<MenuInnerWithSub
title='Crafted'
@@ -19,6 +19,12 @@ const getCustomerList = (query: string): Promise<UsersQueryResponse> => { // FUN
.then((d: AxiosResponse<UsersQueryResponse>) => d.data);
};
const getAdminUserList = (query: string): Promise<UsersQueryResponse> => { // FUNCTION TO GET USERS THAT HAVE STARTED LOAN APPLICATION
return axios
.get(`${NEW_USER_ENDPOINT}/users`)
.then((d: AxiosResponse<UsersQueryResponse>) => d.data);
};
const getUserById = (id: ID): Promise<User | undefined> => {
return axios
.get(`${USER_URL}/${id}`)
@@ -51,6 +57,7 @@ const deleteSelectedUsers = (userIds: Array<ID>): Promise<void> => {
export {
getCustomerList,
getAdminUserList,
deleteUser,
deleteSelectedUsers,
getUserById,
@@ -57,10 +57,10 @@ const deleteSelectedUsers = (userIds: Array<ID>): Promise<void> => {
export {
getCustomerList,
getAdminUserList,
deleteUser,
deleteSelectedUsers,
getUserById,
getAdminUserList,
createUser,
updateUser,
};
+6 -3
View File
@@ -1,8 +1,11 @@
import { Content } from "../../../_digifi/layout/components/content";
export default function HelpPage() {
return (
<div className="w-100 h-100">
<h1 className="fs-2hx fw-bold text-gray-800">Help</h1>
</div>
<Content>
<div className="w-100 h-100">
<h1 className="fs-2hx fw-bold text-gray-800">Help</h1>
</div>
</Content>
)
}
-2
View File
@@ -11,7 +11,6 @@ import {PrivateRoutes} from './PrivateRoutes'
import {ErrorsPage} from '../modules/errors/ErrorsPage'
import {Logout, AuthPage, useAuth} from '../modules/auth'
import {App} from '../App'
import HelpPage from '../modules/help/HelpPage'
/**
* Base URL of the website.
@@ -27,7 +26,6 @@ const AppRoutes: FC = () => {
<Routes>
<Route element={<App />}>
<Route path='error/*' element={<ErrorsPage />} />
<Route path='/help' element={<HelpPage />} />
<Route path='logout' element={<Logout />} />
{currentUser ? (
<>
+2
View File
@@ -6,6 +6,7 @@ import { DashboardWrapper } from "../pages/dashboard/DashboardWrapper";
// import {MenuTestPage} from '../pages/MenuTestPage'
import { getCSSVariableValue } from "../../_digifi/assets/ts/_utils";
import { WithChildren } from "../../_digifi/helpers";
import HelpPage from "../modules/help/HelpPage";
// import BuilderPageWrapper from '../pages/layout-builder/BuilderPageWrapper'
const PrivateRoutes = () => {
@@ -98,6 +99,7 @@ const PrivateRoutes = () => {
</SuspensedView>
}
/>
<Route path='/help' element={<HelpPage />} />
{/* Page Not Found */}
<Route path="*" element={<Navigate to="/error/404" />} />
</Route>