OpenNeo/impress-2020
OpenNeo/impress-2020
1
0
Fork 0
Code Pull requests Activity

rename GlobalNavBar to GlobalHeader

Browse source 
for consistency with GlobalFooter
This commit is contained in:
Emi Matchu 2020-09-21 03:08:24 -07:00
parent 5c8fbdc81e
commit 1eeba40fac
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/GlobalNavBar.js → src/app/GlobalHeader.js
View file

@ -9,7 +9,7 @@ import useCurrentUser from "./components/useCurrentUser";
import HomeLinkIcon from "../images/home-link-icon.png"; 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 GlobalNavBar() { function GlobalHeader() {
const { pathname } = useLocation(); const { pathname } = useLocation();
const isHomePage = pathname === "/"; const isHomePage = pathname === "/";
@ -151,4 +151,4 @@ const NavButton = React.forwardRef(({ icon, ...props }, ref) => {
); );
}); });
export default GlobalNavBar; export default GlobalHeader;

4
src/app/PageLayout.js
View file

@ -2,7 +2,7 @@ import React from "react";
import { Box } from "@chakra-ui/core"; import { Box } from "@chakra-ui/core";
import loadable from "@loadable/component"; import loadable from "@loadable/component";
const GlobalNavBar = loadable(() => import("./GlobalNavBar")); const GlobalHeader = loadable(() => import("./GlobalHeader"));
const GlobalFooter = loadable(() => import("./GlobalFooter")); const GlobalFooter = loadable(() => import("./GlobalFooter"));
function PageLayout({ children }) { function PageLayout({ children }) {
@ -22,7 +22,7 @@ function PageLayout({ children }) {
// Leave space while content is still loading // Leave space while content is still loading
minHeight="2rem" minHeight="2rem"
> >
<GlobalNavBar /> <GlobalHeader />
</Box> </Box>
<Box flex="1 0 0">{children}</Box> <Box flex="1 0 0">{children}</Box>
<Box width="100%" marginTop="12"> <Box width="100%" marginTop="12">