Merge pull request #82 from tkcco21/revert-81-develop

Revert "Develop"
tkcco21 · Mar 28, 2020 · 1fd0b78 · 1fd0b78
2 parents 3881fa3 + fcec8cb
commit 1fd0b78
Show file tree

Hide file tree

Showing 48 changed files with 802 additions and 3,210 deletions.
diff --git a/.babelrc b/.babelrc
@@ -23,6 +23,7 @@
       {
         "alias": {
           "@Config": "./config",
+          "@Common": "./src/js/common",
           "@Admin": "./src/js/admin",
           "@Public": "./src/js/public"
         }

diff --git a/.eslintrc b/.eslintrc
@@ -20,6 +20,7 @@
       "alias": {
         "map": [
           ["@Config", "./config"],
+          ["@Common", "./src/js/common"],
           ["@Admin", "./src/js/admin"],
           ["@Public", "./src/js/public"]
         ],
@@ -36,7 +37,6 @@
     "no-new": "off",
     "no-console": "warn",
     "no-control-regex": "off",
-    "import/prefer-default-export": "off",
     "max-len": [
       "error",
       {

diff --git a/mock/db.json b/mock/db.json
diff --git a/mock/server.js b/mock/server.js