diff --git a/clientapp/src/App.tsx b/clientapp/src/App.tsx index dde7cfb..b2337c2 100644 --- a/clientapp/src/App.tsx +++ b/clientapp/src/App.tsx @@ -36,7 +36,7 @@ const NestedRoutes = (routes: IRoute[], tag: string | undefined = undefined) => const App: FC = () => { const dispatch = useDispatch() - const { routes, serviceRoutes } = useSelector((state: IReduxState) => state.settings) + const { routes, adminRoutes, serviceRoutes } = useSelector((state: IReduxState) => state.settings) useEffect(() => { dispatch(settingsActionCreators.requestSettings()) @@ -44,8 +44,9 @@ const App: FC = () => { return <> - {NestedRoutes(routes, 'AdminLayout')} - {NestedRoutes(serviceRoutes)} + { NestedRoutes(routes, 'PublicLayout') } + { NestedRoutes(adminRoutes, 'AdminLayout') } + { NestedRoutes(serviceRoutes) } } diff --git a/clientapp/src/layouts/admin/NavMenu/index.tsx b/clientapp/src/layouts/admin/NavMenu/index.tsx index 1d62511..9073543 100644 --- a/clientapp/src/layouts/admin/NavMenu/index.tsx +++ b/clientapp/src/layouts/admin/NavMenu/index.tsx @@ -1,16 +1,16 @@ import React, { FC, useState } from 'react' -import { Button, Collapse, Navbar, NavbarBrand, NavbarToggler, NavItem, NavLink } from 'reactstrap' import { Link } from 'react-router-dom' +import { useSelector } from 'react-redux' +import { Button, Collapse, Navbar, NavbarBrand, NavbarToggler, NavItem, NavLink } from 'reactstrap' import { FeatherIcon } from '../../../components/FeatherIcons' import { IMenuItem, IReduxState } from '../../../interfaces' -import { useSelector } from 'react-redux' interface INavMenu { toggleSidebar: () => void } const NavMenu : FC = (props: INavMenu) => { - let { topMenu = [] } = useSelector((state: IReduxState) => state.settings) + let { siteName, topMenu = [] } = useSelector((state: IReduxState) => state.settings) const { toggleSidebar } = props @@ -24,33 +24,29 @@ const NavMenu : FC = (props: INavMenu) => { }) } - return - - - - reactstrap - - - - -
    - {topMenu.map((item: IMenuItem, index: number) => { - return - - {item.icon ? : ''} - {item.title} - - - })} -
-
- - -
+ return
+ + + {siteName} + + +
    + {topMenu.map((item: IMenuItem, index: number) => { + return + + {item.icon ? : ''} + {item.title} + + + })} +
+
+
+
} export { NavMenu -} \ No newline at end of file +} diff --git a/clientapp/src/layouts/admin/SideMenu/index.tsx b/clientapp/src/layouts/admin/SideMenu/index.tsx index cfeb007..acbabdd 100644 --- a/clientapp/src/layouts/admin/SideMenu/index.tsx +++ b/clientapp/src/layouts/admin/SideMenu/index.tsx @@ -1,13 +1,11 @@ import React, { FC, useState } from 'react' - +import { Link } from 'react-router-dom' +import { useSelector } from 'react-redux' import classNames from 'classnames' import { Collapse, Nav, NavItem, NavLink } from 'reactstrap' -import { Link } from 'react-router-dom' - import { FeatherIcon } from '../../../components/FeatherIcons' import { IMenuItem, IReduxState, ISubMenuItem } from '../../../interfaces' -import { useSelector } from 'react-redux' - +import style from './scss/style.module.scss' interface ISubMenu { icon?: string, @@ -23,18 +21,18 @@ const SubMenu : FC = (props: ISubMenu) => { return (
- - + + {icon ? : ''} - {title} + {title} - + {items.map((item: ISubMenuItem, index: number) => ( - - + + {item.icon ? : ''} - {item.title} + {item.title} ))} @@ -46,17 +44,17 @@ const SubMenu : FC = (props: ISubMenu) => { const SideMenu : FC = () => { let { sideMenu = [] } = useSelector((state: IReduxState) => state.settings) - return
+ return