diff --git a/src/frontend/src/components/items/InvenTreeLogo.tsx b/src/frontend/src/components/items/InvenTreeLogo.tsx index 29862818a3..811658bfa6 100644 --- a/src/frontend/src/components/items/InvenTreeLogo.tsx +++ b/src/frontend/src/components/items/InvenTreeLogo.tsx @@ -5,14 +5,20 @@ import { NavLink } from 'react-router-dom'; import InvenTreeIcon from './inventree.svg'; -export const InvenTreeLogo = forwardRef((props, ref) => { - return ( -
- - - {t`InvenTree - - -
- ); -}); +export const InvenTreeLogoHomeButton = forwardRef( + (props, ref) => { + return ( +
+ + + + + +
+ ); + } +); + +export const InvenTreeLogo = () => { + return {t`InvenTree; +}; diff --git a/src/frontend/src/components/nav/Footer.tsx b/src/frontend/src/components/nav/Footer.tsx index d089fd3a41..52ad114912 100644 --- a/src/frontend/src/components/nav/Footer.tsx +++ b/src/frontend/src/components/nav/Footer.tsx @@ -2,7 +2,7 @@ import { Anchor, Container, Group } from '@mantine/core'; import { footerLinks } from '../../defaults/links'; import { InvenTreeStyle } from '../../globalStyle'; -import { InvenTreeLogo } from '../items/InvenTreeLogo'; +import { InvenTreeLogoHomeButton } from '../items/InvenTreeLogo'; export function Footer() { const { classes } = InvenTreeStyle(); @@ -21,7 +21,7 @@ export function Footer() { return (
- + {items}
diff --git a/src/frontend/src/components/nav/NavHoverMenu.tsx b/src/frontend/src/components/nav/NavHoverMenu.tsx index 3a05e1815a..9294dd6162 100644 --- a/src/frontend/src/components/nav/NavHoverMenu.tsx +++ b/src/frontend/src/components/nav/NavHoverMenu.tsx @@ -7,7 +7,8 @@ import { Group, HoverCard, Skeleton, - Text + Text, + UnstyledButton } from '@mantine/core'; import { IconLayoutSidebar } from '@tabler/icons-react'; import { useEffect, useState } from 'react'; @@ -39,9 +40,17 @@ export function NavHoverMenu({ }, [hostKey]); return ( - + - + openDrawer()}> + + diff --git a/src/frontend/src/defaults/menuItems.tsx b/src/frontend/src/defaults/menuItems.tsx index 45e77b96a0..16b5a0eb7b 100644 --- a/src/frontend/src/defaults/menuItems.tsx +++ b/src/frontend/src/defaults/menuItems.tsx @@ -12,8 +12,8 @@ export const menuItems: MenuLinkItem[] = [ }, { id: 'profile', - text: Profile page, - link: '/profile/user', + text: Account settings, + link: '/settings/user', doctext: User attributes and design settings. }, { @@ -22,6 +22,41 @@ export const menuItems: MenuLinkItem[] = [ link: '/scan', doctext: View for interactive scanning and multiple actions., highlight: true + }, + { + id: 'dashboard', + text: Dashboard, + link: '/dashboard' + }, + { + id: 'parts', + text: Parts, + link: '/part/' + }, + { + id: 'stock', + text: Stock, + link: '/stock' + }, + { + id: 'build', + text: Build, + link: '/build/' + }, + { + id: 'purchasing', + text: Purchasing, + link: '/purchasing/' + }, + { + id: 'sales', + text: Sales, + link: '/sales/' + }, + { + id: 'settings-system', + text: System Settings, + link: '/settings/system' } ];