metadata 추가

pknu-wap · Nov 29, 2023 · 822cdde · 822cdde
1 parent 1683f42
commit 822cdde
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 22 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -27,6 +27,7 @@
     "next": "^14.0.3",
     "next-remove-imports": "^1.0.12",
     "notistack": "^3.0.1",
+    "picocolors": "^1.0.0",
     "react": "18.2.0",
     "react-beautiful-dnd": "^13.1.1",
     "react-dom": "18.2.0",

diff --git a/client/src/app/layout.tsx b/client/src/app/layout.tsx
@@ -1,15 +1,10 @@
-'use client';
-
 import './globals.css';
 import React, { ReactNode } from 'react';
-// import Footer from '@/components/Footer';
 import Recoil from '@/components/Recoil/Recoil';
 import ThemeRegistry from '@/components/ReactQuery/ThemeRegistry';
 import ReactQuery from '@/components/ReactQuery/Provider';
 import Header from '@/components/Layout/Header';
 import FullLayout from '@/components/Layout/FullLayout';
-import { usePathname } from 'next/navigation';
-import { SnackbarProvider } from 'notistack';
 import { Metadata } from 'next';
 
 export const metadata: Metadata = {
@@ -19,23 +14,19 @@ export const metadata: Metadata = {
 
 export default function RootLayout(props: { children: ReactNode }) {
   const { children } = props;
-  const pathname = usePathname();
 
   return (
     <html lang="en">
       <body>
         <Recoil>
-          <SnackbarProvider>
-            <ReactQuery>
-              <ThemeRegistry options={{ key: 'mui' }}>
-                {!pathname.startsWith('/login') && <Header />}
-                <div className="light">
-                  <FullLayout>{children}</FullLayout>
-                </div>
-                {/* <Footer /> */}
-              </ThemeRegistry>
-            </ReactQuery>
-          </SnackbarProvider>
+          <ReactQuery>
+            <ThemeRegistry options={{ key: 'mui' }}>
+              <Header />
+              <div className="light">
+                <FullLayout>{children}</FullLayout>
+              </div>
+            </ThemeRegistry>
+          </ReactQuery>
         </Recoil>
       </body>
     </html>

diff --git a/client/src/components/Layout/FullLayout.tsx b/client/src/components/Layout/FullLayout.tsx
@@ -1,8 +1,10 @@
+'use client';
+
 import { Stack } from '@mui/material';
 import { Theme, styled } from '@mui/material/styles';
 import { usePathname } from 'next/navigation';
 import FootPrintAnimation from '../FootPrint/FootPrintAnimation';
-// import { useAndroidSSR, useIphoneSSR } from '../../../hooks/useRecoilSSR';
+import { SnackbarProvider } from 'notistack';
 
 type Children = {
   children: React.ReactNode;
@@ -22,9 +24,11 @@ export default function FullLayout({ children }: Children) {
   const pathname = usePathname();
 
   return (
-    <MainStack pathname={pathname}>
-      {children}
-      <FootPrintAnimation />
-    </MainStack>
+    <SnackbarProvider>
+      <MainStack pathname={pathname}>
+        {children}
+        <FootPrintAnimation />
+      </MainStack>
+    </SnackbarProvider>
   );
 }