crowetic/commerce
1
0
Fork 1
mirror of https://github.com/vercel/commerce.git synced 2025-07-22 20:26:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

♻️ enhan: move CustomShapeSvg to _app

Browse Source 
:%s
This commit is contained in:
lytrankieio123
2021-09-15 16:38:20 +07:00
parent 8af039d14e
commit e256cece62
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pages/_app.tsx
View File

@@ -1,8 +1,8 @@
import { ThemeProvider } from 'next-themes'; import { ThemeProvider } from 'next-themes';
import type { AppProps } from 'next/app'; import type { AppProps } from 'next/app';
import React, { FC, useEffect } from 'react'; import React, { FC, useEffect } from 'react';
import { Head } from 'src/components/common'; import { CustomShapeSvg, Head } from 'src/components/common';
import 'keen-slider/keen-slider.min.css'; import 'keen-slider/keen-slider.min.css';
import '../src/styles/main.scss'; import '../src/styles/main.scss';
@@ -19,6 +19,7 @@ export default function MyApp({ Component, pageProps }: AppProps) {
<> <>
<Head /> <Head />
<ThemeProvider> <ThemeProvider>
<CustomShapeSvg />
<Layout pageProps={pageProps}> <Layout pageProps={pageProps}>
<Component {...pageProps} /> <Component {...pageProps} />
</Layout> </Layout>

18
src/components/common/Layout/Layout.tsx
View File

@@ -3,7 +3,7 @@ import { useRouter } from 'next/router'
import { FC } from 'react' import { FC } from 'react'
import { useModalCommon } from 'src/components/hooks' import { useModalCommon } from 'src/components/hooks'
import { BRAND, CATEGORY, FEATURED } from 'src/utils/constanst.utils' import { BRAND, CATEGORY, FEATURED } from 'src/utils/constanst.utils'
import { CustomShapeSvg, ScrollToTop } from '..' import { ScrollToTop } from '..'
import Footer from '../Footer/Footer' import Footer from '../Footer/Footer'
import Header from '../Header/Header' import Header from '../Header/Header'
import MenuNavigationProductList from '../MenuNavigationProductList/MenuNavigationProductList' import MenuNavigationProductList from '../MenuNavigationProductList/MenuNavigationProductList'
@@ -28,15 +28,13 @@ const Layout: FC<Props> = ({ children }) => {
} }
return ( return (
<CommerceProvider locale={locale}> <CommerceProvider locale={locale}>
<div className={s.mainLayout}> <div className={s.mainLayout}>
<Header toggleFilter={toggleFilter} visibleFilter={visibleFilter}/> <Header toggleFilter={toggleFilter} visibleFilter={visibleFilter} />
<main >{children}</main> <main >{children}</main>
<div className={s.filter}><MenuNavigationProductList categories={CATEGORY} brands={BRAND} featured={FEATURED} visible={visibleFilter} onClose={closeFilter} /> </div>
<CustomShapeSvg/> <ScrollToTop visibilityHeight={1500} />
<div className={s.filter}><MenuNavigationProductList categories={CATEGORY} brands={BRAND} featured={FEATURED} visible={visibleFilter} onClose={closeFilter}/> </div> <Footer />
<ScrollToTop visibilityHeight={1500} /> </div>
<Footer />
</div>
</CommerceProvider> </CommerceProvider>
) )