diff --git a/src/app/GlobalNavBar.js b/src/app/GlobalNavBar.js index 3948d54..e82938d 100644 --- a/src/app/GlobalNavBar.js +++ b/src/app/GlobalNavBar.js @@ -1,18 +1,8 @@ import React from "react"; -import { - Box, - Button, - HStack, - IconButton, - Menu, - MenuButton, - MenuItem, - MenuList, - useBreakpointValue, -} from "@chakra-ui/core"; +import { Box, Button, HStack, IconButton } from "@chakra-ui/core"; import { Link, useLocation } from "react-router-dom"; import { useAuth0 } from "@auth0/auth0-react"; -import { ChevronLeftIcon, HamburgerIcon } from "@chakra-ui/icons"; +import { ChevronLeftIcon } from "@chakra-ui/icons"; import useCurrentUser from "./components/useCurrentUser"; @@ -20,15 +10,20 @@ import HomeLinkIcon from "../images/home-link-icon.png"; import HomeLinkIcon2x from "../images/home-link-icon@2x.png"; function GlobalNavBar() { - const navStyle = useBreakpointValue({ base: "menu", md: "buttons" }); + const { pathname } = useLocation(); + const isHomePage = pathname === "/"; return ( - - - {navStyle === "menu" && } - {navStyle === "buttons" && } - + + + + @@ -36,10 +31,7 @@ function GlobalNavBar() { ); } -function HomeLink() { - const { pathname } = useLocation(); - const isHomePage = pathname === "/"; - +function HomeLink({ showArrow }) { return ( @@ -104,46 +96,41 @@ function UserNavBarSection() { )} {id && ( - + Items )} + + Modeling + logout({ returnTo: window.location.origin })}> Log out ); } else { - return loginWithRedirect()}>Log in; + return ( + + + Modeling + + loginWithRedirect()}>Log in + + ); } } -function NavMenu() { +function DressToImpressTitle(props) { return ( - - } /> - - - Home - - - Modeling - - - - ); -} - -function NavButtons() { - return ( - - Modeling - + + Dress to Impress + ); }