diff --git a/frontend/src/component/layout/MainLayout/NavigationSidebar/NavigationSidebar.tsx b/frontend/src/component/layout/MainLayout/NavigationSidebar/NavigationSidebar.tsx
index 25a1c2b960..b52f3f9cff 100644
--- a/frontend/src/component/layout/MainLayout/NavigationSidebar/NavigationSidebar.tsx
+++ b/frontend/src/component/layout/MainLayout/NavigationSidebar/NavigationSidebar.tsx
@@ -1,7 +1,7 @@
import { Box, styled } from '@mui/material';
import { type FC, useState } from 'react';
import { useNavigationMode } from './useNavigationMode';
-import { ShowHide } from './ShowHide';
+import { ShowAdmin, ShowHide } from './ShowHide';
import { useRoutes } from './useRoutes';
import { useExpanded } from './useExpanded';
import {
@@ -37,13 +37,18 @@ export const MobileNavigationSidebar: FC<{ onClick: () => void }> = ({
);
};
-export const StyledBox = styled(Box)(({ theme }) => ({
+export const StretchContainer = styled(Box)(({ theme }) => ({
backgroundColor: theme.palette.background.paper,
padding: theme.spacing(2, 2, 2, 2),
+ zIndex: theme.zIndex.tooltip,
+ alignSelf: 'stretch',
+}));
+
+export const ScreenHeightBox = styled(Box)(({ theme }) => ({
display: 'flex',
flexDirection: 'column',
gap: theme.spacing(3),
- zIndex: theme.zIndex.tooltip,
+ minHeight: '93vh',
}));
export const NavigationSidebar = () => {
@@ -59,59 +64,70 @@ export const NavigationSidebar = () => {
const showRecentProject = mode === 'full' && lastViewed;
return (
-
-
- {
- changeExpanded('configure', expand);
- }}
- mode={mode}
- title='Configure'
- >
-
+
+
-
- {mode === 'full' && (
{
- changeExpanded('admin', expand);
+ changeExpanded('configure', expand);
}}
mode={mode}
- title='Admin'
+ title='Configure'
>
- )}
+ {mode === 'full' && (
+ {
+ changeExpanded('admin', expand);
+ }}
+ mode={mode}
+ title='Admin'
+ >
+
+
+ )}
- {showRecentProject && (
- {
+ changeExpanded('admin', true);
+ setMode('full');
+ }}
+ />
+ )}
+
+ {showRecentProject && (
+ setActiveItem('/projects')}
+ />
+ )}
+
+ setActiveItem('/projects')}
+ onChange={() => {
+ setMode(mode === 'full' ? 'mini' : 'full');
+ }}
/>
- )}
-
- {
- setMode(mode === 'full' ? 'mini' : 'full');
- }}
- />
-
+
+
);
};
diff --git a/frontend/src/component/layout/MainLayout/NavigationSidebar/ShowHide.tsx b/frontend/src/component/layout/MainLayout/NavigationSidebar/ShowHide.tsx
index 64d455e468..7ee109dcdf 100644
--- a/frontend/src/component/layout/MainLayout/NavigationSidebar/ShowHide.tsx
+++ b/frontend/src/component/layout/MainLayout/NavigationSidebar/ShowHide.tsx
@@ -3,6 +3,7 @@ import type { NavigationMode } from './NavigationMode';
import type { FC } from 'react';
import HideIcon from '@mui/icons-material/KeyboardDoubleArrowLeft';
import ExpandIcon from '@mui/icons-material/KeyboardDoubleArrowRight';
+import SettingsIcon from '@mui/icons-material/Settings';
const ShowHideWrapper = styled(Box, {
shouldForwardProp: (prop) => prop !== 'mode',
@@ -46,3 +47,19 @@ export const ShowHide: FC<{ mode: NavigationMode; onChange: () => void }> = ({
);
};
+
+const ShowAdminWrapper = styled(Box)(({ theme }) => ({
+ padding: theme.spacing(2, 1, 0, 1.5),
+}));
+
+export const ShowAdmin: FC<{ onChange: () => void }> = ({ onChange }) => {
+ return (
+
+
+
+
+
+
+
+ );
+};