create nav menu, move dark/light toggle to left
This commit is contained in:
parent
0c3d9443c2
commit
75df0cc445
1 changed files with 70 additions and 27 deletions
|
@ -1,8 +1,24 @@
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import { Box, Button, HStack, IconButton, useColorMode } from "@chakra-ui/core";
|
import {
|
||||||
|
Box,
|
||||||
|
Button,
|
||||||
|
HStack,
|
||||||
|
IconButton,
|
||||||
|
Menu,
|
||||||
|
MenuButton,
|
||||||
|
MenuItem,
|
||||||
|
MenuList,
|
||||||
|
useBreakpointValue,
|
||||||
|
useColorMode,
|
||||||
|
} from "@chakra-ui/core";
|
||||||
import { Link, useLocation } from "react-router-dom";
|
import { Link, useLocation } from "react-router-dom";
|
||||||
import { useAuth0 } from "@auth0/auth0-react";
|
import { useAuth0 } from "@auth0/auth0-react";
|
||||||
import { ChevronLeftIcon, MoonIcon, SunIcon } from "@chakra-ui/icons";
|
import {
|
||||||
|
ChevronLeftIcon,
|
||||||
|
HamburgerIcon,
|
||||||
|
MoonIcon,
|
||||||
|
SunIcon,
|
||||||
|
} from "@chakra-ui/icons";
|
||||||
|
|
||||||
import useCurrentUser from "./components/useCurrentUser";
|
import useCurrentUser from "./components/useCurrentUser";
|
||||||
|
|
||||||
|
@ -10,6 +26,8 @@ import HomeLinkIcon from "../images/home-link-icon.png";
|
||||||
import HomeLinkIcon2x from "../images/home-link-icon@2x.png";
|
import HomeLinkIcon2x from "../images/home-link-icon@2x.png";
|
||||||
|
|
||||||
function PageLayout({ children }) {
|
function PageLayout({ children }) {
|
||||||
|
const navStyle = useBreakpointValue({ base: "menu", md: "buttons" });
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box padding="6" paddingTop="3" maxWidth="1024px" margin="0 auto">
|
<Box padding="6" paddingTop="3" maxWidth="1024px" margin="0 auto">
|
||||||
<Box
|
<Box
|
||||||
|
@ -23,9 +41,8 @@ function PageLayout({ children }) {
|
||||||
>
|
>
|
||||||
<HStack alignItems="center" spacing="2" marginRight="4">
|
<HStack alignItems="center" spacing="2" marginRight="4">
|
||||||
<HomeLink />
|
<HomeLink />
|
||||||
<NavButton as={Link} to="/modeling">
|
{navStyle === "menu" && <NavMenu />}
|
||||||
Modeling
|
{navStyle === "buttons" && <NavButtons />}
|
||||||
</NavButton>
|
|
||||||
</HStack>
|
</HStack>
|
||||||
<Box marginLeft="auto">
|
<Box marginLeft="auto">
|
||||||
<UserNavBarSection />
|
<UserNavBarSection />
|
||||||
|
@ -103,7 +120,6 @@ function UserNavBarSection() {
|
||||||
Hi, {username}!
|
Hi, {username}!
|
||||||
</Box>
|
</Box>
|
||||||
)}
|
)}
|
||||||
<ColorModeToggleButton />
|
|
||||||
{id && (
|
{id && (
|
||||||
<NavButton
|
<NavButton
|
||||||
as={Link}
|
as={Link}
|
||||||
|
@ -120,41 +136,68 @@ function UserNavBarSection() {
|
||||||
</HStack>
|
</HStack>
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
return (
|
return <NavButton onClick={() => loginWithRedirect()}>Log in</NavButton>;
|
||||||
<HStack align="center" spacing="2">
|
|
||||||
<ColorModeToggleButton />
|
|
||||||
<NavButton onClick={() => loginWithRedirect()}>Log in</NavButton>
|
|
||||||
</HStack>
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function ColorModeToggleButton() {
|
function NavMenu() {
|
||||||
const { colorMode, toggleColorMode } = useColorMode();
|
const { colorMode, toggleColorMode } = useColorMode();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<NavButton
|
<Menu>
|
||||||
kind="IconButton"
|
<MenuButton as={NavButton} icon={<HamburgerIcon />} />
|
||||||
size="sm"
|
<MenuList fontSize="sm">
|
||||||
variant="outline"
|
<MenuItem as={Link} to="/modeling">
|
||||||
aria-label={
|
Modeling
|
||||||
colorMode === "light" ? "Switch to dark mode" : "Switch to light mode"
|
</MenuItem>
|
||||||
}
|
<MenuItem onClick={toggleColorMode}>
|
||||||
icon={colorMode === "light" ? <MoonIcon /> : <SunIcon />}
|
{colorMode === "light" ? (
|
||||||
onClick={toggleColorMode}
|
<Box display="flex" alignItems="center">
|
||||||
/>
|
<Box>Dark mode</Box>
|
||||||
|
<MoonIcon marginLeft="2" />
|
||||||
|
</Box>
|
||||||
|
) : (
|
||||||
|
<Box display="flex" alignItems="center">
|
||||||
|
<Box>Light mode</Box>
|
||||||
|
<SunIcon marginLeft="2" />
|
||||||
|
</Box>
|
||||||
|
)}
|
||||||
|
</MenuItem>
|
||||||
|
</MenuList>
|
||||||
|
</Menu>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function NavButton({ kind = "Button", ...props }) {
|
function NavButtons() {
|
||||||
const Component = kind === "IconButton" ? IconButton : Button;
|
const { colorMode, toggleColorMode } = useColorMode();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<NavButton as={Link} to="/modeling">
|
||||||
|
Modeling
|
||||||
|
</NavButton>
|
||||||
|
<NavButton
|
||||||
|
size="sm"
|
||||||
|
variant="outline"
|
||||||
|
aria-label={
|
||||||
|
colorMode === "light" ? "Switch to dark mode" : "Switch to light mode"
|
||||||
|
}
|
||||||
|
icon={colorMode === "light" ? <MoonIcon /> : <SunIcon />}
|
||||||
|
onClick={toggleColorMode}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const NavButton = React.forwardRef(({ icon, ...props }, ref) => {
|
||||||
|
const Component = icon ? IconButton : Button;
|
||||||
return (
|
return (
|
||||||
// Opacity is in a separate Box, to avoid overriding the built-in Button
|
// Opacity is in a separate Box, to avoid overriding the built-in Button
|
||||||
// hover/focus states.
|
// hover/focus states.
|
||||||
<Box opacity="0.8" _hover={{ opacity: "1" }} _focus={{ opacity: "1" }}>
|
<Box opacity="0.8" _hover={{ opacity: "1" }} _focus={{ opacity: "1" }}>
|
||||||
<Component size="sm" variant="outline" {...props} />
|
<Component size="sm" variant="outline" icon={icon} ref={ref} {...props} />
|
||||||
</Box>
|
</Box>
|
||||||
);
|
);
|
||||||
}
|
});
|
||||||
|
|
||||||
export default PageLayout;
|
export default PageLayout;
|
||||||
|
|
Loading…
Reference in a new issue