Merge pull request #164 from boostcamp-2020/develop

4주차 배포
boostcamp-2020 · Dec 10, 2020 · e18f097 · e18f097
2 parents 7717890 + e39a6c3
commit e18f097
Show file tree

Hide file tree

Showing 142 changed files with 2,878 additions and 383 deletions.
diff --git a/client/.eslintrc.json b/client/.eslintrc.json
@@ -53,6 +53,7 @@
         "ts": "never",
         "tsx": "never"
       }
-   ]
+   ],
+   "no-alert": "off"
   }
 }
diff --git a/client/.storybook/main.js b/client/.storybook/main.js
@@ -19,8 +19,9 @@ module.exports = {
       '@theme': path.resolve(__dirname, '../src/common/theme'),
       '@utils': path.resolve(__dirname, '../src/common/utils'),
       '@store': path.resolve(__dirname, '../src/common/store'),
-      '@dispatch': path.resolve(__dirname, '../src/common/dispatch'),
-      '@imgs': path.resolve(__dirname, '../public/imgs')
+      '@imgs': path.resolve(__dirname, '../public/imgs'),
+      '@socket': path.resolve(__dirname, '../src/common/socket'),
+      '@constants': path.resolve(__dirname, '../src/common/constants')
     }
     return config;
   }

diff --git a/client/package-lock.json b/client/package-lock.json