fixed docker

client/vite.config.js

@@ -1,14 +1,14 @@
-import { defineConfig } from 'vite';
-import react from '@vitejs/plugin-react';
+import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react";
 // https://vitejs.dev/config/
 export default defineConfig({
-    plugins: [react()],
-    server: {
-        proxy: {
-            '/api': {
-                target: 'http://localhost:3000',
-                changeOrigin: true,
-            },
-        },
+  plugins: [react()],
+  server: {
+    proxy: {
+      "/api": {
+        target: "http://backend:3000",
+        changeOrigin: true,
+      },
     },
+  },
 });

client/vite.config.ts

@@ -10,7 +10,7 @@ export default defineConfig({
     open: true,
     proxy: {
       "/api": {
-        target: "http://localhost:3000",
+        target: "http://backend:3000",
         changeOrigin: true,
       },
     },

docker-compose.yml

@@ -10,6 +10,8 @@ services:
       - node_modules:/usr/src/app/node_modules
     depends_on:
       - backend
+    environment:
+      - VITE_API_URL=http://backend:3000
 
   backend:
     build:
@@ -20,9 +22,8 @@ services:
     volumes:
       - ./server:/usr/src/app
       - ./data:/usr/src/app/data
-    environment:
-      - DATABASE_URL=/usr/src/app/data/dev.db
-
+      - /usr/src/app/node_modules
+
 volumes:
   node_modules:
   data:

server/.dockerignore

@@ -1 +1,2 @@
-node_modules
+node_modules
+dist

server/Dockerfile

@@ -2,12 +2,25 @@ FROM node:20
 
 WORKDIR /usr/src/app
 
-COPY . . 
+ENV DATABASE_URL="file:./dev.db" 
+
+ENV JWT_SECRET=2c146a3da80f85866a3083e51e631c207fb45456ad86569992f1445a4043f788
+
+COPY package*.json ./
 
 RUN npm install
 
+COPY prisma ./prisma/
+
+RUN npx prisma generate
+
+COPY . .
+
 RUN npm run build
+RUN ls -la dist
+RUN ls -R /usr/src/app
+RUN cat dist/index.js || echo "index.js no existe"
 
 EXPOSE 3000
 
-CMD ["npm", "run", "start"]
+CMD ["npm", "start"]

server/package.json

@@ -2,13 +2,13 @@
   "name": "6-claudio-martin-andrea-rethy",
   "version": "1.0.0",
   "description": "",
-  "main": "./dist/src/index.js",
+  "main": "./dist/index.js",
   "type": "module",
   "scripts": {
-    "dev": "nodemon ./dist/src/index.js",
+    "dev": "nodemon dist/index.js",
     "test": "vitest",
     "build": "tsc",
-    "start": "node ./dist/src/index.js"
+    "start": "node dist/index.js"
   },
   "keywords": [],
   "author": "ClaudioMartinH & Andrea Rethy",
@@ -31,4 +31,4 @@
     "jsonwebtoken": "^9.0.2",
     "prisma": "^5.19.1"
   }
-}
+}

server/src/index.ts

@@ -6,17 +6,15 @@ import loginRoutes from "./routes/login.routes.js";
 import authMiddlewareJWT from "./middleware/authMiddleware.js";
 import dotenv from "dotenv";
 import cors from "cors";
-// import { PlayerController } from "./infrastructure/controllers/playerController.js";
 
-// const playerController = new PlayerController();
 dotenv.config();
 const app = express();
 app.use(
   cors({
     origin: "http://localhost:5173",
     methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],
     allowedHeaders: ["Content-Type", "Authorization"],
-    credentials: true
+    credentials: true,
   })
 );
 
@@ -26,11 +24,10 @@ const PORT = process.env.PORT || 3000;
 app.use(express.json());
 
 app.use("/api", loginRoutes);
-// app.post("/api/players", playerController.createPlayer);
 app.use("/api", authMiddlewareJWT, playersRoutes);
 app.use("/api", authMiddlewareJWT, gamesRoutes);
 app.use("/api", authMiddlewareJWT, rankingsRoutes);
 
-app.listen(PORT, () => {
+app.listen(Number(PORT), "0.0.0.0", () => {
   console.log(`Server listening on localhost:${PORT}`);
 });

server/tsconfig.json

@@ -1,10 +1,15 @@
 {
   "compilerOptions": {
+    "types": [
+      "@types/node",
+      "@prisma/client"
+    ],
     "target": "ES6",
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
     "strict": true,
     "outDir": "./dist",
+    "rootDir": "./src",
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "removeComments": true,
@@ -28,33 +33,4 @@
   "exclude": [
     "node_modules"
   ]
-}
-// {
-//   "compilerOptions": {
-//     "target": "ES6",
-//     "module": "ESNext",
-//     "strict": true,
-//     "outDir": "./dist",
-//     "esModuleInterop": true,
-//     "forceConsistentCasingInFileNames": true,
-//     "removeComments": true,
-//     "skipLibCheck": true,
-//     "allowSyntheticDefaultImports": true,
-//     "noEmitHelpers": true,
-//     "noImplicitReturns": true,
-//     "noUnusedLocals": true,
-//     "noUnusedParameters": true,
-//     "baseUrl": ".",
-//     "paths": {
-//       "@prisma/client": [
-//         "./node_modules/@prisma/client"
-//       ]
-//     }
-//   },
-//   "include": [
-//     "./src/**/*.ts"
-//   ],
-//   "exclude": [
-//     "node_modules"
-//   ]
-// }
+}