From bd39cf8c4618944f254d316c96729c2af82598ff Mon Sep 17 00:00:00 2001 From: Nathaniel Tampus Date: Sun, 5 Feb 2023 13:49:40 +0800 Subject: [PATCH] npm workspaces, NodeNext for server --- client/index.html | 13 - client/package.json | 35 +-- client/public/chessu.svg | 104 -------- client/src/App.tsx | 32 --- client/src/assets/oauth_facebook.png | Bin 3848 -> 0 bytes client/src/assets/oauth_google.png | Bin 3983 -> 0 bytes client/src/components/Auth/Auth.module.css | 125 --------- client/src/components/Auth/Auth.tsx | 90 ------- client/src/components/Board/Board.tsx | 217 ---------------- .../src/components/Footer/Footer.module.css | 14 -- client/src/components/Footer/Footer.tsx | 24 -- .../src/components/Header/Header.module.css | 15 -- client/src/components/Header/Header.tsx | 47 ---- client/src/config/config.ts | 1 - client/src/context/ContextProvider.tsx | 29 --- client/src/context/session.ts | 7 - client/src/context/socket.ts | 18 -- client/src/global.css | 39 --- client/src/main.tsx | 10 - client/src/routes/Game/Game.module.css | 121 --------- client/src/routes/Game/Game.tsx | 238 ------------------ client/src/routes/Home/Home.module.css | 117 --------- client/src/routes/Home/Home.tsx | 139 ---------- client/src/routes/NotFound/NotFound.tsx | 5 - client/src/routes/ProtectedRoutes.tsx | 12 - client/src/utils/auth.ts | 28 --- client/src/utils/games.ts | 24 -- client/src/vite-env.d.ts | 1 - client/tsconfig.json | 44 ++-- client/tsconfig.node.json | 9 - client/vercel.json | 3 - client/vite.config.ts | 7 - package.json | 29 +-- server/package.json | 23 +- server/src/controllers/auth.controller.ts | 2 +- server/src/controllers/games.controller.ts | 35 ++- server/src/db/index.ts | 4 +- server/src/db/models/game.model.ts | 4 +- server/src/db/models/user.model.ts | 4 +- server/src/middleware/session.ts | 9 +- server/src/routes/auth.route.ts | 4 +- server/src/routes/games.route.ts | 4 +- server/src/routes/index.ts | 6 +- server/src/server.ts | 14 +- server/src/socket/game.socket.ts | 4 +- server/src/socket/index.ts | 11 +- server/tsconfig.json | 6 +- types/{index.ts => index.d.ts} | 2 +- types/package.json | 5 + 49 files changed, 129 insertions(+), 1605 deletions(-) delete mode 100644 client/index.html delete mode 100644 client/public/chessu.svg delete mode 100644 client/src/App.tsx delete mode 100644 client/src/assets/oauth_facebook.png delete mode 100644 client/src/assets/oauth_google.png delete mode 100644 client/src/components/Auth/Auth.module.css delete mode 100644 client/src/components/Auth/Auth.tsx delete mode 100644 client/src/components/Board/Board.tsx delete mode 100644 client/src/components/Footer/Footer.module.css delete mode 100644 client/src/components/Footer/Footer.tsx delete mode 100644 client/src/components/Header/Header.module.css delete mode 100644 client/src/components/Header/Header.tsx delete mode 100644 client/src/config/config.ts delete mode 100644 client/src/context/ContextProvider.tsx delete mode 100644 client/src/context/session.ts delete mode 100644 client/src/context/socket.ts delete mode 100644 client/src/global.css delete mode 100644 client/src/main.tsx delete mode 100644 client/src/routes/Game/Game.module.css delete mode 100644 client/src/routes/Game/Game.tsx delete mode 100644 client/src/routes/Home/Home.module.css delete mode 100644 client/src/routes/Home/Home.tsx delete mode 100644 client/src/routes/NotFound/NotFound.tsx delete mode 100644 client/src/routes/ProtectedRoutes.tsx delete mode 100644 client/src/utils/auth.ts delete mode 100644 client/src/utils/games.ts delete mode 100644 client/src/vite-env.d.ts delete mode 100644 client/tsconfig.node.json delete mode 100644 client/vercel.json delete mode 100644 client/vite.config.ts rename types/{index.ts => index.d.ts} (93%) create mode 100644 types/package.json diff --git a/client/index.html b/client/index.html deleted file mode 100644 index a546081..0000000 --- a/client/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - Chessu - - -
- - - diff --git a/client/package.json b/client/package.json index 2e6fb9f..1a1ee70 100644 --- a/client/package.json +++ b/client/package.json @@ -1,28 +1,29 @@ { - "name": "chessu", + "name": "@chessu/client", "private": true, - "version": "0.0.0", - "type": "module", + "sideEffects": false, "scripts": { - "dev": "vite", - "build": "tsc && vite build", - "preview": "vite preview" + "build": "npm run build:css && remix build", + "build:css": "tailwindcss -m -i ./styles/app.css -o app/styles/app.css", + "dev": "concurrently \"npm run dev:css\" \"remix dev\"", + "dev:css": "tailwindcss -w -i ./styles/app.css -o app/styles/app.css", + "typecheck": "tsc" }, "dependencies": { - "@radix-ui/colors": "^0.1.8", - "@radix-ui/react-icons": "^1.1.1", - "chess.js": "^1.0.0-beta.1", + "@remix-run/node": "^1.12.0", + "@remix-run/react": "^1.12.0", + "@remix-run/vercel": "^1.12.0", + "@vercel/node": "^2.9.0", "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-dom": "^18.2.0" }, "devDependencies": { - "@types/react": "^18.0.26", + "@chessu/types": "*", + "@remix-run/dev": "^1.12.0", + "@remix-run/serve": "^1.12.0", + "@types/react": "^18.0.27", "@types/react-dom": "^18.0.10", - "@vitejs/plugin-react-swc": "^3.0.1", - "typescript": "^4.9.4", - "vite": "^4.0.4" + "tailwindcss": "^3.2.4", + "typescript": "^4.9.5" } } diff --git a/client/public/chessu.svg b/client/public/chessu.svg deleted file mode 100644 index cabe48a..0000000 --- a/client/public/chessu.svg +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/src/App.tsx b/client/src/App.tsx deleted file mode 100644 index 18bbb0c..0000000 --- a/client/src/App.tsx +++ /dev/null @@ -1,32 +0,0 @@ -import { Route, Routes } from "react-router-dom"; -import ContextProvider from "./context/ContextProvider"; - -import Header from "./components/Header/Header"; -import Footer from "./components/Footer/Footer"; - -import ProtectedRoutes from "./routes/ProtectedRoutes"; -import Home from "./routes/Home/Home"; -import Game from "./routes/Game/Game"; -import NotFound from "./routes/NotFound/NotFound"; - -import "./global.css"; - -const App = (): JSX.Element => { - return ( - -
-
- - } /> - }> - } /> - - } /> - -
-