Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wip multitier drawer #1229

Merged
merged 2 commits into from
Aug 28, 2023
Merged

wip multitier drawer #1229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dd5f14
the navigation drawer is multiple tiered, other small fixes
mipyykko Aug 27, 2023
977cfa9
fix skiplink; fix page max width according
mipyykko Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions frontend/components/Breadcrumbs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ import BreadcrumbsTranslations, {
Breadcrumbs as BreadcrumbsTranslationType,
} from "/translations/breadcrumbs"

const BreadcrumbContainer = styled("nav")`
margin: 0 auto;
width: 100vw;
max-width: 1920px;
`
const BreadcrumbList = styled("ul")`
list-style: none;
overflow: hidden;
Expand Down Expand Up @@ -131,7 +136,7 @@ export function Breadcrumbs() {
}

return (
<nav id="breadcrumbs" aria-label="breadcrumbs">
<BreadcrumbContainer id="breadcrumbs" aria-label="breadcrumbs">
<BreadcrumbList>
<BreadcrumbComponent translation="home" href="/" key="home" />
{breadcrumbs.map((breadcrumb, index) => (
Expand All @@ -141,6 +146,6 @@ export function Breadcrumbs() {
/>
))}
</BreadcrumbList>
</nav>
</BreadcrumbContainer>
)
}
5 changes: 2 additions & 3 deletions frontend/components/NewLayout/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { AppBar, Slide, Toolbar, useScrollTrigger } from "@mui/material"
import { styled } from "@mui/material/styles"

import HyLogoIcon from "../Icons/HyLogo"
import { DesktopNavigationMenu, MobileNavigationMenu } from "../Navigation"
import { NavigationMenu } from "../Navigation"
import LanguageSwitch from "./LanguageSwitch"
import MoocLogo from "./MoocLogo"
import { useTranslator } from "/hooks/useTranslator"
Expand Down Expand Up @@ -139,8 +139,7 @@ function Header() {
<BrandingContainer>
<MoocLogo />
</BrandingContainer>
<DesktopNavigationMenu />
<MobileNavigationMenu />
<NavigationMenu />
</GroupToolbar>
</HeaderAppBar>
</HideOnScroll>
Expand Down
10 changes: 10 additions & 0 deletions frontend/components/NewLayout/Icons/CaretLeft.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { createSvgIcon } from "@mui/material/utils"

const CaretLeftIcon = createSvgIcon(
<svg viewBox="0 0 1000 1000">
<path d="M181 503l532 462 110-123-394-339 394-345L713 35z" />
</svg>,
"CaretLeft",
)

export default CaretLeftIcon
27 changes: 0 additions & 27 deletions frontend/components/NewLayout/Navigation/BottomNavigation.tsx
View file
Open in desktop

This file was deleted.

9 changes: 7 additions & 2 deletions frontend/components/NewLayout/Navigation/DesktopNavigationMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
} from "@mui/material"
import { styled, Theme } from "@mui/material/styles"

import { NavigationMenuItem } from "."
import { NavigationLinks } from "./NavigationLinks"
import { useLoginStateContext } from "/contexts/LoginStateContext"
import { useTranslator } from "/hooks/useTranslator"
Expand Down Expand Up @@ -124,10 +125,14 @@ const UserOptionsMenu = () => {
)
}

const DesktopNavigationMenu = () => {
interface DesktopNavigationMenuProps {
items: Array<NavigationMenuItem>
}

const DesktopNavigationMenu = ({ items }: DesktopNavigationMenuProps) => {
return (
<>
<NavigationLinks />
<NavigationLinks items={items} />
<NavigationRightContainer>
<UserOptionsMenu />
</NavigationRightContainer>
Expand Down
Loading