From 2e1b981973fb1dca2c6e8fccaca06a4d8425f5d5 Mon Sep 17 00:00:00 2001 From: Nathaniel Tampus Date: Thu, 16 Feb 2023 21:26:14 +0800 Subject: [PATCH 1/5] update deps --- client/package.json | 16 ++++++++-------- package.json | 10 +++++----- server/package.json | 12 ++++++------ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/client/package.json b/client/package.json index 2e6fb9f..27424d8 100644 --- a/client/package.json +++ b/client/package.json @@ -11,18 +11,18 @@ "dependencies": { "@radix-ui/colors": "^0.1.8", "@radix-ui/react-icons": "^1.1.1", - "chess.js": "^1.0.0-beta.1", + "chess.js": "^1.0.0-beta.3", "react": "^18.2.0", "react-chessboard": "^2.0.8", "react-dom": "^18.2.0", - "react-router-dom": "^6.6.2", - "socket.io-client": "^4.5.4" + "react-router-dom": "^6.8.1", + "socket.io-client": "^4.6.0" }, "devDependencies": { - "@types/react": "^18.0.26", - "@types/react-dom": "^18.0.10", - "@vitejs/plugin-react-swc": "^3.0.1", - "typescript": "^4.9.4", - "vite": "^4.0.4" + "@types/react": "^18.0.28", + "@types/react-dom": "^18.0.11", + "@vitejs/plugin-react-swc": "^3.1.0", + "typescript": "^4.9.5", + "vite": "^4.1.1" } } diff --git a/package.json b/package.json index 6e8d4b2..ddef049 100644 --- a/package.json +++ b/package.json @@ -15,13 +15,13 @@ "format:write": "prettier --write ." }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^5.48.1", - "@typescript-eslint/parser": "^5.48.1", + "@typescript-eslint/eslint-plugin": "^5.52.0", + "@typescript-eslint/parser": "^5.52.0", "concurrently": "^7.6.0", - "eslint": "^8.32.0", + "eslint": "^8.34.0", "eslint-config-prettier": "^8.6.0", "eslint-plugin-prettier": "^4.2.1", - "eslint-plugin-react": "^7.32.0", - "prettier": "^2.8.3" + "eslint-plugin-react": "^7.32.2", + "prettier": "^2.8.4" } } diff --git a/server/package.json b/server/package.json index 9e07f75..8127b39 100644 --- a/server/package.json +++ b/server/package.json @@ -13,17 +13,17 @@ "express": "^4.18.2", "express-session": "^1.17.3", "nanoid": "^3.3.4", - "pg": "^8.8.0", - "socket.io": "^4.5.4", + "pg": "^8.9.0", + "socket.io": "^4.6.0", "xss": "^1.0.14" }, "devDependencies": { "@types/connect-pg-simple": "^7.0.0", - "@types/express": "^4.17.15", - "@types/express-session": "^1.17.5", - "@types/node": "^18.11.18", + "@types/express": "^4.17.17", + "@types/express-session": "^1.17.6", + "@types/node": "^18.13.0", "@types/pg": "^8.6.6", "ts-node-dev": "^2.0.0", - "typescript": "^4.9.4" + "typescript": "^4.9.5" } } From 279f1b0f630c1b809515f713d7a2fd99caa49c52 Mon Sep 17 00:00:00 2001 From: Nathaniel Tampus Date: Thu, 16 Feb 2023 21:28:54 +0800 Subject: [PATCH 2/5] increase socket ping interval & timeout --- server/src/server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/server.ts b/server/src/server.ts index b16b446..fe6dc7a 100644 --- a/server/src/server.ts +++ b/server/src/server.ts @@ -25,7 +25,7 @@ app.use(session); app.use("/v1", routes); // socket.io -export const io = new Server(server, { cors: corsConfig }); +export const io = new Server(server, { cors: corsConfig, pingInterval: 30000, pingTimeout: 50000 }); io.use((socket, next) => { session(socket.request as Request, {} as Response, next as NextFunction); }); From 96280b6d71ea5326e487956cc31ff2d0f20f5112 Mon Sep 17 00:00:00 2001 From: Nathaniel Tampus Date: Mon, 6 Feb 2023 14:48:31 +0800 Subject: [PATCH 3/5] env variables for easier dev setup --- server/src/middleware/session.ts | 9 +++------ server/src/server.ts | 8 ++++++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/server/src/middleware/session.ts b/server/src/middleware/session.ts index cf9c7c2..f20d8c4 100644 --- a/server/src/middleware/session.ts +++ b/server/src/middleware/session.ts @@ -19,10 +19,7 @@ declare module "http" { } } const sessionMiddleware = session({ - store: new PGSession({ - pool: db, - createTableIfMissing: true - }), + store: new PGSession({ pool: db, createTableIfMissing: true }), secret: process.env.SESSION_SECRET || "whatever this is", resave: false, saveUninitialized: false, @@ -30,9 +27,9 @@ const sessionMiddleware = session({ proxy: true, cookie: { maxAge: 30 * 24 * 60 * 60 * 1000, // 30 days - secure: true, + secure: process.env.NODE_ENV === "production" ? true : false, httpOnly: true, - sameSite: "none" + sameSite: process.env.NODE_ENV === "production" ? "none" : "lax" }, genid: function () { return nanoid(21); diff --git a/server/src/server.ts b/server/src/server.ts index fe6dc7a..66e427b 100644 --- a/server/src/server.ts +++ b/server/src/server.ts @@ -1,6 +1,5 @@ import "dotenv/config"; import cors from "cors"; -const corsConfig = { origin: "https://ches.su", credentials: true }; import express, { Request, Response, NextFunction } from "express"; import { createServer } from "http"; @@ -11,6 +10,11 @@ import { db } from "./db"; import routes from "./routes"; +const corsConfig = { + origin: process.env.CORS_ORIGIN || "http://localhost:3000", + credentials: true +}; + const app = express(); const server = createServer(app); @@ -40,7 +44,7 @@ io.use((socket, next) => { }); initSocket(); -const port = process.env.PORT || 3000; +const port = process.env.PORT || 3001; server.listen(port, () => { console.log(`listening on :${port}`); }); From aae76e83c46f68e338a82572fced0da718430a1a Mon Sep 17 00:00:00 2001 From: Nathaniel Tampus Date: Thu, 16 Feb 2023 21:36:04 +0800 Subject: [PATCH 4/5] update client dev port --- client/vite.config.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/vite.config.ts b/client/vite.config.ts index c60c308..cb46aea 100644 --- a/client/vite.config.ts +++ b/client/vite.config.ts @@ -3,5 +3,8 @@ import react from "@vitejs/plugin-react-swc"; // https://vitejs.dev/config/ export default defineConfig({ - plugins: [react()] + plugins: [react()], + server: { + port: 3000 + } }); From 903cfc10eed1b1d9280f08d89b966849760f2fe8 Mon Sep 17 00:00:00 2001 From: Nathaniel Tampus Date: Thu, 16 Feb 2023 22:00:19 +0800 Subject: [PATCH 5/5] add refactoring note on top of page --- .../src/components/Header/Header.module.css | 14 ++++++++ client/src/components/Header/Header.tsx | 33 ++++++++++++------- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/client/src/components/Header/Header.module.css b/client/src/components/Header/Header.module.css index e09bc6f..6149e85 100644 --- a/client/src/components/Header/Header.module.css +++ b/client/src/components/Header/Header.module.css @@ -13,3 +13,17 @@ background: transparent; color: var(--blue12); } + +.note { + text-align: center; + background-color: var(--blue2); + padding: 0.9em 0; + font-size: 0.7em; + width: 100%; + color: var(--blue12); +} + +.note a { + color: var(--blue11); + text-decoration: underline; +} diff --git a/client/src/components/Header/Header.tsx b/client/src/components/Header/Header.tsx index ec74611..092cbd9 100644 --- a/client/src/components/Header/Header.tsx +++ b/client/src/components/Header/Header.tsx @@ -29,18 +29,27 @@ const Header = () => { } return ( -
- - chessu - - -
+ <> +
+ This project is currently undergoing a major refactor & redesign. ( + + #4 + + ) +
+
+ + chessu + + +
+ ); };