Merge branch 'develop' of https://github.com/seohyun319/HanALL into f…

…eat/#99
HanALL-all-of-korean-spelling · Sep 8, 2022 · d2dceef · d2dceef
2 parents 62196a0 + d18f284
commit d2dceef
Show file tree

Hide file tree

Showing 20 changed files with 584 additions and 35 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -13,13 +13,15 @@
     "@emotion/styled": "^11.9.3",
     "@mui/icons-material": "^5.8.4",
     "@mui/material": "^5.9.1",
+    "@reduxjs/toolkit": "^1.8.5",
     "@types/axios": "^0.14.0",
     "@types/js-cookie": "^3.0.2",
     "classnames": "^2.3.1",
     "js-cookie": "^3.0.1",
     "next": "12.1.5",
     "react": "18.0.0",
-    "react-dom": "18.0.0"
+    "react-dom": "18.0.0",
+    "react-redux": "^8.0.2"
   },
   "devDependencies": {
     "@types/node": "17.0.25",

diff --git a/client/pages/_app.tsx b/client/pages/_app.tsx
@@ -1,14 +1,18 @@
 import "../styles/globals.scss";
 import type { AppProps } from "next/app";
+import { store } from "../src/_app/store";
+import { Provider } from "react-redux";
 import Gnb from "../src/component/Gnb/Gnb";
 
 function MyApp({ Component, pageProps }: AppProps) {
   return (
     <>
       <Gnb />
-      <div className="container">
-        <Component {...pageProps} />
-      </div>
+      <Provider store={store}>
+        <div className="container">
+          <Component {...pageProps} />
+        </div>
+      </Provider>
     </>
   );
 }