Layout Order (#18)

This commit is contained in:
Nazareno Oviedo 2022-04-05 22:43:13 -03:00 committed by GitHub
parent 67db1c724a
commit 801078beb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -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 />
</>
)
})

View File

@ -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>
)