Move BannerContainer into PayeLayout

ZdruzenieSTROM · Nov 16, 2023 · 99feb11 · 99feb11
1 parent 9509110
commit 99feb11
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/src/components/PageLayout/PageLayout.tsx b/src/components/PageLayout/PageLayout.tsx
@@ -1,6 +1,7 @@
 import clsx from 'clsx'
-import {FC, ReactNode, useEffect} from 'react'
+import {FC, ReactNode} from 'react'
 
+import {BannerContainer} from '@/utils/BannerContainer'
 import {PageTitleContainer} from '@/utils/PageTitleContainer'
 
 import {Banner} from './Banner/Banner'
@@ -21,25 +22,27 @@ type PageLayoutProps = {
 export const PageLayout: FC<PageLayoutProps> = ({contentWidth = 2, title = '', children}) => {
   return (
     <PageTitleContainer.Provider initialState={title}>
-      <div className={styles.pageContainer}>
-        <TopGrid />
-        <Banner />
-        <MenuMain />
-        <div className={styles.grid}>
-          <StromLogo />
-          <div
-            className={clsx(
-              styles.mainContent,
-              contentWidth === 1 && styles.col1,
-              contentWidth === 2 && styles.col2,
-              contentWidth === 3 && styles.col3,
-            )}
-          >
-            {children}
+      <BannerContainer.Provider>
+        <div className={styles.pageContainer}>
+          <TopGrid />
+          <Banner />
+          <MenuMain />
+          <div className={styles.grid}>
+            <StromLogo />
+            <div
+              className={clsx(
+                styles.mainContent,
+                contentWidth === 1 && styles.col1,
+                contentWidth === 2 && styles.col2,
+                contentWidth === 3 && styles.col3,
+              )}
+            >
+              {children}
+            </div>
           </div>
+          <Footer />
         </div>
-        <Footer />
-      </div>
+      </BannerContainer.Provider>
     </PageTitleContainer.Provider>
   )
 }
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
@@ -11,7 +11,6 @@ import {CookiesProvider} from 'react-cookie'
 
 import {theme} from '@/theme'
 import {AuthContainer} from '@/utils/AuthContainer'
-import {BannerContainer} from '@/utils/BannerContainer'
 
 const ReactQueryDevtools = dynamic(
   () => import('@tanstack/react-query-devtools').then(({ReactQueryDevtools}) => ReactQueryDevtools),
@@ -83,11 +82,9 @@ const MyApp: FC<AppProps> = ({Component, pageProps}) => {
         <ReactQueryDevtools />
         <CookiesProvider>
           <AuthContainer.Provider>
-            <BannerContainer.Provider>
-              <ThemeProvider theme={theme}>
-                <Component {...pageProps} />
-              </ThemeProvider>
-            </BannerContainer.Provider>
+            <ThemeProvider theme={theme}>
+              <Component {...pageProps} />
+            </ThemeProvider>
           </AuthContainer.Provider>
         </CookiesProvider>
       </QueryClientProvider>