From 2238038c95fd9e9ed2cc91eafbbf01de8718999b Mon Sep 17 00:00:00 2001
From: Nathaniel Tampus <contact@nize.foo>
Date: Thu, 27 Jul 2023 15:02:34 +0800
Subject: [PATCH] update eslint configs

---
 .eslintrc => client/.eslintrc      |  5 +++--
 client/package.json                |  1 +
 package.json                       |  1 -
 server/.eslintrc                   | 11 +++++++++++
 server/src/db/models/game.model.ts |  2 +-
 server/src/db/models/user.model.ts |  4 ++--
 6 files changed, 18 insertions(+), 6 deletions(-)
 rename .eslintrc => client/.eslintrc (73%)
 create mode 100644 server/.eslintrc

diff --git a/.eslintrc b/client/.eslintrc
similarity index 73%
rename from .eslintrc
rename to client/.eslintrc
index 3aec9ed..a64baab 100644
--- a/.eslintrc
+++ b/client/.eslintrc
@@ -2,7 +2,8 @@
   "extends": ["eslint:recommended", "next/core-web-vitals", "prettier"],
   "settings": {
     "next": {
-      "rootDir": "client/"
+      "rootDir": "."
     }
-  }
+  },
+  "root": true
 }
diff --git a/client/package.json b/client/package.json
index 24e785e..e410396 100644
--- a/client/package.json
+++ b/client/package.json
@@ -24,6 +24,7 @@
         "@types/react-dom": "^18.2.7",
         "autoprefixer": "^10.4.14",
         "daisyui": "^2.52.0",
+        "eslint-config-next": "^13.4.12",
         "postcss": "^8.4.27",
         "tailwindcss": "^3.3.3",
         "typescript": "^5.1.6"
diff --git a/package.json b/package.json
index b3dfaf5..3883fe3 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,6 @@
     "devDependencies": {
         "concurrently": "^8.2.0",
         "eslint": "^8.45.0",
-        "eslint-config-next": "^13.4.12",
         "eslint-config-prettier": "^8.8.0",
         "prettier": "^2.8.8",
         "prettier-plugin-tailwindcss": "^0.4.1"
diff --git a/server/.eslintrc b/server/.eslintrc
new file mode 100644
index 0000000..adbd124
--- /dev/null
+++ b/server/.eslintrc
@@ -0,0 +1,11 @@
+{
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:@typescript-eslint/stylistic",
+    "prettier"
+  ],
+  "parser": "@typescript-eslint/parser",
+  "plugins": ["@typescript-eslint"],
+  "root": true
+}
diff --git a/server/src/db/models/game.model.ts b/server/src/db/models/game.model.ts
index 0297e82..02bc70d 100644
--- a/server/src/db/models/game.model.ts
+++ b/server/src/db/models/game.model.ts
@@ -1,7 +1,7 @@
 import type { Game, User } from "@chessu/types";
 import { db } from "../index.js";
 
-export const activeGames: Array<Game> = [];
+export const activeGames: Game[] = [];
 
 export const save = async (game: Game) => {
     try {
diff --git a/server/src/db/models/user.model.ts b/server/src/db/models/user.model.ts
index cb23373..bbf1623 100644
--- a/server/src/db/models/user.model.ts
+++ b/server/src/db/models/user.model.ts
@@ -44,7 +44,7 @@ export const findByNameEmail = async (user: User, includePassword = false, limit
                 `SELECT id, name, email, wins, losses, draws FROM "user" LIMIT $1`,
                 [limit ?? 10]
             );
-            return res.rows as Array<User & { password?: string }>;
+            return res.rows as (User & { password?: string })[];
         } catch (err: unknown) {
             console.log(err);
             return null;
@@ -58,7 +58,7 @@ export const findByNameEmail = async (user: User, includePassword = false, limit
             } FROM "user" WHERE name=$1 OR email=$2 LIMIT $3`,
             [user.name, user.email, limit ?? 1]
         );
-        return res.rows as Array<User & { password?: string }>;
+        return res.rows as (User & { password?: string })[];
     } catch (err: unknown) {
         console.log(err);
         return null;