^^._, work in progress, small changes

.45env45

@@ -0,0 +1,10 @@
+POSTGRES_PASSWORD=coucou
+JWT_SECRET=superlongsecretkeyatleast32characterspleasenevercommitthis
+POSTGRES_DB=database
+POSTGRES_HOST=database
+POSTGRES_USER=user
+GITHUB_CLIENT_ID=Ov23li6ovg3fzec5IO5D
+GITHUB_CLIENT_SECRET=0345e959e8f0e9f784061c5c90ee227ddb2ef9ab
+GITHUB_CALLBACK_URL=http://localhost:8080/api/auth/github/callback
+
+pogpog

README.md

@@ -1,142 +0,0 @@
-*This project has been created as part of the 42 curriculum by agallon, gprunet, yantoine and tfauve-p*
-
-**DESCRIPTION**
-
-For starters, ft_transcendence is a wonderful project based on building a web-application running from Docker containers where the goal is, for the first time to do whatever we want, yet still we need to follow multiples criteria based on a number of points to grind to set the project as finished.
-
-For such a project our group thought about the "CATETRIBBL.IO". We chose to make a web application featuring multiples games such as Tetris one of the very first game ever developed and Skkribl.io the amazing drawing game !
-
-But beware ! A mysterious noble cat named Wiskas The Third is gone ... It is said that he's been lurking around trapping 42's students into infinite conversation known as "tunnel". If you see him please report to us as soon as possible !
-
-**INSTRUCTIONS**
-
-Like every 42 project you will need to git clone it into a valid repository, then add our functional .env file at the root of the repository. After all that, make use of the "make" command and watch our fabulous containers building themselves ! Look for https://localhost:8443/ once it's built, remember that you need to login in order to play on our web app !
-
-Outside of 42 environment you will obviously need Docker and Make installed.
-
-**RESOURCES**
-
-- https://www.geeksforgeeks.org
-- https://developer.mozilla.org/fr/docs/Web/JavaScript
-- https://www.w3schools.com/js/
-- https://www.tigerdata.com/learn/postgres-cheat-sheet
-- https://www.programiz.com/css/button-styling
-- https://developer.mozilla.org/fr/docs/Web/CSS
-- https://chatgpt.com/
-- https://www.gimp.org/tutorials/
-
-AI was mostly used to ask questions and deepen understanding, it was also used to generate multiple samples of what we could do front-end wise.
-
-**FEATURES:**
-
-- Login
-- Avatar
-- Global Chat
-- Skribbl.io + Spectator mode
-- Tetris + Duels
-- Wiskas the Third
-
-Use of the framework Express for the back-end because its compatible with jsonwebtoken(JWT) and contains solid and well tested features.
-
-**DEPENDENCIES**
-
-- "express": "^4.18.2",
-- "pg": "^8.11.3",
-- "bcrypt": "^5.1.0",
-- "jsonwebtoken": "^9.0.2",
-- "dotenv": "^17.2.3",
-- "socket.io": "^4.6.1",
-- "cors": "^2.8.5",
-- "passport": "0.7.0",
-- "passport-github2": "0.1.12",
-- "express-session": "1.18.0",
-- "multer": "^1.4.5-lts.1",
-- "file-type": "^19.0.0"
-
-**TEAM INFORMATION**
-
-Tfauve-p : The project manager, is in lead of organizing all the meeting with the team which changed over time, including then some recruitment. There was some adjustments to make over our vision of the project while coding it on GitHub.
-
-Yantoine : The project owner, is in lead of both games, Tetris and Skkribl.io, made core decisions on features about these and got the work completed. His communication skills were very important due to the front-end / back-end relationship needed in order to achieve this glorious project.
-
-Gprunet : The technical lead, is in charge of the back-end, made some strong decisions on the architectures of the project in terms of technology used. Created the entire database and most of the foundation of this project such as the builder files.
-
-Agallon : Developer in the front-end action, he joined the team after the project was done but managed to innovate and brought to life the marvelous Wiskas the Third. Furthermore he also cared about the integrity of the web application and greatly improved the user experience through logical decisions.
-
-**PROJECT MANAGEMENT**
-
-The task's sharing was based on our own advance of the 42 cursus, meaning that Gprunet and Yantoine started coding the app sooner than Tfauve-p and Agallon.
-
-Gprunet: Back-end + spectator mode
-Yantoine: Github auth, games and Front/Back sockets
-Tfauve-p: Front-end Designer
-Agallon: Adjustements on Front-end and some new features.
-
-
-**TECHNICAL STACK**
-
-Front-end: JavaScript, HTML, CSS, NGINX
-Back-end: JavaScript, Express, JWT, multer, etc...
-Database: PostgreSQL because it uses a permissibe open-source licence and is feature-rich and powerful for the scale of our project
-
-Since python doesn't have many front-end framework we opted to use JavaScript for both front and back.
-After learning about JWT and learning that Express had a great synergy with it the choice was natural.
-
-
-**DATABASES SCHEMA**
-
-![Database Schema required ... ](./postgresql-architecture.jpg)
-
-
-**FEATURES LIST**
-
-- 2 Games
-- One talking Cat
-- Friends chat
-- 
-
-**MODULES**
-
-Total : 23pts ( 14pts for 100% 19pts for 125% )
-
-- WEB
-
-Minor : Use a back end framework
-
-Major : Implement real-time features
-
-Major : Allow users to interact with others
-
-Major : A public API to interact with the database
-
-Minor : A complete notification system for all creation, update and deletion account
-
-- ACCESSIBILITY
-
-Minor : Support for additional browsers
-
-- USER MANAGEMENT
-
-Major : Standard user management and authentication
-
-Minor : Game statistics and match history ???
-
-Minor : Implement remote authentication
-
-- GAMING AND USER EXPERIENCE
-
-Major : Implement a complete web-based game where users can play against each other
-
-Major : Remote players, Enable two players on separate computers to play the same game
-
-Major : Multiplayer game
-
-Major : Add another game with user history and matchmaking
-
-Minor : Advanced chat features ???? 
-
-Minor : Game customization options
-
-Minor : Spectator mode for games
-
-

