Skip to content

Commit

Permalink
[joy-ui][Templates] Update and standardize Sidemenus (#39271)
Browse files Browse the repository at this point in the history
  • Loading branch information
zanivan committed Oct 3, 2023
1 parent 9b1a06b commit 62d3b96
Show file tree
Hide file tree
Showing 16 changed files with 349 additions and 282 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ import Stack from '@mui/joy/Stack';
import SearchRoundedIcon from '@mui/icons-material/SearchRounded';
import HomeRoundedIcon from '@mui/icons-material/HomeRounded';
import DashboardRoundedIcon from '@mui/icons-material/DashboardRounded';
import CollectionsBookmarkRoundedIcon from '@mui/icons-material/CollectionsBookmarkRounded';
import ShoppingCartRoundedIcon from '@mui/icons-material/ShoppingCartRounded';
import AssignmentRoundedIcon from '@mui/icons-material/AssignmentRounded';
import QuestionAnswerRoundedIcon from '@mui/icons-material/QuestionAnswerRounded';
import GroupRoundedIcon from '@mui/icons-material/GroupRounded';
import SupportRoundedIcon from '@mui/icons-material/SupportRounded';
import SettingsRoundedIcon from '@mui/icons-material/SettingsRounded';
import CloseRoundedIcon from '@mui/icons-material/CloseRounded';
import LogoutRoundedIcon from '@mui/icons-material/LogoutRounded';
import BadgeRoundedIcon from '@mui/icons-material/BadgeRounded';
import BrightnessAutoRoundedIcon from '@mui/icons-material/BrightnessAutoRounded';
import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';

import ColorSchemeToggle from './ColorSchemeToggle';
Expand Down Expand Up @@ -83,8 +83,7 @@ export default function Sidebar() {
height: '100dvh',
width: 'var(--Sidebar-width)',
top: 0,
p: 1.5,
py: 2,
p: 2,
flexShrink: 0,
display: 'flex',
flexDirection: 'column',
Expand Down Expand Up @@ -124,9 +123,9 @@ export default function Sidebar() {
/>
<Box sx={{ display: 'flex', gap: 1, alignItems: 'center' }}>
<IconButton variant="soft" color="primary" size="sm">
<BadgeRoundedIcon />
<BrightnessAutoRoundedIcon />
</IconButton>
<Typography level="title-lg">Profiles</Typography>
<Typography level="title-lg">Acme Co.</Typography>
<ColorSchemeToggle sx={{ ml: 'auto' }} />
</Box>
<Input size="sm" startDecorator={<SearchRoundedIcon />} placeholder="Search" />
Expand Down Expand Up @@ -169,10 +168,14 @@ export default function Sidebar() {
</ListItem>

<ListItem>
<ListItemButton>
<CollectionsBookmarkRoundedIcon />
<ListItemButton
role="menuitem"
component="a"
href="/joy-ui/getting-started/templates/order-dashboard/"
>
<ShoppingCartRoundedIcon />
<ListItemContent>
<Typography level="title-sm">Projects</Typography>
<Typography level="title-sm">Orders</Typography>
</ListItemContent>
</ListItemButton>
</ListItem>
Expand Down
10 changes: 2 additions & 8 deletions docs/data/joy/getting-started/templates/order-dashboard/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@ import ChevronRightRoundedIcon from '@mui/icons-material/ChevronRightRounded';
import DownloadRoundedIcon from '@mui/icons-material/DownloadRounded';

import useScript from './useScript';
import FirstSidebar from './components/FirstSidebar';
import SecondSidebar from './components/SecondSidebar';
import Sidebar from './components/Sidebar';
import OrderTable from './components/OrderTable';
import OrderList from './components/OrderList';
import Header from './components/Header';
import ColorSchemeToggle from './components/ColorSchemeToggle';

const useEnhancedEffect =
typeof window !== 'undefined' ? React.useLayoutEffect : React.useEffect;
Expand All @@ -39,8 +37,7 @@ export default function JoyOrderDashboardTemplate() {
<CssBaseline />
<Box sx={{ display: 'flex', minHeight: '100dvh' }}>
<Header />
<FirstSidebar />
<SecondSidebar />
<Sidebar />
<Box
component="main"
className="MainContent"
Expand Down Expand Up @@ -95,9 +92,6 @@ export default function JoyOrderDashboardTemplate() {
Orders
</Typography>
</Breadcrumbs>
<ColorSchemeToggle
sx={{ ml: 'auto', display: { xs: 'none', md: 'inline-flex' } }}
/>
</Box>
<Box
sx={{
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import Sheet from '@mui/joy/Sheet';
import IconButton from '@mui/joy/IconButton';
import MenuIcon from '@mui/icons-material/Menu';

import ColorSchemeToggle from './ColorSchemeToggle';
import { toggleSidebar } from '../utils';

export default function Header() {
Expand Down Expand Up @@ -44,7 +43,6 @@ export default function Header() {
>
<MenuIcon />
</IconButton>
<ColorSchemeToggle id={undefined} />
</Sheet>
);
}

This file was deleted.

Loading

0 comments on commit 62d3b96

Please sign in to comment.