mirror of
https://github.com/LaconicNetwork/laconic.com.git
synced 2026-01-16 14:04:07 +00:00
Layout Order (#18)
This commit is contained in:
parent
67db1c724a
commit
801078beb5
@ -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 />
|
||||
</>
|
||||
)
|
||||
})
|
||||
|
||||
@ -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>
|
||||
)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user