Merge remote-tracking branch 'origin/main'

windeer9 · Nov 2, 2023 · a8da80e · a8da80e
2 parents bf21991 + 3b061f3
commit a8da80e
Show file tree

Hide file tree

Showing 51 changed files with 1,312 additions and 1,205 deletions.
diff --git a/client/.eslintrc.json b/client/.eslintrc.json
@@ -14,19 +14,17 @@
     "plugin:import/recommended",
     "prettier"
   ],
-  "plugins": [
-    "react",
-    "react-hooks",
-    "jsx-a11y",
-    "import"
-  ],
+  "plugins": ["react", "react-hooks", "jsx-a11y", "import"],
   "rules": {
-    "no-unused-vars": "warn"
+    "no-unused-vars": "warn",
+    "import/no-unresolved": [2, { "commonjs": true, "amd": true }],
+    "import/extensions": [2, "ignorePackages"]
   },
   "settings": {
     "import/resolver": {
       "node": {
-        "paths": ["src"] // src 폴더를 모듈 경로로 추가
+        "paths": ["src"], // src 폴더를 모듈 경로로 추가
+        "extensions": [".js", ".jsx", ".ts", ".tsx"]
       }
     }
   }

diff --git a/client/.prettierrc.json b/client/.prettierrc.json
@@ -1,13 +1,13 @@
 {
-    "printWidth": 120,
-    "tabWidth": 2,
-    "useTabs": false,
-    "semi": true,
-    "singleQuote": true,
-    "trailingComma": "all",
-    "bracketSpacing": true,
-    "jsxBracketSameLine": true,
-    "arrowParens": "avoid",
-    "vueIndentScriptAndStyle": false,
-    "endOfLine": "auto"
-  }
+  "printWidth": 120,
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "bracketSpacing": true,
+  "jsxBracketSameLine": true,
+  "arrowParens": "avoid",
+  "vueIndentScriptAndStyle": false,
+  "endOfLine": "auto"
+}
diff --git a/client/build/asset-manifest.json b/client/build/asset-manifest.json
@@ -1,15 +1,15 @@
 {
   "files": {
     "main.css": "/static/css/main.f4fdb1bd.css",
-    "main.js": "/static/js/main.4fcd2700.js",
+    "main.js": "/static/js/main.d889b95b.js",
     "static/media/user_shadow.png": "/static/media/user_shadow.697fdcd21f6d157b9073.png",
     "static/media/logo.png": "/static/media/logo.d61babd8e60c9f74e60d.png",
     "index.html": "/index.html",
     "main.f4fdb1bd.css.map": "/static/css/main.f4fdb1bd.css.map",
-    "main.4fcd2700.js.map": "/static/js/main.4fcd2700.js.map"
+    "main.d889b95b.js.map": "/static/js/main.d889b95b.js.map"
   },
   "entrypoints": [
     "static/css/main.f4fdb1bd.css",
-    "static/js/main.4fcd2700.js"
+    "static/js/main.d889b95b.js"
   ]
 }