Transcendence/Makefile

@@ -1,17 +1,24 @@
-all : up
+all :
+	@$(call random_shmol_cat, "hELLO", "nice human corrector", $(CLS), )
+	@docker compose -f ./docker-compose.yml up -d
 
-up :
+no_cache :
 	@docker compose -f ./docker-compose.yml build --no-cache
 	@docker compose -f ./docker-compose.yml up -d
 
 clean :
+	@$(call print_cat, $(CLEAR), $(C_225), $(C_320), $(C_450), $(call pad_word, 10, "Objects"), $(call pad_word, 12, "Exterminated"));
 	@docker compose -f ./docker-compose.yml down -t 1
 
 fclean :
+	@$(call print_cat, $(CLEAR), $(C_120), $(C_300), $(C_210), $(call pad_word, 10, "All⠀clean"), $(call pad_word, 12, "Miaster"));
 	@docker compose -f ./docker-compose.yml down -v -t 1
 	@docker system prune -af --volumes
 
-re : fclean up
+re : fclean no_cache
+	@$(call print_cat, $(CLEAR), $(C_120), $(C_300), $(C_210), $(call pad_word, 10, "Re-Doing"), $(call pad_word, 12, "Miaster"));
+
+.PHONY : all no_cache clean fclean re
 
 
 

Transcendence/docker-compose.yml

@@ -1,5 +1,5 @@
 volumes:
-  pgdata:
+  data:
 
 networks:
   transcendence:
@@ -12,7 +12,7 @@ services:
     ports:
       - "5432:5432"
     volumes:
-      - pgdata:/var/lib/postgresql
+      - data:/var/lib/postgresql/data/pg15/
     env_file:
       - ../.env
     networks:
@@ -24,6 +24,8 @@ services:
     build: ./srcs/backend
     expose:
       - "3001"
+    # ports:
+    #   - "3001:3001"
     depends_on:
       - database
     volumes:
@@ -38,7 +40,7 @@ services:
     container_name: frontend
     build: ./srcs/frontend/
     ports:
-      - "8443:443"
+      - "8080:80"
     depends_on:
       - backend
     networks:

Transcendence/srcs/backend/db.js

@@ -127,7 +127,7 @@ async function createTables()
 				status VARCHAR(20) DEFAULT 'waiting',
 				max_players INT DEFAULT 8,
 				current_round INT DEFAULT 0,
-				max_rounds INT DEFAULT 5,
+				max_rounds INT DEFAULT 3,
 				round_duration INT DEFAULT 90,
 				created_at TIMESTAMP DEFAULT NOW(),
 				started_at TIMESTAMP,

