refact: rename Column components to be generic

This commit is contained in:
Jean-Philippe Sirois
2019-11-11 17:18:09 -08:00
parent ba88927304
commit 711da3c517
25 changed files with 553 additions and 555 deletions
+2 -3
View File
@@ -1,7 +1,6 @@
import React, { FC, useMemo, useState } from "react"
import { ColumnSidebar } from "../../components/ColumnSidebar"
import { MobileHeader } from "../../components/MobileHeader"
import { HomeMobileHeader } from "../../components/HomeMobileHeader"
import { GlobalStyles } from "../../globalStyles"
import { useLockBodyScroll } from "../../hooks/useLockBodyScroll"
import { SidebarProvider } from "../../SidebarProvider"
@@ -32,7 +31,7 @@ export const ColumnLayout: FC<IColumnLayoutProps> = ({ sidebar, content }) => {
<SidebarProvider>
<GlobalStyles />
<SC.Main>
<MobileHeader openMenu={openMenu} />
<HomeMobileHeader openMenu={openMenu} />
{sidebar({ className: activeMobileMenu ? "is-open" : "" })}
<SC.MainContent>
<SC.Container>{content}</SC.Container>
+4 -4
View File
@@ -2,8 +2,8 @@ import { RouteComponentProps } from "@reach/router"
import React, { FC, Fragment, useEffect } from "react"
import { Container } from "../../components/Container"
import { Footer } from "../../components/Footer"
import { Header } from "../../components/Header"
import { HomeFooter } from "../../components/HomeFooter"
import { HomeHeader } from "../../components/HomeHeader"
import { WavesBottom } from "../../components/Waves"
import { GlobalStyles } from "../../globalStyles"
import useLocation from "../../hooks/useLocation"
@@ -25,13 +25,13 @@ export const Layout: FC<RouteComponentProps> = ({ children }) => {
<ThemeProvider>
<SC.LayoutWrapper>
<GlobalStyles />
<Header isHome={isHome} />
<HomeHeader isHome={isHome} />
{!isHome && (
<Fragment>
<SC.MainContent>
<Container>{children}</Container>
</SC.MainContent>
<Footer />
<HomeFooter />
<WavesBottom />
<SC.WavesSpacer />
</Fragment>