diff --git a/client/build/index.html b/client/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="description" content="Web site created using create-react-app"/><title>그린어스포어스</title><script defer="defer" src="/static/js/main.4fcd2700.js"></script><link href="/static/css/main.f4fdb1bd.css" rel="stylesheet"><body><div id="root"></div></body></html>
+<!doctype html><html lang="en"><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="description" content="Web site created using create-react-app"/><title>그린어스포어스</title><script defer="defer" src="/static/js/main.d889b95b.js"></script><link href="/static/css/main.f4fdb1bd.css" rel="stylesheet"><body><div id="root"></div></body></html>
diff --git a/client/build/static/js/main.4fcd2700.js b/client/build/static/js/main.4fcd2700.js
diff --git a/client/build/static/js/main.4fcd2700.js.map b/client/build/static/js/main.4fcd2700.js.map
diff --git a/client/build/static/js/main.d889b95b.js b/client/build/static/js/main.d889b95b.js
diff --git a/...ld/static/js/main.4fcd2700.js.LICENSE.txt → ...ld/static/js/main.d889b95b.js.LICENSE.txt b/...ld/static/js/main.4fcd2700.js.LICENSE.txt → ...ld/static/js/main.d889b95b.js.LICENSE.txt
@@ -1,3 +1,5 @@
+/*! js-cookie v3.0.5 | MIT */
+
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
 
 /**

diff --git a/client/build/static/js/main.d889b95b.js.map b/client/build/static/js/main.d889b95b.js.map
diff --git a/client/jsconfig.json b/client/jsconfig.json
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,4 +1,3 @@
-
 {
   "name": "client",
   "version": "0.1.0",
@@ -11,6 +10,10 @@
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
+    "@types/jest": "^29.5.6",
+    "@types/node": "^20.8.8",
+    "@types/react": "^18.2.31",
+    "@types/react-dom": "^18.2.14",
     "axios": "^1.5.0",
     "chartjs-react": "^4.1.0",
     "eslint-plugin-jest-dom": "^5.1.0",
@@ -24,6 +27,7 @@
     "react-router-dom": "^6.15.0",
     "react-scripts": "5.0.1",
     "redux": "^4.2.1",
+    "typescript": "^5.2.2",
     "web-vitals": "^2.1.4"
   },
   "scripts": {

diff --git a/client/src/App.js b/client/src/App.js
@@ -1,49 +1,51 @@
 import React from 'react';
 import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
+import { Provider } from 'react-redux';
 import './App.css';
+import store from './store/store.js';
 
-import SignUpPage from './pages/SignUpPage.jsx';
+import SignUpPage from './pages/SignUpPage.tsx';
 import Login from './pages/LoginPage.jsx';
 import EditerPage from './pages/EditerPage.jsx';
 
-import AllBoardPage from './pages/AllBoardPage.jsx';
-import FreeBoardPage from './pages/FreeBoardPage.jsx';
-import FreeDetailPage from './pages/FreeDetailPage.jsx';
-import AuthBoardPage from './pages/AuthBoardPage.jsx';
-import AuthDetailPage from './pages/AuthDetailPage.jsx';
-import EnvBoardPage from './pages/EnvBoardPage.jsx';
+import AllBoardPage from './pages/AllBoardPage.tsx';
+import FreeBoardPage from './pages/FreeBoardPage.tsx';
+import FreeDetailPage from './pages/FreeDetailPage.tsx';
+import AuthBoardPage from './pages/AuthBoardPage.tsx';
+import AuthDetailPage from './pages/AuthDetailPage.tsx';
+import EnvBoardPage from './pages/EnvBoardPage.tsx';
 
-import Header from './components/Header.jsx';
+import AppHeader from './components/AppHeader.jsx';
 
 import MyPageMain from 'pages/MyPageMain.jsx';
-import MyPageInfo from './pages/MyPageInfo.jsx';
+import MyPageInfo from './pages/MyPageInfo.tsx';
 import MyPost from 'pages/MyPost.jsx';
 
 function App() {
-
   return (
-    <div className="App">
-
-      <Router>
-        <Header />
-        <Routes>
-          <Route path="/" element={<AllBoardPage/>} />
-          <Route path="/login" element={<Login/>} />
-          <Route path="/signup" element={<SignUpPage/>} />
-          <Route path="/posts/write" element={<EditerPage/>} />
-
-          <Route path="/free" element={<FreeBoardPage/>} />
-          <Route path="/free/:postId/:userId/:voteId" element={<FreeDetailPage />} />
-          <Route path="/auth" element={<AuthBoardPage/>} />
-          <Route path="/auth/:postId/:userId" element={<AuthDetailPage/>} />
-          <Route path="/env" element={<EnvBoardPage/>} />
-
-          <Route path="/mypage/main" element={<MyPageMain />} />
-          <Route path="/mypage/info" element={<MyPageInfo/>} />
-          <Route path="mypage/posts/:postId" element={<MyPost />} />
-        </Routes>
-      </Router>
-    </div>
+    <Provider store={store}>
+      <div className="App">
+        <Router>
+          <AppHeader />
+          <Routes>
+            <Route path="/" element={<AllBoardPage />} />
+            <Route path="/login" element={<Login />} />
+            <Route path="/signup" element={<SignUpPage />} />
+            <Route path="/posts/write" element={<EditerPage />} />
+
+            <Route path="/free" element={<FreeBoardPage />} />
+            <Route path="/free/:postId/:userId" element={<FreeDetailPage />} />
+            <Route path="/auth" element={<AuthBoardPage />} />
+            <Route path="/auth/:postId/:userId" element={<AuthDetailPage />} />
+            <Route path="/env" element={<EnvBoardPage />} />
+
+            <Route path="/mypage/main" element={<MyPageMain />} />
+            <Route path="/mypage/info" element={<MyPageInfo />} />
+            <Route path="mypage/posts/:postId" element={<MyPost />} />
+          </Routes>
+        </Router>
+      </div>
+    </Provider>
   );
 }