From 801078beb5e7d4eccc93c8f8a7dcde2965d934b7 Mon Sep 17 00:00:00 2001
From: Nazareno Oviedo <nazareno@basement.studio>
Date: Tue, 5 Apr 2022 22:43:13 -0300
Subject: [PATCH] Layout Order (#18)

---
 src/components/layout/page.tsx | 4 ----
 src/pages/_app.tsx             | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/layout/page.tsx b/src/components/layout/page.tsx
index 7118ced..76d3e16 100644
--- a/src/components/layout/page.tsx
+++ b/src/components/layout/page.tsx
@@ -1,7 +1,5 @@
 import * as React from 'react'
 
-import { Footer } from '~/components/common/footer'
-import { Header } from '~/components/common/header'
 import { CUSTOM_EASE, DURATION, ScrollSmoother } from '~/lib/gsap'
 
 type Props = {
@@ -14,9 +12,7 @@ const ContentMemo = React.memo(({ children, extras }: Props) => {
   return (
     <>
       {extras}
-      <Header />
       <main>{children}</main>
-      <Footer />
     </>
   )
 })
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index dc92f1a..b870879 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -5,6 +5,8 @@ import { AppProps } from 'next/app'
 import { RealViewportProvider } from 'next-real-viewport'
 import * as React from 'react'
 
+import { Footer } from '~/components/common/footer'
+import { Header } from '~/components/common/header'
 import { AnimationContextProvider } from '~/context/animation'
 import { basementLog, isProd } from '~/lib/constants'
 import { FontsReadyScript } from '~/lib/font-scripts'
@@ -56,7 +58,9 @@ const App = ({ Component, pageProps, ...rest }: AppProps) => {
       <AnimationContextProvider>
         {/* <GAScripts /> */}
         <FontsReadyScript />
+        <Header />
         {getLayout({ Component, pageProps, ...rest })}
+        <Footer />
       </AnimationContextProvider>
     </RealViewportProvider>
   )