Merge branch 'main' into issue-242

devhatt · Jul 29, 2024 · 61acf56 · 61acf56
2 parents 4095cbc + a1d9893
commit 61acf56
Show file tree

Hide file tree

Showing 16 changed files with 568 additions and 71 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -51,6 +51,12 @@
       "globals": {
         "vi": true
       }
+    },
+    {
+      "files": ["src/services/*.js"],
+      "rules": {
+        "no-console": "off"
+      }
     }
   ]
 }
diff --git a/db.json b/db.json
@@ -1,4 +1,9 @@
 {
+  "login": [
+    {
+      "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6Ijc3OTFkZmMwLWY3YzEtNDAyMy05ZDUxLTFlYTQ3OWQ2ZjgyYiIsIm5hbWUiOiJqb2huZG9lQGV4YW1wbGUuY29tIiwiZW1haWwiOiJqb2huZG9lQGV4YW1wbGUuY29tIiwiZXhwIjoxNzIxODI4MDA3fQ.Agk6Yz2E6TpoqI6mVYeClKx1zOxSsp TyIhtJEvFvG-E"
+    }
+  ],
   "user": [
     {
       "id": "1",

diff --git a/package.json b/package.json
@@ -71,6 +71,7 @@
     "eslint-plugin-vitest-globals": "1.5.0",
     "husky": "^8.0.3",
     "jsdom": "^23.2.0",
+    "json-server": "1.0.0-beta.1",
     "lint-staged": "^15.2.2",
     "prettier": "^3.2.5",
     "reset-css": "^5.0.2",
@@ -82,8 +83,7 @@
     "stylelint-order": "^6.0.4",
     "stylelint-prettier": "^5.0.0",
     "stylelint-scss": "^6.2.1",
-    "vitest": "^1.6.0",
-    "json-server": "1.0.0-beta.1"
+    "vitest": "^1.6.0"
   },
   "config": {
     "commitizen": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml