Merge branch 'feat/#100' of https://github.com/Yapp-17th/Web_2_Client …

…into feat/#100
Yapp-17th · Dec 6, 2020 · c3e8bde · c3e8bde
2 parents 82cdca2 + 82565ba
commit c3e8bde
Show file tree

Hide file tree

Showing 63 changed files with 1,771 additions and 694 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,6 +1,3 @@
 {
-  "presets": [
-    "@babel/preset-env",
-    "@babel/preset-react"
-  ]
-}
+  "presets": ["@babel/preset-env", "@babel/preset-react"]
+}
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -42,4 +42,11 @@ module.exports = {
       },
     },
   },
+  settings: {
+    'import/resolver': {
+      webpack: {
+        config: 'webpack.config.js',
+      },
+    },
+  },
 };
diff --git a/favicon.png b/favicon.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -85,6 +85,7 @@
     "react-redux": "^7.2.1",
     "react-router-dom": "^5.2.0",
     "react-router-prop-types": "^1.0.5",
+    "react-spinners": "^0.9.0",
     "redux": "^4.0.5",
     "redux-thunk": "^2.3.0",
     "simple-peer": "^9.7.2",