merge common into m1-datnguyen

This commit is contained in:
unknown 2021-08-20 18:16:19 +07:00
commit 6260b2f175
4 changed files with 28 additions and 8 deletions

View File

@ -1,10 +1,10 @@
import '../src/styles/main.scss' import { ThemeProvider } from 'next-themes';
import 'keen-slider/keen-slider.min.css' import type { AppProps } from 'next/app';
import React, { FC, useEffect } from 'react';
import { Head } from 'src/components/common';
import 'keen-slider/keen-slider.min.css';
import '../src/styles/main.scss';
import { FC, useEffect } from 'react'
import type { AppProps } from 'next/app'
import { Head } from '@components/common'
import { ManagedUIContext } from '@components/ui/context'
const Noop: FC = ({ children }) => <>{children}</> const Noop: FC = ({ children }) => <>{children}</>
@ -18,11 +18,11 @@ export default function MyApp({ Component, pageProps }: AppProps) {
return ( return (
<> <>
<Head /> <Head />
<ManagedUIContext> <ThemeProvider>
<Layout pageProps={pageProps}> <Layout pageProps={pageProps}>
<Component {...pageProps} /> <Component {...pageProps} />
</Layout> </Layout>
</ManagedUIContext> </ThemeProvider>
</> </>
) )
} }

View File

@ -0,0 +1,18 @@
import { FC } from 'react'
import NextHead from 'next/head'
import { DefaultSeo } from 'next-seo'
import config from '@config/seo.json'
const Head: FC = () => {
return (
<>
<DefaultSeo {...config} />
<NextHead>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="manifest" href="/site.webmanifest" key="site-manifest" />
</NextHead>
</>
)
}
export default Head

View File

@ -1,4 +1,5 @@
export { default as ButtonCommon } from './ButtonCommon/ButtonCommon' export { default as ButtonCommon } from './ButtonCommon/ButtonCommon'
export { default as Layout } from './Layout/Layout' export { default as Layout } from './Layout/Layout'
export { default as CarouselCommon } from './CarouselCommon/CarouselCommon' export { default as CarouselCommon } from './CarouselCommon/CarouselCommon'
export { default as Head } from './Head/Head'

View File

@ -15,6 +15,7 @@
"isolatedModules": true, "isolatedModules": true,
"jsx": "preserve", "jsx": "preserve",
"incremental": true, "incremental": true,
"noUnusedLocals": true,
"paths": { "paths": {
"@lib/*": ["lib/*"], "@lib/*": ["lib/*"],
"@utils/*": ["utils/*"], "@utils/*": ["utils/*"],