admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Design fixes (#665)

Browse Source
This commit is contained in:
Charles Bochet
2023-07-14 18:43:16 -07:00
committed by GitHub
parent 0a319bcf86
commit b971464fe5
22 changed files with 464 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
front/src/AppNavbar.tsx
View File

@ -10,24 +10,23 @@ import {
IconTargetArrow,
IconUser,
} from '@/ui/icons/index';
import NavItemsContainer from '@/ui/layout/navbar/NavItemsContainer';
import { useIsSubNavbarDisplayed } from '@/ui/layout/hooks/useIsSubNavbarDisplayed';
import MainNavbar from '@/ui/layout/navbar/MainNavbar';
import NavItem from './modules/ui/layout/navbar/NavItem';
import NavTitle from './modules/ui/layout/navbar/NavTitle';
import NavWorkspaceButton from './modules/ui/layout/navbar/NavWorkspaceButton';
export function AppNavbar() {
const theme = useTheme();
const currentPath = useLocation().pathname;
const shouldDiplaySubNavBar = currentPath.match(/\/settings\//g) !== null;
const isSubNavbarDisplayed = useIsSubNavbarDisplayed();
return (
<>
{!shouldDiplaySubNavBar ? (
<>
<NavWorkspaceButton />
<NavItemsContainer>
{!isSubNavbarDisplayed ? (
<MainNavbar>
<>
<NavItem
label="Search"
to="/search"
@ -64,8 +63,8 @@ export function AppNavbar() {
icon={<IconTargetArrow size={theme.icon.size.md} />}
active={currentPath === '/opportunities'}
/>
</NavItemsContainer>
</>
</>
</MainNavbar>
) : (
<SettingsNavbar />
)}