Transcendence/srcs/backend/dockerfile

@@ -1,13 +1,5 @@
 FROM node:20-alpine
 
-RUN apk add --no-cache openssl
-RUN mkdir -p /etc/backend/.ssl
-RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
-	-keyout /etc/backend/.ssl/key.pem \
-	-out /etc/backend/.ssl/cert.pem \
-	-subj "/CN=localhost" \
-	-addext "subjectAltName=DNS:localhost,IP:127.0.0.1"
-
 WORKDIR /app
 
 COPY package*.json ./

Transcendence/srcs/backend/index.js

@@ -1,6 +1,5 @@
 import express from 'express';
-import https from 'https';
-import fs from 'fs';
+import http from 'http';
 import cors from 'cors';
 import {Server} from 'socket.io';
 import authRouter from './routes/auth.js';
@@ -14,11 +13,7 @@ import setupSocketIO from './services/socket.js';
 import avatarService from './services/avatar.js';
 
 const app = express();
-const httpsOptions = {
-	key: fs.readFileSync('/etc/backend/.ssl/key.pem'),
-	cert: fs.readFileSync('/etc/backend/.ssl/cert.pem')
-};
-const server = https.createServer(httpsOptions, app);
+const server = http.createServer(app);
 const io = new Server(server,
 {
 	cors:

Transcendence/srcs/backend/routes/auth.js

@@ -26,17 +26,6 @@ router.post('/login', async(req, res) =>
 	res.status(result.status).json(result.data);
 });
 
-router.post('/logout', async(req, res) =>
-{
-  const authHeader = req.headers['authorization'];
-  const token = authHeader && authHeader.split(' ')[1];
-  if (!token)
-    return (res.status(401).json({error: 'Missing token'}));
-
-  const result = await authService.logout(token);
-  res.status(result.status).json(result.data);
-});
-
 router.get('/github', (req, res) => {
   const githubAuthUrl = `https://github.com/login/oauth/authorize?` +
     `client_id=${process.env.GITHUB_CLIENT_ID}&` +

Transcendence/srcs/backend/routes/avatar.js

@@ -25,7 +25,7 @@ router.post('/upload', authenticateToken, upload.single('avatar'), async(req, re
 	res.status(result.status).json(result.data);
 });
 
-router.delete('/delete', authenticateToken, async(req, res) =>
+router.delete('/', authenticateToken, async(req, res) =>
 {
 	const result = await avatarService.deleteAvatar(req.user.userId);
 	res.status(result.status).json(result.data);

Transcendence/srcs/backend/services/auth.js

@@ -2,30 +2,6 @@ import bcrypt from 'bcrypt';
 import jwt from 'jsonwebtoken';
 import {query} from '../db.js';
 
-async function logout(token)
-{
-	try
-	{
-		if (!token)
-			return ({status: 400, data: {error: 'Missing token'}});
-		try
-		{
-			jwt.verify(token, process.env.JWT_SECRET);
-		}
-		catch
-		{
-			return ({status: 401, data: {error: 'Invalid token'}});
-		}
-
-		return ({status: 200, data: {message: 'Logged out'}});
-	}
-	catch (err)
-	{
-		console.error(err);
-		return ({status: 500, data: {error: 'Server error'}});
-	}
-}
-
 async function login(username, password)
 {
 	try
@@ -84,4 +60,4 @@ async function register(username, password)
 	}
 };
 
-export default {register, login, logout};
+export default {register, login};

Transcendence/srcs/backend/services/avatar.js

@@ -69,9 +69,6 @@ async function deleteAvatar(userId) {
 		if (currentAvatar === null)
 			return ({status: 404, data: {error: 'User not found'}});
 
-		if (currentAvatar === DEFAULT_AVATAR)
-			return ({status: 400, data: {error: 'Cannot delete default avatar'}});
-
 		// Reset the avatar to the default one
 		await setAvatar(DEFAULT_AVATAR, userId);
 

Transcendence/srcs/backend/services/socket.js

@@ -30,63 +30,6 @@ async function broadcastRoomsList(io) {
 	}
 }
 
-function startRoomTimer(io, roomId, seconds)
-{
-	const gameState = gameRooms.get(roomId);
-	if (!gameState) return;
-
-	if (gameState.timerInterval)
-		clearInterval(gameState.timerInterval);
-
-	gameState.timerSeconds = seconds;
-
-	gameState.timerInterval = setInterval(() => {
-		gameState.timerSeconds--;
-
-		if (gameState.timerSeconds < 0)
-			gameState.timerSeconds = 0;
-
-		if (gameState.timerSeconds <= 0)
-		{
-			io.to(roomId).emit('game-timer-sync', {
-				remaining: 0
-			});
-			clearInterval(gameState.timerInterval);
-			gameState.timerInterval = null;
-			io.to(roomId).emit('game-timer-ended', { message: 'Temps écoulé !' });
-
-			gameState.currentPlayerIndex = (gameState.currentPlayerIndex + 1) % gameState.players.length;
-			const nextDrawer = gameState.players[gameState.currentPlayerIndex];
-			gameState.drawer = nextDrawer;
-			
-
-			gameState.currentWord = '';
-			gameState.revealedLetters = [];
-			gameState.revealedWord = [];
-			gameState.guessedLetters = [];
-			gameState.wrongGuesses = 0;
-
-			io.to(roomId).emit('game-new-round', {
-				drawer: nextDrawer
-			});
-		}
-		else
-		{
-			io.to(roomId).emit('game-timer-sync', {
-				remaining: gameState.timerSeconds
-			});
-		}
-	}, 1000);
-}
-
-function stopRoomTimer(roomId)
-{
-	const gameState = gameRooms.get(roomId);
-	if (!gameState || !gameState.timerInterval) return;
-	clearInterval(gameState.timerInterval);
-	gameState.timerInterval = null;
-}
-
 // Check if a playing game has only 1 player left and auto-stop it
 async function checkAndStopSinglePlayerGame(io, roomId, dbRoomId) {
 	if (!dbRoomId) return;
@@ -100,7 +43,6 @@ async function checkAndStopSinglePlayerGame(io, roomId, dbRoomId) {
 		const players = await gameRoomService.getRoomPlayers(dbRoomId);
 		if (players.length <= 1) {
 			console.log(`Room ${dbRoomId} has only ${players.length} player(s) left, ending game`);
-			stopRoomTimer(roomId);
 			
 			// Update room status to 'ended'
 			await gameRoomService.updateRoomStatus(dbRoomId, 'waiting');
@@ -250,9 +192,7 @@ function setupSocketIO(io)
 					revealedLetters: gameState.revealedLetters,
 					revealedWord: gameState.revealedWord || [],
 					guessedLetters: gameState.guessedLetters,
-					players: gameState.players,
-					scores: gameState.scores || {},
-					timer: gameState.timerSeconds || 0
+					players: gameState.players
 				});
 			}
 		});
@@ -262,15 +202,6 @@ function setupSocketIO(io)
 			if (socket.gameRoomId) {
 				const roomId = socket.gameRoomId;
 				const dbRoomId = socket.gameRoomDbId;
-				const userId = socket.user.userId;
-
-				if (dbRoomId && userId) {
-					try {
-						await gameRoomService.leaveRoom(dbRoomId, userId);
-					} catch (err) {
-						console.error('Error removing player from room on socket leave:', err.message);
-					}
-				}
 
 				socket.to(roomId).emit('game-player-left', {
 					username: socket.user.username,
@@ -337,8 +268,7 @@ function setupSocketIO(io)
 						revealedWord: gameState.revealedWord || [],
 						guessedLetters: gameState.guessedLetters,
 						players: gameState.players,
-						scores: gameState.scores || {},
-						timer: gameState.timerSeconds || 0
+						scores: gameState.scores || {}
 					});
 				}
 			} catch (err) {
@@ -460,7 +390,6 @@ function setupSocketIO(io)
 			const gameState = gameRooms.get(roomId);
 			if (!gameState) return;
 
-			startRoomTimer(io, roomId, 60);
 			gameState.currentWord = data.word.toLowerCase();
 			gameState.revealedLetters = new Array(data.word.length).fill(false);
 			gameState.revealedWord = new Array(data.word.length).fill('_');
@@ -623,8 +552,6 @@ function setupSocketIO(io)
 				// Update round start scores for next round
 				gameState.roundStartScores = { ...gameState.scores };
 
-				stopRoomTimer(roomId);
-
 				io.to(roomId).emit('game-word-found', {
 					word: gameState.currentWord,
 					winner: username,
@@ -686,7 +613,6 @@ function setupSocketIO(io)
 					// If the drawer left and there are still enough players, choose a new drawer
 					if (wasDrawer && gameState.players.length >= 1)
 					{
-						stopRoomTimer(roomId);
 						// Pick the next player as the new drawer
 						gameState.currentPlayerIndex = gameState.currentPlayerIndex % gameState.players.length;
 						const newDrawer = gameState.players[gameState.currentPlayerIndex];
@@ -706,7 +632,6 @@ function setupSocketIO(io)
 							reason: 'drawer_left',
 							message: `${username} (dessinateur) a quitté, ${newDrawer} devient le nouveau dessinateur`
 						});
-						startRoomTimer(io, roomId, 60);
 					}
 				}
 
@@ -727,7 +652,6 @@ function setupSocketIO(io)
 		socket.on('game-end', async () => {
 			const roomId = socket.gameRoomId;
 			if (!roomId) return;
-			stopRoomTimer(roomId);
 
 			// Update room status to 'waiting' in database
 			const dbRoomId = socket.gameRoomDbId;
@@ -806,16 +730,6 @@ function setupSocketIO(io)
 			_tetrisRelayToOpponent(socket, 'tetris:lines-cleared', data);
 		});
 
-		// Relay pur : shield-activated → adversaire uniquement
-		socket.on('tetris:shield-activated', () => {
-			_tetrisRelayToOpponent(socket, 'tetris:shield-activated', {});
-		});
-
-		// Relay pur : shield-deactivated → adversaire uniquement
-		socket.on('tetris:shield-deactivated', () => {
-			_tetrisRelayToOpponent(socket, 'tetris:shield-deactivated', {});
-		});
-
 		// start-duel → relayé aux DEUX joueurs de la room (inclut l'émetteur)
 		socket.on('tetris:start-duel', () => {
 			const code = socket.tetrisRoomCode;
@@ -943,14 +857,6 @@ function setupSocketIO(io)
 				}
 				else
 				{
-					if (dbRoomId && socket.user.userId) {
-						try {
-							await gameRoomService.leaveRoom(dbRoomId, socket.user.userId);
-						} catch (err) {
-							console.error('Error removing disconnected player from room:', err.message);
-						}
-					}
-
 					// Regular player disconnect
 					socket.to(roomId).emit('game-player-left', {
 						username: socket.user.username,

Transcendence/srcs/frontend/dockerfile

@@ -1,20 +1,5 @@
 FROM nginx:alpine
-
-RUN apk add --no-cache openssl && \
-    mkdir -p /etc/nginx/ssl && \
-    openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
-    -keyout /etc/nginx/ssl/key.pem \
-    -out /etc/nginx/ssl/cert.pem \
-    -subj "/CN=localhost" \
-    -addext "subjectAltName=DNS:localhost,IP:127.0.0.1"
-
-#ADDED
-RUN rm -f /etc/nginx/conf.d/default.conf
-
 COPY src /usr/share/nginx/html
-
 COPY nginx.conf /etc/nginx/conf.d/default.conf
-
-EXPOSE 443
-
+EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]

Transcendence/srcs/frontend/nginx.conf

@@ -1,9 +1,5 @@
 server {
-    listen 443 ssl;
-
-    ssl_certificate /etc/nginx/ssl/cert.pem;
-    ssl_certificate_key /etc/nginx/ssl/key.pem;
-    error_page 497 =301 https://$host:8443$request_uri;
+    listen 80;
 
     root /usr/share/nginx/html;
     index index.html;
@@ -15,33 +11,27 @@ server {
 
     # Backend API
     location /api/ {
-        proxy_pass https://backend:3001;
-		proxy_ssl_verify off;
+        proxy_pass http://backend:3001;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-Proto https;
     }
 
     # Socket.IO WebSocket proxying
     location /socket.io/ {
-        proxy_pass https://backend:3001;
-		proxy_ssl_verify off;
+        proxy_pass http://backend:3001;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto https;
-        proxy_read_timeout 3600s;
-        proxy_send_timeout 3600s;
+        proxy_set_header X-Forwarded-Proto $scheme;
     }
 
     location /avatar/ {
-        proxy_pass https://backend:3001/avatar/;
+        proxy_pass http://backend:3001/avatar/;
         proxy_http_version 1.1;
         proxy_set_header Host $host;
-        proxy_ssl_verify off;
         proxy_hide_header Content-Type;
         add_header Cache-Control "public, max-age=3600";
     }