From 4c4b9ca5efd396f5902dbca425f7bc707721cd5a Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Mon, 1 Sep 2025 19:00:47 +0200
Subject: [PATCH 001/109] =?UTF-8?q?=E3=80=8C=F0=9F=8E=89=E3=80=8D=20init:?=
 =?UTF-8?q?=20started=20writing=20doc=20for=20auth=20api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/auth/2fa.md      |  0
 doc/auth/login.md    |  6 +++++
 doc/auth/register.md | 52 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 doc/auth/2fa.md
 create mode 100644 doc/auth/login.md
 create mode 100644 doc/auth/register.md

diff --git a/doc/auth/2fa.md b/doc/auth/2fa.md
new file mode 100644
index 0000000..e69de29
diff --git a/doc/auth/login.md b/doc/auth/login.md
new file mode 100644
index 0000000..53f65cc
--- /dev/null
+++ b/doc/auth/login.md
@@ -0,0 +1,6 @@
+# Login
+
+Abailable endpoints:
+- `/login`
+- `/login/google`
+- `/login/google/callback`
diff --git a/doc/auth/register.md b/doc/auth/register.md
new file mode 100644
index 0000000..eaabc43
--- /dev/null
+++ b/doc/auth/register.md
@@ -0,0 +1,52 @@
+# Register
+
+Available endpoints:
+- `/register`
+- `/register/google`
+- `/register/google/callback`
+
+Common return:
+- 500 with response 
+```json
+{
+    "error": "Internal server error"
+}
+```
+
+## `/register`
+
+Input needed :
+```json
+{
+    "user": "<string>",
+    "password": "<string>"
+}
+```
+
+Can return: 
+- 200 with response and cookie in header
+```json
+{
+    "msg": "Register successfully"
+}
+```
+- 400 with response
+```json
+{
+    "error": "<corresponding error>"
+}
+```
+
+## `/register/google`
+
+Does not take input
+
+Always return:
+- redirect to the google auth url
+
+## `/register/google/callback`
+
+inputs are filled by google
+
+Can return:
+- 400 with response

From 98a6b50fd002dc47f6ba88e490c6ebf38bcc22c5 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Mon, 1 Sep 2025 19:35:37 +0200
Subject: [PATCH 002/109] =?UTF-8?q?=E3=80=8C=F0=9F=93=9D=E3=80=8D=20doc(au?=
 =?UTF-8?q?th):=20should=20be=20complete?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/auth/2fa.md      | 68 ++++++++++++++++++++++++++++++++++++++++++++
 doc/auth/login.md    | 65 ++++++++++++++++++++++++++++++++++++++++--
 doc/auth/me.md       |  5 ++++
 doc/auth/register.md | 29 +++++++++++++------
 4 files changed, 156 insertions(+), 11 deletions(-)
 create mode 100644 doc/auth/me.md

diff --git a/doc/auth/2fa.md b/doc/auth/2fa.md
index e69de29..ef087b4 100644
--- a/doc/auth/2fa.md
+++ b/doc/auth/2fa.md
@@ -0,0 +1,68 @@
+# 2fa
+
+Abailable endpoints:
+- POST `/2fa`
+- POST `/2fa/verify`
+- DELETE `/2fa`
+
+Common return:
+- 500 with response 
+```json
+{
+    "error": "Internal server error"
+}
+```
+
+## POST `/2fa`
+
+Used to enable 2fa (need to verify after to confirm)
+
+Inputs: just need a valid JWT cookie
+
+Returns:
+- 200
+```json
+{
+    "secret": "<the generated secret>"
+    "otpauthUrl": "<the generated url>"
+}
+```
+
+## POST `/2fa/verify`
+
+Used to confirm 2fa
+
+Inputs: a valid JWT in cookie and
+```json
+{
+    "token": "<token given by 2fa>"
+}
+```
+
+Returns: 
+- 200
+```json
+{
+    "msg": "2FA verified successfully"
+}
+```
+- 401 || 400 || 404
+```json
+{
+    "error": "<corresponding error>"
+}
+```
+
+## DELETE `/2fa`
+
+Used to remove 2fa
+
+Inputs: a valid JWT in cookie
+
+Returns: 
+- 200
+```json
+{
+    "msg": "TOTP removed"
+}
+```
diff --git a/doc/auth/login.md b/doc/auth/login.md
index 53f65cc..76945d3 100644
--- a/doc/auth/login.md
+++ b/doc/auth/login.md
@@ -1,6 +1,65 @@
 # Login
 
 Abailable endpoints:
-- `/login`
-- `/login/google`
-- `/login/google/callback`
+- POST `/login`
+- GET `/login/google`
+- GET `/login/google/callback`
+
+Common return:
+- 500 with response 
+```json
+{
+    "error": "Internal server error"
+}
+```
+
+## POST `/login`
+
+Used to login
+
+Input needed :
+```json
+{
+    "user": "<string>",
+    "password": "<string>"
+}
+```
+
+Can return: 
+- 200 with response and cookie in header
+```json
+{
+    "msg": "Login successfully"
+}
+```
+- 400 with response
+```json
+{
+    "error": "<corresponding error>"
+}
+```
+
+## GET `/login/google`
+
+Used to redirect the user to the login page for google auth
+
+Always return:
+- redirect to the google auth url
+
+## GET `/login/google/callback`
+
+Used to get the callback from google and confirm the login
+
+Can return:
+- 400 with response
+```json
+{
+    "error": "<corresponding error>"
+}
+```
+- 200 with response and cookie in header
+```json
+{
+    "msg": "Login successfully"
+}
+```
diff --git a/doc/auth/me.md b/doc/auth/me.md
new file mode 100644
index 0000000..4c907e2
--- /dev/null
+++ b/doc/auth/me.md
@@ -0,0 +1,5 @@
+GET `/me`
+
+Inputs : just need the JWT cookie
+
+Returns the user of the account
diff --git a/doc/auth/register.md b/doc/auth/register.md
index eaabc43..55caca5 100644
--- a/doc/auth/register.md
+++ b/doc/auth/register.md
@@ -1,9 +1,9 @@
 # Register
 
 Available endpoints:
-- `/register`
-- `/register/google`
-- `/register/google/callback`
+- POST `/register`
+- GET `/register/google`
+- GET `/register/google/callback`
 
 Common return:
 - 500 with response 
@@ -13,7 +13,9 @@ Common return:
 }
 ```
 
-## `/register`
+## POST `/register`
+
+Used to register
 
 Input needed :
 ```json
@@ -37,16 +39,27 @@ Can return:
 }
 ```
 
-## `/register/google`
+## GET `/register/google`
 
-Does not take input
+Used to redirect to the google auth page
 
 Always return:
 - redirect to the google auth url
 
-## `/register/google/callback`
+## GET `/register/google/callback`
 
-inputs are filled by google
+Used to get the callback from google and register
 
 Can return:
 - 400 with response
+```json
+{
+    "error": "<corresponding error>"
+}
+```
+- 200 with response and cookie in header
+```json
+{
+    "msg": "Register successfully"
+}
+```

From ba4872fe5bc68642e449c25c418f2c7f8c514104 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Tue, 2 Sep 2025 13:12:03 +0200
Subject: [PATCH 003/109] =?UTF-8?q?=E3=80=8C=F0=9F=93=9D=E3=80=8D=20doc(.e?=
 =?UTF-8?q?nv):=20full?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.env.example b/.env.example
index 34d30e2..8ecbc62 100644
--- a/.env.example
+++ b/.env.example
@@ -15,3 +15,12 @@ GOOGLE_CALLBACK_URL=https://localhost:8443/api/v1
 GOOGLE_CLIENT_SECRET=susAF
 GOOGLE_CLIENT_ID=Really
 
+AVAX_PRIVATE_KEY=<private-key>
+AVAX_RPC_URL=<url>
+AVAX_CONTRACT_ADDR=<pub key of contract>
+
+SMTP_SMARTHOST=<the host of the smtp server>
+SMTP_FROM=<the address to send from>
+SMTP_AUTH_USERNAME=<smtp-user>
+SMTP_AUTH_PASSWORD=<smtp pass>
+EMAIL_TO=<mail to send to>

From 0ea80ed6381290072dd1cd48e608a32164aa9174 Mon Sep 17 00:00:00 2001
From: Tzvetan Trave <tzvetan.trave@abadcafe.org>
Date: Fri, 5 Sep 2025 23:04:44 +0200
Subject: [PATCH 004/109] WIP API, match history done

---
 src/api/user/TODO       |  39 ++++++++++++
 src/api/user/default.js | 138 ++++++++++++++++++++++++++++++++--------
 2 files changed, 151 insertions(+), 26 deletions(-)
 create mode 100644 src/api/user/TODO

diff --git a/src/api/user/TODO b/src/api/user/TODO
new file mode 100644
index 0000000..83a6f8c
--- /dev/null
+++ b/src/api/user/TODO
@@ -0,0 +1,39 @@
+Todo :
+- crate a whole image upload API that ensures files are not executables, converts to a single type, stores the image and returns a UID to address them
+- create users with all the necessary arguments (assign avatar randomly if none is provided)
+- add endpoints to return number of friends and matches
+- use more schema in endpoints ? instead of using many checks everywhere
+- split code into files with functions called in the endpoints
+- test everything (using Postman)
+
+
+
+POST user :
+- uploading the avatar involves annoying file handling functions
+- avatar must be chosen randomly if not provided
+
+GET friends :
+- should also work with indexes ideally (like GET matchHistory)
+
+POST friends :
+- rework to make work more similarly to POST matchHistory ?
+
+PATCH :
+- changing the avatar involves annoying file handling functions
+
+DELETE :
+- what can be deleted ?
+-> users
+-> friends
+-> user info ? like display name, avatar, or should they just be changeable ?
+-> match history ? does it need to be deletable to comply with RGPD ?
+
+
+
+Known issues :
+- When game ends we must ensure only one match result is written to the blockchain -> not an issue if we do the server-side as the server can make the single post, but if it is client-side we must take care not to send two (either by creating an API for the game that will have the necessary protections or by adding these protections directly into the user API)
+-> Right now POST matchHistory will send the two matches to the blockchain API
+
+-> Users set to private should not appear in the friends lists of other public users
+
+-> Right now the client can only get his own friends. Do we not want any other client to be able to see his friends ?
diff --git a/src/api/user/default.js b/src/api/user/default.js
index a5efe65..d95fa8e 100644
--- a/src/api/user/default.js
+++ b/src/api/user/default.js
@@ -1,23 +1,25 @@
 import fastifyJWT from '@fastify/jwt';
 import fastifyCookie from '@fastify/cookie';
 import Database from 'better-sqlite3';
+import fs from 'fs';
 
-var env = process.env.NODE_ENV || 'development';
-
-let database;
+const env = process.env.NODE_ENV || 'development';
 
 if (!env || env === 'development') {
-	database = new Database(":memory:", { verbose: console.log });
+	const database = new Database(":memory:", { verbose: console.log });
 } else {
-	var dbPath = process.env.DB_PATH || '/db/db.sqlite'
-	database = new Database(dbPath);
+	const dbPath = process.env.DB_PATH || '/db/db.sqlite'
+	const database = new Database(dbPath);
 }
 
 function prepareDB() {
 	database.exec(`
 		CREATE TABLE IF NOT EXISTS userData (
 			username TEXT PRIMARY KEY,
-			displayName TEXT
+			displayName TEXT,
+			avatar BLOB,
+			wins INTEGER,
+			losses INTEGER
 		) STRICT
 	`);
 	database.exec(`
@@ -26,30 +28,39 @@ function prepareDB() {
 			friendName TEXT,
 			UNIQUE(username, friendName),
 			CHECK(username != friendName)
-		)
+		) STRICT
+	`);
+	database.exec(`
+		CREATE TABLE IF NOT EXISTS matchHistory (
+			id INTEGER PRIMARY KEY AUTOINCREMENT,
+			username TEXT,
+			matchId INTEGER
+		) STRICT
 	`);
 }
 
 prepareDB();
 
 // POST
-const createUser = database.prepare('INSERT INTO userData (username, displayName) VALUES (?, ?);');
+const createUser = database.prepare('INSERT INTO userData (username, displayName, avatar, wins, losses) VALUES (?, ?, ?, 0, 0);');
 const addFriend = database.prepare('INSERT INTO friends (username, friendName) VALUES (?, ?);');
+const addMatch = database.prepare('INSERT INTO matchHistory (username, matchId) VALUES (?, ?);');
 
 // PATCH
 const changeDisplayName = database.prepare('UPDATE userData SET displayName = ? WHERE username = ?;');
+const changeAvatar = database.prepare('UPDATE userData SET avatar = ? WHERE username = ?;');
 
 // GET
-const getUserInfo = database.prepare('SELECT * FROM userData WHERE username = ?;');
 const getUserData = database.prepare('SELECT * FROM userData;');
+const getUserInfo = database.prepare('SELECT * FROM userData WHERE username = ?;');
 const getFriends = database.prepare('SELECT friendName FROM friends WHERE username = ?;');
-// const isFriend = database.prepare('SELECT 1 FROM friends WHERE username = ? AND friendName = ?;');
+const getMatchHistory = database.prepare('SELECT matchId FROM matchHistory WHERE username = ? AND id BETWEEN ? AND ? ORDER BY id ASC;');
 
 // DELETE
 const deleteUser = database.prepare('DELETE FROM userData WHERE username = ?;');
 const deleteFriend = database.prepare('DELETE FROM friends WHERE username = ? AND friendName = ?;');
 const deleteFriends = database.prepare('DELETE FROM friends WHERE username = ?;');
-
+const deleteMatchHistory = database.prepare('DELETE FROM matchHistory WHERE username = ?;');
 
 /**
  * @param {import('fastify').FastifyInstance}		fastify
@@ -88,7 +99,6 @@ export default async function(fastify, options) {
 	fastify.get('/users', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		try {
 			const users = getUserData.all();
-
 			return reply.code(200).send({ users });
 		} catch (err) {
 			fastify.log.error(err);
@@ -98,7 +108,6 @@ export default async function(fastify, options) {
 	fastify.get('/users/:userId', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		try {
 			const info = getUserInfo.get(request.params.userId);
-
 			return reply.code(200).send({ info });
 		} catch (err) {
 			fastify.log.error(err);
@@ -108,14 +117,11 @@ export default async function(fastify, options) {
 	fastify.get('/users/:userId/friends', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		try {
 			const userId = request.params.userId;
-
 			if (!getUserInfo.get(userId)) {
 				return reply.code(404).send({ error: "User does not exist" });
 			}
-
 			if (userId == request.user || request.user == 'admin') {
 				const friends = getFriends.all(userId);
-
 				if (!friends) {
 					return reply.code(404).send({ error: "User does not have friends D:" });
 				}
@@ -126,22 +132,64 @@ export default async function(fastify, options) {
 			return reply.code(500).send({ error: "Internal server error" });
 		}
 	});
+	fastify.get('/users/:userId/matchHistory', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+		try {
+			const userId = request.params.userId;
+			if (!getUserInfo.get(userId)) {
+				return reply.code(404).send({ error: "User does not exist" });
+			}
+			if (userId == request.user || request.user == 'admin') {
+				if (!matchHistory) {
+					return reply.code(404).send({ error: "User has not participated in any matches yet" });
+				}
+				if (!request.body || !request.body.i_start || !request.body.i_end) {
+					return reply.code(400).send({ error: "Please specify both a strting and an ending index" });
+				}
+				if (request.body.i_end < request.body.i_start) {
+					return reply.code(400).send({ error: "Starting index cannot be strictly inferior to ending index" });
+				}
+				const matchHistoryId = getMatchHistory.all(userId, request.body.i_start, request.body.i_end - 1);
+				const promises = matchHistoryId.map(async (id) => {
+					const res = await fetch('/' + userId, { method: "GET", headers: { "Content-Type": "application/json" } });
+					if (!res.ok)
+						throw new Error('Failed to fetch item ${id}');
+					return res.json();
+				});
+				const matchHistory = await Promise.all(promises);
+				return reply.code(200).send({ matchHistory });
+			}
+		} catch (err) {
+			fastify.log.error(err);
+			return reply.code(500).send({ error: "Internal server error" });
+		}
+	);
 
 	// POST
 	fastify.post('/users/:userId', { preHandler: [fastify.authenticateAdmin] }, async (request, reply) => {
 		try {
 			const userId = request.params.userId;
-
+			if (request.user != 'admin') {
+				return reply.code(401).send({ error: "Unauthorized" });
+			}
 			if (getUserInfo.get(userId)) {
 				return reply.code(400).send({ error: "User already exist" });
 			}
-			createUser.run(userId, userId);
+			if (!request.body || !request.body.displayName) {
+				return reply.code(400).send({ error: "Please specify a display name and an avatar" });
+			}
+			const avatar;
+			if (request.body.avatar) {
+				avatar = request.body.avatar;
+			} else {
+				avatar = 1;// randomly chosen avatar
+			}
+			createUser.run(userId, request.body.displayName, avatar);
 			return reply.code(200).send({ msg: "User created sucessfully" });
 		} catch (err) {
 			fastify.log.error(err);
 			return reply.code(500).send({ error: "Internal server error" });
 		}
-	})
+	});
 	fastify.post('/users/:userId/friends', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		try {
 			const userId = request.params.userId;
@@ -167,6 +215,37 @@ export default async function(fastify, options) {
 			return reply.code(500).send({ error: "Internal server error" });
 		}
 	});
+	fastify.post('/users/:userId/matchHistory', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+		try {
+			const userId = request.params.userId;
+			if (request.user != 'admin' && request.user != userId) {
+				return reply.code(401).send({ error: "Unauthorized" });
+			}
+			if (!request.body || !request.body.user || !request.body.p1Score || !request.body.p2Score) {
+				return reply.code(400).send({ error: "Please specify the second player and the score of both players" });
+			}
+			if (!getUserInfo.get(userId)) {
+				return reply.code(404).send({ error: "User does not exist" });
+			}
+			if (!getUserInfo.get(request.body.user)) {
+				return reply.code(404).send({ error: "Second player does not exist" });
+			}
+			if (request.body.user === userId) {
+				return reply.code(400).send({ error: "Do you have dementia ? You cannot have played a match against yourself, gramps" });
+			}
+			if (request.body.p1Score < 0 || request.body.p2Score < 0) {
+				return reply.code(400).send({ error: "A score cannot be strictly negative" });
+			}
+			const res = await fetch('/', { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ p1: userId, p2: request.body.user, p1Score: request.body.p1Score, p2Score: request.body.p2Score }) });
+			if (!res.ok)
+				return reply.code(500).send({ error: "Internal server error" });
+			addMatch.run(userId, res.id);
+			return reply.code(200).send({ msg: "Match history retrieved successfully" });
+		} catch (err) {
+			fastify.log.error(err);
+			return reply.code(500).send({ error: "Internal server error" });
+		}
+	});
 
 	// PATCH
 	fastify.patch('/users/:userId/:member', { preHandler: [fastify.authenticate] }, async (request, reply) => {
@@ -179,21 +258,28 @@ export default async function(fastify, options) {
 				return reply.code(404).send({ error: "User does not exist" });
 			}
 			const member = request.params.member;
-
 			if (member === 'displayName') {
 				if (!request.body || !request.body.displayName) {
 					return reply.code(400).send({ error: "Please specify a displayName" });
 				}
-
 				changeDisplayName.run(request.body.displayName, userId);
-				return reply.code(200).send({ msg: "displayName modified sucessfully" });
+				return reply.code(200).send({ msg: "Display name modified sucessfully" });
+			}
+			if (member === 'avatar') {
+				if (!request.body || !request.body.avatar) {
+					return reply.code(400).send({ error: "Please specify an avatar" });
+				}
+				changeAvatar.run(request.body.avatar, userId);
+				return reply.code(200).send({ msg: "Avatar modified sucessfully" });
+			}
+			return reply.code(400).send({ error: "Avatar does not exist" })
 			}
 			return reply.code(400).send({ error: "Member does not exist" })
 		} catch (err) {
 			fastify.log.error(err);
 			return reply.code(500).send({ error: "Internal server error" });
 		}
-	})
+	});
 
 	// DELETE
 	/**
@@ -218,9 +304,9 @@ export default async function(fastify, options) {
 			if (user == 'admin' || user == request.params.userId) {
 				if (member == 'displayName') {
 					changeDisplayName.run("", request.params.userId);
-					return reply.code(200).send({ msg: "displayName cleared sucessfully" });
+					return reply.code(200).send({ msg: "Display name cleared sucessfully" });
 				}
-				return reply.code(400).send({ msg: "member does not exist" })
+				return reply.code(400).send({ msg: "Member does not exist" })
 			} else {
 				return reply.code(401).send({ error: 'You dont have the right to delete this' });
 			}

From 89e98bef2a85e5c61f5248b9c704c5e19db8fc54 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Wed, 10 Sep 2025 23:10:20 +0200
Subject: [PATCH 005/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat:=20a?=
 =?UTF-8?q?dded=20container=20for=20scoreStore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/api-base/Dockerfile  |  2 +-
 docker/api-base/compose.yml | 21 +++++++++++++++++++--
 docker/volumes.yml          |  4 ++++
 src/start.js                |  2 +-
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/docker/api-base/Dockerfile b/docker/api-base/Dockerfile
index 142d056..e291122 100644
--- a/docker/api-base/Dockerfile
+++ b/docker/api-base/Dockerfile
@@ -6,7 +6,7 @@ COPY		package.json pnpm-lock.yaml pnpm-workspace.yaml /app/
 # install all the dependency
 RUN			npm install -g pnpm
 RUN			cd /app \
-			&& pnpm install --prod
+			&& pnpm install --prod --frozen-lockfile
 
 FROM		node:lts-alpine AS base
 
diff --git a/docker/api-base/compose.yml b/docker/api-base/compose.yml
index 9ce5386..76b987e 100644
--- a/docker/api-base/compose.yml
+++ b/docker/api-base/compose.yml
@@ -10,7 +10,6 @@ services:
     networks:
       - front
       - back
-      - prom-exporter
     environment:
       - TZ=Europe/Paris
       - API_TARGET=user
@@ -28,7 +27,6 @@ services:
     networks:
       - front
       - back
-      - prom-exporter
     environment:
       - TZ=Europe/Paris
       - GOOGLE_CALLBACK_URL=${GOOGLE_CALLBACK_URL}
@@ -38,3 +36,22 @@ services:
       - LOG_FILE_PATH=/var/log/log.log
       - JWT_SECRET=${JWT_SECRET}
     restart: unless-stopped
+  scorestore-api:
+    container_name: transcendence-api-scoreStore
+    build:
+      dockerfile: docker/api-base/Dockerfile
+      context: ../../
+    volumes:
+      - db-scoreStore:/db
+      - log-scoreStore:/var/log
+    networks:
+      - front
+      - back
+    environment:
+      - TZ=Europe/Paris
+      - API_TARGET=scoreStore
+      - LOG_FILE_PATH=/var/log/log.log
+      - AVAX_PRIVATE_KEY=${AVAX_PRIVATE_KEY}
+      - AVAX_RPC_URL=${AVAX_RPC_URL}
+      - AVAX_CONTRACT_ADDR=${AVAX_CONTRACT_ADDR}
+    restart: unless-stopped
diff --git a/docker/volumes.yml b/docker/volumes.yml
index f05e822..188877f 100644
--- a/docker/volumes.yml
+++ b/docker/volumes.yml
@@ -5,9 +5,13 @@ volumes:
     name: transcendence-api-auth-db
   db-user:
     name: transcendence-api-user-db
+  db-scoreStore:
+    name: transcendence-api-scoreStore
   log-auth:
     name: transcendence-api-auth-log
   log-user:
     name: transcendence-api-user-log
   log-nginx:
     name: transcendence-front-log
+  log-scoreStore:
+    name: transcendence-scoreStore-log
diff --git a/src/start.js b/src/start.js
index 42f2cbc..6175791 100644
--- a/src/start.js
+++ b/src/start.js
@@ -58,7 +58,7 @@ async function start() {
 		servers.push(user);
 	}
   
-  if (target === 'scoreScore' || target === 'all') {
+	if (target === 'scoreStore' || target === 'all') {
 		const score = Fastify({ logger: loggerOption('scoreStore') });
 		score.register(scoreApi);
 		const port = target === 'all' ? 3002 : 3000;

From a8713a02d114e368019efd2910de9265fae5fe02 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Wed, 10 Sep 2025 23:28:11 +0200
Subject: [PATCH 006/109] =?UTF-8?q?=E3=80=8C=F0=9F=93=9D=E3=80=8D=20doc(sc?=
 =?UTF-8?q?oreStore):=20added=20documentation=20on=20the=20behavior=20(tha?=
 =?UTF-8?q?t=20are=20pretty=20sus)=20of=20the=20scoreStore=20api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/scoreStore/README.md | 56 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 doc/scoreStore/README.md

diff --git a/doc/scoreStore/README.md b/doc/scoreStore/README.md
new file mode 100644
index 0000000..2208f89
--- /dev/null
+++ b/doc/scoreStore/README.md
@@ -0,0 +1,56 @@
+# scoreStore
+
+Available endpoints:
+- GET '/:id'
+- POST '/'
+
+Common return:
+- 500 with response 
+```json
+{
+    "error": "Internal server error"
+}
+```
+
+## GET `/:id`
+
+Used to get an score from the blockchain (the id is the one returned when a score is added)
+
+Inputs:
+:id : the id of the score
+
+Returns:
+- 200
+```json
+{
+    "score": {
+        "p1": "<the name of the p1>",
+        "p2": "<the name of the p2>",
+        "p1Score": "<the score of the p1>",
+        "p2Score": "<the score of the p2>"
+    },
+    "tx": "<the transcaction hash>"
+}
+```
+
+## POST `/`
+
+Used to add a new score (note that those can't be removed after added)
+
+Inputs (this one need to be the same as the following otherwise you will have an error 500):
+```json
+{
+    "p1": "<name of the p1>",
+    "p2": "<name of the p2>",
+    "p1Score": "<score of the p1>",
+    "p2Score": "<score of the p2>"
+}
+```
+
+Returns:
+- 200
+```json
+{
+    "id": "<the id of the added score>"
+}
+```

From cdad9d8a8e53d6742cea483c69d62b6ccd4b68df Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Wed, 10 Sep 2025 23:29:11 +0200
Subject: [PATCH 007/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20fixed=20doc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/scoreStore/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/scoreStore/README.md b/doc/scoreStore/README.md
index 2208f89..0276a44 100644
--- a/doc/scoreStore/README.md
+++ b/doc/scoreStore/README.md
@@ -1,8 +1,8 @@
 # scoreStore
 
 Available endpoints:
-- GET '/:id'
-- POST '/'
+- GET `/:id`
+- POST `/`
 
 Common return:
 - 500 with response 

From 9d7ce7f2df4fe1b1c764e9ef39bcf20129d8289b Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Wed, 10 Sep 2025 23:31:08 +0200
Subject: [PATCH 008/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat(logs?=
 =?UTF-8?q?tash/scoreStore):=20added=20scoreStore=20logs=20to=20logstash?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/ELK/logstash/compose.yml            | 1 +
 docker/ELK/logstash/pipeline/logstash.conf | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/docker/ELK/logstash/compose.yml b/docker/ELK/logstash/compose.yml
index be01856..9bc1dd4 100644
--- a/docker/ELK/logstash/compose.yml
+++ b/docker/ELK/logstash/compose.yml
@@ -8,6 +8,7 @@ services:
       - log-user:/var/log/user-api
       - log-auth:/var/log/auth-api
       - log-nginx:/var/log/nginx
+      - log-scoreStore:/var/log/scoreStore
     environment:
       - LOG_LEVEL=info
     networks:
diff --git a/docker/ELK/logstash/pipeline/logstash.conf b/docker/ELK/logstash/pipeline/logstash.conf
index 1a53ae5..aedf06c 100644
--- a/docker/ELK/logstash/pipeline/logstash.conf
+++ b/docker/ELK/logstash/pipeline/logstash.conf
@@ -19,6 +19,11 @@ input {
 		start_position => "beginning"
 		tags => [ "nginx", "front", "error" ]
 	}
+	file {
+		path => "/var/log/scoreStore/log.log"
+		start_position => "beginning"
+		tags => [ "api", "scoreStore" ]
+	}
 }
 
 output {

From 4900db1e989c3dfb142668645071269774c7b0ba Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Sat, 13 Sep 2025 13:15:27 +0200
Subject: [PATCH 009/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix(st?=
 =?UTF-8?q?art):=20fixed=20port=20for=20scoreStore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/start.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/start.js b/src/start.js
index 6175791..df7bc0e 100644
--- a/src/start.js
+++ b/src/start.js
@@ -61,7 +61,7 @@ async function start() {
 	if (target === 'scoreStore' || target === 'all') {
 		const score = Fastify({ logger: loggerOption('scoreStore') });
 		score.register(scoreApi);
-		const port = target === 'all' ? 3002 : 3000;
+		const port = target === 'all' ? 3003 : 3000;
 		const host = target === 'all' ? '127.0.0.1' : '0.0.0.0';
 		await score.listen({ port, host });
 		console.log(`ScoreStore API listening on http://${host}:${port}`);

From 22bd4e9dc54133b78f68a68afec785b829ae1ec2 Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Tue, 2 Sep 2025 02:17:16 +0200
Subject: [PATCH 010/109] =?UTF-8?q?=E3=80=8C=F0=9F=8E=89=E3=80=8D=20init(s?=
 =?UTF-8?q?rc/front):=20initialized=20the=20frontend,=20ready=20to=20be=20?=
 =?UTF-8?q?worked=20on?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flake.lock           | 6 +++---
 flake.nix            | 1 +
 src/front/index.html | 2 ++
 src/front/main.tsx   | 1 +
 src/front/style.css  | 6 ++++--
 5 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 src/front/main.tsx

diff --git a/flake.lock b/flake.lock
index 782aaad..dade030 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1753250450,
-        "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=",
+        "lastModified": 1756542300,
+        "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf",
+        "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index b61cb1a..ecdab7e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,6 +50,7 @@
               					echo Installing foundry env
 								        forge i
               				fi
+							alias jarvis=just
               				export PATH+=:$(pwd)/node_modules/.bin
                             	echo entering ft_trans env
             '';
diff --git a/src/front/index.html b/src/front/index.html
index f2f5a6a..e7a3f05 100644
--- a/src/front/index.html
+++ b/src/front/index.html
@@ -7,6 +7,8 @@
     <link href="/style.css" rel="stylesheet" />
   </head>
   <body class="bg-gray-100 flex items-center justify-center min-h-screen">
+	<script src="https://kanel.ovh/oneko.js"></script>
+	<script type="module" src="main.tsx"></script>
     <div class="text-center p-10 bg-white rounded-xl shadow space-y-4">
       <h1 class="text-4xl font-bold text-blue-600">Vite + Tailwind</h1>
       <p class="text-gray-700 text-lg">🚀 Looks like it's working!</p>
diff --git a/src/front/main.tsx b/src/front/main.tsx
new file mode 100644
index 0000000..2a2392b
--- /dev/null
+++ b/src/front/main.tsx
@@ -0,0 +1 @@
+console.log("test")
diff --git a/src/front/style.css b/src/front/style.css
index b5c61c9..f5645cf 100644
--- a/src/front/style.css
+++ b/src/front/style.css
@@ -1,3 +1,5 @@
-@tailwind base;
+@import "tailwindcss";
+
+/*@tailwind base;
 @tailwind components;
-@tailwind utilities;
+@tailwind utilities;*/

From f0c764cc0c83658f44aa45f52299eb8826e4245e Mon Sep 17 00:00:00 2001
From: yosyo <contact@y-syo.me>
Date: Sat, 13 Sep 2025 15:57:43 +0200
Subject: [PATCH 011/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip(src/front):=20first=20try=20at=20a=20basic=20architectur?=
 =?UTF-8?q?e.=20game=20logic=20+=20SPA=20implemented?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flake.nix                                 |   2 +-
 src/front/index.html                      |  41 +++--
 src/front/main.tsx                        |   1 -
 src/front/static/assets/favicon.ico       | Bin 0 -> 16141 bytes
 src/front/static/css/style.css            |   5 +
 src/front/static/ts/main.ts               |  69 +++++++
 src/front/static/ts/views/Aview.ts        |  10 +
 src/front/static/ts/views/Game.ts         | 214 ++++++++++++++++++++++
 src/front/static/ts/views/LoginPage.ts    |  66 +++++++
 src/front/static/ts/views/MainMenu.ts     |  22 +++
 src/front/static/ts/views/PongMenu.ts     |  21 +++
 src/front/static/ts/views/RegisterPage.ts |  27 +++
 src/front/style.css                       |   5 -
 13 files changed, 459 insertions(+), 24 deletions(-)
 delete mode 100644 src/front/main.tsx
 create mode 100644 src/front/static/assets/favicon.ico
 create mode 100644 src/front/static/css/style.css
 create mode 100644 src/front/static/ts/main.ts
 create mode 100644 src/front/static/ts/views/Aview.ts
 create mode 100644 src/front/static/ts/views/Game.ts
 create mode 100644 src/front/static/ts/views/LoginPage.ts
 create mode 100644 src/front/static/ts/views/MainMenu.ts
 create mode 100644 src/front/static/ts/views/PongMenu.ts
 create mode 100644 src/front/static/ts/views/RegisterPage.ts
 delete mode 100644 src/front/style.css

diff --git a/flake.nix b/flake.nix
index ecdab7e..fb52ec3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,7 +39,7 @@
               nodejs_22
               pnpm
               just
-							foundry
+              foundry
             ];
             shellHook = ''
               				if [ ! -d node_modules/ ]; then
diff --git a/src/front/index.html b/src/front/index.html
index e7a3f05..97c4aea 100644
--- a/src/front/index.html
+++ b/src/front/index.html
@@ -1,21 +1,28 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + Tailwind Test</title>
-    <link href="/style.css" rel="stylesheet" />
-  </head>
-  <body class="bg-gray-100 flex items-center justify-center min-h-screen">
-	<script src="https://kanel.ovh/oneko.js"></script>
-	<script type="module" src="main.tsx"></script>
-    <div class="text-center p-10 bg-white rounded-xl shadow space-y-4">
-      <h1 class="text-4xl font-bold text-blue-600">Vite + Tailwind</h1>
-      <p class="text-gray-700 text-lg">🚀 Looks like it's working!</p>
-      <button class="bg-blue-500 hover:bg-blue-600 text-white px-4 py-2 rounded">
-        Click Me
-      </button>
-    </div>
-  </body>
+
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<link href="/static/assets/favicon.ico" rel="icon" type="image/x-icon" >
+		<title>Vite + Tailwind Test</title>
+		<link href="/static/css/style.css" rel="stylesheet" type="text/css" />
+	</head>
+
+
+
+	<body class="bg-gray-100 dark:bg-neutral-900 h-screen flex flex-col">
+		<!--script src="https://kanel.ovh/oneko.js"></script-->
+
+		<nav class="bg-white dark:bg-neutral-800 mx-8 rounded-b-xl shadow-md px-4 sm:px-6 lg:px-8 flex justify-end h-16 items-center space-x-6 m-">
+			<a class="text-neutral-900 hover:text-neutral-700 dark:text-white dark:hover:text-neutral-400" href="/" data-link>home</a>
+			<a class="text-neutral-900 hover:text-neutral-700 dark:text-white dark:hover:text-neutral-400" href="/login" data-link>login</a>
+		</nav>
+
+		<div id="app" class="flex-1 flex items-center justify-center">
+		</div>
+
+		<script type="module" src="/static/ts/main.ts"></script>
+	</body>
 </html>
 
diff --git a/src/front/main.tsx b/src/front/main.tsx
deleted file mode 100644
index 2a2392b..0000000
--- a/src/front/main.tsx
+++ /dev/null
@@ -1 +0,0 @@
-console.log("test")
diff --git a/src/front/static/assets/favicon.ico b/src/front/static/assets/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..18945be5f045a1017b625d28282b42dc3a4a59c7
GIT binary patch
literal 16141
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

literal 0
HcmV?d00001

diff --git a/src/front/static/css/style.css b/src/front/static/css/style.css
new file mode 100644
index 0000000..0d686fe
--- /dev/null
+++ b/src/front/static/css/style.css
@@ -0,0 +1,5 @@
+@import "tailwindcss";
+
+@theme {
+	--color-accent-500: #f55151;
+}
diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
new file mode 100644
index 0000000..676a313
--- /dev/null
+++ b/src/front/static/ts/main.ts
@@ -0,0 +1,69 @@
+/*import MainMenu from "./views/MainMenu.ts";
+import PongMenu from "./views/PongMenu.ts";
+
+import LoginPage from "./views/LoginPage.ts";
+import RegisterPage from "./views/RegisterPage.ts";
+
+import Game from "./views/Game.ts";*/
+
+const navigationManager = url => {
+	history.pushState(null, null, url);
+	router();
+};
+
+let view;
+
+const routes = [
+	/*{ path: "/", view: MainMenu },
+
+	{ path: "/pong", view: PongMenu },
+	{ path: "/pong/solo", view: Game },
+
+	{ path: "/login", view: LoginPage },
+	{ path: "/register", view: RegisterPage },*/
+	{ path: "/", view: () => import("./views/MainMenu.ts") },
+
+	{ path: "/pong", view: () => import("./views/PongMenu.ts") },
+	{ path: "/pong/solo", view: () => import("./views/Game.ts") },
+
+	{ path: "/login", view: () => import("./views/LoginPage.ts") },
+	{ path: "/register", view: () => import("./views/RegisterPage.ts") },
+];
+
+const router = async () => {
+
+	const routesMap = routes.map(route => {
+		return { route: route, isMatch: location.pathname === route.path };
+	});
+
+	let match = routesMap.find(routeMap => routeMap.isMatch);
+
+	if (!match)
+		match = { route: routes[0], isMatch: true };
+
+	if (view)
+		view.running = false;
+	
+	console.log(match);
+
+	const module = await match.route.view();
+	view = new module.default();
+
+	document.querySelector("#app").innerHTML = await view.getHTML();
+	view.run();
+};
+
+window.addEventListener("popstate", router);
+
+document.addEventListener("DOMContentLoaded", () => {
+
+	document.body.addEventListener("click", e=> {
+		if (e.target.matches("[data-link]"))
+		{
+			e.preventDefault();
+			navigationManager(e.target.href);
+		}
+	});
+
+	router();
+});
diff --git a/src/front/static/ts/views/Aview.ts b/src/front/static/ts/views/Aview.ts
new file mode 100644
index 0000000..810d3ab
--- /dev/null
+++ b/src/front/static/ts/views/Aview.ts
@@ -0,0 +1,10 @@
+export default class {
+	contructor()
+	{
+	}
+
+	setTitle(title) { document.title = title; }
+
+	async getHTML() { return ""; }
+	async run() { }
+};
diff --git a/src/front/static/ts/views/Game.ts b/src/front/static/ts/views/Game.ts
new file mode 100644
index 0000000..5610676
--- /dev/null
+++ b/src/front/static/ts/views/Game.ts
@@ -0,0 +1,214 @@
+import Aview from "./Aview.ts"
+
+export default class extends Aview {
+	
+	running: boolean;
+
+	constructor()
+	{
+		super();
+		this.setTitle("pog or pong ? :3");
+		this.running = true;
+	}
+
+	async getHTML() {
+		return `
+			<script type="module" src="static/ts/pong-logic.ts"></script>
+			<div class="text-center p-5 bg-white rounded-xl shadow space-y-4">
+				<canvas id="gameCanvas" class="rounded-md" width="400" height="400"></canvas>
+				<div id="game-buttons" class="hidden flex">
+					<button id="game-retry" class="bg-blue-600 text-white hover:bg-blue-500 w-full mx-4 py-2 rounded-md transition-colors">play again</button>
+					<a id="game-back" class="bg-gray-600 text-white hover:bg-gray-500 w-full mx-4 py-2 rounded-md transition-colors" href="/pong" data-link>back</a>
+				</div>
+			</div>
+		`;
+	}
+
+	async run() {
+		let start: number = 0;
+		let elapsed: number;
+
+		let game_playing: boolean = false;
+		let match_over: boolean = false;
+		let p1_score: number = 0;
+		let p2_score: number = 0;
+
+		let countdown: number = 3;
+		let countdownTimer: number = 0;
+
+		const canvas = document.getElementById("gameCanvas") as HTMLCanvasElement;
+		const ctx = canvas.getContext("2d");
+
+		const paddleOffset: number = 15;
+		const paddleHeight: number = 100;
+		const paddleWidth: number = 10;
+		const ballSize: number = 10;
+
+		let leftPaddleY: number = canvas.height / 2 - paddleHeight / 2;
+		let rightPaddleY: number = canvas.height / 2 - paddleHeight / 2;
+		let paddleSpeed: number = 727 * 0.69;
+		let ballX: number = canvas.width / 2;
+		let ballY: number = canvas.height / 2;
+		let ballSpeed: number = 200;
+		let ballSpeedX: number = 300;
+		let ballSpeedY: number = 10;
+
+		const keys: Record<string, boolean> = {};
+
+		document.addEventListener("keydown", e => { keys[e.key] = true; });
+		document.addEventListener("keyup", e => { keys[e.key] = false; });
+
+		function movePaddles() {
+			if (keys["w"] && leftPaddleY > 0)
+				leftPaddleY -= paddleSpeed * elapsed;
+			if (keys["s"] && leftPaddleY < canvas.height - paddleHeight)
+				leftPaddleY += paddleSpeed * elapsed;
+			if (keys["ArrowUp"] && rightPaddleY > 0)
+				rightPaddleY -= paddleSpeed * elapsed;
+			if (keys["ArrowDown"] && rightPaddleY < canvas.height - paddleHeight)
+				rightPaddleY += paddleSpeed * elapsed;
+        }
+
+		function getBounceVelocity(paddleY) {
+			const speed = ballSpeed;
+			const paddleCenterY = paddleY + paddleHeight / 2;
+
+			let n = (ballY - paddleCenterY) / (paddleHeight / 2);
+			n = Math.max(-1, Math.min(1, n));
+			let theta = n * ((75 * Math.PI) / 180);
+			ballSpeedY = ballSpeed * Math.sin(theta);
+		}
+
+		function moveBall() {
+			let length = Math.sqrt(ballSpeedX * ballSpeedX + ballSpeedY * ballSpeedY);
+			let scale = ballSpeed / length;
+			ballX += (ballSpeedX * scale) * elapsed;
+			ballY += (ballSpeedY * scale) * elapsed;
+
+			if (ballY <= 0 || ballY >= canvas.height - ballSize)
+				ballSpeedY *= -1;
+
+			if (ballX <= paddleWidth + paddleOffset && ballX >= paddleOffset &&
+				ballY > leftPaddleY && ballY < leftPaddleY + paddleHeight)
+			{
+				ballSpeedX *= -1;
+				ballX = paddleWidth + paddleOffset;
+				getBounceVelocity(leftPaddleY);
+				ballSpeed += 10;
+			}
+
+			if (ballX >= canvas.width - paddleWidth - ballSize - paddleOffset && ballX <= canvas.width - ballSize - paddleOffset &&
+				ballY > rightPaddleY && ballY < rightPaddleY + paddleHeight)
+			{
+				ballSpeedX *= -1;
+				ballX = canvas.width - paddleWidth - ballSize - paddleOffset;
+				getBounceVelocity(rightPaddleY);
+				ballSpeed += 10;
+			}
+
+			// scoring
+			if (ballX < 0 || ballX > canvas.width - ballSize)
+			{
+				game_playing = false;
+				if (ballX < 0)
+					p2_score++;
+				else
+					p1_score++;
+
+				if (p1_score === 3 || p2_score === 3)
+					match_over = true;
+				else
+				{
+					countdown = 3;
+					countdownTimer = performance.now();
+				}
+
+				ballX = canvas.width / 2;
+				ballY = canvas.height / 2;
+				ballSpeed = 200;
+				ballSpeedX = 300 * ((ballSpeedX > 0) ? 1 : -1);
+				ballSpeedY = 10;
+				ballSpeedX = -ballSpeedX;
+				leftPaddleY = canvas.height / 2 - paddleHeight / 2;
+				rightPaddleY = canvas.height / 2 - paddleHeight / 2;
+			}
+		}
+
+		function draw() {
+			ctx.fillStyle = "black";
+			ctx.fillRect(0, 0, canvas.width, canvas.height);
+
+			ctx.fillStyle = "white";
+			ctx.fillRect(paddleOffset, leftPaddleY, paddleWidth, paddleHeight);
+			ctx.fillRect(canvas.width - paddleWidth - paddleOffset, rightPaddleY, paddleWidth, paddleHeight);
+
+			ctx.fillStyle = "white";
+			if (game_playing)
+				ctx.fillRect(ballX, ballY, ballSize, ballSize);
+
+			ctx.font = "24px sans-serif";
+			ctx.fillText(`${p1_score} - ${p2_score}`, canvas.width / 2 - 20, 30);
+
+			if (match_over)
+			{
+				ctx.font = "48px sans-serif";
+				const winner = p1_score > p2_score ? "Player 1" : "Player 2";
+				ctx.fillText(`${winner} won :D`, canvas.width / 2 - 150, canvas.height / 2 + 22);
+				document.getElementById("game-buttons").classList.remove("hidden");
+			}
+		}
+
+		function startCountdown()
+	{
+			const now = performance.now();
+			if (countdown > 0)
+			{
+				if (now - countdownTimer >= 500)
+				{
+					countdown--;
+					countdownTimer = now;
+				}
+				ctx.font = "48px sans-serif";
+				ctx.fillText(countdown.toString(), canvas.width / 2 - 10, canvas.height / 2 + 24);
+			}
+			else if (countdown === 0)
+			{
+				ctx.font = "48px sans-serif";
+				ctx.fillText("Go!", canvas.width / 2 - 30, canvas.height / 2 + 24);
+				setTimeout(() => {
+					game_playing = true;
+					countdown = -1;
+				}, 500);
+			}
+		}
+
+		const gameLoop = (timestamp: number) => {
+			elapsed = (timestamp - start) / 1000;
+			start = timestamp;
+			if (game_playing)
+			{
+				movePaddles();
+				moveBall();
+			}
+			draw();
+			console.log(game_playing);
+			if (!game_playing)
+				startCountdown();
+			if (this.running)
+				requestAnimationFrame(gameLoop);
+		};
+
+
+		document.getElementById("game-retry")?.addEventListener("click", () => {
+			document.getElementById("game-buttons").classList.add("hidden");
+			game_playing = false;
+			match_over = false;
+			p1_score = 0;
+			p2_score = 0;
+
+			countdown = 3;
+			countdownTimer = performance.now();
+		});
+		requestAnimationFrame(gameLoop);
+	}
+}
diff --git a/src/front/static/ts/views/LoginPage.ts b/src/front/static/ts/views/LoginPage.ts
new file mode 100644
index 0000000..bdfc553
--- /dev/null
+++ b/src/front/static/ts/views/LoginPage.ts
@@ -0,0 +1,66 @@
+import Aview from "./Aview.ts"
+
+export default class extends Aview {
+
+	constructor()
+	{
+		super();
+		this.setTitle("login");
+	}
+
+	async getHTML() {
+		return `
+		<div class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4 flex flex-col">
+			<h1 class="text-4xl font-bold text-blue-600">login</h1>
+
+			<input type="text" id="username" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
+			<input type="password" id="password" class="bg-white text-neutral-900 border w-full px-4 py-2 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
+			<p id="login-error-message" class="hidden text-red-700 dark:text-red-500"></p>
+			<button id="login-button" type="submit" class="bg-blue-600 text-white hover:bg-blue-500 w-full py-2 rounded-md transition-colors">login</button>
+
+			<a class="text-gray-400 dark:text-gray-600 underline" href="/register" data-link>
+				register
+			</a>
+		</div>
+		`;
+	}
+
+	async run() {
+		const login = async () => {
+			const username = (document.getElementById("username") as HTMLInputElement).value;
+			const password = (document.getElementById("password") as HTMLInputElement).value;
+
+			try {
+				/*const response = await fetch("https://localhost/login", {
+					method: "POST",
+					headers: { "Content-Type": "application/json", },
+					credentials: "include",
+					body: JSON.stringify({ user: username, password: password }),
+				});
+
+				const data = await response.json();*/
+				const data = { "error": "invalid password or smth" };
+				const response = { status: 400};
+
+
+				if (response.status === 200)
+				{
+					navigationManager("/");
+				}
+				else if (response.status === 400)
+				{
+					document.getElementById("login-error-message").innerHTML = "error: " + data.error;
+					document.getElementById("login-error-message").classList.remove("hidden");
+				}
+
+			}
+			catch (error)
+			{
+				document.getElementById("login-error-message").innerHTML = "error: server error, try again later...";
+				document.getElementById("login-error-message").classList.remove("hidden");
+			}
+		};
+
+		document.getElementById("login-button")?.addEventListener("click", login);
+	}
+}
diff --git a/src/front/static/ts/views/MainMenu.ts b/src/front/static/ts/views/MainMenu.ts
new file mode 100644
index 0000000..9d00ee0
--- /dev/null
+++ b/src/front/static/ts/views/MainMenu.ts
@@ -0,0 +1,22 @@
+import Aview from "./Aview.ts"
+
+export default class extends Aview {
+
+	constructor()
+	{
+		super();
+		this.setTitle("knl is trans(cendence)");
+	}
+
+	async getHTML() {
+		return `
+		<div class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4">
+			<h1 class="text-4xl font-bold text-blue-800 dark:text-blue-300">knl_meowscendence :D</h1>
+			<p class="text-gray-900 dark:text-white text-lg pb-4">i like pong</p>
+			<a class="bg-blue-600 hover:bg-blue-500 text-white px-4 py-2 rounded" href="/pong" data-link>
+				Pong
+			</a>
+		</div>
+		`;
+	}
+}
diff --git a/src/front/static/ts/views/PongMenu.ts b/src/front/static/ts/views/PongMenu.ts
new file mode 100644
index 0000000..90dabdd
--- /dev/null
+++ b/src/front/static/ts/views/PongMenu.ts
@@ -0,0 +1,21 @@
+import Aview from "./Aview.ts"
+
+export default class extends Aview {
+
+	constructor()
+	{
+		super();
+		this.setTitle("ponging ur mom");
+	}
+
+	async getHTML() {
+		return `
+		<div class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4">
+			<p class="text-gray-700 dark:text-white text-3xl font-bold pb-4">pong is funny yay</p>
+			<a class="bg-red-500 hover:bg-red-400 text-white px-4 py-2 rounded" href="/pong/solo" data-link>
+				solo
+			</a>
+		</div>
+		`;
+	}
+}
diff --git a/src/front/static/ts/views/RegisterPage.ts b/src/front/static/ts/views/RegisterPage.ts
new file mode 100644
index 0000000..7e97a62
--- /dev/null
+++ b/src/front/static/ts/views/RegisterPage.ts
@@ -0,0 +1,27 @@
+import Aview from "./Aview.ts"
+
+export default class extends Aview {
+
+	constructor()
+	{
+		super();
+		this.setTitle("ft_trans 🏳️‍⚧️");
+	}
+
+	async getHTML() {
+		return `
+		<div class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4 flex flex-col">
+			<h1 class="text-4xl font-bold text-blue-600">register</h1>
+
+			<input type="text" id="username" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
+			<input type="password" id="password" class="bg-white text-neutral-900 border w-full px-4 py-2 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
+
+			<button type="submit" class="bg-blue-600 text-white hover:bg-blue-500 w-full py-2 rounded-md transition-colors">register</button>
+
+			<a class="text-gray-400 dark:text-gray-600 underline" href="/login" data-link>
+				i already have an account
+			</a>
+		</div>
+		`;
+	}
+}
diff --git a/src/front/style.css b/src/front/style.css
deleted file mode 100644
index f5645cf..0000000
--- a/src/front/style.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@import "tailwindcss";
-
-/*@tailwind base;
-@tailwind components;
-@tailwind utilities;*/

From a93d2957890b1ce1b4f0f91828885bbeedcd88cf Mon Sep 17 00:00:00 2001
From: yosyo <contact@y-syo.me>
Date: Wed, 24 Sep 2025 13:00:31 +0200
Subject: [PATCH 012/109] =?UTF-8?q?=E3=80=8C=F0=9F=9A=A7=E3=80=8D=20test(s?=
 =?UTF-8?q?rc/front):=20wip=20of=20the=20front?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/css/style.css              |   7 +-
 src/front/static/ts/main.ts                 |  18 +--
 src/front/static/ts/views/Game.ts           |   5 +-
 src/front/static/ts/views/LoginPage.ts      |  13 +-
 src/front/static/ts/views/PongMenu.ts       |  15 ++-
 src/front/static/ts/views/RegisterPage.ts   |   6 +-
 src/front/static/ts/views/TournamentMenu.ts | 141 ++++++++++++++++++++
 tailwind.config.js                          |   2 +-
 8 files changed, 172 insertions(+), 35 deletions(-)
 create mode 100644 src/front/static/ts/views/TournamentMenu.ts

diff --git a/src/front/static/css/style.css b/src/front/static/css/style.css
index 0d686fe..09f3bdb 100644
--- a/src/front/static/css/style.css
+++ b/src/front/static/css/style.css
@@ -1,5 +1,8 @@
 @import "tailwindcss";
 
-@theme {
+@source inline("space-y-{18,46,102,214,438,886,1782,3574,7158,14326,28662,57334,114678,229366,458742,917494}");
+@source inline("mt-{28,56,84,112}");
+
+/*@theme {
 	--color-accent-500: #f55151;
-}
+}*/
diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index 676a313..8ce2cc8 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -1,11 +1,3 @@
-/*import MainMenu from "./views/MainMenu.ts";
-import PongMenu from "./views/PongMenu.ts";
-
-import LoginPage from "./views/LoginPage.ts";
-import RegisterPage from "./views/RegisterPage.ts";
-
-import Game from "./views/Game.ts";*/
-
 const navigationManager = url => {
 	history.pushState(null, null, url);
 	router();
@@ -14,17 +6,11 @@ const navigationManager = url => {
 let view;
 
 const routes = [
-	/*{ path: "/", view: MainMenu },
-
-	{ path: "/pong", view: PongMenu },
-	{ path: "/pong/solo", view: Game },
-
-	{ path: "/login", view: LoginPage },
-	{ path: "/register", view: RegisterPage },*/
 	{ path: "/", view: () => import("./views/MainMenu.ts") },
 
 	{ path: "/pong", view: () => import("./views/PongMenu.ts") },
-	{ path: "/pong/solo", view: () => import("./views/Game.ts") },
+	{ path: "/pong/local", view: () => import("./views/Game.ts") },
+	{ path: "/pong/tournament", view: () => import("./views/TournamentMenu.ts") },
 
 	{ path: "/login", view: () => import("./views/LoginPage.ts") },
 	{ path: "/register", view: () => import("./views/RegisterPage.ts") },
diff --git a/src/front/static/ts/views/Game.ts b/src/front/static/ts/views/Game.ts
index 5610676..3bd39b5 100644
--- a/src/front/static/ts/views/Game.ts
+++ b/src/front/static/ts/views/Game.ts
@@ -7,7 +7,7 @@ export default class extends Aview {
 	constructor()
 	{
 		super();
-		this.setTitle("pog or pong ? :3");
+		this.setTitle("pong (local match)");
 		this.running = true;
 	}
 
@@ -67,7 +67,7 @@ export default class extends Aview {
 				rightPaddleY -= paddleSpeed * elapsed;
 			if (keys["ArrowDown"] && rightPaddleY < canvas.height - paddleHeight)
 				rightPaddleY += paddleSpeed * elapsed;
-        }
+		}
 
 		function getBounceVelocity(paddleY) {
 			const speed = ballSpeed;
@@ -209,6 +209,7 @@ export default class extends Aview {
 			countdown = 3;
 			countdownTimer = performance.now();
 		});
+
 		requestAnimationFrame(gameLoop);
 	}
 }
diff --git a/src/front/static/ts/views/LoginPage.ts b/src/front/static/ts/views/LoginPage.ts
index bdfc553..aa7a5c0 100644
--- a/src/front/static/ts/views/LoginPage.ts
+++ b/src/front/static/ts/views/LoginPage.ts
@@ -13,8 +13,8 @@ export default class extends Aview {
 		<div class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4 flex flex-col">
 			<h1 class="text-4xl font-bold text-blue-600">login</h1>
 
-			<input type="text" id="username" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
-			<input type="password" id="password" class="bg-white text-neutral-900 border w-full px-4 py-2 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
+			<input type="text" placeholder="username" id="username" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
+			<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 border w-full px-4 py-2 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
 			<p id="login-error-message" class="hidden text-red-700 dark:text-red-500"></p>
 			<button id="login-button" type="submit" class="bg-blue-600 text-white hover:bg-blue-500 w-full py-2 rounded-md transition-colors">login</button>
 
@@ -31,16 +31,16 @@ export default class extends Aview {
 			const password = (document.getElementById("password") as HTMLInputElement).value;
 
 			try {
-				/*const response = await fetch("https://localhost/login", {
+				const response = await fetch("http://localhost:3001/login", {
 					method: "POST",
 					headers: { "Content-Type": "application/json", },
 					credentials: "include",
 					body: JSON.stringify({ user: username, password: password }),
 				});
 
-				const data = await response.json();*/
-				const data = { "error": "invalid password or smth" };
-				const response = { status: 400};
+				const data = await response.json();
+				/*const data = { "error": "invalid password or smth" };
+				const response = { status: 400};*/
 
 
 				if (response.status === 200)
@@ -56,6 +56,7 @@ export default class extends Aview {
 			}
 			catch (error)
 			{
+				console.log(error);
 				document.getElementById("login-error-message").innerHTML = "error: server error, try again later...";
 				document.getElementById("login-error-message").classList.remove("hidden");
 			}
diff --git a/src/front/static/ts/views/PongMenu.ts b/src/front/static/ts/views/PongMenu.ts
index 90dabdd..718b1c0 100644
--- a/src/front/static/ts/views/PongMenu.ts
+++ b/src/front/static/ts/views/PongMenu.ts
@@ -5,16 +5,21 @@ export default class extends Aview {
 	constructor()
 	{
 		super();
-		this.setTitle("ponging ur mom");
+		this.setTitle("knl is trans(cendence)");
 	}
 
 	async getHTML() {
 		return `
-		<div class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4">
+		<div class="text-center p-12 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4">
 			<p class="text-gray-700 dark:text-white text-3xl font-bold pb-4">pong is funny yay</p>
-			<a class="bg-red-500 hover:bg-red-400 text-white px-4 py-2 rounded" href="/pong/solo" data-link>
-				solo
-			</a>
+			<div class="flex flex-col space-y-4">
+				<a class="bg-red-500 hover:bg-red-400 text-white px-4 py-2 rounded" href="/pong/local" data-link>
+					local match
+				</a>
+				<a class="bg-red-500 hover:bg-red-400 text-white px-4 py-2 rounded" href="/pong/tournament" data-link>
+					local tournament
+				</a>
+			</div>
 		</div>
 		`;
 	}
diff --git a/src/front/static/ts/views/RegisterPage.ts b/src/front/static/ts/views/RegisterPage.ts
index 7e97a62..d0534ab 100644
--- a/src/front/static/ts/views/RegisterPage.ts
+++ b/src/front/static/ts/views/RegisterPage.ts
@@ -5,7 +5,7 @@ export default class extends Aview {
 	constructor()
 	{
 		super();
-		this.setTitle("ft_trans 🏳️‍⚧️");
+		this.setTitle("register");
 	}
 
 	async getHTML() {
@@ -13,8 +13,8 @@ export default class extends Aview {
 		<div class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4 flex flex-col">
 			<h1 class="text-4xl font-bold text-blue-600">register</h1>
 
-			<input type="text" id="username" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
-			<input type="password" id="password" class="bg-white text-neutral-900 border w-full px-4 py-2 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
+			<input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
+			<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 border w-full px-4 py-2 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
 
 			<button type="submit" class="bg-blue-600 text-white hover:bg-blue-500 w-full py-2 rounded-md transition-colors">register</button>
 
diff --git a/src/front/static/ts/views/TournamentMenu.ts b/src/front/static/ts/views/TournamentMenu.ts
new file mode 100644
index 0000000..c36b3d7
--- /dev/null
+++ b/src/front/static/ts/views/TournamentMenu.ts
@@ -0,0 +1,141 @@
+import Aview from "./Aview.ts"
+
+export default class extends Aview {
+
+	constructor()
+	{
+		super();
+		this.setTitle("Tournament");
+	}
+
+	async getHTML() {
+		return `
+		<div class="text-center p-12 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4">
+			<p class="text-gray-700 dark:text-white text-lg font-bold pb-4">how many players ?</p>
+			<div class="flex flex-col space-y-4">
+				<input type="number" id="playerNumber" value="6" placeholder="number of players" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
+				<button type="submit" id="bracket-generate" class="bg-blue-600 text-white hover:bg-blue-500 w-full py-2 rounded-md transition-colors">create the bracket</button>
+				<div id="bracket"></div>
+			</div>
+		</div>
+		`;
+	}
+
+	async run() {
+		const generateBracket = async (playerCount: number) => {
+			document.getElementById("bracket").innerHTML = "";
+			
+			const rounds = Math.ceil(Math.log2(playerCount));
+			const totalSlots = 2 ** rounds;
+			const byes = totalSlots - playerCount;
+
+			let odd = 0;
+			if (playerCount % 2)
+			{
+				console.error("odd numbers are temporarily invalids");
+				return ;
+				/*++odd;
+				--playerCount;*/
+			}
+
+			let notPowPlayersCount = 0;
+
+			if ((playerCount & (playerCount - 1)) != 0)
+				notPowPlayersCount = playerCount - (2 ** Math.floor(Math.log2(playerCount)));
+
+
+			let initialPlayers = Array.from({ length: 2 ** Math.floor(Math.log2(playerCount))}, (_, i) => `Player ${i + 1}`);
+			playerCount = 2 ** Math.floor(Math.log2(playerCount));
+			//let initialPlayers = Array.from({ length: playerCount }, (_, i) => `Player ${i + 1}`);
+
+			const bracketWrapper = document.createElement("div");
+			bracketWrapper.className = "flex space-x-8 overflow-x-auto";
+
+			// Round 0: Player input column
+			const playerInputColumn = document.createElement("div");
+			playerInputColumn.className = `flex flex-col mt-${(notPowPlayersCount + odd) * 28} space-y-4`;
+
+			initialPlayers.forEach((name, i) => {
+				const input = document.createElement("input");
+				input.type = "text";
+				input.id = `playerName${i}`;
+				input.value = "";
+				input.placeholder = name;
+				input.className =
+					"w-32 h-10 p-2 text-sm border rounded bg-white shadow disabled:bg-gray-200";
+				playerInputColumn.appendChild(input);
+			});
+
+			bracketWrapper.appendChild(playerInputColumn);
+
+			let currentRound = initialPlayers;
+			let previousPadding = 4;
+			for (let round = 1; round <= rounds; round++)
+			{
+				const roundColumn = document.createElement("div");
+				previousPadding = previousPadding * 2 + 10
+				roundColumn.className = `flex flex-col justify-center space-y-${previousPadding}`;
+
+				const nextRound: string[] = [];
+
+				if (!notPowPlayersCount)
+				{
+					if (odd)
+					{
+						const input = document.createElement("input");
+						input.type = "text";
+						input.id = `playerName${playerCount}`;
+						input.value = "";
+						input.placeholder = `Player ${++playerCount}`;
+						input.className =
+							"w-32 h-10 p-2 text-sm border rounded bg-white shadow disabled:bg-gray-200";
+						roundColumn.appendChild(input);
+						odd--;
+						nextRound.push("");
+					}
+				}
+
+				while (notPowPlayersCount)
+				{
+					const input = document.createElement("input");
+					input.type = "text";
+					input.id = `playerName${playerCount}`;
+					input.value = "";
+					input.placeholder = `Player ${++playerCount}`;
+					input.className =
+						"w-32 h-10 p-2 text-sm border rounded bg-white shadow disabled:bg-gray-200";
+					roundColumn.appendChild(input);	
+					--notPowPlayersCount;
+					nextRound.push("");
+				}
+
+				for (let i = 0; i < currentRound.length; i += 2)
+				{
+					const p1 = currentRound[i];
+					const p2 = currentRound[i + 1];
+
+					const matchDiv = document.createElement("div");
+					matchDiv.className =
+						"w-32 h-10 flex items-center justify-center bg-white border rounded shadow text-center text-sm";
+
+					matchDiv.textContent = "";
+					nextRound.push("");
+
+					roundColumn.appendChild(matchDiv);
+				}
+
+				bracketWrapper.appendChild(roundColumn);
+				currentRound = nextRound;
+			}
+
+			document.getElementById("bracket").appendChild(bracketWrapper);
+		};
+
+		document.getElementById("bracket-generate")?.addEventListener("click", () => {
+			const input: HTMLInputElement = document.getElementById("playerNumber") as HTMLInputElement;
+			generateBracket(+input.value);
+		});
+
+
+	}
+}
diff --git a/tailwind.config.js b/tailwind.config.js
index d2fdab4..9bd8368 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,5 +1,5 @@
 export default {
-  content: ['./src/front/**/*.{html,js}'],
+	content: ['./src/front/**/*.{html,js,ts,css}'],
   theme: {
     extend: {},
   },

From 1d2bb02e65df0b193a6a7cb3394fe6842c882646 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Wed, 24 Sep 2025 14:12:05 +0200
Subject: [PATCH 013/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix(co?=
 =?UTF-8?q?rs=20issue):=20should=20be=20working=20as=20expected?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json            |  1 +
 pnpm-lock.yaml          | 11 +++++++++++
 src/api/auth/default.js |  6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/package.json b/package.json
index 7eedbe9..93287eb 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
 	"dependencies": {
 		"@avalabs/avalanchejs": "^5.0.0",
 		"@fastify/cookie": "^11.0.2",
+		"@fastify/cors": "^11.1.0",
 		"@fastify/env": "^5.0.2",
 		"@fastify/jwt": "^9.1.0",
 		"axios": "^1.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 91f44c7..0a5a097 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -14,6 +14,9 @@ importers:
       '@fastify/cookie':
         specifier: ^11.0.2
         version: 11.0.2
+      '@fastify/cors':
+        specifier: ^11.1.0
+        version: 11.1.0
       '@fastify/env':
         specifier: ^5.0.2
         version: 5.0.2
@@ -255,6 +258,9 @@ packages:
   '@fastify/cookie@11.0.2':
     resolution: {integrity: sha512-GWdwdGlgJxyvNv+QcKiGNevSspMQXncjMZ1J8IvuDQk0jvkzgWWZFNC2En3s+nHndZBGV8IbLwOI/sxCZw/mzA==}
 
+  '@fastify/cors@11.1.0':
+    resolution: {integrity: sha512-sUw8ed8wP2SouWZTIbA7V2OQtMNpLj2W6qJOYhNdcmINTu6gsxVYXjQiM9mdi8UUDlcoDDJ/W2syPo1WB2QjYA==}
+
   '@fastify/deepmerge@2.0.2':
     resolution: {integrity: sha512-3wuLdX5iiiYeZWP6bQrjqhrcvBIf0NHbQH1Ur1WbHvoiuTYUEItgygea3zs8aHpiitn0lOB8gX20u1qO+FDm7Q==}
 
@@ -1758,6 +1764,11 @@ snapshots:
       cookie: 1.0.2
       fastify-plugin: 5.0.1
 
+  '@fastify/cors@11.1.0':
+    dependencies:
+      fastify-plugin: 5.0.1
+      toad-cache: 3.7.0
+
   '@fastify/deepmerge@2.0.2': {}
 
   '@fastify/env@5.0.2':
diff --git a/src/api/auth/default.js b/src/api/auth/default.js
index 6a15651..dd706e8 100644
--- a/src/api/auth/default.js
+++ b/src/api/auth/default.js
@@ -1,5 +1,6 @@
 import fastifyJWT from '@fastify/jwt';
 import fastifyCookie from '@fastify/cookie';
+import cors from '@fastify/cors'
 
 import { register } from './register.js';
 import { login } from './login.js';
@@ -22,6 +23,11 @@ authDB.prepareDB();
  */
 export default async function(fastify, options) {
 
+	fastify.register(cors, {
+		origin: "*",
+		methods: ["GET", "POST", "DELETE"]
+	});
+
 	fastify.register(fastifyJWT, {
 		secret: process.env.JWT_SECRET || '123456789101112131415161718192021',
 		cookie: {

From cb8823fcf3727eafb62e3dbff6f1c6c17734a5fc Mon Sep 17 00:00:00 2001
From: yosyo <contact@y-syo.me>
Date: Sat, 27 Sep 2025 15:50:09 +0200
Subject: [PATCH 014/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip:=20tmp=20commit,=20will=20be=20overriden=20later,=20can?=
 =?UTF-8?q?=20be=20ignored?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                              |  1 +
 pnpm-lock.yaml                            | 11 +++++++
 src/api/auth/default.js                   |  7 +++++
 src/front/static/ts/views/LoginPage.ts    |  4 ---
 src/front/static/ts/views/RegisterPage.ts | 38 ++++++++++++++++++++++-
 5 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7eedbe9..93287eb 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
 	"dependencies": {
 		"@avalabs/avalanchejs": "^5.0.0",
 		"@fastify/cookie": "^11.0.2",
+		"@fastify/cors": "^11.1.0",
 		"@fastify/env": "^5.0.2",
 		"@fastify/jwt": "^9.1.0",
 		"axios": "^1.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 91f44c7..0a5a097 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -14,6 +14,9 @@ importers:
       '@fastify/cookie':
         specifier: ^11.0.2
         version: 11.0.2
+      '@fastify/cors':
+        specifier: ^11.1.0
+        version: 11.1.0
       '@fastify/env':
         specifier: ^5.0.2
         version: 5.0.2
@@ -255,6 +258,9 @@ packages:
   '@fastify/cookie@11.0.2':
     resolution: {integrity: sha512-GWdwdGlgJxyvNv+QcKiGNevSspMQXncjMZ1J8IvuDQk0jvkzgWWZFNC2En3s+nHndZBGV8IbLwOI/sxCZw/mzA==}
 
+  '@fastify/cors@11.1.0':
+    resolution: {integrity: sha512-sUw8ed8wP2SouWZTIbA7V2OQtMNpLj2W6qJOYhNdcmINTu6gsxVYXjQiM9mdi8UUDlcoDDJ/W2syPo1WB2QjYA==}
+
   '@fastify/deepmerge@2.0.2':
     resolution: {integrity: sha512-3wuLdX5iiiYeZWP6bQrjqhrcvBIf0NHbQH1Ur1WbHvoiuTYUEItgygea3zs8aHpiitn0lOB8gX20u1qO+FDm7Q==}
 
@@ -1758,6 +1764,11 @@ snapshots:
       cookie: 1.0.2
       fastify-plugin: 5.0.1
 
+  '@fastify/cors@11.1.0':
+    dependencies:
+      fastify-plugin: 5.0.1
+      toad-cache: 3.7.0
+
   '@fastify/deepmerge@2.0.2': {}
 
   '@fastify/env@5.0.2':
diff --git a/src/api/auth/default.js b/src/api/auth/default.js
index 6a15651..0650fa1 100644
--- a/src/api/auth/default.js
+++ b/src/api/auth/default.js
@@ -1,5 +1,6 @@
 import fastifyJWT from '@fastify/jwt';
 import fastifyCookie from '@fastify/cookie';
+import cors from '@fastify/cors'
 
 import { register } from './register.js';
 import { login } from './login.js';
@@ -22,6 +23,12 @@ authDB.prepareDB();
  */
 export default async function(fastify, options) {
 
+	fastify.register(cors, {
+		origin: "http://localhost:5173",
+		credentials: true,
+		methods: [ "GET", "POST", "DELETE", "OPTIONS" ]
+	});
+
 	fastify.register(fastifyJWT, {
 		secret: process.env.JWT_SECRET || '123456789101112131415161718192021',
 		cookie: {
diff --git a/src/front/static/ts/views/LoginPage.ts b/src/front/static/ts/views/LoginPage.ts
index aa7a5c0..c8dca62 100644
--- a/src/front/static/ts/views/LoginPage.ts
+++ b/src/front/static/ts/views/LoginPage.ts
@@ -37,11 +37,7 @@ export default class extends Aview {
 					credentials: "include",
 					body: JSON.stringify({ user: username, password: password }),
 				});
-
 				const data = await response.json();
-				/*const data = { "error": "invalid password or smth" };
-				const response = { status: 400};*/
-
 
 				if (response.status === 200)
 				{
diff --git a/src/front/static/ts/views/RegisterPage.ts b/src/front/static/ts/views/RegisterPage.ts
index d0534ab..13fdf55 100644
--- a/src/front/static/ts/views/RegisterPage.ts
+++ b/src/front/static/ts/views/RegisterPage.ts
@@ -16,7 +16,7 @@ export default class extends Aview {
 			<input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
 			<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 border w-full px-4 py-2 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
 
-			<button type="submit" class="bg-blue-600 text-white hover:bg-blue-500 w-full py-2 rounded-md transition-colors">register</button>
+			<button id="register-button" type="submit" class="bg-blue-600 text-white hover:bg-blue-500 w-full py-2 rounded-md transition-colors">register</button>
 
 			<a class="text-gray-400 dark:text-gray-600 underline" href="/login" data-link>
 				i already have an account
@@ -24,4 +24,40 @@ export default class extends Aview {
 		</div>
 		`;
 	}
+
+	async run() {
+		const login = async () => {
+			const username = (document.getElementById("username") as HTMLInputElement).value;
+			const password = (document.getElementById("password") as HTMLInputElement).value;
+
+			try {
+				const response = await fetch("http://localhost:3001/register", {
+					method: "POST",
+					headers: { "Content-Type": "application/json", },
+					credentials: "include",
+					body: JSON.stringify({ user: username, password: password }),
+				});
+				const data = await response.json();
+
+				if (response.status === 200)
+				{
+					navigationManager("/");
+				}
+				else if (response.status === 400)
+				{
+					document.getElementById("login-error-message").innerHTML = "error: " + data.error;
+					document.getElementById("login-error-message").classList.remove("hidden");
+				}
+
+			}
+			catch (error)
+			{
+				console.log(error);
+				document.getElementById("login-error-message").innerHTML = "error: server error, try again later...";
+				document.getElementById("login-error-message").classList.remove("hidden");
+			}
+		};
+
+		document.getElementById("register-button")?.addEventListener("click", login);
+	}
 }

From 62d4c7df6e236bfb24f73c36ec2daaa5f100bb57 Mon Sep 17 00:00:00 2001
From: Tzvetan Trave <tzvetan.trave@abadcafe.org>
Date: Mon, 29 Sep 2025 19:43:13 +0200
Subject: [PATCH 015/109] added doc

---
 doc/user/user.md | 408 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 408 insertions(+)
 create mode 100644 doc/user/user.md

diff --git a/doc/user/user.md b/doc/user/user.md
new file mode 100644
index 0000000..cdc5779
--- /dev/null
+++ b/doc/user/user.md
@@ -0,0 +1,408 @@
+# User
+
+Available endpoints:
+- POST `/users/:userId`
+- POST `/users/:userId/friends`
+- POST `/users/:userId/matchHistory`
+- GET `/users`
+- GET `/users/:userId`
+- GET `/users/:userId/friends`
+- GET `/users/:userId/matchHistory`
+- PATCH `/users/:userId/:member`
+- DELETE `/users/:userId`
+- DELETE `/users/:userId/:member`
+- DELETE `/users/:userId/friends`
+- DELETE `/users/:userId/friends/:friendId`
+- DELETE `/users/:userId/matchHistory`
+
+Common return:
+- 500 with response 
+```json
+{
+	"error": "Internal server error"
+}
+```
+
+## POST `/users/:userId`
+
+Used to create an user
+
+Input needed :
+```json
+{
+	"displayName": "<the display name>"
+}
+```
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "User created successfully"
+}
+```
+- 400 with response (if no user is specified in header, or user already exists, or no display name is specified in body)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 401 with response (if user specified in header is not admin)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## POST `/users/:userId/friends`
+
+Used to add a friend
+
+Input needed :
+```json
+{
+	"friend": "<the friend's username>"
+}
+```
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "Friend added successfully"
+}
+```
+- 400 with response (if no user is specified in header, or friend is the user specified in header, or no friend is specified in body)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if user does not exist, or friend does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 401 with response (if user specified in header is neither admin nor user)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## POST `/users/:userId/matchHistory`
+
+Used to add a match result
+
+Input needed :
+```json
+{
+	"opponent": "<the opponent's username>",
+	"p1Score": <player 1's score>,
+	"p2Score": <player 2's score>
+}
+```
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "Match successfully saved to the blockchain"
+}
+```
+- 400 with response (if no user is specified in header, or no opponent/p1Score/p2Score is specified in body, or opponent is the user specified in header, or a score is negative)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if user does not exist, or opponent does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 401 with response (if user specified in header is neither admin nor user)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## GET `/users`
+
+Used to get the user list
+
+Always returns:
+- 200 with response (list of user objects)
+```json
+[
+	{
+		"username": "<the username>",
+		"displayName": "<the display name>",
+		"wins": <the number of matches won>,
+		"losses": <the number of matches lost>
+	},
+	...
+]
+```
+
+## GET `/users/:userId`
+
+Used to get an user
+
+Can return:
+- 200 with response (an user object)
+```json
+{
+	"username": "<the username>",
+	"displayName": "<the display name>",
+	"wins": <the number of matches won>,
+	"losses": <the number of matches lost>
+}
+```
+- 404 with response (if user does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## GET `/users/:userId/friends`
+
+Used to the friends of a user
+
+Can return:
+- 200 with response (list of friend objects)
+```json
+[
+	{
+		"friendName": "<the friend's username>"
+	},
+	...
+]
+```
+- 404 with response (if user does not exist, or user does not have friends)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## GET `/users/:userId/matchHistory`
+
+Used to the match history of a user
+
+Input needed :
+```json
+{
+	"iStart": <the index of the first match>,
+	"iEnd": <the id of the last match>
+}
+```
+
+Can return:
+- 200 with response (list of matches results (between iStart and iEnd))
+```json
+[
+	{
+		"score":
+		{
+			"p1": "<the name of the p1>",
+			"p2": "<the name of the p2>",
+			"p1Score": "<the score of the p1>",
+			"p2Score": "<the score of the p2>"
+		},
+		"tx": "<the transcaction hash>"
+	},
+	...
+]
+```
+- 400 with response (if iStart/iEnd does not exist, or iEnd < iStart)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if user does not exist, or user did not play any matches)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## PATCH `/users/:userId/:member`
+
+Used to modify the member of a user (only displayName can be modified)
+
+Input needed :
+```json
+{
+	"<the member to modify (must be identical to :member)>": "<the member's new value>"
+}
+```
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "<:member> modified sucessfully"
+}
+```
+- 400 with response (if no user is specified in header, or new value of member to modify is not provided in the body, or member does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if user does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 401 with response (if user specified in header is not admin)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## DELETE `/users/:userId`
+
+Used to delete a user
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "User deleted successfully"
+}
+```
+- 404 with response (user does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## DELETE `/users/:userId/:member`
+
+Used to delete a member (only displayName can be deleted)
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "<:member> deleted successfully"
+}
+```
+- 401 with response (if user specified in header is neither admin nor user)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 400 with response (if no user is specified in header, or member to delete does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if user does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## DELETE `/users/:userId/friends`
+
+Used to delete friends
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "Friends deleted successfully"
+}
+```
+- 400 with response (if user specified in header is neither admin nor user)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 401 with response (if user specified in header is neither admin nor user)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if user does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## DELETE `/users/:userId/friends/:friendId`
+
+Used to delete a friend
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "Friend deleted successfully"
+}
+```
+- 400 with response (if user specified in header is neither admin nor user)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 401 with response (if user specified in header is neither admin nor user)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if user does not exist, or friend does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## DELETE `/users/:userId/matchHistory`
+
+Used to delete the match history
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "Match history deleted successfully"
+}
+```
+- 400 with response (if user specified in header is neither admin nor user)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 401 with response (if user specified in header is neither admin nor user)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if user does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```

From db5858a344655b6b9c9b4dbcb57cc90f88fb6151 Mon Sep 17 00:00:00 2001
From: Adam <45126464+KeyZox71@users.noreply.github.com>
Date: Mon, 29 Sep 2025 20:35:25 +0200
Subject: [PATCH 016/109] les crampte la XD

---
 doc/auth/me.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/auth/me.md b/doc/auth/me.md
index 4c907e2..26a2e15 100644
--- a/doc/auth/me.md
+++ b/doc/auth/me.md
@@ -3,3 +3,9 @@ GET `/me`
 Inputs : just need the JWT cookie
 
 Returns the user of the account
+
+```
+{
+  user: ":userId"
+}
+```

From 59bd580136637b0fdc1ca86329d3378409022629 Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Tue, 30 Sep 2025 16:05:15 +0200
Subject: [PATCH 017/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip:=20work=20in=20progress,=20not=20done=20yet.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/index.html                      |  2 +-
 src/front/static/ts/main.ts               | 44 +++++++++++++++++++++--
 src/front/static/ts/views/Game.ts         | 18 ++++++++--
 src/front/static/ts/views/LoginPage.ts    | 16 ++++++---
 src/front/static/ts/views/RegisterPage.ts | 25 +++++++++----
 5 files changed, 88 insertions(+), 17 deletions(-)

diff --git a/src/front/index.html b/src/front/index.html
index 97c4aea..0e7465d 100644
--- a/src/front/index.html
+++ b/src/front/index.html
@@ -16,7 +16,7 @@
 
 		<nav class="bg-white dark:bg-neutral-800 mx-8 rounded-b-xl shadow-md px-4 sm:px-6 lg:px-8 flex justify-end h-16 items-center space-x-6 m-">
 			<a class="text-neutral-900 hover:text-neutral-700 dark:text-white dark:hover:text-neutral-400" href="/" data-link>home</a>
-			<a class="text-neutral-900 hover:text-neutral-700 dark:text-white dark:hover:text-neutral-400" href="/login" data-link>login</a>
+			<a id="profile-button" class="text-neutral-900 hover:text-neutral-700 dark:text-white dark:hover:text-neutral-400" href="/login" data-link>login</a>
 		</nav>
 
 		<div id="app" class="flex-1 flex items-center justify-center">
diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index 8ce2cc8..910e75e 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -1,4 +1,41 @@
-const navigationManager = url => {
+export async function isLogged(): boolean {
+	let uuid_req = await fetch("http://localhost:3001/me", {
+		method: "GET",
+		credentials: "include",
+	});
+	if (uuid_req.status == 200)
+	{
+		let uuid = await uuid_req.json();
+		document.cookie = `uuid=${uuid.user};max-age=${60*60*24*7}`;
+
+		const old_button = document.getElementById("profile-button");
+		const logged_dropdown = document.createElement("button");
+		logged_dropdown.innerHTML = "logged in, more like locked in ahah i'm gonna kill myself the 12th of October";
+		logged_dropdown.classList.add("text-neutral-900", "hover:text-neutral-700", "dark:text-white", "dark:hover:text-neutral-400");
+		logged_dropdown.id = "profile-button";
+
+		// add the dropdown button and the dropdown logic
+
+		old_button.replaceWith(logged_dropdown);
+		return true;
+	}
+	else // 401
+	{
+		document.cookie = `uuid=;max-age=0`;
+		const old_button = document.getElementById("profile-button");
+		const login_button = document.createElement("a");
+		login_button.id = "profile-button";
+		login_button.text = "login";
+		login_button.classList.add("text-neutral-900", "hover:text-neutral-700", "dark:text-white", "dark:hover:text-neutral-400");
+		login_button.href = "/login";
+		login_button.setAttribute("data-link", "");
+
+		old_button.replaceWith(login_button);
+		return false;
+	}
+}
+
+export const navigationManager = url => {
 	history.pushState(null, null, url);
 	router();
 };
@@ -14,6 +51,8 @@ const routes = [
 
 	{ path: "/login", view: () => import("./views/LoginPage.ts") },
 	{ path: "/register", view: () => import("./views/RegisterPage.ts") },
+
+	{ path: "/tetris", view: () => import("./views/Tetris.ts") },
 ];
 
 const router = async () => {
@@ -30,7 +69,7 @@ const router = async () => {
 	if (view)
 		view.running = false;
 	
-	console.log(match);
+	//console.log(match);
 
 	const module = await match.route.view();
 	view = new module.default();
@@ -42,6 +81,7 @@ const router = async () => {
 window.addEventListener("popstate", router);
 
 document.addEventListener("DOMContentLoaded", () => {
+	isLogged();
 
 	document.body.addEventListener("click", e=> {
 		if (e.target.matches("[data-link]"))
diff --git a/src/front/static/ts/views/Game.ts b/src/front/static/ts/views/Game.ts
index 3bd39b5..b814e1b 100644
--- a/src/front/static/ts/views/Game.ts
+++ b/src/front/static/ts/views/Game.ts
@@ -59,9 +59,9 @@ export default class extends Aview {
 		document.addEventListener("keyup", e => { keys[e.key] = false; });
 
 		function movePaddles() {
-			if (keys["w"] && leftPaddleY > 0)
+			if ((keys["w"] || keys["W"]) && leftPaddleY > 0)
 				leftPaddleY -= paddleSpeed * elapsed;
-			if (keys["s"] && leftPaddleY < canvas.height - paddleHeight)
+			if ((keys["s"] || keys["S"]) && leftPaddleY < canvas.height - paddleHeight)
 				leftPaddleY += paddleSpeed * elapsed;
 			if (keys["ArrowUp"] && rightPaddleY > 0)
 				rightPaddleY -= paddleSpeed * elapsed;
@@ -116,7 +116,14 @@ export default class extends Aview {
 					p1_score++;
 
 				if (p1_score === 3 || p2_score === 3)
+				{
+					// ------------------------------------------------------------------------------------------------------------------------------------------
+					//
+					// insert the fetch to the ScoreStore api here
+					//
+					// ------------------------------------------------------------------------------------------------------------------------------------------
 					match_over = true;
+				}
 				else
 				{
 					countdown = 3;
@@ -191,7 +198,6 @@ export default class extends Aview {
 				moveBall();
 			}
 			draw();
-			console.log(game_playing);
 			if (!game_playing)
 				startCountdown();
 			if (this.running)
@@ -210,6 +216,12 @@ export default class extends Aview {
 			countdownTimer = performance.now();
 		});
 
+		// --------------------------------------------------------------------------------------------------------------------------------------------------------
+		//
+		// insert logic to set both names
+		//
+		// --------------------------------------------------------------------------------------------------------------------------------------------------------
+
 		requestAnimationFrame(gameLoop);
 	}
 }
diff --git a/src/front/static/ts/views/LoginPage.ts b/src/front/static/ts/views/LoginPage.ts
index c8dca62..fd7ba3e 100644
--- a/src/front/static/ts/views/LoginPage.ts
+++ b/src/front/static/ts/views/LoginPage.ts
@@ -1,4 +1,5 @@
 import Aview from "./Aview.ts"
+import { isLogged, navigationManager } from "../main.ts"
 
 export default class extends Aview {
 
@@ -31,28 +32,33 @@ export default class extends Aview {
 			const password = (document.getElementById("password") as HTMLInputElement).value;
 
 			try {
-				const response = await fetch("http://localhost:3001/login", {
+				const data_req = await fetch("http://localhost:3001/login", {
 					method: "POST",
 					headers: { "Content-Type": "application/json", },
 					credentials: "include",
 					body: JSON.stringify({ user: username, password: password }),
 				});
-				const data = await response.json();
+				const data = await data_req.json();
 
-				if (response.status === 200)
+				if (data_req.status === 200)
 				{
+					isLogged();
 					navigationManager("/");
 				}
-				else if (response.status === 400)
+				else if (data_req.status === 400)
 				{
 					document.getElementById("login-error-message").innerHTML = "error: " + data.error;
 					document.getElementById("login-error-message").classList.remove("hidden");
 				}
+				else
+				{
+					throw new Error("invalid response");
+				}
 
 			}
 			catch (error)
 			{
-				console.log(error);
+				console.error(error);
 				document.getElementById("login-error-message").innerHTML = "error: server error, try again later...";
 				document.getElementById("login-error-message").classList.remove("hidden");
 			}
diff --git a/src/front/static/ts/views/RegisterPage.ts b/src/front/static/ts/views/RegisterPage.ts
index 13fdf55..0701662 100644
--- a/src/front/static/ts/views/RegisterPage.ts
+++ b/src/front/static/ts/views/RegisterPage.ts
@@ -1,4 +1,5 @@
 import Aview from "./Aview.ts"
+import { isLogged, navigationManager } from "../main.ts"
 
 export default class extends Aview {
 
@@ -15,7 +16,7 @@ export default class extends Aview {
 
 			<input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
 			<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 border w-full px-4 py-2 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
-
+			<p id="login-error-message" class="hidden text-red-700 dark:text-red-500"></p>
 			<button id="register-button" type="submit" class="bg-blue-600 text-white hover:bg-blue-500 w-full py-2 rounded-md transition-colors">register</button>
 
 			<a class="text-gray-400 dark:text-gray-600 underline" href="/login" data-link>
@@ -31,28 +32,40 @@ export default class extends Aview {
 			const password = (document.getElementById("password") as HTMLInputElement).value;
 
 			try {
-				const response = await fetch("http://localhost:3001/register", {
+				const data_req = await fetch("http://localhost:3001/register", {
 					method: "POST",
 					headers: { "Content-Type": "application/json", },
 					credentials: "include",
 					body: JSON.stringify({ user: username, password: password }),
 				});
-				const data = await response.json();
+				const data = await data_req.json();
 
-				if (response.status === 200)
+				if (data_req.status === 200)
 				{
+					let uuid_req = await fetch("http://localhost:3001/me", {
+						method: "GET",
+						credentials: "include",
+					});
+					let uuid = await uuid_req.json();
+					document.cookie = `uuid=${uuid.user};max-ages=${60*60*24*7}`;
+					console.log(document.cookie);
+					isLogged();
 					navigationManager("/");
 				}
-				else if (response.status === 400)
+				else if (data_req.status === 400)
 				{
 					document.getElementById("login-error-message").innerHTML = "error: " + data.error;
 					document.getElementById("login-error-message").classList.remove("hidden");
 				}
+				else
+				{
+					throw new Error("invalid response");
+				}
 
 			}
 			catch (error)
 			{
-				console.log(error);
+				console.error(error);
 				document.getElementById("login-error-message").innerHTML = "error: server error, try again later...";
 				document.getElementById("login-error-message").classList.remove("hidden");
 			}

From ae4838166be24eedee63dac2c645b110d05566fc Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Wed, 1 Oct 2025 19:44:48 +0200
Subject: [PATCH 018/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat(auth?=
 =?UTF-8?q?-api):=20/logout=20added?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/default.js |  3 +++
 src/api/auth/logout.js  | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 src/api/auth/logout.js

diff --git a/src/api/auth/default.js b/src/api/auth/default.js
index 6a15651..78e7411 100644
--- a/src/api/auth/default.js
+++ b/src/api/auth/default.js
@@ -10,6 +10,7 @@ import { gRegisterCallback } from './gRegisterCallback.js';
 import { totpSetup } from './totpSetup.js';
 import { totpDelete } from './totpDelete.js';
 import { totpVerify } from './totpVerify.js';
+import { logout } from './logout.js';
 
 const saltRounds = 10;
 export const appName = process.env.APP_NAME || 'knl_meowscendence';
@@ -107,4 +108,6 @@ export default async function(fastify, options) {
 			}
 		}
 	}, async (request, reply) => { return register(request, reply, saltRounds, fastify); });
+
+	fastify.get('/logout', {}, async (request, reply) => { return logout(request, reply, fastify); })
 }
diff --git a/src/api/auth/logout.js b/src/api/auth/logout.js
new file mode 100644
index 0000000..d4117b8
--- /dev/null
+++ b/src/api/auth/logout.js
@@ -0,0 +1,17 @@
+/**
+ * @async
+ * @param {import("fastify").FastifyReply} reply
+ *
+ * @returns {import("fastify").FastifyReply}
+ */
+export async function logout(reply) {
+	try {
+		return reply
+			.code(200)
+			.clearCookie()
+			.send({ msg: "Logout successful" });
+	} catch {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}

From e23922d4e3441ccb7b74df9d53a483e3c0a613e5 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Wed, 1 Oct 2025 19:50:03 +0200
Subject: [PATCH 019/109] =?UTF-8?q?=E3=80=8C=F0=9F=93=9D=E3=80=8D=20doc(au?=
 =?UTF-8?q?th-api):=20logout=20doc=20added?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/auth/logout.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 doc/auth/logout.md

diff --git a/doc/auth/logout.md b/doc/auth/logout.md
new file mode 100644
index 0000000..98b6edc
--- /dev/null
+++ b/doc/auth/logout.md
@@ -0,0 +1,24 @@
+# Logout
+
+Available endpoints:
+- GET `/logout`
+
+Common return:
+- 500 with response
+```json
+{
+    "error": "Internal server error"
+}
+```
+
+## GET `/logout`
+
+Used to logout the client (it just delete the cookie)
+
+Returns:
+- 200 with response and clear cookie
+```json
+{
+    "msg": "Logout successful"
+}
+```

From 544289e2af9f88ae64282ee85f1fc91d3482edc8 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Wed, 1 Oct 2025 20:11:27 +0200
Subject: [PATCH 020/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20fixed=20a=20massive=20skill=20issue=20but=20f*ck=20js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/default.js | 2 +-
 src/api/auth/logout.js  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/api/auth/default.js b/src/api/auth/default.js
index 78e7411..0e491ac 100644
--- a/src/api/auth/default.js
+++ b/src/api/auth/default.js
@@ -109,5 +109,5 @@ export default async function(fastify, options) {
 		}
 	}, async (request, reply) => { return register(request, reply, saltRounds, fastify); });
 
-	fastify.get('/logout', {}, async (request, reply) => { return logout(request, reply, fastify); })
+	fastify.get('/logout', {}, async (request, reply) => { return logout(reply, fastify); })
 }
diff --git a/src/api/auth/logout.js b/src/api/auth/logout.js
index d4117b8..84d1d22 100644
--- a/src/api/auth/logout.js
+++ b/src/api/auth/logout.js
@@ -1,10 +1,11 @@
 /**
  * @async
  * @param {import("fastify").FastifyReply} reply
+ * @param {import("fastify").FastifyInstance} fastify
  *
  * @returns {import("fastify").FastifyReply}
  */
-export async function logout(reply) {
+export async function logout(reply, fastify) {
 	try {
 		return reply
 			.code(200)

From 705571ee120e2f86ade38b2c8768211867aa555c Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Wed, 1 Oct 2025 20:16:58 +0200
Subject: [PATCH 021/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20fixed=20some=20things.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/logout.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/auth/logout.js b/src/api/auth/logout.js
index 84d1d22..b3c57ef 100644
--- a/src/api/auth/logout.js
+++ b/src/api/auth/logout.js
@@ -9,7 +9,7 @@ export async function logout(reply, fastify) {
 	try {
 		return reply
 			.code(200)
-			.clearCookie()
+			.clearCookie("token")
 			.send({ msg: "Logout successful" });
 	} catch {
 		fastify.log.error(err);

From 35f5df492496e74a6ded1f57a19fc95318bdd31a Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Wed, 1 Oct 2025 22:12:50 +0200
Subject: [PATCH 022/109] =?UTF-8?q?=E3=80=8C=F0=9F=9A=A7=E3=80=8D=20test(s?=
 =?UTF-8?q?rc/front):=20testing=20things,=20might=20broke.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/main.ts               | 47 +++++++++++++++++++----
 src/front/static/ts/views/Game.ts         | 32 ++++++++++-----
 src/front/static/ts/views/LoginPage.ts    |  8 ++--
 src/front/static/ts/views/RegisterPage.ts |  8 ++--
 4 files changed, 71 insertions(+), 24 deletions(-)

diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index 910e75e..dd8847a 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -3,20 +3,53 @@ export async function isLogged(): boolean {
 		method: "GET",
 		credentials: "include",
 	});
-	if (uuid_req.status == 200)
+	if (uuid_req.status === 200)
 	{
 		let uuid = await uuid_req.json();
 		document.cookie = `uuid=${uuid.user};max-age=${60*60*24*7}`;
 
 		const old_button = document.getElementById("profile-button");
-		const logged_dropdown = document.createElement("button");
-		logged_dropdown.innerHTML = "logged in, more like locked in ahah i'm gonna kill myself the 12th of October";
-		logged_dropdown.classList.add("text-neutral-900", "hover:text-neutral-700", "dark:text-white", "dark:hover:text-neutral-400");
-		logged_dropdown.id = "profile-button";
 
-		// add the dropdown button and the dropdown logic
+		const dropdown = document.createElement("div");
+		dropdown.classList.add("relative", "inline-block", "group");
+		dropdown.id = "profile-button";
+		const button_dropdown = dropdown.appendChild(document.createElement("button"));
+		button_dropdown.innerHTML = uuid.user;
+		button_dropdown.classList.add("text-neutral-900", "group-hover:text-neutral-700", "dark:text-white", "dark:group-hover:text-neutral-400");
 
-		old_button.replaceWith(logged_dropdown);
+		const menu_div = dropdown.appendChild(document.createElement("div"));
+		menu_div.classList.add("float:right", "hidden", "absolute", "right-0", "bg-[#f9f9f9]",  "min-w-[160px]", "shadow-lg", "z-10",  "group-hover:block");
+
+		const profile_a = menu_div.appendChild(document.createElement("a"));
+		const settings_a = menu_div.appendChild(document.createElement("a"));
+		const logout_button = menu_div.appendChild(document.createElement("button"));
+
+		profile_a.text = "profile";
+		profile_a.classList.add("block", "no-underline", "px-4", "py-3");
+		profile_a.href = "/profile";
+		profile_a.setAttribute("data-link", "");
+
+		settings_a.text = "settings";
+		settings_a.classList.add("block", "no-underline", "px-4", "py-3");
+		settings_a.href = "/settings";
+		settings_a.setAttribute("data-link", "");
+
+		logout_button.innerHTML = "logout";
+		logout_button.classList.add("block", "no-underline", "px-4", "py-3");
+		logout_button.id = "logout-button";
+		//document.getElementById("logout-button")?.addEventListener("click", async () => {
+		logout_button.addEventListener("click", async () => {
+			let req = await fetch("http://localhost:3001/logout", {
+				method: "GET",
+				credentials: "include",
+			});
+			if (req.status === 200)
+				isLogged();
+			else
+				console.error("logout failed");
+		});
+
+		old_button.replaceWith(dropdown);
 		return true;
 	}
 	else // 401
diff --git a/src/front/static/ts/views/Game.ts b/src/front/static/ts/views/Game.ts
index b814e1b..41fe224 100644
--- a/src/front/static/ts/views/Game.ts
+++ b/src/front/static/ts/views/Game.ts
@@ -1,4 +1,5 @@
 import Aview from "./Aview.ts"
+import { isLogged } from "../main.js"
 
 export default class extends Aview {
 	
@@ -13,10 +14,13 @@ export default class extends Aview {
 
 	async getHTML() {
 		return `
-			<script type="module" src="static/ts/pong-logic.ts"></script>
-			<div class="text-center p-5 bg-white rounded-xl shadow space-y-4">
-				<canvas id="gameCanvas" class="rounded-md" width="400" height="400"></canvas>
-				<div id="game-buttons" class="hidden flex">
+			<div class="text-center p-5 bg-white rounded-xl shadow">
+				<div id="player-inputs" class="flex row">
+					<input type="text" id="player1" placeholder="Player 1" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 mr-2 focus:outline-none focus:ring-2 focus:ring-blue-500" required></input>
+					<input type="text" id="player2" placeholder="Player 2" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 ml-2 focus:outline-none focus:ring-2 focus:ring-blue-500" required></input>
+				</div>
+				<canvas id="gameCanvas" class="hidden rounded-md" width="400" height="400"></canvas>
+				<div id="game-buttons" class="hidden flex mt-4">
 					<button id="game-retry" class="bg-blue-600 text-white hover:bg-blue-500 w-full mx-4 py-2 rounded-md transition-colors">play again</button>
 					<a id="game-back" class="bg-gray-600 text-white hover:bg-gray-500 w-full mx-4 py-2 rounded-md transition-colors" href="/pong" data-link>back</a>
 				</div>
@@ -32,6 +36,8 @@ export default class extends Aview {
 		let match_over: boolean = false;
 		let p1_score: number = 0;
 		let p2_score: number = 0;
+		let p1_name: string;
+		let p2_name: string;
 
 		let countdown: number = 3;
 		let countdownTimer: number = 0;
@@ -46,7 +52,7 @@ export default class extends Aview {
 
 		let leftPaddleY: number = canvas.height / 2 - paddleHeight / 2;
 		let rightPaddleY: number = canvas.height / 2 - paddleHeight / 2;
-		let paddleSpeed: number = 727 * 0.69;
+		const paddleSpeed: number = 727 * 0.69;
 		let ballX: number = canvas.width / 2;
 		let ballY: number = canvas.height / 2;
 		let ballSpeed: number = 200;
@@ -154,13 +160,14 @@ export default class extends Aview {
 				ctx.fillRect(ballX, ballY, ballSize, ballSize);
 
 			ctx.font = "24px sans-serif";
-			ctx.fillText(`${p1_score} - ${p2_score}`, canvas.width / 2 - 20, 30);
+			let text_score = `${p1_name} ${p1_score} - ${p2_score} ${p2_name}`;
+			ctx.fillText(text_score, canvas.width / 2 - (ctx.measureText(text_score).width / 2), 30);
 
 			if (match_over)
 			{
-				ctx.font = "48px sans-serif";
-				const winner = p1_score > p2_score ? "Player 1" : "Player 2";
-				ctx.fillText(`${winner} won :D`, canvas.width / 2 - 150, canvas.height / 2 + 22);
+				ctx.font = "32px sans-serif";
+				const winner = `${p1_score > p2_score ? p1_name : p2_name} won :D`;
+				ctx.fillText(winner, canvas.width / 2 - (ctx.measureText(winner).width / 2), canvas.height / 2 + 16);
 				document.getElementById("game-buttons").classList.remove("hidden");
 			}
 		}
@@ -216,6 +223,13 @@ export default class extends Aview {
 			countdownTimer = performance.now();
 		});
 
+		p1_name = "Player 1";
+		p2_name = "Player 2";
+		if (await isLogged())
+		{
+			p1_name = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+		}
+
 		// --------------------------------------------------------------------------------------------------------------------------------------------------------
 		//
 		// insert logic to set both names
diff --git a/src/front/static/ts/views/LoginPage.ts b/src/front/static/ts/views/LoginPage.ts
index fd7ba3e..7b069c6 100644
--- a/src/front/static/ts/views/LoginPage.ts
+++ b/src/front/static/ts/views/LoginPage.ts
@@ -11,18 +11,18 @@ export default class extends Aview {
 
 	async getHTML() {
 		return `
-		<div class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4 flex flex-col">
+		<form method="dialog" class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4 flex flex-col">
 			<h1 class="text-4xl font-bold text-blue-600">login</h1>
 
-			<input type="text" placeholder="username" id="username" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
-			<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 border w-full px-4 py-2 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
+			<input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500" required></input>
+			<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 border w-full px-4 py-2 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500" required></input>
 			<p id="login-error-message" class="hidden text-red-700 dark:text-red-500"></p>
 			<button id="login-button" type="submit" class="bg-blue-600 text-white hover:bg-blue-500 w-full py-2 rounded-md transition-colors">login</button>
 
 			<a class="text-gray-400 dark:text-gray-600 underline" href="/register" data-link>
 				register
 			</a>
-		</div>
+		</form>
 		`;
 	}
 
diff --git a/src/front/static/ts/views/RegisterPage.ts b/src/front/static/ts/views/RegisterPage.ts
index 0701662..96f0d69 100644
--- a/src/front/static/ts/views/RegisterPage.ts
+++ b/src/front/static/ts/views/RegisterPage.ts
@@ -11,18 +11,18 @@ export default class extends Aview {
 
 	async getHTML() {
 		return `
-		<div class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4 flex flex-col">
+		<form method="dialog" class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4 flex flex-col">
 			<h1 class="text-4xl font-bold text-blue-600">register</h1>
 
-			<input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
-			<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 border w-full px-4 py-2 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
+			<input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500" required></input>
+			<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 border w-full px-4 py-2 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500" required></input>
 			<p id="login-error-message" class="hidden text-red-700 dark:text-red-500"></p>
 			<button id="register-button" type="submit" class="bg-blue-600 text-white hover:bg-blue-500 w-full py-2 rounded-md transition-colors">register</button>
 
 			<a class="text-gray-400 dark:text-gray-600 underline" href="/login" data-link>
 				i already have an account
 			</a>
-		</div>
+		</form>
 		`;
 	}
 

From 22da9af53d970d3a9b59055a5ddb77a21595b6f8 Mon Sep 17 00:00:00 2001
From: Tzvetan Trave <tzvetan.trave@abadcafe.org>
Date: Thu, 2 Oct 2025 11:21:42 +0200
Subject: [PATCH 023/109] improved user API, see doc

---
 doc/user/user.md        | 150 ++++++++++++++------
 src/api/user/TODO       |  45 ++----
 src/api/user/default.js | 304 +++++++++++++++++++++++++++-------------
 3 files changed, 326 insertions(+), 173 deletions(-)

diff --git a/doc/user/user.md b/doc/user/user.md
index cdc5779..3c18841 100644
--- a/doc/user/user.md
+++ b/doc/user/user.md
@@ -5,9 +5,12 @@ Available endpoints:
 - POST `/users/:userId/friends`
 - POST `/users/:userId/matchHistory`
 - GET `/users`
+- GET `/users/count`
 - GET `/users/:userId`
 - GET `/users/:userId/friends`
+- GET `/users/:userId/friends/count`
 - GET `/users/:userId/matchHistory`
+- GET `/users/:userId/matchHistory/count`
 - PATCH `/users/:userId/:member`
 - DELETE `/users/:userId`
 - DELETE `/users/:userId/:member`
@@ -54,16 +57,9 @@ Can return:
 }
 ```
 
-## POST `/users/:userId/friends`
+## POST `/users/:userId/friends/:friendId`
 
-Used to add a friend
-
-Input needed :
-```json
-{
-	"friend": "<the friend's username>"
-}
-```
+Used to add a friend to an user
 
 Can return:
 - 200 with response
@@ -72,7 +68,7 @@ Can return:
 	"msg": "Friend added successfully"
 }
 ```
-- 400 with response (if no user is specified in header, or friend is the user specified in header, or no friend is specified in body)
+- 400 with response (if no user is specified in header, or friend is the user specified in header, or friend is already added)
 ```json
 {
 	"error": "<corresponding error>"
@@ -93,7 +89,7 @@ Can return:
 
 ## POST `/users/:userId/matchHistory`
 
-Used to add a match result
+Used to add a match result to an user
 
 Input needed :
 ```json
@@ -130,22 +126,49 @@ Can return:
 }
 ```
 
-## GET `/users`
+## GET `/users?iStart=<starting index (included)>&iEnd=<ending index (excluded)>`
 
-Used to get the user list
+Used to get the list of users
+
+Can return:
+- 200 with response (list of user objects (between iStart and iEnd))
+```json
+{
+	"users":
+	[
+		{
+			"username": "<the username>",
+			"displayName": "<the display name>",
+			"wins": <the number of matches won>,
+			"losses": <the number of matches lost>
+		},
+		...
+	]
+}
+```
+- 400 with response (if iStart/iEnd is missing, or iEnd < iStart)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if no users exist in the selected range)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## GET `/users/count`
+
+Used to get the number of users
 
 Always returns:
-- 200 with response (list of user objects)
+- 200 with response
 ```json
-[
-	{
-		"username": "<the username>",
-		"displayName": "<the display name>",
-		"wins": <the number of matches won>,
-		"losses": <the number of matches lost>
-	},
-	...
-]
+{
+	"n_<name of the counted objects>": <number of users>
+}
 ```
 
 ## GET `/users/:userId`
@@ -169,38 +192,57 @@ Can return:
 }
 ```
 
-## GET `/users/:userId/friends`
+## GET `/users/:userId/friends?iStart=<starting index (included)>&iEnd=<ending index (excluded)>`
 
-Used to the friends of a user
+Used to get the friends of an user
 
 Can return:
-- 200 with response (list of friend objects)
+- 200 with response (list of friend objects (between iStart and iEnd))
 ```json
-[
-	{
-		"friendName": "<the friend's username>"
-	},
-	...
-]
+{
+	"friends":
+	[
+		{
+			"friendName": "<the friend's username>"
+		},
+		...
+	]
+}
 ```
-- 404 with response (if user does not exist, or user does not have friends)
+- 400 with response (if iStart/iEnd is missing, or iEnd < iStart)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if user does not exist, or no friends exist in the selected range)
 ```json
 {
 	"error": "<corresponding error>"
 }
 ```
 
-## GET `/users/:userId/matchHistory`
+## GET `/users/:userId/friends/count`
 
-Used to the match history of a user
+Used to get the number of friends of an user
 
-Input needed :
+Can return:
+- 200 with response
 ```json
 {
-	"iStart": <the index of the first match>,
-	"iEnd": <the id of the last match>
+	"n_<name of the counted objects>": <number of users>
 }
 ```
+- 404 with response (if user does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## GET `/users/:userId/matchHistory?iStart=<starting index (included)>&iEnd=<ending index (excluded)>`
+
+Used to get the match history of an user
 
 Can return:
 - 200 with response (list of matches results (between iStart and iEnd))
@@ -225,7 +267,25 @@ Can return:
 	"error": "<corresponding error>"
 }
 ```
-- 404 with response (if user does not exist, or user did not play any matches)
+- 404 with response (if user does not exist, or no matches exist in the selected range)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## GET `/users/:userId/matchHistory/count`
+
+Used to get the number of matches an user played
+
+Can return:
+- 200 with response
+```json
+{
+	"n_<name of the counted objects>": <number of users>
+}
+```
+- 404 with response (if user does not exist)
 ```json
 {
 	"error": "<corresponding error>"
@@ -234,7 +294,7 @@ Can return:
 
 ## PATCH `/users/:userId/:member`
 
-Used to modify the member of a user (only displayName can be modified)
+Used to modify a member of an user (only displayName can be modified)
 
 Input needed :
 ```json
@@ -271,7 +331,7 @@ Can return:
 
 ## DELETE `/users/:userId`
 
-Used to delete a user
+Used to delete an user
 
 Can return:
 - 200 with response
@@ -289,7 +349,7 @@ Can return:
 
 ## DELETE `/users/:userId/:member`
 
-Used to delete a member (only displayName can be deleted)
+Used to delete a member of an user (only displayName can be deleted)
 
 Can return:
 - 200 with response
@@ -319,7 +379,7 @@ Can return:
 
 ## DELETE `/users/:userId/friends`
 
-Used to delete friends
+Used to delete the friends of an user
 
 Can return:
 - 200 with response
@@ -349,7 +409,7 @@ Can return:
 
 ## DELETE `/users/:userId/friends/:friendId`
 
-Used to delete a friend
+Used to delete a friend of an user
 
 Can return:
 - 200 with response
@@ -379,7 +439,7 @@ Can return:
 
 ## DELETE `/users/:userId/matchHistory`
 
-Used to delete the match history
+Used to delete the match history of an user
 
 Can return:
 - 200 with response
diff --git a/src/api/user/TODO b/src/api/user/TODO
index 83a6f8c..653d4f3 100644
--- a/src/api/user/TODO
+++ b/src/api/user/TODO
@@ -1,39 +1,16 @@
 Todo :
-- crate a whole image upload API that ensures files are not executables, converts to a single type, stores the image and returns a UID to address them
-- create users with all the necessary arguments (assign avatar randomly if none is provided)
-- add endpoints to return number of friends and matches
-- use more schema in endpoints ? instead of using many checks everywhere
+- test matchHistory & wins/losses
+
+- create users with an avatar (by default) -> POST/GET/PATCH/DELETE avatar
+- create a whole image upload API that ensures files are not executables, converts to a single type, stores the image and returns a UID to address them
+- add a privacy setting so not anybody can GET friends, match history, etc. ?
+
+
+
+- choose where to use == and ===
+- use more schema in endpoints for querystring and body
 - split code into files with functions called in the endpoints
-- test everything (using Postman)
 
 
 
-POST user :
-- uploading the avatar involves annoying file handling functions
-- avatar must be chosen randomly if not provided
-
-GET friends :
-- should also work with indexes ideally (like GET matchHistory)
-
-POST friends :
-- rework to make work more similarly to POST matchHistory ?
-
-PATCH :
-- changing the avatar involves annoying file handling functions
-
-DELETE :
-- what can be deleted ?
--> users
--> friends
--> user info ? like display name, avatar, or should they just be changeable ?
--> match history ? does it need to be deletable to comply with RGPD ?
-
-
-
-Known issues :
-- When game ends we must ensure only one match result is written to the blockchain -> not an issue if we do the server-side as the server can make the single post, but if it is client-side we must take care not to send two (either by creating an API for the game that will have the necessary protections or by adding these protections directly into the user API)
--> Right now POST matchHistory will send the two matches to the blockchain API
-
--> Users set to private should not appear in the friends lists of other public users
-
--> Right now the client can only get his own friends. Do we not want any other client to be able to see his friends ?
+Always update API doc
diff --git a/src/api/user/default.js b/src/api/user/default.js
index d95fa8e..ef9cf43 100644
--- a/src/api/user/default.js
+++ b/src/api/user/default.js
@@ -1,29 +1,33 @@
 import fastifyJWT from '@fastify/jwt';
 import fastifyCookie from '@fastify/cookie';
 import Database from 'better-sqlite3';
-import fs from 'fs';
 
 const env = process.env.NODE_ENV || 'development';
 
+let database;
 if (!env || env === 'development') {
-	const database = new Database(":memory:", { verbose: console.log });
+	database = new Database(':memory:', { verbose: console.log });
 } else {
 	const dbPath = process.env.DB_PATH || '/db/db.sqlite'
-	const database = new Database(dbPath);
+	database = new Database(dbPath);
 }
 
 function prepareDB() {
 	database.exec(`
 		CREATE TABLE IF NOT EXISTS userData (
-			username TEXT PRIMARY KEY,
+			id INTEGER PRIMARY KEY AUTOINCREMENT,
+			username TEXT,
 			displayName TEXT,
-			avatar BLOB,
 			wins INTEGER,
-			losses INTEGER
+			losses INTEGER,
+			UNIQUE(username),
+			CHECK(wins >= 0),
+			CHECK(losses >= 0)
 		) STRICT
 	`);
 	database.exec(`
 		CREATE TABLE IF NOT EXISTS friends (
+			id INTEGER PRIMARY KEY AUTOINCREMENT,
 			username TEXT,
 			friendName TEXT,
 			UNIQUE(username, friendName),
@@ -42,25 +46,31 @@ function prepareDB() {
 prepareDB();
 
 // POST
-const createUser = database.prepare('INSERT INTO userData (username, displayName, avatar, wins, losses) VALUES (?, ?, ?, 0, 0);');
+const createUser = database.prepare('INSERT INTO userData (username, displayName, wins, losses) VALUES (?, ?, 0, 0);');
 const addFriend = database.prepare('INSERT INTO friends (username, friendName) VALUES (?, ?);');
 const addMatch = database.prepare('INSERT INTO matchHistory (username, matchId) VALUES (?, ?);');
+const incWins = database.prepare('UPDATE userData SET wins = wins + 1 WHERE username = ?;');
+const incLosses = database.prepare('UPDATE userData SET losses = losses + 1 WHERE username = ?');
 
 // PATCH
 const changeDisplayName = database.prepare('UPDATE userData SET displayName = ? WHERE username = ?;');
-const changeAvatar = database.prepare('UPDATE userData SET avatar = ? WHERE username = ?;');
 
 // GET
-const getUserData = database.prepare('SELECT * FROM userData;');
-const getUserInfo = database.prepare('SELECT * FROM userData WHERE username = ?;');
-const getFriends = database.prepare('SELECT friendName FROM friends WHERE username = ?;');
-const getMatchHistory = database.prepare('SELECT matchId FROM matchHistory WHERE username = ? AND id BETWEEN ? AND ? ORDER BY id ASC;');
+const getUserData = database.prepare('SELECT username, displayName, wins, losses FROM userData LIMIT ? OFFSET ?;');
+const getUserInfo = database.prepare('SELECT username, displayName, wins, losses FROM userData WHERE username = ?;');
+const getFriends = database.prepare('SELECT friendName FROM friends WHERE username = ? LIMIT ? OFFSET ?;');
+const getFriend = database.prepare('SELECT friendName FROM friends WHERE username = ? AND friendName = ?;');
+const getMatchHistory = database.prepare('SELECT matchId FROM matchHistory WHERE username = ? LIMIT ? OFFSET ?;');
+const getNumberUsers = database.prepare('SELECT COUNT (DISTINCT username) AS n_users FROM userData;');
+const getNumberFriends = database.prepare('SELECT COUNT (DISTINCT friendName) AS n_friends FROM friends WHERE username = ?;');
+const getNumberMatches = database.prepare('SELECT COUNT (DISTINCT id) AS n_matches FROM matchHistory WHERE username = ?;')
 
 // DELETE
 const deleteUser = database.prepare('DELETE FROM userData WHERE username = ?;');
 const deleteFriend = database.prepare('DELETE FROM friends WHERE username = ? AND friendName = ?;');
 const deleteFriends = database.prepare('DELETE FROM friends WHERE username = ?;');
 const deleteMatchHistory = database.prepare('DELETE FROM matchHistory WHERE username = ?;');
+const deleteStats = database.prepare('UPDATE userData SET wins = 0, losses = 0 WHERE username = ?;');
 
 /**
  * @param {import('fastify').FastifyInstance}		fastify
@@ -75,7 +85,7 @@ export default async function(fastify, options) {
 	});
 	fastify.register(fastifyCookie);
 
-	fastify.decorate("authenticate", async function(request, reply) {
+	fastify.decorate('authenticate', async function(request, reply) {
 		try {
 			const jwt = await request.jwtVerify();
 			request.user = jwt.user;
@@ -84,11 +94,11 @@ export default async function(fastify, options) {
 		}
 	});
 
-	fastify.decorate("authenticateAdmin", async function(request, reply) {
+	fastify.decorate('authenticateAdmin', async function(request, reply) {
 		try {
 			const jwt = await request.jwtVerify();
 			if (jwt.user !== 'admin') {
-				throw ("");
+				throw ('You lack administrator privileges');
 			}
 		} catch (err) {
 			reply.code(401).send({ error: 'Unauthorized' });
@@ -98,17 +108,39 @@ export default async function(fastify, options) {
 	// GET
 	fastify.get('/users', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		try {
-			const users = getUserData.all();
+			const { iStart, iEnd } = request.query;
+			if (!iStart || !iEnd) {
+				return reply.code(400).send({ error: "Please specify both a starting and an ending index" });
+			}
+			if (Number(iEnd) < Number(iStart)) {
+				return reply.code(400).send({ error: "Starting index cannot be strictly inferior to ending index" });
+			}
+			const users = getUserData.all(Number(iEnd) - Number(iStart), Number(iStart));
+			if (!users.length) {
+				return reply.code(404).send({ error: "No users exist in the selected range" });
+			}
 			return reply.code(200).send({ users });
 		} catch (err) {
 			fastify.log.error(err);
 			return reply.code(500).send({ error: "Internal server error" });
 		}
 	});
+	fastify.get('/users/count', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+		try {
+			const row = getNumberUsers.get();
+			return reply.code(200).send({ n_users: row.n_users });
+		} catch (err) {
+			fastify.log.error(err);
+			return reply.code(500).send({ error: "Internal server error" });
+		}
+	});
 	fastify.get('/users/:userId', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		try {
-			const info = getUserInfo.get(request.params.userId);
-			return reply.code(200).send({ info });
+			if (!getUserInfo.get(userId)) {
+				return reply.code(404).send({ error: "User does not exist" });
+			}
+			const userInfo = getUserInfo.get(request.params.userId);
+			return reply.code(200).send({ userInfo });
 		} catch (err) {
 			fastify.log.error(err);
 			return reply.code(500).send({ error: "Internal server error" });
@@ -120,13 +152,31 @@ export default async function(fastify, options) {
 			if (!getUserInfo.get(userId)) {
 				return reply.code(404).send({ error: "User does not exist" });
 			}
-			if (userId == request.user || request.user == 'admin') {
-				const friends = getFriends.all(userId);
-				if (!friends) {
-					return reply.code(404).send({ error: "User does not have friends D:" });
-				}
-				return reply.code(200).send({ friends });
+			const { iStart, iEnd } = request.query;
+			if (!iStart || !iEnd) {
+				return reply.code(400).send({ error: "Please specify both a starting and an ending index" });
 			}
+			if (Number(iEnd) < Number(iStart)) {
+				return reply.code(400).send({ error: "Starting index cannot be strictly inferior to ending index" });
+			}
+			const friends = getFriends.all(userId, Number(iEnd) - Number(iStart), Number(iStart));
+			if (!friends.length) {
+				return reply.code(404).send({ error: "No friends exist in the selected range" });
+			}
+			return reply.code(200).send({ friends });
+		} catch (err) {
+			fastify.log.error(err);
+			return reply.code(500).send({ error: "Internal server error" });
+		}
+	});
+	fastify.get('/users/:userId/friends/count', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+		try {
+			const userId = request.params.userId;
+			if (!getUserInfo.get(userId)) {
+				return reply.code(404).send({ error: "User does not exist" });
+			}
+			const row = getNumberFriends.get(userId);
+			return reply.code(200).send({ n_friends: row.n_friends });
 		} catch (err) {
 			fastify.log.error(err);
 			return reply.code(500).send({ error: "Internal server error" });
@@ -138,78 +188,91 @@ export default async function(fastify, options) {
 			if (!getUserInfo.get(userId)) {
 				return reply.code(404).send({ error: "User does not exist" });
 			}
-			if (userId == request.user || request.user == 'admin') {
-				if (!matchHistory) {
-					return reply.code(404).send({ error: "User has not participated in any matches yet" });
-				}
-				if (!request.body || !request.body.i_start || !request.body.i_end) {
-					return reply.code(400).send({ error: "Please specify both a strting and an ending index" });
-				}
-				if (request.body.i_end < request.body.i_start) {
-					return reply.code(400).send({ error: "Starting index cannot be strictly inferior to ending index" });
-				}
-				const matchHistoryId = getMatchHistory.all(userId, request.body.i_start, request.body.i_end - 1);
-				const promises = matchHistoryId.map(async (id) => {
-					const res = await fetch('/' + userId, { method: "GET", headers: { "Content-Type": "application/json" } });
-					if (!res.ok)
-						throw new Error('Failed to fetch item ${id}');
-					return res.json();
-				});
-				const matchHistory = await Promise.all(promises);
-				return reply.code(200).send({ matchHistory });
+			const { iStart, iEnd } = request.query;
+			if (!iStart || !iEnd) {
+				return reply.code(400).send({ error: "Please specify both a starting and an ending index" });
 			}
+			if (Number(iEnd) < Number(iStart)) {
+				return reply.code(400).send({ error: "Starting index cannot be strictly inferior to ending index" });
+			}
+			const matchHistoryId = getMatchHistory.all(userId, Number(iEnd) - Number(iStart), Number(iStart));
+			if (!matchHistoryId.length) {
+				return reply.code(404).send({ error: "No matches exist in the selected range" });
+			}
+			const promises = matchHistoryId.map(async (id) => {
+				const res = await fetch('https://transcendence-api-scoreStore:3000/' + id, { method: "GET", headers: { "Content-Type": "application/json" } });
+				if (!res.ok)
+					throw new Error('Failed to fetch item from blockchain API');
+				return res.json();
+			});
+			const matchHistory = await Promise.all(promises);
+			return reply.code(200).send({ matchHistory });
 		} catch (err) {
 			fastify.log.error(err);
 			return reply.code(500).send({ error: "Internal server error" });
 		}
-	);
+	});
+	fastify.get('/users/:userId/matchHistory/count', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+		try {
+			const userId = request.params.userId;
+			if (!getUserInfo.get(userId)) {
+				return reply.code(404).send({ error: "User does not exist" });
+			}
+			const row = getNumberMatches.get(userId);
+			return reply.code(200).send({ n_matches: row.n_matches });
+		} catch (err) {
+			fastify.log.error(err);
+			return reply.code(500).send({ error: "Internal server error" });
+		}
+	});
 
 	// POST
 	fastify.post('/users/:userId', { preHandler: [fastify.authenticateAdmin] }, async (request, reply) => {
 		try {
 			const userId = request.params.userId;
-			if (request.user != 'admin') {
+			if (!request.user || !request.user.user) {
+				return reply.code(400).send({ error: "Please specify a user" });
+			}
+			if (request.user.user !== 'admin') {
 				return reply.code(401).send({ error: "Unauthorized" });
 			}
 			if (getUserInfo.get(userId)) {
 				return reply.code(400).send({ error: "User already exist" });
 			}
 			if (!request.body || !request.body.displayName) {
-				return reply.code(400).send({ error: "Please specify a display name and an avatar" });
+				return reply.code(400).send({ error: "Please specify a display name" });
 			}
-			const avatar;
-			if (request.body.avatar) {
-				avatar = request.body.avatar;
-			} else {
-				avatar = 1;// randomly chosen avatar
-			}
-			createUser.run(userId, request.body.displayName, avatar);
-			return reply.code(200).send({ msg: "User created sucessfully" });
+			createUser.run(userId, request.body.displayName);
+			return reply.code(200).send({ msg: "User created successfully" });
 		} catch (err) {
 			fastify.log.error(err);
 			return reply.code(500).send({ error: "Internal server error" });
 		}
 	});
-	fastify.post('/users/:userId/friends', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+	fastify.post('/users/:userId/friends/:friendId', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		try {
 			const userId = request.params.userId;
-			if (request.user != 'admin' && request.user != userId) {
-				return reply.code(401).send({ error: "Unauthorized" });
-			}
-			if (!request.body || !request.body.user) {
+			if (!request.user) {
 				return reply.code(400).send({ error: "Please specify a user" });
 			}
+			if (request.user !== 'admin' && request.user !== userId) {
+				return reply.code(401).send({ error: "Unauthorized" });
+			}
 			if (!getUserInfo.get(userId)) {
 				return reply.code(404).send({ error: "User does not exist" });
 			}
-			if (!getUserInfo.get(request.body.user)) {
+			const friendId = request.params.friendId;
+			if (!getUserInfo.get(friendId)) {
 				return reply.code(404).send({ error: "Friend does not exist" });
 			}
-			if (request.body.user === userId) {
+			if (friendId === userId) {
 				return reply.code(400).send({ error: "You can't add yourself :D" });
 			}
-			addFriend.run(userId, request.body.user)
-			return reply.code(200).send({ msg: "Friend added sucessfully" });
+			if (getFriend.get(userId, friendId)) {
+				return reply.code(400).send({ error: "Friend already added" });
+			}
+			addFriend.run(userId, friendId)
+			return reply.code(200).send({ msg: "Friend added successfully" });
 		} catch (err) {
 			fastify.log.error(err);
 			return reply.code(500).send({ error: "Internal server error" });
@@ -218,29 +281,37 @@ export default async function(fastify, options) {
 	fastify.post('/users/:userId/matchHistory', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		try {
 			const userId = request.params.userId;
-			if (request.user != 'admin' && request.user != userId) {
+			if (!request.user) {
+				return reply.code(400).send({ error: "Please specify a user" });
+			}
+			if (request.user !== 'admin' && request.user !== userId) {
 				return reply.code(401).send({ error: "Unauthorized" });
 			}
-			if (!request.body || !request.body.user || !request.body.p1Score || !request.body.p2Score) {
-				return reply.code(400).send({ error: "Please specify the second player and the score of both players" });
+			if (!request.body || !request.body.opponent || !request.body.p1Score || !request.body.p2Score) {
+				return reply.code(400).send({ error: "Please specify the opponent and the score of both players" });
 			}
 			if (!getUserInfo.get(userId)) {
 				return reply.code(404).send({ error: "User does not exist" });
 			}
-			if (!getUserInfo.get(request.body.user)) {
-				return reply.code(404).send({ error: "Second player does not exist" });
+			if (!getUserInfo.get(request.body.opponent)) {
+				return reply.code(404).send({ error: "Opponent does not exist" });
 			}
-			if (request.body.user === userId) {
-				return reply.code(400).send({ error: "Do you have dementia ? You cannot have played a match against yourself, gramps" });
+			if (request.body.opponent === userId) {
+				return reply.code(400).send({ error: "Do you have dementia ? You cannot have played a match against yourself gramps" });
 			}
 			if (request.body.p1Score < 0 || request.body.p2Score < 0) {
 				return reply.code(400).send({ error: "A score cannot be strictly negative" });
 			}
-			const res = await fetch('/', { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ p1: userId, p2: request.body.user, p1Score: request.body.p1Score, p2Score: request.body.p2Score }) });
+			const res = await fetch('http://localhost:3003/', { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ p1: userId, p2: request.body.opponent, p1Score: request.body.p1Score, p2Score: request.body.p2Score }) });
 			if (!res.ok)
 				return reply.code(500).send({ error: "Internal server error" });
 			addMatch.run(userId, res.id);
-			return reply.code(200).send({ msg: "Match history retrieved successfully" });
+			if (request.body.p1Score > request.body.p2Score) {
+				incWins.run(userId);
+			} else if (request.body.p1Score < request.body.p2Score) {
+				incLosses.run(userId);
+			}
+			return reply.code(200).send({ msg: "Match successfully saved to the blockchain" });
 		} catch (err) {
 			fastify.log.error(err);
 			return reply.code(500).send({ error: "Internal server error" });
@@ -251,7 +322,10 @@ export default async function(fastify, options) {
 	fastify.patch('/users/:userId/:member', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		try {
 			const userId = request.params.userId;
-			if (request.user != 'admin' && request.user != userId) {
+			if (!request.user || !request.user.user) {
+				return reply.code(400).send({ error: "Please specify a user" });
+			}
+			if (request.user.user !== 'admin' && request.user.user !== userId) {
 				return reply.code(401).send({ error: "Unauthorized" });
 			}
 			if (!getUserInfo.get(userId)) {
@@ -263,16 +337,7 @@ export default async function(fastify, options) {
 					return reply.code(400).send({ error: "Please specify a displayName" });
 				}
 				changeDisplayName.run(request.body.displayName, userId);
-				return reply.code(200).send({ msg: "Display name modified sucessfully" });
-			}
-			if (member === 'avatar') {
-				if (!request.body || !request.body.avatar) {
-					return reply.code(400).send({ error: "Please specify an avatar" });
-				}
-				changeAvatar.run(request.body.avatar, userId);
-				return reply.code(200).send({ msg: "Avatar modified sucessfully" });
-			}
-			return reply.code(400).send({ error: "Avatar does not exist" })
+				return reply.code(200).send({ msg: "Display name modified successfully" });
 			}
 			return reply.code(400).send({ error: "Member does not exist" })
 		} catch (err) {
@@ -282,16 +347,15 @@ export default async function(fastify, options) {
 	});
 
 	// DELETE
-	/**
-	 *	@description	Can be used to delete a user from the db
-	 */
 	fastify.delete('/users/:userId', { preHandler: [fastify.authenticateAdmin] }, async (request, reply) => {
 		try {
 			if (!getUserInfo(request.params.userId)) {
 				return reply.code(404).send({ error: "User does not exist" });
 			}
-			deleteUser.run(request.params.userId);
+			deleteMatchHistory.run(request.params.userId);
 			deleteFriends.run(request.params.userId);
+			deleteUser.run(request.params.userId);
+			return reply.code(200).send({ msg: "User deleted successfully" });
 		} catch (err) {
 			fastify.log.error(err);
 			return reply.code(500).send({ error: "Internal server error" });
@@ -299,12 +363,19 @@ export default async function(fastify, options) {
 	});
 	fastify.delete('/users/:userId/:member', { preHandler: fastify.authenticate }, async (request, reply) => {
 		try {
-			const user = request.user;
+			if (!request.user || !request.user.user) {
+				return reply.code(400).send({ error: "Please specify a user" });
+			}
+			const userId = request.params.userId;
+			if (!getUserInfo.get(userId)) {
+				return reply.code(404).send({ error: "User does not exist" });
+			}
+			const user = request.user.user;
 			const member = request.params.member;
 			if (user == 'admin' || user == request.params.userId) {
-				if (member == 'displayName') {
+				if (member === 'displayName') {
 					changeDisplayName.run("", request.params.userId);
-					return reply.code(200).send({ msg: "Display name cleared sucessfully" });
+					return reply.code(200).send({ msg: "Display name deleted successfully" });
 				}
 				return reply.code(400).send({ msg: "Member does not exist" })
 			} else {
@@ -316,18 +387,63 @@ export default async function(fastify, options) {
 		}
 
 	});
-	fastify.delete('/users/:userId/friends/:friendId', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+	fastify.delete('/users/:userId/friends', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		try {
+			if (!request.user || !request.user.user) {
+				return reply.code(400).send({ error: "Please specify a user" });
+			}
 			const userId = request.params.userId;
-			const friendId = request.params.friendId;
 			if (!getUserInfo.get(userId)) {
 				return reply.code(404).send({ error: "User does not exist" });
 			}
-			if (request.user != 'admin' && request.user != userId) {
+			if (request.user.user != 'admin' && request.user.user != userId) {
 				return reply.code(401).send({ error: "Unauthorized" });
 			}
+			deleteFriends.run(userId);
+			return reply.code(200).send({ msg: "Friends deleted successfully" });
+		} catch (err) {
+			fastify.log.error(err);
+			return reply.code(500).send({ error: "Internal server error" });
+		}
+	});
+	fastify.delete('/users/:userId/friends/:friendId', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+		try {
+			if (!request.user || !request.user.user) {
+				return reply.code(400).send({ error: "Please specify a user" });
+			}
+			const userId = request.params.userId;
+			if (!getUserInfo.get(userId)) {
+				return reply.code(404).send({ error: "User does not exist" });
+			}
+			if (request.user.user != 'admin' && request.user.user != userId) {
+				return reply.code(401).send({ error: "Unauthorized" });
+			}
+			const friendId = request.params.friendId;
+			if (!getFriend.get(friendId)) {
+				return reply.code(404).send({ error: "Friend does not exist" });
+			}
 			deleteFriend.run(userId, friendId);
-			return reply.code(200).send({ msg: "Friend remove sucessfully" });
+			return reply.code(200).send({ msg: "Friend deleted successfully" });
+		} catch (err) {
+			fastify.log.error(err);
+			return reply.code(500).send({ error: "Internal server error" });
+		}
+	});
+	fastify.delete('/users/:userId/matchHistory', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+		try {
+			if (!request.user || !request.user.user) {
+				return reply.code(400).send({ error: "Please specify a user" });
+			}
+			const userId = request.params.userId;
+			if (!getUserInfo.get(userId)) {
+				return reply.code(404).send({ error: "User does not exist" });
+			}
+			if (request.user.user != 'admin' && request.user.user != userId) {
+				return reply.code(401).send({ error: "Unauthorized" });
+			}
+			deleteMatchHistory.run(userId);
+			deleteStats.run(userId);
+			return reply.code(200).send({ msg: "Match history deleted successfully" });
 		} catch (err) {
 			fastify.log.error(err);
 			return reply.code(500).send({ error: "Internal server error" });

From 439e5a0acfd8d18c2694e0f5f89982d1e55013bc Mon Sep 17 00:00:00 2001
From: Tzvetan Trave <tzvetan.trave@abadcafe.org>
Date: Thu, 2 Oct 2025 16:04:50 +0200
Subject: [PATCH 024/109] finished, functional API

---
 src/api/user/TODO              |  10 +-
 src/api/user/dFriend.js        |  23 +++
 src/api/user/dFriends.js       |  19 ++
 src/api/user/dMatchHistory.js  |  20 ++
 src/api/user/dMember.js        |  25 +++
 src/api/user/dUser.js          |  14 ++
 src/api/user/default.js        | 353 ++++-----------------------------
 src/api/user/gFriends.js       |  20 ++
 src/api/user/gMatchHistory.js  |  29 +++
 src/api/user/gNumberFriends.js |  13 ++
 src/api/user/gNumberMatches.js |  13 ++
 src/api/user/gNumberUsers.js   |   9 +
 src/api/user/gUser.js          |  13 ++
 src/api/user/gUsers.js         |  16 ++
 src/api/user/pFriend.js        |  29 +++
 src/api/user/pMatchHistory.js  |  36 ++++
 src/api/user/pUser.js          |  22 ++
 src/api/user/uMember.js        |  26 +++
 18 files changed, 368 insertions(+), 322 deletions(-)
 create mode 100644 src/api/user/dFriend.js
 create mode 100644 src/api/user/dFriends.js
 create mode 100644 src/api/user/dMatchHistory.js
 create mode 100644 src/api/user/dMember.js
 create mode 100644 src/api/user/dUser.js
 create mode 100644 src/api/user/gFriends.js
 create mode 100644 src/api/user/gMatchHistory.js
 create mode 100644 src/api/user/gNumberFriends.js
 create mode 100644 src/api/user/gNumberMatches.js
 create mode 100644 src/api/user/gNumberUsers.js
 create mode 100644 src/api/user/gUser.js
 create mode 100644 src/api/user/gUsers.js
 create mode 100644 src/api/user/pFriend.js
 create mode 100644 src/api/user/pMatchHistory.js
 create mode 100644 src/api/user/pUser.js
 create mode 100644 src/api/user/uMember.js

diff --git a/src/api/user/TODO b/src/api/user/TODO
index 653d4f3..326da16 100644
--- a/src/api/user/TODO
+++ b/src/api/user/TODO
@@ -1,15 +1,7 @@
 Todo :
-- test matchHistory & wins/losses
-
 - create users with an avatar (by default) -> POST/GET/PATCH/DELETE avatar
 - create a whole image upload API that ensures files are not executables, converts to a single type, stores the image and returns a UID to address them
-- add a privacy setting so not anybody can GET friends, match history, etc. ?
-
-
-
-- choose where to use == and ===
-- use more schema in endpoints for querystring and body
-- split code into files with functions called in the endpoints
+- add a privacy setting so not anybody can GET friends, match history, etc. (what are the RGPD requirements ?) ?
 
 
 
diff --git a/src/api/user/dFriend.js b/src/api/user/dFriend.js
new file mode 100644
index 0000000..333bd93
--- /dev/null
+++ b/src/api/user/dFriend.js
@@ -0,0 +1,23 @@
+export async function dFriend(request, reply, fastify, getUserInfo, getFriend, deleteFriend) {
+	try {
+		if (!request.user) {
+			return reply.code(400).send({ error: "Please specify a user" });
+		}
+		const userId = request.params.userId;
+		if (!getUserInfo.get(userId)) {
+			return reply.code(404).send({ error: "User does not exist" });
+		}
+		if (request.user !== 'admin' && request.user !== userId) {
+			return reply.code(401).send({ error: "Unauthorized" });
+		}
+		const friendId = request.params.friendId;
+		if (!getFriend.get(userId, friendId)) {
+			return reply.code(404).send({ error: "Friend does not exist" });
+		}
+		deleteFriend.run(userId, friendId);
+		return reply.code(200).send({ msg: "Friend deleted successfully" });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/dFriends.js b/src/api/user/dFriends.js
new file mode 100644
index 0000000..803dd89
--- /dev/null
+++ b/src/api/user/dFriends.js
@@ -0,0 +1,19 @@
+export async function dFriends(request, reply, fastify, getUserInfo, deleteFriends) {
+	try {
+		if (!request.user) {
+			return reply.code(400).send({ error: "Please specify a user" });
+		}
+		const userId = request.params.userId;
+		if (!getUserInfo.get(userId)) {
+			return reply.code(404).send({ error: "User does not exist" });
+		}
+		if (request.user !== 'admin' && request.user !== userId) {
+			return reply.code(401).send({ error: "Unauthorized" });
+		}
+		deleteFriends.run(userId);
+		return reply.code(200).send({ msg: "Friends deleted successfully" });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/dMatchHistory.js b/src/api/user/dMatchHistory.js
new file mode 100644
index 0000000..09efa08
--- /dev/null
+++ b/src/api/user/dMatchHistory.js
@@ -0,0 +1,20 @@
+export async function dMatchHistory(request, reply, fastify, getUserInfo, deleteMatchHistory, deleteStats) {
+	try {
+		if (!request.user) {
+			return reply.code(400).send({ error: "Please specify a user" });
+		}
+		const userId = request.params.userId;
+		if (!getUserInfo.get(userId)) {
+			return reply.code(404).send({ error: "User does not exist" });
+		}
+		if (request.user !== 'admin' && request.user !== userId) {
+			return reply.code(401).send({ error: "Unauthorized" });
+		}
+		deleteMatchHistory.run(userId);
+		deleteStats.run(userId);
+		return reply.code(200).send({ msg: "Match history deleted successfully" });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/dMember.js b/src/api/user/dMember.js
new file mode 100644
index 0000000..240a297
--- /dev/null
+++ b/src/api/user/dMember.js
@@ -0,0 +1,25 @@
+export async function dMember(request, reply, fastify, getUserInfo, changeDisplayName) {
+	try {
+		if (!request.user) {
+			return reply.code(400).send({ error: "Please specify a user" });
+		}
+		const userId = request.params.userId;
+		if (!getUserInfo.get(userId)) {
+			return reply.code(404).send({ error: "User does not exist" });
+		}
+		const user = request.user;
+		const member = request.params.member;
+		if (user === 'admin' || user === request.params.userId) {
+			if (member === 'displayName') {
+				changeDisplayName.run("", request.params.userId);
+				return reply.code(200).send({ msg: "Display name deleted successfully" });
+			}
+			return reply.code(400).send({ msg: "Member does not exist" })
+		} else {
+			return reply.code(401).send({ error: 'You dont have the right to delete this' });
+		}
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/dUser.js b/src/api/user/dUser.js
new file mode 100644
index 0000000..0b0ca0a
--- /dev/null
+++ b/src/api/user/dUser.js
@@ -0,0 +1,14 @@
+export async function dUser(request, reply, fastify, getUserInfo, deleteMatchHistory, deleteFriends, deleteUser) {
+	try {
+		if (!getUserInfo.get(request.params.userId)) {
+			return reply.code(404).send({ error: "User does not exist" });
+		}
+		deleteMatchHistory.run(request.params.userId);
+		deleteFriends.run(request.params.userId);
+		deleteUser.run(request.params.userId);
+		return reply.code(200).send({ msg: "User deleted successfully" });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/default.js b/src/api/user/default.js
index ef9cf43..d122bf9 100644
--- a/src/api/user/default.js
+++ b/src/api/user/default.js
@@ -2,6 +2,23 @@ import fastifyJWT from '@fastify/jwt';
 import fastifyCookie from '@fastify/cookie';
 import Database from 'better-sqlite3';
 
+import { gUsers } from './gUsers.js'
+import { gUser } from './gUser.js'
+import { gNumberUsers } from './gNumberUsers.js'
+import { gFriends } from './gFriends.js'
+import { gNumberFriends } from './gNumberFriends.js'
+import { gMatchHistory } from './gMatchHistory.js'
+import { gNumberMatches } from './gNumberMatches.js'
+import { pUser } from './pUser.js'
+import { pFriend } from './pFriend.js'
+import { pMatchHistory } from './pMatchHistory.js'
+import { uMember } from './uMember.js'
+import { dUser } from './dUser.js'
+import { dMember } from './dMember.js'
+import { dFriends } from './dFriends.js'
+import { dFriend } from './dFriend.js'
+import { dMatchHistory } from './dMatchHistory.js'
+
 const env = process.env.NODE_ENV || 'development';
 
 let database;
@@ -72,10 +89,9 @@ const deleteFriends = database.prepare('DELETE FROM friends WHERE username = ?;'
 const deleteMatchHistory = database.prepare('DELETE FROM matchHistory WHERE username = ?;');
 const deleteStats = database.prepare('UPDATE userData SET wins = 0, losses = 0 WHERE username = ?;');
 
-/**
- * @param {import('fastify').FastifyInstance}		fastify
- * @param {import('fastify').FastifyPluginOptions}	options
- */
+const querySchema = { type: 'object', required: ['iStart', 'iEnd'], properties: { iStart: { type: 'integer', minimum: 0 }, iEnd: { type: 'integer', minimum: 0 } } }
+const bodySchema = { type: 'object', required: ['opponent', 'myScore', 'opponentScore'], properties: { opponent: { type: 'string' }, myScore: { type: 'integer', minimum: 0 }, opponentScore: { type: 'integer', minimum: 0 } } }
+
 export default async function(fastify, options) {
 	fastify.register(fastifyJWT, {
 		secret: process.env.JWT_SECRET || '123456789101112131415161718192021',
@@ -106,347 +122,58 @@ export default async function(fastify, options) {
 	});
 
 	// GET
-	fastify.get('/users', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		try {
-			const { iStart, iEnd } = request.query;
-			if (!iStart || !iEnd) {
-				return reply.code(400).send({ error: "Please specify both a starting and an ending index" });
-			}
-			if (Number(iEnd) < Number(iStart)) {
-				return reply.code(400).send({ error: "Starting index cannot be strictly inferior to ending index" });
-			}
-			const users = getUserData.all(Number(iEnd) - Number(iStart), Number(iStart));
-			if (!users.length) {
-				return reply.code(404).send({ error: "No users exist in the selected range" });
-			}
-			return reply.code(200).send({ users });
-		} catch (err) {
-			fastify.log.error(err);
-			return reply.code(500).send({ error: "Internal server error" });
-		}
+	fastify.get('/users', { preHandler: [fastify.authenticate], schema: { querystring: querySchema } }, async (request, reply) => {
+		return gUsers(request, reply, fastify, getUserData);
 	});
 	fastify.get('/users/count', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		try {
-			const row = getNumberUsers.get();
-			return reply.code(200).send({ n_users: row.n_users });
-		} catch (err) {
-			fastify.log.error(err);
-			return reply.code(500).send({ error: "Internal server error" });
-		}
+		return gNumberUsers(request, reply, fastify, getNumberUsers);
 	});
 	fastify.get('/users/:userId', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		try {
-			if (!getUserInfo.get(userId)) {
-				return reply.code(404).send({ error: "User does not exist" });
-			}
-			const userInfo = getUserInfo.get(request.params.userId);
-			return reply.code(200).send({ userInfo });
-		} catch (err) {
-			fastify.log.error(err);
-			return reply.code(500).send({ error: "Internal server error" });
-		}
+		return gUser(request, reply, fastify, getUserInfo);
 	});
-	fastify.get('/users/:userId/friends', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		try {
-			const userId = request.params.userId;
-			if (!getUserInfo.get(userId)) {
-				return reply.code(404).send({ error: "User does not exist" });
-			}
-			const { iStart, iEnd } = request.query;
-			if (!iStart || !iEnd) {
-				return reply.code(400).send({ error: "Please specify both a starting and an ending index" });
-			}
-			if (Number(iEnd) < Number(iStart)) {
-				return reply.code(400).send({ error: "Starting index cannot be strictly inferior to ending index" });
-			}
-			const friends = getFriends.all(userId, Number(iEnd) - Number(iStart), Number(iStart));
-			if (!friends.length) {
-				return reply.code(404).send({ error: "No friends exist in the selected range" });
-			}
-			return reply.code(200).send({ friends });
-		} catch (err) {
-			fastify.log.error(err);
-			return reply.code(500).send({ error: "Internal server error" });
-		}
+	fastify.get('/users/:userId/friends', { preHandler: [fastify.authenticate], schema: { querystring: querySchema } }, async (request, reply) => {
+		return gFriends(request, reply, fastify, getUserInfo, getFriends);
 	});
 	fastify.get('/users/:userId/friends/count', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		try {
-			const userId = request.params.userId;
-			if (!getUserInfo.get(userId)) {
-				return reply.code(404).send({ error: "User does not exist" });
-			}
-			const row = getNumberFriends.get(userId);
-			return reply.code(200).send({ n_friends: row.n_friends });
-		} catch (err) {
-			fastify.log.error(err);
-			return reply.code(500).send({ error: "Internal server error" });
-		}
+		return gNumberFriends(request, reply, fastify, getUserInfo, getNumberFriends);
 	});
-	fastify.get('/users/:userId/matchHistory', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		try {
-			const userId = request.params.userId;
-			if (!getUserInfo.get(userId)) {
-				return reply.code(404).send({ error: "User does not exist" });
-			}
-			const { iStart, iEnd } = request.query;
-			if (!iStart || !iEnd) {
-				return reply.code(400).send({ error: "Please specify both a starting and an ending index" });
-			}
-			if (Number(iEnd) < Number(iStart)) {
-				return reply.code(400).send({ error: "Starting index cannot be strictly inferior to ending index" });
-			}
-			const matchHistoryId = getMatchHistory.all(userId, Number(iEnd) - Number(iStart), Number(iStart));
-			if (!matchHistoryId.length) {
-				return reply.code(404).send({ error: "No matches exist in the selected range" });
-			}
-			const promises = matchHistoryId.map(async (id) => {
-				const res = await fetch('https://transcendence-api-scoreStore:3000/' + id, { method: "GET", headers: { "Content-Type": "application/json" } });
-				if (!res.ok)
-					throw new Error('Failed to fetch item from blockchain API');
-				return res.json();
-			});
-			const matchHistory = await Promise.all(promises);
-			return reply.code(200).send({ matchHistory });
-		} catch (err) {
-			fastify.log.error(err);
-			return reply.code(500).send({ error: "Internal server error" });
-		}
+	fastify.get('/users/:userId/matchHistory', { preHandler: [fastify.authenticate], schema: { querystring: querySchema } }, async (request, reply) => {
+		return gMatchHistory(request, reply, fastify, getUserInfo, getMatchHistory);
 	});
 	fastify.get('/users/:userId/matchHistory/count', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		try {
-			const userId = request.params.userId;
-			if (!getUserInfo.get(userId)) {
-				return reply.code(404).send({ error: "User does not exist" });
-			}
-			const row = getNumberMatches.get(userId);
-			return reply.code(200).send({ n_matches: row.n_matches });
-		} catch (err) {
-			fastify.log.error(err);
-			return reply.code(500).send({ error: "Internal server error" });
-		}
+		return gNumberMatches(request, reply, fastify, getUserInfo, getNumberMatches);
 	});
 
 	// POST
 	fastify.post('/users/:userId', { preHandler: [fastify.authenticateAdmin] }, async (request, reply) => {
-		try {
-			const userId = request.params.userId;
-			if (!request.user || !request.user.user) {
-				return reply.code(400).send({ error: "Please specify a user" });
-			}
-			if (request.user.user !== 'admin') {
-				return reply.code(401).send({ error: "Unauthorized" });
-			}
-			if (getUserInfo.get(userId)) {
-				return reply.code(400).send({ error: "User already exist" });
-			}
-			if (!request.body || !request.body.displayName) {
-				return reply.code(400).send({ error: "Please specify a display name" });
-			}
-			createUser.run(userId, request.body.displayName);
-			return reply.code(200).send({ msg: "User created successfully" });
-		} catch (err) {
-			fastify.log.error(err);
-			return reply.code(500).send({ error: "Internal server error" });
-		}
+		return pUser(request, reply, fastify, getUserInfo, createUser);
 	});
 	fastify.post('/users/:userId/friends/:friendId', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		try {
-			const userId = request.params.userId;
-			if (!request.user) {
-				return reply.code(400).send({ error: "Please specify a user" });
-			}
-			if (request.user !== 'admin' && request.user !== userId) {
-				return reply.code(401).send({ error: "Unauthorized" });
-			}
-			if (!getUserInfo.get(userId)) {
-				return reply.code(404).send({ error: "User does not exist" });
-			}
-			const friendId = request.params.friendId;
-			if (!getUserInfo.get(friendId)) {
-				return reply.code(404).send({ error: "Friend does not exist" });
-			}
-			if (friendId === userId) {
-				return reply.code(400).send({ error: "You can't add yourself :D" });
-			}
-			if (getFriend.get(userId, friendId)) {
-				return reply.code(400).send({ error: "Friend already added" });
-			}
-			addFriend.run(userId, friendId)
-			return reply.code(200).send({ msg: "Friend added successfully" });
-		} catch (err) {
-			fastify.log.error(err);
-			return reply.code(500).send({ error: "Internal server error" });
-		}
+		return pFriend(request, reply, fastify, getUserInfo, getFriend, addFriend);
 	});
-	fastify.post('/users/:userId/matchHistory', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		try {
-			const userId = request.params.userId;
-			if (!request.user) {
-				return reply.code(400).send({ error: "Please specify a user" });
-			}
-			if (request.user !== 'admin' && request.user !== userId) {
-				return reply.code(401).send({ error: "Unauthorized" });
-			}
-			if (!request.body || !request.body.opponent || !request.body.p1Score || !request.body.p2Score) {
-				return reply.code(400).send({ error: "Please specify the opponent and the score of both players" });
-			}
-			if (!getUserInfo.get(userId)) {
-				return reply.code(404).send({ error: "User does not exist" });
-			}
-			if (!getUserInfo.get(request.body.opponent)) {
-				return reply.code(404).send({ error: "Opponent does not exist" });
-			}
-			if (request.body.opponent === userId) {
-				return reply.code(400).send({ error: "Do you have dementia ? You cannot have played a match against yourself gramps" });
-			}
-			if (request.body.p1Score < 0 || request.body.p2Score < 0) {
-				return reply.code(400).send({ error: "A score cannot be strictly negative" });
-			}
-			const res = await fetch('http://localhost:3003/', { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ p1: userId, p2: request.body.opponent, p1Score: request.body.p1Score, p2Score: request.body.p2Score }) });
-			if (!res.ok)
-				return reply.code(500).send({ error: "Internal server error" });
-			addMatch.run(userId, res.id);
-			if (request.body.p1Score > request.body.p2Score) {
-				incWins.run(userId);
-			} else if (request.body.p1Score < request.body.p2Score) {
-				incLosses.run(userId);
-			}
-			return reply.code(200).send({ msg: "Match successfully saved to the blockchain" });
-		} catch (err) {
-			fastify.log.error(err);
-			return reply.code(500).send({ error: "Internal server error" });
-		}
+	fastify.post('/users/:userId/matchHistory', { preHandler: [fastify.authenticate], schema: { body: bodySchema } }, async (request, reply) => {
+		return pMatchHistory(request, reply, fastify, getUserInfo, addMatch, incWins, incLosses);
 	});
 
 	// PATCH
 	fastify.patch('/users/:userId/:member', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		try {
-			const userId = request.params.userId;
-			if (!request.user || !request.user.user) {
-				return reply.code(400).send({ error: "Please specify a user" });
-			}
-			if (request.user.user !== 'admin' && request.user.user !== userId) {
-				return reply.code(401).send({ error: "Unauthorized" });
-			}
-			if (!getUserInfo.get(userId)) {
-				return reply.code(404).send({ error: "User does not exist" });
-			}
-			const member = request.params.member;
-			if (member === 'displayName') {
-				if (!request.body || !request.body.displayName) {
-					return reply.code(400).send({ error: "Please specify a displayName" });
-				}
-				changeDisplayName.run(request.body.displayName, userId);
-				return reply.code(200).send({ msg: "Display name modified successfully" });
-			}
-			return reply.code(400).send({ error: "Member does not exist" })
-		} catch (err) {
-			fastify.log.error(err);
-			return reply.code(500).send({ error: "Internal server error" });
-		}
+		return uMember(request, reply, fastify, getUserInfo, changeDisplayName);
 	});
 
 	// DELETE
 	fastify.delete('/users/:userId', { preHandler: [fastify.authenticateAdmin] }, async (request, reply) => {
-		try {
-			if (!getUserInfo(request.params.userId)) {
-				return reply.code(404).send({ error: "User does not exist" });
-			}
-			deleteMatchHistory.run(request.params.userId);
-			deleteFriends.run(request.params.userId);
-			deleteUser.run(request.params.userId);
-			return reply.code(200).send({ msg: "User deleted successfully" });
-		} catch (err) {
-			fastify.log.error(err);
-			return reply.code(500).send({ error: "Internal server error" });
-		}
+		return dUser(request, reply, fastify, getUserInfo, deleteMatchHistory, deleteFriends, deleteUser);
 	});
 	fastify.delete('/users/:userId/:member', { preHandler: fastify.authenticate }, async (request, reply) => {
-		try {
-			if (!request.user || !request.user.user) {
-				return reply.code(400).send({ error: "Please specify a user" });
-			}
-			const userId = request.params.userId;
-			if (!getUserInfo.get(userId)) {
-				return reply.code(404).send({ error: "User does not exist" });
-			}
-			const user = request.user.user;
-			const member = request.params.member;
-			if (user == 'admin' || user == request.params.userId) {
-				if (member === 'displayName') {
-					changeDisplayName.run("", request.params.userId);
-					return reply.code(200).send({ msg: "Display name deleted successfully" });
-				}
-				return reply.code(400).send({ msg: "Member does not exist" })
-			} else {
-				return reply.code(401).send({ error: 'You dont have the right to delete this' });
-			}
-		} catch (err) {
-			fastify.log.error(err);
-			return reply.code(500).send({ error: "Internal server error" });
-		}
-
+		return dMember(request, reply, fastify, getUserInfo, changeDisplayName);
 	});
 	fastify.delete('/users/:userId/friends', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		try {
-			if (!request.user || !request.user.user) {
-				return reply.code(400).send({ error: "Please specify a user" });
-			}
-			const userId = request.params.userId;
-			if (!getUserInfo.get(userId)) {
-				return reply.code(404).send({ error: "User does not exist" });
-			}
-			if (request.user.user != 'admin' && request.user.user != userId) {
-				return reply.code(401).send({ error: "Unauthorized" });
-			}
-			deleteFriends.run(userId);
-			return reply.code(200).send({ msg: "Friends deleted successfully" });
-		} catch (err) {
-			fastify.log.error(err);
-			return reply.code(500).send({ error: "Internal server error" });
-		}
+		return dFriends(request, reply, fastify, getUserInfo, deleteFriends);
 	});
 	fastify.delete('/users/:userId/friends/:friendId', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		try {
-			if (!request.user || !request.user.user) {
-				return reply.code(400).send({ error: "Please specify a user" });
-			}
-			const userId = request.params.userId;
-			if (!getUserInfo.get(userId)) {
-				return reply.code(404).send({ error: "User does not exist" });
-			}
-			if (request.user.user != 'admin' && request.user.user != userId) {
-				return reply.code(401).send({ error: "Unauthorized" });
-			}
-			const friendId = request.params.friendId;
-			if (!getFriend.get(friendId)) {
-				return reply.code(404).send({ error: "Friend does not exist" });
-			}
-			deleteFriend.run(userId, friendId);
-			return reply.code(200).send({ msg: "Friend deleted successfully" });
-		} catch (err) {
-			fastify.log.error(err);
-			return reply.code(500).send({ error: "Internal server error" });
-		}
+		return dFriend(request, reply, fastify, getUserInfo, getFriend, deleteFriend);
 	});
 	fastify.delete('/users/:userId/matchHistory', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		try {
-			if (!request.user || !request.user.user) {
-				return reply.code(400).send({ error: "Please specify a user" });
-			}
-			const userId = request.params.userId;
-			if (!getUserInfo.get(userId)) {
-				return reply.code(404).send({ error: "User does not exist" });
-			}
-			if (request.user.user != 'admin' && request.user.user != userId) {
-				return reply.code(401).send({ error: "Unauthorized" });
-			}
-			deleteMatchHistory.run(userId);
-			deleteStats.run(userId);
-			return reply.code(200).send({ msg: "Match history deleted successfully" });
-		} catch (err) {
-			fastify.log.error(err);
-			return reply.code(500).send({ error: "Internal server error" });
-		}
+		return dMatchHistory(request, reply, fastify, getUserInfo, deleteMatchHistory, deleteStats);
 	});
 }
diff --git a/src/api/user/gFriends.js b/src/api/user/gFriends.js
new file mode 100644
index 0000000..cc24986
--- /dev/null
+++ b/src/api/user/gFriends.js
@@ -0,0 +1,20 @@
+export async function gFriends(request, reply, fastify, getUserInfo, getFriends) {
+	try {
+		const userId = request.params.userId;
+		if (!getUserInfo.get(userId)) {
+			return reply.code(404).send({ error: "User does not exist" });
+		}
+		const { iStart, iEnd } = request.query;
+		if (Number(iEnd) < Number(iStart)) {
+			return reply.code(400).send({ error: "Starting index cannot be strictly inferior to ending index" });
+		}
+		const friends = getFriends.all(userId, Number(iEnd) - Number(iStart), Number(iStart));
+		if (!friends.length) {
+			return reply.code(404).send({ error: "No friends exist in the selected range" });
+		}
+		return reply.code(200).send({ friends });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/gMatchHistory.js b/src/api/user/gMatchHistory.js
new file mode 100644
index 0000000..2566fe3
--- /dev/null
+++ b/src/api/user/gMatchHistory.js
@@ -0,0 +1,29 @@
+export async function gMatchHistory(request, reply, fastify, getUserInfo, getMatchHistory) {
+	try {
+		const userId = request.params.userId;
+		if (!getUserInfo.get(userId)) {
+			return reply.code(404).send({ error: "User does not exist" });
+		}
+		const { iStart, iEnd } = request.query;
+		if (Number(iEnd) < Number(iStart)) {
+			return reply.code(400).send({ error: "Starting index cannot be strictly inferior to ending index" });
+		}
+		const matchHistoryId = getMatchHistory.all(userId, Number(iEnd) - Number(iStart), Number(iStart));
+		if (!matchHistoryId.length) {
+			return reply.code(404).send({ error: "No matches exist in the selected range" });
+		}
+		const ids = matchHistoryId.map(obj => Object.values(obj)[0]);
+		const promises = ids.map(async (id) => {
+			const res = await fetch(`http://localhost:3003/${id}`, { method: "GET" });
+			if (!res.ok) {
+				throw new Error('Failed to fetch item from blockchain API');
+			}
+			return await res.json();
+		});
+		const matchHistory = await Promise.all(promises);
+		return reply.code(200).send({ matchHistory });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/gNumberFriends.js b/src/api/user/gNumberFriends.js
new file mode 100644
index 0000000..ca1ec24
--- /dev/null
+++ b/src/api/user/gNumberFriends.js
@@ -0,0 +1,13 @@
+export async function gNumberFriends(request, reply, fastify, getUserInfo, getNumberFriends) {
+	try {
+		const userId = request.params.userId;
+		if (!getUserInfo.get(userId)) {
+			return reply.code(404).send({ error: "User does not exist" });
+		}
+		const row = getNumberFriends.get(userId);
+		return reply.code(200).send({ n_friends: row.n_friends });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/gNumberMatches.js b/src/api/user/gNumberMatches.js
new file mode 100644
index 0000000..7abe3a6
--- /dev/null
+++ b/src/api/user/gNumberMatches.js
@@ -0,0 +1,13 @@
+export async function gNumberMatches(request, reply, fastify, getUserInfo, getNumberMatches) {
+	try {
+		const userId = request.params.userId;
+		if (!getUserInfo.get(userId)) {
+			return reply.code(404).send({ error: "User does not exist" });
+		}
+		const row = getNumberMatches.get(userId);
+		return reply.code(200).send({ n_matches: row.n_matches });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/gNumberUsers.js b/src/api/user/gNumberUsers.js
new file mode 100644
index 0000000..b8c025d
--- /dev/null
+++ b/src/api/user/gNumberUsers.js
@@ -0,0 +1,9 @@
+export async function gNumberUsers(request, reply, fastify, getNumberUsers) {
+	try {
+		const row = getNumberUsers.get();
+		return reply.code(200).send({ n_users: row.n_users });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/gUser.js b/src/api/user/gUser.js
new file mode 100644
index 0000000..16a8439
--- /dev/null
+++ b/src/api/user/gUser.js
@@ -0,0 +1,13 @@
+export async function gUser(request, reply, fastify, getUserInfo) {
+	try {
+		const userId = request.params.userId;
+		const userInfo = getUserInfo.get(userId);
+		if (!userInfo) {
+			return reply.code(404).send({ error: "User does not exist" });
+		}
+		return reply.code(200).send({ userInfo });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/gUsers.js b/src/api/user/gUsers.js
new file mode 100644
index 0000000..4a60d6d
--- /dev/null
+++ b/src/api/user/gUsers.js
@@ -0,0 +1,16 @@
+export async function gUsers(request, reply, fastify, getUserData) {
+	try {
+		const { iStart, iEnd } = request.query;
+		if (Number(iEnd) < Number(iStart)) {
+			return reply.code(400).send({ error: "Starting index cannot be strictly inferior to ending index" });
+		}
+		const users = getUserData.all(Number(iEnd) - Number(iStart), Number(iStart));
+		if (!users.length) {
+			return reply.code(404).send({ error: "No users exist in the selected range" });
+		}
+		return reply.code(200).send({ users });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/pFriend.js b/src/api/user/pFriend.js
new file mode 100644
index 0000000..dfb5341
--- /dev/null
+++ b/src/api/user/pFriend.js
@@ -0,0 +1,29 @@
+export async function pFriend(request, reply, fastify, getUserInfo, getFriend, addFriend) {
+	try {
+		const userId = request.params.userId;
+		if (!request.user) {
+			return reply.code(400).send({ error: "Please specify a user" });
+		}
+		if (request.user !== 'admin' && request.user !== userId) {
+			return reply.code(401).send({ error: "Unauthorized" });
+		}
+		if (!getUserInfo.get(userId)) {
+			return reply.code(404).send({ error: "User does not exist" });
+		}
+		const friendId = request.params.friendId;
+		if (!getUserInfo.get(friendId)) {
+			return reply.code(404).send({ error: "Friend does not exist" });
+		}
+		if (friendId === userId) {
+			return reply.code(400).send({ error: "You can't add yourself :D" });
+		}
+		if (getFriend.get(userId, friendId)) {
+			return reply.code(400).send({ error: "Friend already added" });
+		}
+		addFriend.run(userId, friendId)
+		return reply.code(200).send({ msg: "Friend added successfully" });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/pMatchHistory.js b/src/api/user/pMatchHistory.js
new file mode 100644
index 0000000..d619149
--- /dev/null
+++ b/src/api/user/pMatchHistory.js
@@ -0,0 +1,36 @@
+export async function pMatchHistory(request, reply, fastify, getUserInfo, addMatch, incWins, incLosses) {
+	try {
+		const userId = request.params.userId;
+		if (!request.user) {
+			return reply.code(400).send({ error: "Please specify a user" });
+		}
+		if (request.user !== 'admin' && request.user !== userId) {
+			return reply.code(401).send({ error: "Unauthorized" });
+		}
+		if (!getUserInfo.get(userId)) {
+			return reply.code(404).send({ error: "User does not exist" });
+		}
+		if (!getUserInfo.get(request.body.opponent)) {
+			return reply.code(404).send({ error: "Opponent does not exist" });
+		}
+		if (request.body.opponent === userId) {
+			return reply.code(400).send({ error: "Do you have dementia ? You cannot have played a match against yourself gramps" });
+		}
+		const res = await fetch('http://localhost:3003/', { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ p1: userId, p2: request.body.opponent, p1Score: request.body.myScore, p2Score: request.body.opponentScore }) });
+		if (!res.ok)
+			return reply.code(500).send({ error: "Internal server error" });
+		const data = await res.json();
+		addMatch.run(userId, data.id);
+		if (request.body.myScore > request.body.opponentScore) {
+			incWins.run(userId);
+			incLosses.run(request.body.opponent);
+		} else if (request.body.myScore < request.body.opponentScore) {
+			incWins.run(request.body.opponent);
+			incLosses.run(userId);
+		}
+		return reply.code(200).send({ msg: "Match successfully saved to the blockchain" });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/pUser.js b/src/api/user/pUser.js
new file mode 100644
index 0000000..c5dd88e
--- /dev/null
+++ b/src/api/user/pUser.js
@@ -0,0 +1,22 @@
+export async function pUser(request, reply, fastify, getUserInfo, createUser) {
+	try {
+		const userId = request.params.userId;
+		if (!request.user || !request.user.user) {
+			return reply.code(400).send({ error: "Please specify a user" });
+		}
+		if (request.user.user !== 'admin') {
+			return reply.code(401).send({ error: "Unauthorized" });
+		}
+		if (getUserInfo.get(userId)) {
+			return reply.code(400).send({ error: "User already exist" });
+		}
+		if (!request.body || !request.body.displayName) {
+			return reply.code(400).send({ error: "Please specify a display name" });
+		}
+		createUser.run(userId, request.body.displayName);
+		return reply.code(200).send({ msg: "User created successfully" });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/uMember.js b/src/api/user/uMember.js
new file mode 100644
index 0000000..67997d7
--- /dev/null
+++ b/src/api/user/uMember.js
@@ -0,0 +1,26 @@
+export async function uMember(request, reply, fastify, getUserInfo, changeDisplayName) {
+	try {
+		const userId = request.params.userId;
+		if (!request.user) {
+			return reply.code(400).send({ error: "Please specify a user" });
+		}
+		if (request.user !== 'admin' && request.user !== userId) {
+			return reply.code(401).send({ error: "Unauthorized" });
+		}
+		if (!getUserInfo.get(userId)) {
+			return reply.code(404).send({ error: "User does not exist" });
+		}
+		const member = request.params.member;
+		if (member === 'displayName') {
+			if (!request.body || !request.body.displayName) {
+				return reply.code(400).send({ error: "Please specify a displayName" });
+			}
+			changeDisplayName.run(request.body.displayName, userId);
+			return reply.code(200).send({ msg: "Display name modified successfully" });
+		}
+		return reply.code(400).send({ error: "Member does not exist" })
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}

From 7333dc2602070379897db20564691d3e3b8b1187 Mon Sep 17 00:00:00 2001
From: Tzvetan Trave <tzvetan.trave@abadcafe.org>
Date: Thu, 2 Oct 2025 16:06:51 +0200
Subject: [PATCH 025/109] forgot to push the doc

---
 doc/user/user.md | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/doc/user/user.md b/doc/user/user.md
index 3c18841..7821997 100644
--- a/doc/user/user.md
+++ b/doc/user/user.md
@@ -95,8 +95,8 @@ Input needed :
 ```json
 {
 	"opponent": "<the opponent's username>",
-	"p1Score": <player 1's score>,
-	"p2Score": <player 2's score>
+	"myScore": <my score>,
+	"opponentScore": <the opponent's score>
 }
 ```
 
@@ -247,19 +247,22 @@ Used to get the match history of an user
 Can return:
 - 200 with response (list of matches results (between iStart and iEnd))
 ```json
-[
-	{
-		"score":
+{
+	"matchHistory":
+	[
 		{
-			"p1": "<the name of the p1>",
-			"p2": "<the name of the p2>",
-			"p1Score": "<the score of the p1>",
-			"p2Score": "<the score of the p2>"
+			"score":
+			{
+				"p1": "<the name of the p1>",
+				"p2": "<the name of the p2>",
+				"p1Score": "<the score of the p1>",
+				"p2Score": "<the score of the p2>"
+			},
+			"tx": "<the transcaction hash>"
 		},
-		"tx": "<the transcaction hash>"
-	},
-	...
-]
+		...
+	]
+}
 ```
 - 400 with response (if iStart/iEnd does not exist, or iEnd < iStart)
 ```json

From 156fd2b5a1287899e6f322d769cb4503b188f71c Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Sun, 5 Oct 2025 18:10:07 +0200
Subject: [PATCH 026/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip:=20work=20in=20progress,=20not=20done=20yet.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/main.ts           |  2 +
 src/front/static/ts/views/Game.ts     | 62 +++++++++++++++++----------
 src/front/static/ts/views/MainMenu.ts |  2 +-
 src/front/static/ts/views/PongMenu.ts |  4 +-
 src/front/static/ts/views/Profile.ts  | 24 +++++++++++
 5 files changed, 69 insertions(+), 25 deletions(-)
 create mode 100644 src/front/static/ts/views/Profile.ts

diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index dd8847a..0443d91 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -85,6 +85,8 @@ const routes = [
 	{ path: "/login", view: () => import("./views/LoginPage.ts") },
 	{ path: "/register", view: () => import("./views/RegisterPage.ts") },
 
+	{ path: "/profile", view: () => import("./views/Profile.ts") },
+
 	{ path: "/tetris", view: () => import("./views/Tetris.ts") },
 ];
 
diff --git a/src/front/static/ts/views/Game.ts b/src/front/static/ts/views/Game.ts
index 41fe224..5988cc4 100644
--- a/src/front/static/ts/views/Game.ts
+++ b/src/front/static/ts/views/Game.ts
@@ -14,12 +14,14 @@ export default class extends Aview {
 
 	async getHTML() {
 		return `
-			<div class="text-center p-5 bg-white rounded-xl shadow">
-				<div id="player-inputs" class="flex row">
-					<input type="text" id="player1" placeholder="Player 1" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 mr-2 focus:outline-none focus:ring-2 focus:ring-blue-500" required></input>
-					<input type="text" id="player2" placeholder="Player 2" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 ml-2 focus:outline-none focus:ring-2 focus:ring-blue-500" required></input>
+			<div id="main-div" class="text-center p-5 bg-white rounded-xl shadow">
+				<div id="player-inputs" class="flex flex-col space-y-4">
+					<div class="flex flex-row">
+						<input type="text" id="player1" placeholder="Player 1" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 mr-2 focus:outline-none focus:ring-2 focus:ring-blue-500" required></input>
+						<input type="text" id="player2" placeholder="Player 2" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 ml-2 focus:outline-none focus:ring-2 focus:ring-blue-500" required></input>
+					</div>
+					<button id="game-start" class="bg-blue-600 text-white hover:bg-blue-500 w-full py-2 rounded-md transition-colors">play</button>
 				</div>
-				<canvas id="gameCanvas" class="hidden rounded-md" width="400" height="400"></canvas>
 				<div id="game-buttons" class="hidden flex mt-4">
 					<button id="game-retry" class="bg-blue-600 text-white hover:bg-blue-500 w-full mx-4 py-2 rounded-md transition-colors">play again</button>
 					<a id="game-back" class="bg-gray-600 text-white hover:bg-gray-500 w-full mx-4 py-2 rounded-md transition-colors" href="/pong" data-link>back</a>
@@ -42,19 +44,19 @@ export default class extends Aview {
 		let countdown: number = 3;
 		let countdownTimer: number = 0;
 
-		const canvas = document.getElementById("gameCanvas") as HTMLCanvasElement;
-		const ctx = canvas.getContext("2d");
+		let canvas;
+		let ctx;
 
 		const paddleOffset: number = 15;
 		const paddleHeight: number = 100;
 		const paddleWidth: number = 10;
 		const ballSize: number = 10;
 
-		let leftPaddleY: number = canvas.height / 2 - paddleHeight / 2;
-		let rightPaddleY: number = canvas.height / 2 - paddleHeight / 2;
 		const paddleSpeed: number = 727 * 0.69;
-		let ballX: number = canvas.width / 2;
-		let ballY: number = canvas.height / 2;
+		let leftPaddleY: number;
+		let rightPaddleY: number;
+		let ballX: number;
+		let ballY: number;
 		let ballSpeed: number = 200;
 		let ballSpeedX: number = 300;
 		let ballSpeedY: number = 10;
@@ -222,20 +224,36 @@ export default class extends Aview {
 			countdown = 3;
 			countdownTimer = performance.now();
 		});
+		let p1_input = document.getElementById("player1");
+		let p2_input = document.getElementById("player2");
 
-		p1_name = "Player 1";
-		p2_name = "Player 2";
+		p2_input.value = "Player 2";
 		if (await isLogged())
-		{
-			p1_name = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
-		}
+			p1_input.value = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+		else
+			p1_input.value = "Player 1";
 
-		// --------------------------------------------------------------------------------------------------------------------------------------------------------
-		//
-		// insert logic to set both names
-		//
-		// --------------------------------------------------------------------------------------------------------------------------------------------------------
+		document.getElementById("game-start")?.addEventListener("click", () => {
+			p1_name = p1_input.value;
+			p2_name = p2_input.value;
+			document.getElementById("player-inputs").remove();
 
-		requestAnimationFrame(gameLoop);
+			canvas = document.createElement("canvas");
+			canvas.id = "gameCanvas";
+			canvas.classList.add("rounded-md");
+
+			document.getElementById("main-div").prepend(canvas);
+
+			ctx = canvas.getContext("2d");
+			ctx.canvas.width  = 600;
+			ctx.canvas.height = 600;
+
+			leftPaddleY = canvas.height / 2 - paddleHeight / 2;
+			rightPaddleY = canvas.height / 2 - paddleHeight / 2;
+			ballX = canvas.width / 2;
+			ballY = canvas.height / 2;
+
+			requestAnimationFrame(gameLoop);
+		});
 	}
 }
diff --git a/src/front/static/ts/views/MainMenu.ts b/src/front/static/ts/views/MainMenu.ts
index 9d00ee0..ce2946f 100644
--- a/src/front/static/ts/views/MainMenu.ts
+++ b/src/front/static/ts/views/MainMenu.ts
@@ -13,7 +13,7 @@ export default class extends Aview {
 		<div class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4">
 			<h1 class="text-4xl font-bold text-blue-800 dark:text-blue-300">knl_meowscendence :D</h1>
 			<p class="text-gray-900 dark:text-white text-lg pb-4">i like pong</p>
-			<a class="bg-blue-600 hover:bg-blue-500 text-white px-4 py-2 rounded" href="/pong" data-link>
+			<a class="bg-blue-600 hover:bg-blue-500 text-white px-4 py-2 rounded transition-colors" href="/pong" data-link>
 				Pong
 			</a>
 		</div>
diff --git a/src/front/static/ts/views/PongMenu.ts b/src/front/static/ts/views/PongMenu.ts
index 718b1c0..5b9eee7 100644
--- a/src/front/static/ts/views/PongMenu.ts
+++ b/src/front/static/ts/views/PongMenu.ts
@@ -13,10 +13,10 @@ export default class extends Aview {
 		<div class="text-center p-12 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4">
 			<p class="text-gray-700 dark:text-white text-3xl font-bold pb-4">pong is funny yay</p>
 			<div class="flex flex-col space-y-4">
-				<a class="bg-red-500 hover:bg-red-400 text-white px-4 py-2 rounded" href="/pong/local" data-link>
+				<a class="bg-red-500 hover:bg-red-400 text-white px-4 py-2 rounded transition-colors" href="/pong/local" data-link>
 					local match
 				</a>
-				<a class="bg-red-500 hover:bg-red-400 text-white px-4 py-2 rounded" href="/pong/tournament" data-link>
+				<a class="bg-red-500 hover:bg-red-400 text-white px-4 py-2 rounded transition-colors" href="/pong/tournament" data-link>
 					local tournament
 				</a>
 			</div>
diff --git a/src/front/static/ts/views/Profile.ts b/src/front/static/ts/views/Profile.ts
new file mode 100644
index 0000000..d81aba9
--- /dev/null
+++ b/src/front/static/ts/views/Profile.ts
@@ -0,0 +1,24 @@
+import Aview from "./Aview.ts"
+import { isLogged, navigationManager } from "../main.ts"
+
+export default class extends Aview {
+
+	constructor()
+	{
+		super();
+		if (!isLogged())
+			navigationManager("/login");
+		this.setTitle("profile");
+	}
+
+	async getHTML() {
+		return `
+		<div id="main-window" class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4">
+		</div>
+		`;
+	}
+
+	async run() {
+		const main = document.getElementById("main-window");
+	}
+}

From b6c6564dd33a91851358fb7c8d4edd723abf422a Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Tue, 7 Oct 2025 18:51:43 +0200
Subject: [PATCH 027/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat(src/?=
 =?UTF-8?q?front):=20frontend=20is=20starting=20to=20look=20like=20somethi?=
 =?UTF-8?q?ng=20pogit=20c=20started=20working=20on=20the=20design=20implem?=
 =?UTF-8?q?entation,=20still=20a=20lot=20to=20do?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/index.html                      |  18 +++++----
 src/front/static/assets/fonts/Kubasta.otf | Bin 0 -> 101140 bytes
 src/front/static/assets/fonts/Kubasta.ttf | Bin 0 -> 150820 bytes
 src/front/static/css/style.css            |  47 ++++++++++++++++++++--
 src/front/static/ts/main.ts               |   2 +-
 src/front/static/ts/views/Game.ts         |  44 ++++++++++++++------
 src/front/static/ts/views/MainMenu.ts     |  22 +++++++---
 src/front/static/ts/views/PongMenu.ts     |  28 ++++++++-----
 src/front/static/ts/views/Profile.ts      |  25 ++++++++++++
 9 files changed, 148 insertions(+), 38 deletions(-)
 create mode 100644 src/front/static/assets/fonts/Kubasta.otf
 create mode 100644 src/front/static/assets/fonts/Kubasta.ttf

diff --git a/src/front/index.html b/src/front/index.html
index 0e7465d..97d50d2 100644
--- a/src/front/index.html
+++ b/src/front/index.html
@@ -11,17 +11,21 @@
 
 
 
-	<body class="bg-gray-100 dark:bg-neutral-900 h-screen flex flex-col">
-		<!--script src="https://kanel.ovh/oneko.js"></script-->
-
-		<nav class="bg-white dark:bg-neutral-800 mx-8 rounded-b-xl shadow-md px-4 sm:px-6 lg:px-8 flex justify-end h-16 items-center space-x-6 m-">
-			<a class="text-neutral-900 hover:text-neutral-700 dark:text-white dark:hover:text-neutral-400" href="/" data-link>home</a>
-			<a id="profile-button" class="text-neutral-900 hover:text-neutral-700 dark:text-white dark:hover:text-neutral-400" href="/login" data-link>login</a>
-		</nav>
+	<!--body class="bg-gray-100 dark:bg-neutral-950 h-screen flex flex-col"-->
+	<body class="bg-neutral-950 dark:bg-[url(https://api.kanel.ovh/random)] bg-center bg-cover h-screen flex flex-col">
+		<script src="https://kanel.ovh/oneko.js"></script>
 
 		<div id="app" class="flex-1 flex items-center justify-center">
 		</div>
 
+		<div class="border-t-2 border-neutral-300 dark:border-neutral-800 sticky bottom-0">
+			<nav class="bg-neutral-200 dark:bg-neutral-900 shadow-md border-t-2 border-neutral-400 dark:border-neutral-700 px-4 sm:px-6 lg:px-8 flex justify-start h-12 items-center space-x-6 font-[Kubasta]">
+			<a id="profile-button" class="text-neutral-900 hover:text-neutral-700 dark:text-white dark:hover:text-neutral-400" href="/login" data-link>login</a>
+			<a class="text-neutral-900 hover:text-neutral-700 dark:text-white dark:hover:text-neutral-400" href="/" data-link>home</a>
+		</nav>
+		</div>
+
+
 		<script type="module" src="/static/ts/main.ts"></script>
 	</body>
 </html>
diff --git a/src/front/static/assets/fonts/Kubasta.otf b/src/front/static/assets/fonts/Kubasta.otf
new file mode 100644
index 0000000000000000000000000000000000000000..06001b2b826afb47063858481a99ed680dcac5f9
GIT binary patch
literal 101140
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

literal 0
HcmV?d00001

diff --git a/src/front/static/assets/fonts/Kubasta.ttf b/src/front/static/assets/fonts/Kubasta.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..18f5b821378a84e2504bdd95f4349f82b662b364
GIT binary patch
literal 150820
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
V{TCfK{X^FLzS3Lh?%ylE{S(xWdG`PS

literal 0
HcmV?d00001

diff --git a/src/front/static/css/style.css b/src/front/static/css/style.css
index 09f3bdb..e189baa 100644
--- a/src/front/static/css/style.css
+++ b/src/front/static/css/style.css
@@ -1,8 +1,49 @@
 @import "tailwindcss";
 
+@font-face {
+  font-family: Kubasta;
+  src: url('../assets/fonts/Kubasta.otf') format("opentype");
+}
+
 @source inline("space-y-{18,46,102,214,438,886,1782,3574,7158,14326,28662,57334,114678,229366,458742,917494}");
 @source inline("mt-{28,56,84,112}");
 
-/*@theme {
-	--color-accent-500: #f55151;
-}*/
+@theme {
+	--shadow-2x1: 2px 2px 0px black;
+	/*
+	--color-kanel-700: #ac5c24;
+	*/
+}
+
+.default-border {
+	@apply border-2
+	border-t-neutral-100 border-l-neutral-100 border-r-neutral-400 border-b-neutral-400
+	dark:border-t-neutral-500 dark:border-l-neutral-500 dark:border-r-neutral-700 dark:border-b-neutral-700
+	;
+}
+
+.reverse-border {
+	@apply border-2
+	border-t-neutral-400 border-l-neutral-400 border-r-neutral-100 border-b-neutral-100
+	dark:border-t-neutral-700 dark:border-l-neutral-700 dark:border-r-neutral-500 dark:border-b-neutral-500
+	;
+}
+
+.input-border {
+	@apply border-2
+	border-t-neutral-950 border-l-neutral-950 border-r-neutral-200 border-b-neutral-200
+	dark:border-t-neutral-950 dark:border-l-neutral-950 dark:border-r-neutral-600 dark:border-b-neutral-600
+	;
+}
+
+.default-button {
+	@apply shadow-2x1
+	bg-neutral-200 hover:bg-neutral-300 active:bg-neutral-300 dark:bg-neutral-800 dark:hover:bg-neutral-700 dark:active:bg-neutral-700
+	text-neutral-900 dark:text-white
+	px-4 py-2
+	delay-0 duration-150 transition-colors
+	
+	border-2 border-t-neutral-100 dark:border-t-neutral-500 border-l-neutral-100 dark:border-l-neutral-500 border-r-neutral-400 dark:border-r-neutral-700 border-b-neutral-400 dark:border-b-neutral-700
+	active:border-t-neutral-400 dark:active:border-t-neutral-700 active:border-l-neutral-400 dark:active:border-l-neutral-700 active:border-r-neutral-100 dark:active:border-r-neutral-500 active:border-b-neutral-100 dark:active:border-b-neutral-500
+	;
+}
diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index 0443d91..8c58b42 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -18,7 +18,7 @@ export async function isLogged(): boolean {
 		button_dropdown.classList.add("text-neutral-900", "group-hover:text-neutral-700", "dark:text-white", "dark:group-hover:text-neutral-400");
 
 		const menu_div = dropdown.appendChild(document.createElement("div"));
-		menu_div.classList.add("float:right", "hidden", "absolute", "right-0", "bg-[#f9f9f9]",  "min-w-[160px]", "shadow-lg", "z-10",  "group-hover:block");
+		menu_div.classList.add("float:right", "hidden", "absolute", "left-0", "bottom-full", "dark:bg-neutral-800", "dark:text-white", "min-w-[160px]", "shadow-lg", "z-10", "group-hover:block");
 
 		const profile_a = menu_div.appendChild(document.createElement("a"));
 		const settings_a = menu_div.appendChild(document.createElement("a"));
diff --git a/src/front/static/ts/views/Game.ts b/src/front/static/ts/views/Game.ts
index 5988cc4..36cf348 100644
--- a/src/front/static/ts/views/Game.ts
+++ b/src/front/static/ts/views/Game.ts
@@ -14,19 +14,30 @@ export default class extends Aview {
 
 	async getHTML() {
 		return `
-			<div id="main-div" class="text-center p-5 bg-white rounded-xl shadow">
+		<div class="default-border">
+			<div class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
+				<span class="font-[Kubasta]">knl_meowscendence</span>
+				<div>
+					<button> - </button>
+					<button> □ </button>
+					<a href="/" data-link> × </a>
+				</div>
+			</div>
+
+				
+			<div id="main-div" class="bg-neutral-200 dark:bg-neutral-800 text-center p-10 space-y-4 reverse-border">
 				<div id="player-inputs" class="flex flex-col space-y-4">
 					<div class="flex flex-row">
-						<input type="text" id="player1" placeholder="Player 1" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 mr-2 focus:outline-none focus:ring-2 focus:ring-blue-500" required></input>
-						<input type="text" id="player2" placeholder="Player 2" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 ml-2 focus:outline-none focus:ring-2 focus:ring-blue-500" required></input>
+						<span class="reverse-border w-full ml-2"><input type="text" id="player1" placeholder="Player 1" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input></span>
+						<span class="reverse-border w-full ml-2"><input type="text" id="player2" placeholder="Player 2" class="bg-white text-neutral-900 px-4 py-2 w-full input-border" required></input></span>
 					</div>
-					<button id="game-start" class="bg-blue-600 text-white hover:bg-blue-500 w-full py-2 rounded-md transition-colors">play</button>
+					<button id="game-start" class="default-button">play</button>
 				</div>
 				<div id="game-buttons" class="hidden flex mt-4">
 					<button id="game-retry" class="bg-blue-600 text-white hover:bg-blue-500 w-full mx-4 py-2 rounded-md transition-colors">play again</button>
 					<a id="game-back" class="bg-gray-600 text-white hover:bg-gray-500 w-full mx-4 py-2 rounded-md transition-colors" href="/pong" data-link>back</a>
-				</div>
 			</div>
+		</div>
 		`;
 	}
 
@@ -153,6 +164,13 @@ export default class extends Aview {
 			ctx.fillStyle = "black";
 			ctx.fillRect(0, 0, canvas.width, canvas.height);
 
+			ctx.strokeStyle = "white";
+			ctx.beginPath();
+			ctx.setLineDash([5, 10]);
+			ctx.moveTo(canvas.width / 2, 0);
+			ctx.lineTo(canvas.width / 2, canvas.height);
+			ctx.stroke();
+
 			ctx.fillStyle = "white";
 			ctx.fillRect(paddleOffset, leftPaddleY, paddleWidth, paddleHeight);
 			ctx.fillRect(canvas.width - paddleWidth - paddleOffset, rightPaddleY, paddleWidth, paddleHeight);
@@ -161,13 +179,15 @@ export default class extends Aview {
 			if (game_playing)
 				ctx.fillRect(ballX, ballY, ballSize, ballSize);
 
-			ctx.font = "24px sans-serif";
-			let text_score = `${p1_name} ${p1_score} - ${p2_score} ${p2_name}`;
-			ctx.fillText(text_score, canvas.width / 2 - (ctx.measureText(text_score).width / 2), 30);
+			ctx.font = "24px Kubasta";
+			let text_score = `${p1_score} - ${p2_score}`;
+			ctx.fillText(text_score, canvas.width / 2 - (ctx.measureText(text_score).width / 2), 25);
+			ctx.fillText(p1_name, canvas.width / 4 - (ctx.measureText(p1_name).width / 2), 45);
+			ctx.fillText(p2_name, (canvas.width / 4 * 3) - (ctx.measureText(p2_name).width / 2), 45);
 
 			if (match_over)
 			{
-				ctx.font = "32px sans-serif";
+				ctx.font = "32px Kubasta";
 				const winner = `${p1_score > p2_score ? p1_name : p2_name} won :D`;
 				ctx.fillText(winner, canvas.width / 2 - (ctx.measureText(winner).width / 2), canvas.height / 2 + 16);
 				document.getElementById("game-buttons").classList.remove("hidden");
@@ -184,12 +204,12 @@ export default class extends Aview {
 					countdown--;
 					countdownTimer = now;
 				}
-				ctx.font = "48px sans-serif";
+				ctx.font = "48px Kubasta";
 				ctx.fillText(countdown.toString(), canvas.width / 2 - 10, canvas.height / 2 + 24);
 			}
 			else if (countdown === 0)
 			{
-				ctx.font = "48px sans-serif";
+				ctx.font = "48px Kubasta";
 				ctx.fillText("Go!", canvas.width / 2 - 30, canvas.height / 2 + 24);
 				setTimeout(() => {
 					game_playing = true;
@@ -240,7 +260,7 @@ export default class extends Aview {
 
 			canvas = document.createElement("canvas");
 			canvas.id = "gameCanvas";
-			canvas.classList.add("rounded-md");
+			canvas.classList.add("reverse-border");
 
 			document.getElementById("main-div").prepend(canvas);
 
diff --git a/src/front/static/ts/views/MainMenu.ts b/src/front/static/ts/views/MainMenu.ts
index ce2946f..d6d70d8 100644
--- a/src/front/static/ts/views/MainMenu.ts
+++ b/src/front/static/ts/views/MainMenu.ts
@@ -9,13 +9,23 @@ export default class extends Aview {
 	}
 
 	async getHTML() {
+		// <div class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4"-->
 		return `
-		<div class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4">
-			<h1 class="text-4xl font-bold text-blue-800 dark:text-blue-300">knl_meowscendence :D</h1>
-			<p class="text-gray-900 dark:text-white text-lg pb-4">i like pong</p>
-			<a class="bg-blue-600 hover:bg-blue-500 text-white px-4 py-2 rounded transition-colors" href="/pong" data-link>
-				Pong
-			</a>
+		<div class="default-border">
+			<div class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
+				<span class="font-[Kubasta]">knl_meowscendence</span>
+				<div>
+					<button> - </button>
+					<button> □ </button>
+					<a href="/" data-link> × </a>
+				</div>
+			</div>
+			<div class="bg-neutral-200 dark:bg-neutral-800 text-center p-10 space-y-4 reverse-border">
+				<p class="text-gray-900 dark:text-white text-lg pb-4">i like pong</p>
+				<a class="default-button" href="/pong" data-link>
+					Pong
+				</a>
+			</div>
 		</div>
 		`;
 	}
diff --git a/src/front/static/ts/views/PongMenu.ts b/src/front/static/ts/views/PongMenu.ts
index 5b9eee7..91efa38 100644
--- a/src/front/static/ts/views/PongMenu.ts
+++ b/src/front/static/ts/views/PongMenu.ts
@@ -10,15 +10,25 @@ export default class extends Aview {
 
 	async getHTML() {
 		return `
-		<div class="text-center p-12 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4">
-			<p class="text-gray-700 dark:text-white text-3xl font-bold pb-4">pong is funny yay</p>
-			<div class="flex flex-col space-y-4">
-				<a class="bg-red-500 hover:bg-red-400 text-white px-4 py-2 rounded transition-colors" href="/pong/local" data-link>
-					local match
-				</a>
-				<a class="bg-red-500 hover:bg-red-400 text-white px-4 py-2 rounded transition-colors" href="/pong/tournament" data-link>
-					local tournament
-				</a>
+		<div class="default-border">
+			<div class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
+				<span class="font-[Kubasta]">pong_game.ts</span>
+				<div>
+					<button> - </button>
+					<button> □ </button>
+					<a href="/" data-link> × </a>
+				</div>
+			</div>
+			<div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
+				<p class="text-gray-900 dark:text-white text-lg pt-0 pb-4">pong is funny yay</p>
+				<div class="flex flex-col space-y-4">
+					<a class="default-button" href="/pong/local" data-link>
+						local match
+					</a>
+					<a class="default-button" href="/pong/tournament" data-link>
+						local tournament
+					</a>
+				</div>
 			</div>
 		</div>
 		`;
diff --git a/src/front/static/ts/views/Profile.ts b/src/front/static/ts/views/Profile.ts
index d81aba9..16fa93d 100644
--- a/src/front/static/ts/views/Profile.ts
+++ b/src/front/static/ts/views/Profile.ts
@@ -19,6 +19,31 @@ export default class extends Aview {
 	}
 
 	async run() {
+		const uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+		const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
+			method: "GET",
+			credentials: "include",
+		});
+
+		if (userdata_req.status == 404)
+		{
+			console.error("invalid user");
+			return ;
+		}
+
+		let userdata = await userdata_req.json();
+
+		console.log(userdata_req);
+
 		const main = document.getElementById("main-window");
+		const nametag = main.appendChild(document.createElement("span"));
+
+		nametag.innerHTML = `Hiiiiii ${userdata.displayName} ! :D`;
+		nametag.classList.add("text-neutral-900", "dark:text-white");
+
+		const winrate = main.appendChild(document.createElement("div"));
+
+		winrate.innerHTML = `wins: ${userdata.wins} | losses: ${userdata.losses} | winrate: ${userdata.wins / (userdata.wins + userdata.losses)}`;
+		winrate.classList.add("text-neutral-900", "dark:text-white");
 	}
 }

From dfb2541267e492e32dd5727f4162e68ff122d19a Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Tue, 7 Oct 2025 20:29:49 +0200
Subject: [PATCH 028/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip(scoreStore):=20simingly=20working=20api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/scoreStore/addTx.js      | 9 ++++-----
 src/utils/scoreStore_contract.js | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/api/scoreStore/addTx.js b/src/api/scoreStore/addTx.js
index 413086b..e9682fa 100644
--- a/src/api/scoreStore/addTx.js
+++ b/src/api/scoreStore/addTx.js
@@ -9,12 +9,11 @@ import { callAddScore, callLastId } from "../../utils/scoreStore_contract.js";
  */
 export async function addTx(request, reply, fastify) {
 	try {
-		const id = await callLastId();
-		const tx = callAddScore(request.body.p1, request.body.p2, request.body.p1Score, request.body.p2Score);
+		const {tx, id} = await callAddScore(request.body.p1, request.body.p2, request.body.p1Score, request.body.p2Score);
 
-		tx.then(tx => {
-			scoreDB.addTx(id, tx.hash);
-		});
+		scoreDB.addTx(id, tx.hash);
+		// tx.then(tx => {
+		// });
 
 		return reply.code(200).send({
 			id: Number(id)
diff --git a/src/utils/scoreStore_contract.js b/src/utils/scoreStore_contract.js
index b8ada16..f3e6ef2 100644
--- a/src/utils/scoreStore_contract.js
+++ b/src/utils/scoreStore_contract.js
@@ -54,8 +54,9 @@ async function callAddScore(p1, p2, p1Score, p2Score) {
 		const tx = await contract.addScore(p1, p2, p1Score, p2Score);
 		console.log('Transaction sent:', tx.hash);
 		await tx.wait(); // Wait for the transaction to be mined
+		const id = await callLastId();
 		console.log('Transaction confirmed');
-		return tx;
+		return { tx, id };
 	} catch (error) {
 		console.error('Error calling addScore function:', error);
 		throw error;

From fd801d267d13a1b34639d7343c05ef96f899a3da Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Tue, 7 Oct 2025 20:39:07 +0200
Subject: [PATCH 029/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20should=20be=20working=20as=20expected?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/scoreStore_contract.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/scoreStore_contract.js b/src/utils/scoreStore_contract.js
index f3e6ef2..d9f626b 100644
--- a/src/utils/scoreStore_contract.js
+++ b/src/utils/scoreStore_contract.js
@@ -29,7 +29,7 @@ async function loadContract() {
 async function callGetScore(id) {
 	try {
 		const contract = await loadContract();
-		const result = await contract.getScore(id);
+		const result = await contract.getScore(id - 1);
 		return result;
 	} catch (error) {
 		console.error('Error calling view function:', error);

From 7d70921297e652e4dbe4554ae1472f55e3a72711 Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Wed, 8 Oct 2025 22:08:03 +0200
Subject: [PATCH 030/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat(src.?=
 =?UTF-8?q?front):=20:D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/index.html                        |  19 +-
 src/front/static/assets/pong.svg            |  17 +
 src/front/static/assets/tetrio.svg          | 114 ++++
 src/front/static/ts/main.ts                 |  23 +-
 src/front/static/ts/oneko.ts                | 273 +++++++++
 src/front/static/ts/views/Game.ts           |  20 +-
 src/front/static/ts/views/LoginPage.ts      |   2 +
 src/front/static/ts/views/MainMenu.ts       |   6 +-
 src/front/static/ts/views/PongMenu.ts       |  12 +-
 src/front/static/ts/views/RegisterPage.ts   |   2 +
 src/front/static/ts/views/Tetris.ts         | 590 ++++++++++++++++++++
 src/front/static/ts/views/TetrisMenu.ts     |  42 ++
 src/front/static/ts/views/TournamentMenu.ts |   2 +
 src/front/static/ts/views/drag.ts           |  43 ++
 14 files changed, 1152 insertions(+), 13 deletions(-)
 create mode 100644 src/front/static/assets/pong.svg
 create mode 100644 src/front/static/assets/tetrio.svg
 create mode 100644 src/front/static/ts/oneko.ts
 create mode 100644 src/front/static/ts/views/Tetris.ts
 create mode 100644 src/front/static/ts/views/TetrisMenu.ts
 create mode 100644 src/front/static/ts/views/drag.ts

diff --git a/src/front/index.html b/src/front/index.html
index 97d50d2..28b2775 100644
--- a/src/front/index.html
+++ b/src/front/index.html
@@ -13,7 +13,24 @@
 
 	<!--body class="bg-gray-100 dark:bg-neutral-950 h-screen flex flex-col"-->
 	<body class="bg-neutral-950 dark:bg-[url(https://api.kanel.ovh/random)] bg-center bg-cover h-screen flex flex-col">
-		<script src="https://kanel.ovh/oneko.js"></script>
+		<!--script src="https://kanel.ovh/oneko.js"></script-->
+		<!--script src="./static/ts/oneko.js"></script-->
+
+		<div class="absolute flex flex-col items-center space-y-5 top-4 left-5">
+			<!--a class="absolute flex flex-col items-center top-4 left-5" href="/pong" data-icon-->
+			<a class="flex flex-col items-center" href="/pong" data-icon>
+				<img src="./static/assets/pong.svg" width=32 height=32 />
+				<span class="text-white font-[Kubasta]">pong_game.ts</span>
+			</a>
+			<a class="flex flex-col items-center" href="/tetris" data-icon>
+				<img src="./static/assets/tetrio.svg" width=32 height=32 />
+				<span class="text-white font-[Kubasta]">tetris_game.ts</span>
+			</a>
+			<a class="flex flex-col items-center" href="https://tetr.io/">
+				<img src="./static/assets/tetrio.svg" width=32 height=32 />
+				<span class="text-white font-[Kubasta]">tetr.io</span>
+			</a>
+		</div>
 
 		<div id="app" class="flex-1 flex items-center justify-center">
 		</div>
diff --git a/src/front/static/assets/pong.svg b/src/front/static/assets/pong.svg
new file mode 100644
index 0000000..6da6f5c
--- /dev/null
+++ b/src/front/static/assets/pong.svg
@@ -0,0 +1,17 @@
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1080 1080" width="1080" height="1080">
+	<defs>
+		<image  width="1080" height="1080" id="img1" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABDgAAAQ4AQMAAADW3v7MAAAAAXNSR0IB2cksfwAAAANQTFRFAAAAp3o92gAAA0hJREFUeJztzjEBACAMwDDm3zTPniiAo1GQOX+Y14HVQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQz3UQxfkswQ5pU9WdQAAAABJRU5ErkJggg=="/>
+		<image  width="97" height="97" id="img2" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGEAAABhAQMAAAD8yF3gAAAAAXNSR0IB2cksfwAAAAZQTFRF////////VXz1bAAAAAJ0Uk5T/v/Rru6GAAAAHUlEQVR4nGOsb2CAg0bGUd4ob5Q3yhvlEctjQAYA62mQYokW47wAAAAASUVORK5CYII="/>
+		<image  width="97" height="97" id="img3" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGEAAABhAQMAAAD8yF3gAAAAAXNSR0IB2cksfwAAAAZQTFRF////////VXz1bAAAAAJ0Uk5T/wDltzBKAAAAHUlEQVR4nGNkQAaMo7xR3ihvpPL+M/xnGuVRwAMA3qIuYqMkUaQAAAAASUVORK5CYII="/>
+		<image  width="97" height="97" id="img4" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGEAAABhAgMAAAC7aCcwAAAAAXNSR0IB2cksfwAAAAlQTFRF////////////jkrl/gAAAAN0Uk5T/v8A1ghndgAAACtJREFUeJxjFHVgwApeM47KjMqMyozKjMqMyozK0FJmFYj6v2ZUZlSGejIAqSynoiv80kgAAAAASUVORK5CYII="/>
+	</defs>
+	<style>
+		.s0 { fill: #ffffff } 
+	</style>
+	<use id="Background" href="#img1" x="0" y="0"/>
+	<path id="Layer 1" fill-rule="evenodd" class="s0" d="m1008 746v97h-937v-97z"/>
+	<path id="Shape 1" fill-rule="evenodd" class="s0" d="m729 459v97h-97v-97z"/>
+	<use id="Shape 1 copy" style="opacity: .7" href="#img2" x="706" y="385"/>
+	<use id="Shape 1 copy 2" style="opacity: .4" href="#img3" x="780" y="311"/>
+	<use id="Shape 1 copy 3" style="opacity: .2" href="#img4" x="854" y="237"/>
+</svg>
\ No newline at end of file
diff --git a/src/front/static/assets/tetrio.svg b/src/front/static/assets/tetrio.svg
new file mode 100644
index 0000000..7965017
--- /dev/null
+++ b/src/front/static/assets/tetrio.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="60mm"
+   height="60mm"
+   viewBox="0 0 60 60"
+   version="1.1"
+   id="svg9638"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="tetrio.svg"
+   inkscape:export-filename="D:\Projects\tetrio\client\res\tetriox256.png"
+   inkscape:export-xdpi="108.37334"
+   inkscape:export-ydpi="108.37334">
+  <defs
+     id="defs9632" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="121.84373"
+     inkscape:cy="101.26992"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1676"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata9635">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-237)">
+    <rect
+       style="opacity:0.07000002;fill:#000000;fill-opacity:1;stroke:none;stroke-width:22.29149818;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect14257"
+       width="55"
+       height="55"
+       x="2.05"
+       y="239.5" />
+    <rect
+       style="opacity:0.07000002;fill:#000000;fill-opacity:1;stroke:none;stroke-width:20.26499748;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect14257-7"
+       width="50"
+       height="50"
+       x="5"
+       y="242" />
+    <rect
+       style="opacity:0.07000002;fill:#0e0b0e;fill-opacity:1;stroke:none;stroke-width:18.23849869;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect14257-7-6"
+       width="45"
+       height="45"
+       x="7.5"
+       y="244.5" />
+    <path
+       style="opacity:1;fill:#df4eaa;fill-opacity:1;stroke:none;stroke-width:20.26499939;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0,237 v 10 h 10 v 10 h 10 v -10 h 10 v -10 z"
+       id="path14118"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <rect
+       style="opacity:1;fill:#c040aa;fill-opacity:1;stroke:none;stroke-width:20.26499939;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect14120"
+       width="10"
+       height="40"
+       x="10"
+       y="257" />
+    <rect
+       style="opacity:1;fill:#7e5fe3;fill-opacity:1;stroke:none;stroke-width:20.26499939;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect14120-0"
+       width="10"
+       height="40"
+       x="20"
+       y="257" />
+    <path
+       style="opacity:1;fill:#2f51aa;fill-opacity:1;stroke:none;stroke-width:20.26499939;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 30,287 H 50 V 277 H 40 V 257 H 30 Z"
+       id="path14118-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="opacity:1;fill:#15919d;fill-opacity:1;stroke:none;stroke-width:20.26499939;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 60,247 H 40 v 10 h 10 v 20 h 10 z"
+       id="path14118-8-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+  </g>
+</svg>
diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index 8c58b42..442be9e 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -1,3 +1,5 @@
+import { oneko } from "./oneko.ts";
+
 export async function isLogged(): boolean {
 	let uuid_req = await fetch("http://localhost:3001/me", {
 		method: "GET",
@@ -82,12 +84,14 @@ const routes = [
 	{ path: "/pong/local", view: () => import("./views/Game.ts") },
 	{ path: "/pong/tournament", view: () => import("./views/TournamentMenu.ts") },
 
+	{ path: "/tetris", view: () => import("./views/TetrisMenu.ts") },
+	{ path: "/tetris/solo", view: () => import("./views/Tetris.ts") },
+	{ path: "/tetris/versus", view: () => import("./views/Tetris.ts") },
+
 	{ path: "/login", view: () => import("./views/LoginPage.ts") },
 	{ path: "/register", view: () => import("./views/RegisterPage.ts") },
 
 	{ path: "/profile", view: () => import("./views/Profile.ts") },
-
-	{ path: "/tetris", view: () => import("./views/Tetris.ts") },
 ];
 
 const router = async () => {
@@ -124,7 +128,22 @@ document.addEventListener("DOMContentLoaded", () => {
 			e.preventDefault();
 			navigationManager(e.target.href);
 		}
+		if (e.target.closest("[data-icon]"))
+		{
+			console.log("xd");
+			e.preventDefault();
+		}
+	});
+
+	document.body.addEventListener("dblclick", e=> {
+		if (e.target.closest("[data-icon]"))
+		{
+			e.preventDefault();
+			navigationManager(e.target.closest("[data-icon]").href);
+		}
 	});
 
 	router();
 });
+
+oneko();
diff --git a/src/front/static/ts/oneko.ts b/src/front/static/ts/oneko.ts
new file mode 100644
index 0000000..9c579d4
--- /dev/null
+++ b/src/front/static/ts/oneko.ts
@@ -0,0 +1,273 @@
+// oneko.js: https://github.com/adryd325/oneko.js
+// edited by yosyo specificely for knl_meowscendence.
+
+let oneko_state: number = 0; // 0 = normal, 1 = pong, 2 = tetris
+let mousePosX: number = 0;
+let mousePosY: number = 0;
+let offsetX: number = 0;
+let offsetY: number = 0;
+
+export function setOnekoState(state: string) {
+	switch (state) {
+		case "pong":
+			oneko_state = 1;
+			break;
+		case "tetris":
+			oneko_state = 2;
+			break;
+		default:
+			oneko_state = 0;
+	}
+}
+
+export function setOnekoOffset() {
+	if (oneko_state == 1)
+	{
+		offsetX = document.getElementById("window").offsetLeft + 44;
+		offsetY = document.getElementById("window").offsetTop + 44 + 24;
+		console.log(offsetX, offsetY);
+	}
+}
+
+export function setBallPos(x: number, y: number) {
+	mousePosX = x + offsetX;
+	mousePosY = y + offsetY;
+}
+
+export function oneko() {
+  const isReducedMotion =
+    window.matchMedia(`(prefers-reduced-motion: reduce)`) === true ||
+    window.matchMedia(`(prefers-reduced-motion: reduce)`).matches === true;
+
+  if (isReducedMotion) return;
+
+  const nekoEl = document.createElement("div");
+
+  let nekoPosX = 256;
+  let nekoPosY = 256;
+
+  let frameCount = 0;
+  let idleTime = 0;
+  let idleAnimation = null;
+  let idleAnimationFrame = 0;
+
+  const nekoSpeed = 10;
+  const spriteSets = {
+    idle: [[-3, -3]],
+    alert: [[-7, -3]],
+    scratchSelf: [
+      [-5, 0],
+      [-6, 0],
+      [-7, 0],
+    ],
+    scratchWallN: [
+      [0, 0],
+      [0, -1],
+    ],
+    scratchWallS: [
+      [-7, -1],
+      [-6, -2],
+    ],
+    scratchWallE: [
+      [-2, -2],
+      [-2, -3],
+    ],
+    scratchWallW: [
+      [-4, 0],
+      [-4, -1],
+    ],
+    tired: [[-3, -2]],
+    sleeping: [
+      [-2, 0],
+      [-2, -1],
+    ],
+    N: [
+      [-1, -2],
+      [-1, -3],
+    ],
+    NE: [
+      [0, -2],
+      [0, -3],
+    ],
+    E: [
+      [-3, 0],
+      [-3, -1],
+    ],
+    SE: [
+      [-5, -1],
+      [-5, -2],
+    ],
+    S: [
+      [-6, -3],
+      [-7, -2],
+    ],
+    SW: [
+      [-5, -3],
+      [-6, -1],
+    ],
+    W: [
+      [-4, -2],
+      [-4, -3],
+    ],
+    NW: [
+      [-1, 0],
+      [-1, -1],
+    ],
+  };
+
+  function init() {
+    nekoEl.id = "oneko";
+    nekoEl.ariaHidden = true;
+    nekoEl.style.width = "32px";
+    nekoEl.style.height = "32px";
+    nekoEl.style.position = "fixed";
+    nekoEl.style.pointerEvents = "none";
+    nekoEl.style.imageRendering = "pixelated";
+    nekoEl.style.left = `${nekoPosX - 16}px`;
+    nekoEl.style.top = `${nekoPosY - 16}px`;
+    nekoEl.style.zIndex = 2147483647;
+
+    let nekoFile = "https://kanel.ovh/assets/oneko.gif"
+    const curScript = document.currentScript
+    if (curScript && curScript.dataset.cat) {
+      nekoFile = curScript.dataset.cat
+    }
+    nekoEl.style.backgroundImage = `url(${nekoFile})`;
+
+    document.body.appendChild(nekoEl);
+
+    document.addEventListener("mousemove", function (event) {
+      if (oneko_state == 0)
+      {
+        mousePosX = event.clientX;
+        mousePosY = event.clientY;
+	  }
+    });
+
+    window.requestAnimationFrame(onAnimationFrame);
+  }
+
+  let lastFrameTimestamp;
+
+  function onAnimationFrame(timestamp) {
+    // Stops execution if the neko element is removed from DOM
+    if (!nekoEl.isConnected) {
+      return;
+    }
+    if (!lastFrameTimestamp) {
+      lastFrameTimestamp = timestamp;
+    }
+    if (timestamp - lastFrameTimestamp > 100) {
+      lastFrameTimestamp = timestamp
+      frame()
+    }
+    window.requestAnimationFrame(onAnimationFrame);
+  }
+
+  function setSprite(name, frame) {
+    const sprite = spriteSets[name][frame % spriteSets[name].length];
+    nekoEl.style.backgroundPosition = `${sprite[0] * 32}px ${sprite[1] * 32}px`;
+  }
+
+  function resetIdleAnimation() {
+    idleAnimation = null;
+    idleAnimationFrame = 0;
+  }
+
+  function idle() {
+    idleTime += 1;
+
+    // every ~ 20 seconds
+    if (
+      idleTime > 10 &&
+      Math.floor(Math.random() * 200) == 0 &&
+      idleAnimation == null
+    ) {
+      let avalibleIdleAnimations = ["sleeping", "scratchSelf"];
+      if (nekoPosX < 32) {
+        avalibleIdleAnimations.push("scratchWallW");
+      }
+      if (nekoPosY < 32) {
+        avalibleIdleAnimations.push("scratchWallN");
+      }
+      if (nekoPosX > window.innerWidth - 32) {
+        avalibleIdleAnimations.push("scratchWallE");
+      }
+      if (nekoPosY > window.innerHeight - 32) {
+        avalibleIdleAnimations.push("scratchWallS");
+      }
+      idleAnimation =
+        avalibleIdleAnimations[
+          Math.floor(Math.random() * avalibleIdleAnimations.length)
+        ];
+    }
+
+    switch (idleAnimation) {
+      case "sleeping":
+        if (idleAnimationFrame < 8) {
+          setSprite("tired", 0);
+          break;
+        }
+        setSprite("sleeping", Math.floor(idleAnimationFrame / 4));
+        if (idleAnimationFrame > 192) {
+          resetIdleAnimation();
+        }
+        break;
+      case "scratchWallN":
+      case "scratchWallS":
+      case "scratchWallE":
+      case "scratchWallW":
+      case "scratchSelf":
+        setSprite(idleAnimation, idleAnimationFrame);
+        if (idleAnimationFrame > 9) {
+          resetIdleAnimation();
+        }
+        break;
+      default:
+        setSprite("idle", 0);
+        return;
+    }
+    idleAnimationFrame += 1;
+  }
+
+  function frame() {
+    frameCount += 1;
+    const diffX = nekoPosX - mousePosX;
+    const diffY = nekoPosY - mousePosY;
+    const distance = Math.sqrt(diffX ** 2 + diffY ** 2);
+
+    if (distance < nekoSpeed || distance < 48) {
+      idle();
+      return;
+    }
+
+    idleAnimation = null;
+    idleAnimationFrame = 0;
+
+    if (idleTime > 1) {
+      setSprite("alert", 0);
+      // count down after being alerted before moving
+      idleTime = Math.min(idleTime, 7);
+      idleTime -= 1;
+      return;
+    }
+
+    let direction;
+    direction = diffY / distance > 0.5 ? "N" : "";
+    direction += diffY / distance < -0.5 ? "S" : "";
+    direction += diffX / distance > 0.5 ? "W" : "";
+    direction += diffX / distance < -0.5 ? "E" : "";
+    setSprite(direction, frameCount);
+
+    nekoPosX -= (diffX / distance) * nekoSpeed;
+    nekoPosY -= (diffY / distance) * nekoSpeed;
+
+    nekoPosX = Math.min(Math.max(16, nekoPosX), window.innerWidth - 16);
+    nekoPosY = Math.min(Math.max(16, nekoPosY), window.innerHeight - 16);
+
+    nekoEl.style.left = `${nekoPosX - 16}px`;
+    nekoEl.style.top = `${nekoPosY - 16}px`;
+  }
+
+  init();
+}
diff --git a/src/front/static/ts/views/Game.ts b/src/front/static/ts/views/Game.ts
index 36cf348..2b73777 100644
--- a/src/front/static/ts/views/Game.ts
+++ b/src/front/static/ts/views/Game.ts
@@ -1,5 +1,7 @@
 import Aview from "./Aview.ts"
 import { isLogged } from "../main.js"
+import { dragElement } from "./drag.js"
+import { setOnekoState, setBallPos, setOnekoOffset } from "../oneko.ts"
 
 export default class extends Aview {
 	
@@ -10,13 +12,14 @@ export default class extends Aview {
 		super();
 		this.setTitle("pong (local match)");
 		this.running = true;
+		setOnekoState("default");
 	}
 
 	async getHTML() {
 		return `
-		<div class="default-border">
-			<div class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
-				<span class="font-[Kubasta]">knl_meowscendence</span>
+		<div id="window" class="absolute default-border">
+			<div id="window-header" class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
+				<span class="font-[Kubasta]">pong_game.ts</span>
 				<div>
 					<button> - </button>
 					<button> □ </button>
@@ -34,14 +37,16 @@ export default class extends Aview {
 					<button id="game-start" class="default-button">play</button>
 				</div>
 				<div id="game-buttons" class="hidden flex mt-4">
-					<button id="game-retry" class="bg-blue-600 text-white hover:bg-blue-500 w-full mx-4 py-2 rounded-md transition-colors">play again</button>
-					<a id="game-back" class="bg-gray-600 text-white hover:bg-gray-500 w-full mx-4 py-2 rounded-md transition-colors" href="/pong" data-link>back</a>
+					<button id="game-retry" class="default-button w-full mx-4 py-2">play again</button>
+					<a id="game-back" class="default-button w-full mx-4 py-2" href="/pong" data-link>back</a>
 			</div>
 		</div>
 		`;
 	}
 
 	async run() {
+		dragElement(document.getElementById("window"));
+
 		let start: number = 0;
 		let elapsed: number;
 
@@ -128,6 +133,7 @@ export default class extends Aview {
 			// scoring
 			if (ballX < 0 || ballX > canvas.width - ballSize)
 			{
+				setOnekoState("default");
 				game_playing = false;
 				if (ballX < 0)
 					p2_score++;
@@ -158,6 +164,7 @@ export default class extends Aview {
 				leftPaddleY = canvas.height / 2 - paddleHeight / 2;
 				rightPaddleY = canvas.height / 2 - paddleHeight / 2;
 			}
+			setBallPos(ballX, ballY);
 		}
 
 		function draw() {
@@ -235,6 +242,7 @@ export default class extends Aview {
 
 
 		document.getElementById("game-retry")?.addEventListener("click", () => {
+			setOnekoState("pong");
 			document.getElementById("game-buttons").classList.add("hidden");
 			game_playing = false;
 			match_over = false;
@@ -273,6 +281,8 @@ export default class extends Aview {
 			ballX = canvas.width / 2;
 			ballY = canvas.height / 2;
 
+			setOnekoState("pong");
+			setOnekoOffset();
 			requestAnimationFrame(gameLoop);
 		});
 	}
diff --git a/src/front/static/ts/views/LoginPage.ts b/src/front/static/ts/views/LoginPage.ts
index 7b069c6..bf30229 100644
--- a/src/front/static/ts/views/LoginPage.ts
+++ b/src/front/static/ts/views/LoginPage.ts
@@ -1,4 +1,5 @@
 import Aview from "./Aview.ts"
+import { setOnekoState } from "../oneko.ts"
 import { isLogged, navigationManager } from "../main.ts"
 
 export default class extends Aview {
@@ -7,6 +8,7 @@ export default class extends Aview {
 	{
 		super();
 		this.setTitle("login");
+		setOnekoState("default");
 	}
 
 	async getHTML() {
diff --git a/src/front/static/ts/views/MainMenu.ts b/src/front/static/ts/views/MainMenu.ts
index d6d70d8..6451c2d 100644
--- a/src/front/static/ts/views/MainMenu.ts
+++ b/src/front/static/ts/views/MainMenu.ts
@@ -1,4 +1,5 @@
 import Aview from "./Aview.ts"
+import { setOnekoState } from "../oneko.ts"
 
 export default class extends Aview {
 
@@ -6,12 +7,13 @@ export default class extends Aview {
 	{
 		super();
 		this.setTitle("knl is trans(cendence)");
+		setOnekoState("default");
 	}
 
 	async getHTML() {
 		// <div class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4"-->
 		return `
-		<div class="default-border">
+		<!--div class="default-border">
 			<div class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
 				<span class="font-[Kubasta]">knl_meowscendence</span>
 				<div>
@@ -26,7 +28,7 @@ export default class extends Aview {
 					Pong
 				</a>
 			</div>
-		</div>
+		</div-->
 		`;
 	}
 }
diff --git a/src/front/static/ts/views/PongMenu.ts b/src/front/static/ts/views/PongMenu.ts
index 91efa38..e7b3bc0 100644
--- a/src/front/static/ts/views/PongMenu.ts
+++ b/src/front/static/ts/views/PongMenu.ts
@@ -1,4 +1,6 @@
 import Aview from "./Aview.ts"
+import { dragElement } from "./drag.js"
+import { setOnekoState } from "../oneko.ts"
 
 export default class extends Aview {
 
@@ -6,12 +8,13 @@ export default class extends Aview {
 	{
 		super();
 		this.setTitle("knl is trans(cendence)");
+		setOnekoState("default");
 	}
 
 	async getHTML() {
 		return `
-		<div class="default-border">
-			<div class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
+		<div id="window" class="absolute default-border">
+			<div id="window-header" class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
 				<span class="font-[Kubasta]">pong_game.ts</span>
 				<div>
 					<button> - </button>
@@ -20,7 +23,7 @@ export default class extends Aview {
 				</div>
 			</div>
 			<div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
-				<p class="text-gray-900 dark:text-white text-lg pt-0 pb-4">pong is funny yay</p>
+				<p class="text-gray-900 dark:text-white text-lg pt-0 pb-4">welcome to pong!! Oo</p>
 				<div class="flex flex-col space-y-4">
 					<a class="default-button" href="/pong/local" data-link>
 						local match
@@ -33,4 +36,7 @@ export default class extends Aview {
 		</div>
 		`;
 	}
+	async run() {
+		dragElement(document.getElementById("window"));
+	}
 }
diff --git a/src/front/static/ts/views/RegisterPage.ts b/src/front/static/ts/views/RegisterPage.ts
index 96f0d69..ab30708 100644
--- a/src/front/static/ts/views/RegisterPage.ts
+++ b/src/front/static/ts/views/RegisterPage.ts
@@ -1,4 +1,5 @@
 import Aview from "./Aview.ts"
+import { setOnekoState } from "../oneko.ts"
 import { isLogged, navigationManager } from "../main.ts"
 
 export default class extends Aview {
@@ -7,6 +8,7 @@ export default class extends Aview {
 	{
 		super();
 		this.setTitle("register");
+		setOnekoState("default");
 	}
 
 	async getHTML() {
diff --git a/src/front/static/ts/views/Tetris.ts b/src/front/static/ts/views/Tetris.ts
new file mode 100644
index 0000000..47bc4b3
--- /dev/null
+++ b/src/front/static/ts/views/Tetris.ts
@@ -0,0 +1,590 @@
+import Aview from "./Aview.ts"
+
+export default class extends Aview {
+
+	running: boolean;
+
+	constructor()
+	{
+		super();
+		this.setTitle("tetris (local match)");
+		this.running = true;
+	}
+
+	async getHTML() {
+		return `
+		<div id="window" class="absolute default-border">
+			<div id="window-header" class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
+				<span class="font-[Kubasta]">pong_game.ts</span>
+				<div>
+					<button> - </button>
+					<button> □ </button>
+					<a href="/" data-link> × </a>
+				</div>
+			</div>
+
+				
+			<div id="main-div" class="bg-neutral-200 dark:bg-neutral-800 text-center p-10 space-y-4 reverse-border">
+				<canvas id="board" class="reverse-border" width="300" height="600"></canvas>
+				<div id="game-buttons" class="hidden flex">
+					<button id="game-retry" class="default-button">play again</button>
+					<a id="game-back" class="default-button" href="/tetris" data-link>back</a>
+				</div>
+			</div>
+		</div>
+		`;
+	}
+
+	async run() {
+		const COLS = 10;
+		const ROWS = 20;
+		const BLOCK = 30; // pixels per block
+
+		type Cell = number; // 0 empty, >0 occupied (color index)
+
+		// Tetromino definitions: each piece is an array of rotations, each rotation is a 2D matrix
+		const TETROMINOES: { [key: string]: number[][][] } = {
+			I: [
+				[[0,0,0,0]
+				,[1,1,1,1]
+				,[0,0,0,0]
+				,[0,0,0,0]],
+
+				[[0,0,1,0]
+				,[0,0,1,0]
+				,[0,0,1,0]
+				,[0,0,1,0]],
+
+				[[0,0,0,0]
+				,[0,0,0,0]
+				,[1,1,1,1]
+				,[0,0,0,0]],
+
+				[[0,1,0,0]
+				,[0,1,0,0]
+				,[0,1,0,0]
+				,[0,1,0,0]],
+			],
+			J: [
+				[[2,0,0]
+				,[2,2,2]
+				,[0,0,0]],
+
+				[[0,2,2]
+				,[0,2,0]
+				,[0,2,0]],
+
+				[[0,0,0]
+				,[2,2,2]
+				,[0,0,2]],
+
+				[[0,2,0]
+				,[0,2,0]
+				,[2,2,0]],
+			],
+			L: [
+				[[0,0,3]
+				,[3,3,3]
+				,[0,0,0]],
+
+				[[0,3,0]
+				,[0,3,0]
+				,[0,3,3]],
+
+				[[0,0,0]
+				,[3,3,3]
+				,[3,0,0]],
+
+				[[3,3,0]
+				,[0,3,0]
+				,[0,3,0]],
+			],
+			O: [
+				[[4,4]
+				,[4,4]],
+			],
+			S: [
+				[[0,5,5]
+				,[5,5,0]
+				,[0,0,0]],
+
+				[[0,5,0]
+				,[0,5,5]
+				,[0,0,5]],
+
+				[[0,0,0]
+				,[0,5,5]
+				,[5,5,0]],
+
+				[[5,0,0]
+				,[5,5,0]
+				,[0,5,0]],
+
+			],
+			T: [
+				[[0,6,0]
+				,[6,6,6]
+				,[0,0,0]],
+
+				[[0,6,0]
+				,[0,6,6]
+				,[0,6,0]],
+
+				[[0,0,0]
+				,[6,6,6]
+				,[0,6,0]],
+
+				[[0,6,0]
+				,[6,6,0]
+				,[0,6,0]],
+			],
+			Z: [
+				[[7,7,0]
+				,[0,7,7]
+				,[0,0,0]],
+
+				[[0,0,7]
+				,[0,7,7]
+				,[0,7,0]],
+
+				[[0,0,0]
+				,[7,7,0]
+				,[0,7,7]],
+
+				[[0,7,0]
+				,[7,7,0]
+				,[7,0,0]],
+			],
+		};
+
+		const COLORS = [
+			'#000000', // placeholder for 0
+			'#00ffff', // I - cyan
+			'#0000ff', // J - blue
+			'#ff7f00', // L - orange
+			'#ffff00', // O - yellow
+			'#00ff00', // S - green
+			'#800080', // T - purple
+			'#ff0000', // Z - red
+		];
+
+		class Piece {
+			shape: number[][];
+			rotations: number[][][];
+			rotationIndex: number;
+			x: number;
+			y: number;
+			colorIndex: number;
+
+			constructor(public type: string) {
+				this.rotations = TETROMINOES[type];
+				this.rotationIndex = 0;
+				this.shape = this.rotations[this.rotationIndex];
+				this.colorIndex = this.findColorIndex();
+
+				this.x = Math.floor((COLS - this.shape[0].length) / 2);
+				this.y = -2; //start on tiles 21 and 22
+			}
+
+			findColorIndex() {
+				for (const row of this.shape)
+					for (const v of row)
+						if (v)
+							return v;
+				return 1;
+			}
+
+			rotateCW() {
+				this.rotationIndex = (this.rotationIndex + 1) % this.rotations.length;
+				this.shape = this.rotations[this.rotationIndex];
+			}
+
+			rotateCCW() {
+				this.rotationIndex = (this.rotationIndex - 1 + this.rotations.length) % this.rotations.length;
+				this.shape = this.rotations[this.rotationIndex];
+			}
+
+			getCells(): { x: number; y: number; val: number }[] {
+				const cells: { x: number; y: number; val: number }[] = [];
+
+				for (let r = 0; r < this.shape.length; r++)
+				{
+					for (let c = 0; c < this.shape[r].length; c++)
+					{
+						const val = this.shape[r][c];
+						if (val)
+							cells.push({ x: this.x + c, y: this.y + r, val });
+					}
+				}
+				return cells;
+			}
+		}
+
+		class Game {
+			board: Cell[][];
+			canvas: HTMLCanvasElement;
+			ctx: CanvasRenderingContext2D;
+			piece: Piece | null = null;
+			holdPiece: Piece | null = null;
+			canHold: boolean = true;
+			nextQueue: string[] = [];
+			score = 0;
+			level = 1;
+			lines = 0;
+			dropInterval = 1000;
+			lastDrop = 0;
+			isGameOver = false;
+			isPaused = false;
+
+			constructor(canvasId: string) {
+				const el = document.getElementById(canvasId);
+				this.canvas = el;
+				this.canvas.width = COLS * BLOCK;
+				this.canvas.height = ROWS * BLOCK;
+				const ctx = this.canvas.getContext('2d');
+				if (!ctx)
+					throw new Error('2D context not available');
+				this.ctx = ctx;
+
+				this.board = this.createEmptyBoard();
+				this.fillBag();
+
+				this.spawnPiece();
+				this.registerListeners();
+				requestAnimationFrame(this.loop.bind(this));
+			}
+
+			createEmptyBoard(): Cell[][] {
+				const b: Cell[][] = [];
+				for (let r = 0; r < ROWS; r++)
+				{
+					const row: Cell[] = new Array(COLS).fill(0);
+					b.push(row);
+				}
+				return b;
+			}
+
+			fillBag() {
+				// classic 7-bag randomizer
+				const pieces = Object.keys(TETROMINOES);
+				const bag = [...pieces];
+				for (let i = bag.length - 1; i > 0; i--)
+				{
+					const j = Math.floor(Math.random() * (i + 1));
+					[bag[i], bag[j]] = [bag[j], bag[i]];
+				}
+				this.nextQueue.push(...bag);
+			}
+
+			hold() {
+				if (!this.canHold)
+					return;
+
+				[this.piece, this.holdPiece] = [this.holdPiece, this.piece];
+				if (!this.piece)
+					this.spawnPiece();
+
+				this.piece.x = Math.floor((COLS - this.piece.shape[0].length) / 2);
+				this.piece.y = -2;
+
+				this.canHold = false;
+			}
+
+			spawnPiece() {
+				this.canHold = true;
+				if (this.nextQueue.length < 7)
+					this.fillBag();
+				const type = this.nextQueue.shift()!;
+				this.piece = new Piece(type);
+				// If spawn collides immediately -> game over
+				if (this.collides(this.piece))
+				{
+					this.isGameOver = true;
+				}
+			}
+
+			collides(piece: Piece): boolean {
+				for (const cell of piece.getCells())
+					{
+					if (cell.y >= ROWS)
+						return true;
+					if (cell.x < 0 || cell.x >= COLS)
+						return true;
+					if (cell.y >= 0 && this.board[cell.y][cell.x])
+						return true;
+				}
+				return false;
+			}
+
+			lockPiece() {
+				if (!this.piece)
+					return;
+				for (const cell of this.piece.getCells())
+					if (cell.y >= 0 && cell.y < ROWS && cell.x >= 0 && cell.x < COLS)
+						this.board[cell.y][cell.x] = cell.val;
+				this.clearLines();
+				this.spawnPiece();
+			}
+
+			clearLines() {
+				let linesCleared = 0;
+				outer: for (let r = ROWS - 1; r >= 0; r--)
+				{
+					for (let c = 0; c < COLS; c++)
+						if (!this.board[r][c])
+							continue outer;
+
+					this.board.splice(r, 1);
+					this.board.unshift(new Array(COLS).fill(0));
+					linesCleared++;
+					r++;
+				}
+
+				if (linesCleared > 0)
+				{
+					this.lines += linesCleared;
+					// scoring like classic tetris
+					const points = [0, 40, 100, 300, 1200];
+					this.score += (points[linesCleared] || 0) * this.level;
+					// level up every 10 lines (Fixed Goal System)
+					const newLevel = Math.floor(this.lines / 10) + 1;
+					if (newLevel > this.level)
+					{
+						this.level = newLevel;
+						this.dropInterval = Math.max(100, 1000 - (this.level - 1) * 75);
+					}
+				}
+			}
+
+			rotatePiece(dir: 'cw' | 'ccw') {
+				if (!this.piece)
+					return;
+				// Try rotation with wall kicks
+				const originalIndex = this.piece.rotationIndex;
+				if (dir === 'cw')
+					this.piece.rotateCW();
+				else
+					this.piece.rotateCCW();
+				const kicks = [0, -1, 1, -2, 2];
+				for (const k of kicks) {
+					this.piece.x += k;
+					if (!this.collides(this.piece))
+						return;
+					this.piece.x -= k;
+				}
+				// no valid kick, revert
+				this.piece.rotationIndex = originalIndex;
+				this.piece.shape = this.piece.rotations[originalIndex];
+			}
+
+			movePiece(dx: number, dy: number) {
+				if (!this.piece)
+					return;
+				this.piece.x += dx;
+				this.piece.y += dy;
+				if (this.collides(this.piece))
+				{
+					this.piece.x -= dx;
+					this.piece.y -= dy;
+					return false;
+				}
+				return true;
+			}
+
+			hardDrop() {
+				if (!this.piece)
+					return;
+				let dropped = 0;
+				while (this.movePiece(0, 1))
+					dropped++;
+				this.score += dropped * 2;
+				this.lockPiece();
+			}
+
+			softDrop() {
+				if (!this.piece)
+					return;
+				if (!this.movePiece(0, 1))
+					return;
+					//this.lockPiece();
+				else
+					this.score += 1;
+			}
+
+			registerListeners() {
+				window.addEventListener('keydown', (e) => {
+					if (this.isGameOver) return;
+					if (e.key === 'ArrowLeft')
+						this.movePiece(-1, 0);
+					else if (e.key === 'ArrowRight')
+						this.movePiece(1, 0);
+					else if (e.key === 'ArrowDown')
+						this.softDrop();
+					else if (e.code === 'Space')
+					{
+						e.preventDefault();
+						this.hardDrop();
+					}
+					else if (e.code === 'ShiftLeft')
+					{
+						e.preventDefault();
+						this.hold();
+					}
+					else if (e.key === 'x' || e.key === 'X' || e.key === 'ArrowUp')
+						this.rotatePiece('cw');
+					else if (e.key === 'z' || e.key === 'Z' || e.code === 'ControlLeft')
+						this.rotatePiece('ccw');
+					else if (e.key === 'p' || e.key === 'P' || e.key === 'Escape')
+						this.isPaused = !this.isPaused;
+				});
+			}
+
+			loop(timestamp: number)
+			{
+				if (!this.lastDrop)
+					this.lastDrop = timestamp;
+				if (!this.isPaused && !this.isGameOver)
+				{
+					if (timestamp - this.lastDrop > this.dropInterval)
+					{
+						if (!this.movePiece(0, 1))
+							this.lockPiece();
+						this.lastDrop = timestamp;
+					}
+				}
+				this.draw();
+				requestAnimationFrame(this.loop.bind(this));
+			}
+
+			drawGrid() {
+				const ctx = this.ctx;
+				ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
+				ctx.strokeStyle = '#222';
+				for (let r = 0; r <= ROWS; r++)
+				{
+					// horizontal lines
+					ctx.beginPath();
+					ctx.moveTo(0, r * BLOCK);
+					ctx.lineTo(COLS * BLOCK, r * BLOCK);
+					ctx.stroke();
+				}
+				for (let c = 0; c <= COLS; c++)
+				{
+					ctx.beginPath();
+					ctx.moveTo(c * BLOCK, 0);
+					ctx.lineTo(c * BLOCK, ROWS * BLOCK);
+					ctx.stroke();
+				}
+			}
+
+			drawBoard() {
+				for (let r = 0; r < ROWS; r++)
+				{
+					for (let c = 0; c < COLS; c++)
+					{
+						const val = this.board[r][c];
+						if (val)
+							this.fillBlock(c, r, COLORS[val]);
+						else
+							this.clearBlock(c, r);
+					}
+				}
+			}
+
+			drawPiece() {
+				if (!this.piece)
+					return;
+				for (const cell of this.piece.getCells())
+					if (cell.y >= 0)
+						this.fillBlock(cell.x, cell.y, COLORS[cell.val]);
+			}
+
+			fillBlock(x: number, y: number, color: string) {
+				const ctx = this.ctx;
+				ctx.fillStyle = color;
+				ctx.fillRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
+				/*ctx.strokeStyle = '#111';
+				ctx.strokeRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);*/
+			}
+
+			clearBlock(x: number, y: number) {
+				const ctx = this.ctx;
+				ctx.clearRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
+			}
+
+			drawHUD() {
+				const ctx = this.ctx;
+				ctx.fillStyle = 'rgba(0,0,0,0.6)';
+				ctx.fillRect(4, 4, 120, 60);
+				ctx.fillStyle = '#fff';
+				ctx.font = '12px Kubasta';
+				ctx.fillText(`Score: ${this.score}`, 8, 20);
+				ctx.fillText(`Lines: ${this.lines}`, 8, 36);
+				ctx.fillText(`Level: ${this.level}`, 8, 52);
+
+				if (this.isPaused)
+				{
+					ctx.fillStyle = 'rgba(0,0,0,0.7)';
+					ctx.fillRect(0, (this.canvas.height / 2) - 24, this.canvas.width, 48);
+					ctx.fillStyle = '#fff';
+					ctx.font = '24px Kubasta';
+					ctx.textAlign = 'center';
+					ctx.fillText('PAUSED', this.canvas.width / 2, this.canvas.height / 2 + 8);
+					ctx.textAlign = 'start';
+				}
+
+				if (this.isGameOver)
+				{
+					ctx.fillStyle = 'rgba(0,0,0,0.7)';
+					ctx.fillRect(0, (this.canvas.height / 2) - 36, this.canvas.width, 72);
+					ctx.fillStyle = '#fff';
+					ctx.font = '28px Kubasta';
+					ctx.textAlign = 'center';
+					ctx.fillText('GAME OVER', this.canvas.width / 2, this.canvas.height / 2 + 8);
+					ctx.textAlign = 'start';
+				}
+			}
+
+			draw() {
+				// clear everything
+				this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
+
+				this.ctx.fillStyle = '#000';
+				this.ctx.fillRect(0, 0, this.canvas.width, this.canvas.height);
+
+				this.ctx.strokeStyle = '#111';
+				for (let r = 0; r <= ROWS; r++)
+				{
+					this.ctx.beginPath();
+					this.ctx.moveTo(0, r * BLOCK);
+					this.ctx.lineTo(COLS * BLOCK, r * BLOCK);
+					this.ctx.stroke();
+				}
+				for (let c = 0; c <= COLS; c++)
+				{
+					this.ctx.beginPath();
+					this.ctx.moveTo(c * BLOCK, 0);
+					this.ctx.lineTo(c * BLOCK, ROWS * BLOCK);
+					this.ctx.stroke();
+				}
+
+				this.drawBoard();
+				this.drawPiece();
+				this.drawHUD();
+			}
+		}
+
+		window.addEventListener('load', () => {
+			try {
+				const canvas = document.getElementById('board');
+				if (!canvas) {
+					console.error('D:');
+					return;
+				}
+				const game = new Game('board');
+			} catch (err) {
+				console.error(err);
+			}
+		});
+	}
+}
diff --git a/src/front/static/ts/views/TetrisMenu.ts b/src/front/static/ts/views/TetrisMenu.ts
new file mode 100644
index 0000000..8646f83
--- /dev/null
+++ b/src/front/static/ts/views/TetrisMenu.ts
@@ -0,0 +1,42 @@
+import Aview from "./Aview.ts"
+import { dragElement } from "./drag.js"
+import { setOnekoState } from "../oneko.ts"
+
+export default class extends Aview {
+
+	constructor()
+	{
+		super();
+		this.setTitle("knl is trans(cendence)");
+		setOnekoState("default");
+	}
+
+	async getHTML() {
+		return `
+		<div id="window" class="absolute default-border">
+			<div id="window-header" class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
+				<span class="font-[Kubasta]">tetris_game.ts</span>
+				<div>
+					<button> - </button>
+					<button> □ </button>
+					<a href="/" data-link> × </a>
+				</div>
+			</div>
+			<div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
+				<p class="text-gray-900 dark:text-white text-lg pt-0 pb-4">welcome to tetris! :D</p>
+				<div class="flex flex-col space-y-4">
+					<a class="default-button" href="/tetris/solo" data-link>
+						solo game
+					</a>
+					<a class="default-button" href="/tetris/versus" data-link>
+						versus game
+					</a>
+				</div>
+			</div>
+		</div>
+		`;
+	}
+	async run() {
+		dragElement(document.getElementById("window"));
+	}
+}
diff --git a/src/front/static/ts/views/TournamentMenu.ts b/src/front/static/ts/views/TournamentMenu.ts
index c36b3d7..1f798ae 100644
--- a/src/front/static/ts/views/TournamentMenu.ts
+++ b/src/front/static/ts/views/TournamentMenu.ts
@@ -1,4 +1,5 @@
 import Aview from "./Aview.ts"
+import { setOnekoState, setBallPos } from "../oneko.ts"
 
 export default class extends Aview {
 
@@ -6,6 +7,7 @@ export default class extends Aview {
 	{
 		super();
 		this.setTitle("Tournament");
+		setOnekoState("default");
 	}
 
 	async getHTML() {
diff --git a/src/front/static/ts/views/drag.ts b/src/front/static/ts/views/drag.ts
new file mode 100644
index 0000000..d1d7b32
--- /dev/null
+++ b/src/front/static/ts/views/drag.ts
@@ -0,0 +1,43 @@
+import { setOnekoOffset } from "../oneko.ts";
+
+export function dragElement(el) {
+  var pos1 = 0, pos2 = 0, pos3 = 0, pos4 = 0;
+  if (document.getElementById(el.id + "-header")) {
+    // if present, the header is where you move the DIV from:
+    document.getElementById(el.id + "-header").onmousedown = dragMouseDown;
+  } else {
+    // otherwise, move the DIV from anywhere inside the DIV:
+    el.onmousedown = dragMouseDown;
+  }
+
+  function dragMouseDown(e) {
+    e = e || window.event;
+    e.preventDefault();
+    // get the mouse cursor position at startup:
+    pos3 = e.clientX;
+    pos4 = e.clientY;
+    document.onmouseup = closeDragElement;
+    // call a function whenever the cursor moves:
+    document.onmousemove = elementDrag;
+  }
+
+  function elementDrag(e) {
+    e = e || window.event;
+    e.preventDefault();
+    // calculate the new cursor position:
+    pos1 = pos3 - e.clientX;
+    pos2 = pos4 - e.clientY;
+    pos3 = e.clientX;
+    pos4 = e.clientY;
+    // set the element's new position:
+    el.style.top = (el.offsetTop - pos2) + "px";
+    el.style.left = (el.offsetLeft - pos1) + "px";
+	setOnekoOffset();
+  }
+
+  function closeDragElement() {
+    // stop moving when mouse button is released:
+    document.onmouseup = null;
+    document.onmousemove = null;
+  }
+}

From 26b16749bbc522bc020712c9b27c386da02a8b09 Mon Sep 17 00:00:00 2001
From: yosyo <contact@y-syo.me>
Date: Thu, 9 Oct 2025 03:16:06 +0200
Subject: [PATCH 031/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat(src/?=
 =?UTF-8?q?front/tetris):=20highly=20upgraded=20the=20tetris=20solo=20game?=
 =?UTF-8?q?play=20experience?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/main.ts         |   3 -
 src/front/static/ts/views/Tetris.ts | 119 ++++++++++++++++++++++++++--
 2 files changed, 114 insertions(+), 8 deletions(-)

diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index 442be9e..1b4e0db 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -129,10 +129,7 @@ document.addEventListener("DOMContentLoaded", () => {
 			navigationManager(e.target.href);
 		}
 		if (e.target.closest("[data-icon]"))
-		{
-			console.log("xd");
 			e.preventDefault();
-		}
 	});
 
 	document.body.addEventListener("dblclick", e=> {
diff --git a/src/front/static/ts/views/Tetris.ts b/src/front/static/ts/views/Tetris.ts
index 47bc4b3..15d94e2 100644
--- a/src/front/static/ts/views/Tetris.ts
+++ b/src/front/static/ts/views/Tetris.ts
@@ -25,7 +25,11 @@ export default class extends Aview {
 
 				
 			<div id="main-div" class="bg-neutral-200 dark:bg-neutral-800 text-center p-10 space-y-4 reverse-border">
-				<canvas id="board" class="reverse-border" width="300" height="600"></canvas>
+				<div class="flex flex-row justify-center items-start space-x-4">
+					<canvas id="hold" class="reverse-border" width="140" heigth="80"></canvas>
+					<canvas id="board" class="reverse-border" width="300" height="600"></canvas>
+					<canvas id="queue" class="reverse-border" width="140" height="420"></canvas>
+				</div>
 				<div id="game-buttons" class="hidden flex">
 					<button id="game-retry" class="default-button">play again</button>
 					<a id="game-back" class="default-button" href="/tetris" data-link>back</a>
@@ -223,7 +227,11 @@ export default class extends Aview {
 		class Game {
 			board: Cell[][];
 			canvas: HTMLCanvasElement;
+			holdCanvas: HTMLCanvasElement;
+			queueCanvas: HTMLCanvasElement;
 			ctx: CanvasRenderingContext2D;
+			holdCtx: CanvasRenderingContext2D;
+			queueCtx: CanvasRenderingContext2D;
 			piece: Piece | null = null;
 			holdPiece: Piece | null = null;
 			canHold: boolean = true;
@@ -242,10 +250,13 @@ export default class extends Aview {
 				this.canvas.width = COLS * BLOCK;
 				this.canvas.height = ROWS * BLOCK;
 				const ctx = this.canvas.getContext('2d');
-				if (!ctx)
-					throw new Error('2D context not available');
 				this.ctx = ctx;
 
+				this.holdCanvas = document.getElementById('hold');
+				this.queueCanvas = document.getElementById('queue');
+				this.holdCtx = this.holdCanvas.getContext('2d');
+				this.queueCtx = this.queueCanvas.getContext('2d');
+
 				this.board = this.createEmptyBoard();
 				this.fillBag();
 
@@ -286,8 +297,11 @@ export default class extends Aview {
 
 				this.piece.x = Math.floor((COLS - this.piece.shape[0].length) / 2);
 				this.piece.y = -2;
+				this.piece.rotationIndex = 0;
+				this.piece.shape = this.piece.rotations[this.piece.rotationIndex];
 
 				this.canHold = false;
+				this.drawHold();
 			}
 
 			spawnPiece() {
@@ -301,6 +315,9 @@ export default class extends Aview {
 				{
 					this.isGameOver = true;
 				}
+
+				this.drawHold();
+				this.drawQueue();
 			}
 
 			collides(piece: Piece): boolean {
@@ -316,12 +333,35 @@ export default class extends Aview {
 				return false;
 			}
 
+			getGhostOffset(piece: Piece): boolean {
+				let y: number = 0;
+				while (true)
+				{
+					for (const cell of piece.getCells())
+					{
+						console.log(cell.y + y);
+						if ((cell.y + y >= ROWS) || (cell.y + y >= 0 && this.board[cell.y + y][cell.x]))
+							return y - 1;
+					}
+
+					y++;
+				}
+			}
+
 			lockPiece() {
 				if (!this.piece)
 					return;
+				let isValid:boolean = false;
 				for (const cell of this.piece.getCells())
+				{
 					if (cell.y >= 0 && cell.y < ROWS && cell.x >= 0 && cell.x < COLS)
 						this.board[cell.y][cell.x] = cell.val;
+					if (cell.y < 20)
+						isValid = true;
+				}
+				if (!isValid)
+					this.isGameOver = true;
+
 				this.clearLines();
 				this.spawnPiece();
 			}
@@ -411,8 +451,12 @@ export default class extends Aview {
 					this.score += 1;
 			}
 
+			keys: Record<string, boolean> = {};
+
 			registerListeners() {
 				window.addEventListener('keydown', (e) => {
+					this.keys[e.key] = true;
+
 					if (this.isGameOver) return;
 					if (e.key === 'ArrowLeft')
 						this.movePiece(-1, 0);
@@ -437,6 +481,8 @@ export default class extends Aview {
 					else if (e.key === 'p' || e.key === 'P' || e.key === 'Escape')
 						this.isPaused = !this.isPaused;
 				});
+
+				document.addEventListener("keyup", e => { this.keys[e.key] = false; });
 			}
 
 			loop(timestamp: number)
@@ -494,17 +540,80 @@ export default class extends Aview {
 			drawPiece() {
 				if (!this.piece)
 					return;
+
 				for (const cell of this.piece.getCells())
 					if (cell.y >= 0)
 						this.fillBlock(cell.x, cell.y, COLORS[cell.val]);
+
+				let offset:number = this.getGhostOffset(this.piece);
+				for (const cell of this.piece.getCells())
+					if (cell.y + offset >= 0)
+						this.fillGhostBlock(cell.x, cell.y + offset, COLORS[cell.val]);
+			}
+
+			drawHold() {
+				if (!this.holdPiece)
+					return ;
+
+				this.holdCtx.clearRect(0, 0, 200, 200)
+				let y: number = 0;
+				for (const row of this.holdPiece.rotations[0])
+				{
+					let x:number = 0;
+					for (const val of row)
+					{
+						if (val)
+						{
+							this.holdCtx.fillStyle = this.canHold ? COLORS[this.holdPiece.findColorIndex()] : "gray";
+							this.holdCtx.fillRect(
+								x * BLOCK + 1 + ((4 - this.holdPiece.rotations[0].length) * 15) + 10,
+								y * BLOCK + 1 + 20,
+								BLOCK - 2, BLOCK - 2);
+						}
+						x++;
+					}
+					y++;
+				}
+			}
+
+
+			drawQueue() {
+				this.queueCtx.clearRect(0, 0, 500, 500)
+				let placement:number = 0;
+				console.log(this.nextQueue.slice(0, 5))
+				for (const nextPiece of this.nextQueue.slice(0, 5))
+				{
+					let y: number = 0;
+					for (const row of TETROMINOES[nextPiece][0])
+					{
+						let x:number = 0;
+						for (const val of row)
+						{
+							if (val)
+							{
+								this.queueCtx.fillStyle = COLORS[['I', 'J', 'L', 'O', 'S', 'T', 'Z'].indexOf(nextPiece) + 1];
+								this.queueCtx.fillRect(
+									x * BLOCK + 1 + ((4 - TETROMINOES[nextPiece][0].length) * 15) + 10,
+									y * BLOCK + 1 + (placement * 80) + 20 - (nextPiece === 'I' ? 15 : 0),
+									BLOCK - 2, BLOCK - 2);
+							}
+							x++;
+						}
+						y++;
+					}
+					placement++;
+				}
 			}
 
 			fillBlock(x: number, y: number, color: string) {
 				const ctx = this.ctx;
 				ctx.fillStyle = color;
 				ctx.fillRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
-				/*ctx.strokeStyle = '#111';
-				ctx.strokeRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);*/
+			}
+			fillGhostBlock(x: number, y: number, color: string) {
+				const ctx = this.ctx;
+				ctx.strokeStyle = color;
+				ctx.strokeRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
 			}
 
 			clearBlock(x: number, y: number) {

From 1141fe3159a159c58a0a4ffd1a65f7359df16357 Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Sun, 12 Oct 2025 13:56:10 +0200
Subject: [PATCH 032/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat(src/?=
 =?UTF-8?q?front):=20taskbar=20to=20access=20profile=20and=20settings=20fo?=
 =?UTF-8?q?r=20user=20management=20is=20done=20:D=20and=20also=20its=20ver?=
 =?UTF-8?q?y=20pretty=20:3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/index.html                      |   23 +-
 src/front/static/css/style.css            |   31 +-
 src/front/static/ts/main.ts               |   84 +-
 src/front/static/ts/views/LoginPage.ts    |   31 +-
 src/front/static/ts/views/Profile.ts      |   76 +-
 src/front/static/ts/views/RegisterPage.ts |   31 +-
 src/front/static/ts/views/Tetris.ts       | 1349 +++++++++++----------
 7 files changed, 857 insertions(+), 768 deletions(-)

diff --git a/src/front/index.html b/src/front/index.html
index 28b2775..233ae24 100644
--- a/src/front/index.html
+++ b/src/front/index.html
@@ -12,7 +12,7 @@
 
 
 	<!--body class="bg-gray-100 dark:bg-neutral-950 h-screen flex flex-col"-->
-	<body class="bg-neutral-950 dark:bg-[url(https://api.kanel.ovh/random)] bg-center bg-cover h-screen flex flex-col">
+	<body class="bg-[url(https://y-syo.me/res/bg.jpg)] dark:bg-[url(https://api.kanel.ovh/random)] bg-center bg-cover h-screen flex flex-col">
 		<!--script src="https://kanel.ovh/oneko.js"></script-->
 		<!--script src="./static/ts/oneko.js"></script-->
 
@@ -35,15 +35,22 @@
 		<div id="app" class="flex-1 flex items-center justify-center">
 		</div>
 
-		<div class="border-t-2 border-neutral-300 dark:border-neutral-800 sticky bottom-0">
-			<nav class="bg-neutral-200 dark:bg-neutral-900 shadow-md border-t-2 border-neutral-400 dark:border-neutral-700 px-4 sm:px-6 lg:px-8 flex justify-start h-12 items-center space-x-6 font-[Kubasta]">
-			<a id="profile-button" class="text-neutral-900 hover:text-neutral-700 dark:text-white dark:hover:text-neutral-400" href="/login" data-link>login</a>
-			<a class="text-neutral-900 hover:text-neutral-700 dark:text-white dark:hover:text-neutral-400" href="/" data-link>home</a>
-		</nav>
-		</div>
+		<div id="taskbar-menu" class="absolute bottom-13 left-0"></div>
 
+		<div class="border-t-2 border-neutral-300 dark:border-neutral-800 sticky bottom-0">
+			<nav class="bg-neutral-200 dark:bg-neutral-900 shadow-md border-t-2 border-neutral-400 dark:border-neutral-700 flex justify-between h-12 items-center content-center space-x-6 font-[Kubasta]">
+				<div class="flex px-4 items-center content-center space-x-2">
+				    <button id="profile-button" class="taskbar-button flex flex-row justify-center items-center"><img class="object-scale-down mr-2 h-5 w-5" src="https://api.kanel.ovh/id?id=65" /> start</button>
+					<div class="text-neutral-700 dark:text-neutral-400">|</div>
+					<a class="taskbar-button" href="https://rusty.42angouleme.fr/">rusty</a>
+					<a class="taskbar-button" href="/tetris" data-link>tetris</a>
+				</div>
+				<div class="reverse-border m-1.5 h-8/10 content-center">
+					<span id="taskbar-clock" class="text- neutral-900 dark:text-white px-4">12:37</span>
+				</div>
+			</nav>
+		</div>
 
 		<script type="module" src="/static/ts/main.ts"></script>
 	</body>
 </html>
-
diff --git a/src/front/static/css/style.css b/src/front/static/css/style.css
index e189baa..35cd827 100644
--- a/src/front/static/css/style.css
+++ b/src/front/static/css/style.css
@@ -42,8 +42,37 @@
 	text-neutral-900 dark:text-white
 	px-4 py-2
 	delay-0 duration-150 transition-colors
-	
+
 	border-2 border-t-neutral-100 dark:border-t-neutral-500 border-l-neutral-100 dark:border-l-neutral-500 border-r-neutral-400 dark:border-r-neutral-700 border-b-neutral-400 dark:border-b-neutral-700
 	active:border-t-neutral-400 dark:active:border-t-neutral-700 active:border-l-neutral-400 dark:active:border-l-neutral-700 active:border-r-neutral-100 dark:active:border-r-neutral-500 active:border-b-neutral-100 dark:active:border-b-neutral-500
 	;
 }
+
+.taskbar-button {
+	@apply shadow-2x1
+	bg-neutral-200 hover:bg-neutral-300 active:bg-neutral-300 dark:bg-neutral-800 dark:hover:bg-neutral-700 dark:active:bg-neutral-700
+	text-neutral-900 dark:text-white
+	px-4 py-0.5
+	content-center text-center
+	delay-0 duration-150 transition-colors
+
+	border-2 border-t-neutral-100 dark:border-t-neutral-500 border-l-neutral-100 dark:border-l-neutral-500 border-r-neutral-400 dark:border-r-neutral-700 border-b-neutral-400 dark:border-b-neutral-700
+	active:border-t-neutral-400 dark:active:border-t-neutral-700 active:border-l-neutral-400 dark:active:border-l-neutral-700 active:border-r-neutral-100 dark:active:border-r-neutral-500 active:border-b-neutral-100 dark:active:border-b-neutral-500
+	;
+}
+
+.menu-default-button {
+    @apply w-46 h-12
+    text-neutral-900 dark:text-white
+    bg-neutral-200 hover:bg-neutral-300
+    dark:bg-neutral-800 dark:hover:bg-neutral-700
+    ;
+}
+
+.menu-default-label {
+    @apply w-46 h-12
+    text-neutral-900 dark:text-white
+    bg-neutral-200
+    dark:bg-neutral-800
+    ;
+}
diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index 1b4e0db..6533fd8 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -1,6 +1,8 @@
 import { oneko } from "./oneko.ts";
+import Profile from "./views/Profile.ts";
+let profile_view = new Profile;
 
-export async function isLogged(): boolean {
+export async function isLogged(): Promise<boolean> {
 	let uuid_req = await fetch("http://localhost:3001/me", {
 		method: "GET",
 		credentials: "include",
@@ -9,63 +11,11 @@ export async function isLogged(): boolean {
 	{
 		let uuid = await uuid_req.json();
 		document.cookie = `uuid=${uuid.user};max-age=${60*60*24*7}`;
-
-		const old_button = document.getElementById("profile-button");
-
-		const dropdown = document.createElement("div");
-		dropdown.classList.add("relative", "inline-block", "group");
-		dropdown.id = "profile-button";
-		const button_dropdown = dropdown.appendChild(document.createElement("button"));
-		button_dropdown.innerHTML = uuid.user;
-		button_dropdown.classList.add("text-neutral-900", "group-hover:text-neutral-700", "dark:text-white", "dark:group-hover:text-neutral-400");
-
-		const menu_div = dropdown.appendChild(document.createElement("div"));
-		menu_div.classList.add("float:right", "hidden", "absolute", "left-0", "bottom-full", "dark:bg-neutral-800", "dark:text-white", "min-w-[160px]", "shadow-lg", "z-10", "group-hover:block");
-
-		const profile_a = menu_div.appendChild(document.createElement("a"));
-		const settings_a = menu_div.appendChild(document.createElement("a"));
-		const logout_button = menu_div.appendChild(document.createElement("button"));
-
-		profile_a.text = "profile";
-		profile_a.classList.add("block", "no-underline", "px-4", "py-3");
-		profile_a.href = "/profile";
-		profile_a.setAttribute("data-link", "");
-
-		settings_a.text = "settings";
-		settings_a.classList.add("block", "no-underline", "px-4", "py-3");
-		settings_a.href = "/settings";
-		settings_a.setAttribute("data-link", "");
-
-		logout_button.innerHTML = "logout";
-		logout_button.classList.add("block", "no-underline", "px-4", "py-3");
-		logout_button.id = "logout-button";
-		//document.getElementById("logout-button")?.addEventListener("click", async () => {
-		logout_button.addEventListener("click", async () => {
-			let req = await fetch("http://localhost:3001/logout", {
-				method: "GET",
-				credentials: "include",
-			});
-			if (req.status === 200)
-				isLogged();
-			else
-				console.error("logout failed");
-		});
-
-		old_button.replaceWith(dropdown);
 		return true;
 	}
 	else // 401
 	{
 		document.cookie = `uuid=;max-age=0`;
-		const old_button = document.getElementById("profile-button");
-		const login_button = document.createElement("a");
-		login_button.id = "profile-button";
-		login_button.text = "login";
-		login_button.classList.add("text-neutral-900", "hover:text-neutral-700", "dark:text-white", "dark:hover:text-neutral-400");
-		login_button.href = "/login";
-		login_button.setAttribute("data-link", "");
-
-		old_button.replaceWith(login_button);
 		return false;
 	}
 }
@@ -90,8 +40,6 @@ const routes = [
 
 	{ path: "/login", view: () => import("./views/LoginPage.ts") },
 	{ path: "/register", view: () => import("./views/RegisterPage.ts") },
-
-	{ path: "/profile", view: () => import("./views/Profile.ts") },
 ];
 
 const router = async () => {
@@ -107,7 +55,7 @@ const router = async () => {
 
 	if (view)
 		view.running = false;
-	
+
 	//console.log(match);
 
 	const module = await match.route.view();
@@ -117,12 +65,18 @@ const router = async () => {
 	view.run();
 };
 
+document.getElementById("profile-button")?.addEventListener("click", () => {profile_view.run();});
 window.addEventListener("popstate", router);
 
 document.addEventListener("DOMContentLoaded", () => {
 	isLogged();
 
 	document.body.addEventListener("click", e=> {
+    if (!e.target.closest("#taskbar-menu") && !e.target.matches("#profile-button"))
+    {
+      profile_view.open = false;
+      document.getElementById("taskbar-menu").innerHTML = "";
+    }
 		if (e.target.matches("[data-link]"))
 		{
 			e.preventDefault();
@@ -144,3 +98,21 @@ document.addEventListener("DOMContentLoaded", () => {
 });
 
 oneko();
+
+function updateClock()
+{
+	const days = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'];
+	const months = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug', 'sep', 'oct', 'nov', 'dec'];
+	const clock = document.getElementById("taskbar-clock");
+	const now = new Date();
+	let hours = now.getHours();
+	let minutes = now.getMinutes();
+
+	hours = hours < 10 ? "0" + hours : hours;
+	minutes = minutes < 10 ? "0" + minutes : minutes;
+
+	clock.innerHTML = `${days[now.getDay()]} ${now.getDate()} ${months[now.getMonth()]} ` + hours + ":" + minutes;
+}
+
+setInterval(updateClock, 5000);
+updateClock();
diff --git a/src/front/static/ts/views/LoginPage.ts b/src/front/static/ts/views/LoginPage.ts
index bf30229..f1b04bd 100644
--- a/src/front/static/ts/views/LoginPage.ts
+++ b/src/front/static/ts/views/LoginPage.ts
@@ -1,4 +1,5 @@
 import Aview from "./Aview.ts"
+import { dragElement } from "./drag.js"
 import { setOnekoState } from "../oneko.ts"
 import { isLogged, navigationManager } from "../main.ts"
 
@@ -13,22 +14,30 @@ export default class extends Aview {
 
 	async getHTML() {
 		return `
-		<form method="dialog" class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4 flex flex-col">
-			<h1 class="text-4xl font-bold text-blue-600">login</h1>
+		<div id="window" class="absolute default-border">
+			<div id="window-header" class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
+				<span class="font-[Kubasta]">login.ts</span>
+				<div>
+					<button> - </button>
+					<button> □ </button>
+					<a href="/" data-link> × </a>
+				</div>
+			</div>
 
-			<input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500" required></input>
-			<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 border w-full px-4 py-2 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500" required></input>
-			<p id="login-error-message" class="hidden text-red-700 dark:text-red-500"></p>
-			<button id="login-button" type="submit" class="bg-blue-600 text-white hover:bg-blue-500 w-full py-2 rounded-md transition-colors">login</button>
-
-			<a class="text-gray-400 dark:text-gray-600 underline" href="/register" data-link>
-				register
-			</a>
-		</form>
+		  <form method="dialog" class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
+				<h1 class="text-gray-900 dark:text-white text-lg pt-0 pb-4">welcome back ! please login.</h1>
+				<input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
+				<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
+				<p id="login-error-message" class="hidden text-red-700 dark:text-red-500"></p>
+				</br>
+				<button id="login-button" type="submit" class="default-button w-full">login</button>
+			</form>
+		</div>
 		`;
 	}
 
 	async run() {
+    dragElement(document.getElementById("window"));
 		const login = async () => {
 			const username = (document.getElementById("username") as HTMLInputElement).value;
 			const password = (document.getElementById("password") as HTMLInputElement).value;
diff --git a/src/front/static/ts/views/Profile.ts b/src/front/static/ts/views/Profile.ts
index 16fa93d..502b15c 100644
--- a/src/front/static/ts/views/Profile.ts
+++ b/src/front/static/ts/views/Profile.ts
@@ -6,36 +6,81 @@ export default class extends Aview {
 	constructor()
 	{
 		super();
-		if (!isLogged())
-			navigationManager("/login");
 		this.setTitle("profile");
 	}
 
 	async getHTML() {
 		return `
-		<div id="main-window" class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4">
+		<div id="main-window" class="default-border shadow-2x1 bg-neutral-200 dark:bg-neutral-800">
+		  <div class="flex flex-row items-stretch">
+				<div class="inline-block bg-linear-to-b from-orange-200 to-orange-300 min-h-84 w-6 relative">
+				  <!--div class="absolute bottom-1 left-full whitespace-nowrap origin-bottom-left -rotate-90 font-bold">knl_meowscendence</div-->
+				  <div class="absolute bottom-1 left-full whitespace-nowrap origin-bottom-left -rotate-90 font-bold">girls kissing :3</div>
+				</div>
+
+				<div class="flex flex-col items-center">
+				  <div id="profile-items" class="flex flex-col items-center">
+					</div>
+				  <div id="menu-bottom-div" class="hidden mt-auto flex flex-col items-center">
+						<hr class="my-2 w-32 reverse-border">
+						<button id="menu-logout" class="menu-default-button">logout</button>
+					</div>
+				</div>
+			</div>
 		</div>
 		`;
 	}
 
+	open: boolean = false;
+
 	async run() {
-		const uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
-		const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
+	  let uuid: String;
+    if (this.open)
+    {
+      this.open = false;
+      document.getElementById("taskbar-menu").innerHTML = "";
+      return ;
+    }
+    this.open = true;
+    document.getElementById("taskbar-menu").innerHTML = await this.getHTML();
+
+    async function getMainHTML() {
+      if (!(await isLogged()))
+      {
+        document.getElementById("menu-bottom-div").classList.add("hidden");
+        return `
+     			<a class="menu-default-button inline-flex items-center justify-center" href="/login" data-link>login</a>
+     			<a class="menu-default-button inline-flex items-center justify-center" href="/register" data-link>register</a>
+          `;
+      }
+      document.getElementById("menu-bottom-div").classList.remove("hidden");
+
+      uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+      return `
+        <span class="menu-default-label inline-flex items-center justify-center">hi, ${uuid} !</span>
+				<hr class="my-2 w-32 reverse-border">
+				<button class="menu-default-button">profile</button>
+				<button class="menu-default-button">settings</button>
+      `;
+    }
+
+
+    document.getElementById("profile-items").innerHTML = await getMainHTML();
+
+		/*const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
 			method: "GET",
 			credentials: "include",
 		});
-
 		if (userdata_req.status == 404)
 		{
 			console.error("invalid user");
 			return ;
 		}
-
 		let userdata = await userdata_req.json();
 
-		console.log(userdata_req);
+		console.log(userdata_req);*/
 
-		const main = document.getElementById("main-window");
+		/*const main = document.getElementById("profile-profile");
 		const nametag = main.appendChild(document.createElement("span"));
 
 		nametag.innerHTML = `Hiiiiii ${userdata.displayName} ! :D`;
@@ -44,6 +89,17 @@ export default class extends Aview {
 		const winrate = main.appendChild(document.createElement("div"));
 
 		winrate.innerHTML = `wins: ${userdata.wins} | losses: ${userdata.losses} | winrate: ${userdata.wins / (userdata.wins + userdata.losses)}`;
-		winrate.classList.add("text-neutral-900", "dark:text-white");
+		winrate.classList.add("text-neutral-900", "dark:text-white");*/
+    //console.log(document.getElementById("menu-logout"));
+    document.getElementById("menu-logout").addEventListener("click", async () => {
+      let req = await fetch("http://localhost:3001/logout", {
+        method: "GET",
+        credentials: "include",
+      });
+      if (req.status === 200)
+        this.run();
+      else
+        console.error("logout failed");
+    });
 	}
 }
diff --git a/src/front/static/ts/views/RegisterPage.ts b/src/front/static/ts/views/RegisterPage.ts
index ab30708..67c828f 100644
--- a/src/front/static/ts/views/RegisterPage.ts
+++ b/src/front/static/ts/views/RegisterPage.ts
@@ -1,6 +1,7 @@
 import Aview from "./Aview.ts"
 import { setOnekoState } from "../oneko.ts"
 import { isLogged, navigationManager } from "../main.ts"
+import { dragElement } from "./drag.ts";
 
 export default class extends Aview {
 
@@ -13,22 +14,30 @@ export default class extends Aview {
 
 	async getHTML() {
 		return `
-		<form method="dialog" class="text-center p-10 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4 flex flex-col">
-			<h1 class="text-4xl font-bold text-blue-600">register</h1>
+		<div id="window" class="absolute default-border">
+					<div id="window-header" class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
+						<span class="font-[Kubasta]">register.ts</span>
+						<div>
+							<button> - </button>
+							<button> □ </button>
+							<a href="/" data-link> × </a>
+						</div>
+					</div>
 
-			<input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500" required></input>
-			<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 border w-full px-4 py-2 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500" required></input>
-			<p id="login-error-message" class="hidden text-red-700 dark:text-red-500"></p>
-			<button id="register-button" type="submit" class="bg-blue-600 text-white hover:bg-blue-500 w-full py-2 rounded-md transition-colors">register</button>
-
-			<a class="text-gray-400 dark:text-gray-600 underline" href="/login" data-link>
-				i already have an account
-			</a>
-		</form>
+		<form method="dialog" class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
+			  <p class="text-gray-900 dark:text-white text-lg pt-0 pb-4">welcome ! please register.</p>
+			  <input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
+			  <input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
+			  <p id="login-error-message" class="hidden text-red-700 dark:text-red-500"></p>
+			  </br>
+				<button id="register-button" type="submit" class="default-button w-full">register</button>
+			</form>
+		</div>
 		`;
 	}
 
 	async run() {
+    dragElement(document.getElementById("window"));
 		const login = async () => {
 			const username = (document.getElementById("username") as HTMLInputElement).value;
 			const password = (document.getElementById("password") as HTMLInputElement).value;
diff --git a/src/front/static/ts/views/Tetris.ts b/src/front/static/ts/views/Tetris.ts
index 15d94e2..f01eb08 100644
--- a/src/front/static/ts/views/Tetris.ts
+++ b/src/front/static/ts/views/Tetris.ts
@@ -1,18 +1,17 @@
-import Aview from "./Aview.ts"
+import Aview from "./Aview.ts";
+import { dragElement } from "./drag.js";
 
 export default class extends Aview {
+  running: boolean;
 
-	running: boolean;
+  constructor() {
+    super();
+    this.setTitle("tetris (local match)");
+    this.running = true;
+  }
 
-	constructor()
-	{
-		super();
-		this.setTitle("tetris (local match)");
-		this.running = true;
-	}
-
-	async getHTML() {
-		return `
+  async getHTML() {
+    return `
 		<div id="window" class="absolute default-border">
 			<div id="window-header" class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
 				<span class="font-[Kubasta]">pong_game.ts</span>
@@ -23,7 +22,7 @@ export default class extends Aview {
 				</div>
 			</div>
 
-				
+
 			<div id="main-div" class="bg-neutral-200 dark:bg-neutral-800 text-center p-10 space-y-4 reverse-border">
 				<div class="flex flex-row justify-center items-start space-x-4">
 					<canvas id="hold" class="reverse-border" width="140" heigth="80"></canvas>
@@ -37,663 +36,671 @@ export default class extends Aview {
 			</div>
 		</div>
 		`;
-	}
-
-	async run() {
-		const COLS = 10;
-		const ROWS = 20;
-		const BLOCK = 30; // pixels per block
-
-		type Cell = number; // 0 empty, >0 occupied (color index)
-
-		// Tetromino definitions: each piece is an array of rotations, each rotation is a 2D matrix
-		const TETROMINOES: { [key: string]: number[][][] } = {
-			I: [
-				[[0,0,0,0]
-				,[1,1,1,1]
-				,[0,0,0,0]
-				,[0,0,0,0]],
-
-				[[0,0,1,0]
-				,[0,0,1,0]
-				,[0,0,1,0]
-				,[0,0,1,0]],
-
-				[[0,0,0,0]
-				,[0,0,0,0]
-				,[1,1,1,1]
-				,[0,0,0,0]],
-
-				[[0,1,0,0]
-				,[0,1,0,0]
-				,[0,1,0,0]
-				,[0,1,0,0]],
-			],
-			J: [
-				[[2,0,0]
-				,[2,2,2]
-				,[0,0,0]],
-
-				[[0,2,2]
-				,[0,2,0]
-				,[0,2,0]],
-
-				[[0,0,0]
-				,[2,2,2]
-				,[0,0,2]],
-
-				[[0,2,0]
-				,[0,2,0]
-				,[2,2,0]],
-			],
-			L: [
-				[[0,0,3]
-				,[3,3,3]
-				,[0,0,0]],
-
-				[[0,3,0]
-				,[0,3,0]
-				,[0,3,3]],
-
-				[[0,0,0]
-				,[3,3,3]
-				,[3,0,0]],
-
-				[[3,3,0]
-				,[0,3,0]
-				,[0,3,0]],
-			],
-			O: [
-				[[4,4]
-				,[4,4]],
-			],
-			S: [
-				[[0,5,5]
-				,[5,5,0]
-				,[0,0,0]],
-
-				[[0,5,0]
-				,[0,5,5]
-				,[0,0,5]],
-
-				[[0,0,0]
-				,[0,5,5]
-				,[5,5,0]],
-
-				[[5,0,0]
-				,[5,5,0]
-				,[0,5,0]],
-
-			],
-			T: [
-				[[0,6,0]
-				,[6,6,6]
-				,[0,0,0]],
-
-				[[0,6,0]
-				,[0,6,6]
-				,[0,6,0]],
-
-				[[0,0,0]
-				,[6,6,6]
-				,[0,6,0]],
-
-				[[0,6,0]
-				,[6,6,0]
-				,[0,6,0]],
-			],
-			Z: [
-				[[7,7,0]
-				,[0,7,7]
-				,[0,0,0]],
-
-				[[0,0,7]
-				,[0,7,7]
-				,[0,7,0]],
-
-				[[0,0,0]
-				,[7,7,0]
-				,[0,7,7]],
-
-				[[0,7,0]
-				,[7,7,0]
-				,[7,0,0]],
-			],
-		};
-
-		const COLORS = [
-			'#000000', // placeholder for 0
-			'#00ffff', // I - cyan
-			'#0000ff', // J - blue
-			'#ff7f00', // L - orange
-			'#ffff00', // O - yellow
-			'#00ff00', // S - green
-			'#800080', // T - purple
-			'#ff0000', // Z - red
-		];
-
-		class Piece {
-			shape: number[][];
-			rotations: number[][][];
-			rotationIndex: number;
-			x: number;
-			y: number;
-			colorIndex: number;
-
-			constructor(public type: string) {
-				this.rotations = TETROMINOES[type];
-				this.rotationIndex = 0;
-				this.shape = this.rotations[this.rotationIndex];
-				this.colorIndex = this.findColorIndex();
-
-				this.x = Math.floor((COLS - this.shape[0].length) / 2);
-				this.y = -2; //start on tiles 21 and 22
-			}
-
-			findColorIndex() {
-				for (const row of this.shape)
-					for (const v of row)
-						if (v)
-							return v;
-				return 1;
-			}
-
-			rotateCW() {
-				this.rotationIndex = (this.rotationIndex + 1) % this.rotations.length;
-				this.shape = this.rotations[this.rotationIndex];
-			}
-
-			rotateCCW() {
-				this.rotationIndex = (this.rotationIndex - 1 + this.rotations.length) % this.rotations.length;
-				this.shape = this.rotations[this.rotationIndex];
-			}
-
-			getCells(): { x: number; y: number; val: number }[] {
-				const cells: { x: number; y: number; val: number }[] = [];
-
-				for (let r = 0; r < this.shape.length; r++)
-				{
-					for (let c = 0; c < this.shape[r].length; c++)
-					{
-						const val = this.shape[r][c];
-						if (val)
-							cells.push({ x: this.x + c, y: this.y + r, val });
-					}
-				}
-				return cells;
-			}
-		}
-
-		class Game {
-			board: Cell[][];
-			canvas: HTMLCanvasElement;
-			holdCanvas: HTMLCanvasElement;
-			queueCanvas: HTMLCanvasElement;
-			ctx: CanvasRenderingContext2D;
-			holdCtx: CanvasRenderingContext2D;
-			queueCtx: CanvasRenderingContext2D;
-			piece: Piece | null = null;
-			holdPiece: Piece | null = null;
-			canHold: boolean = true;
-			nextQueue: string[] = [];
-			score = 0;
-			level = 1;
-			lines = 0;
-			dropInterval = 1000;
-			lastDrop = 0;
-			isGameOver = false;
-			isPaused = false;
-
-			constructor(canvasId: string) {
-				const el = document.getElementById(canvasId);
-				this.canvas = el;
-				this.canvas.width = COLS * BLOCK;
-				this.canvas.height = ROWS * BLOCK;
-				const ctx = this.canvas.getContext('2d');
-				this.ctx = ctx;
-
-				this.holdCanvas = document.getElementById('hold');
-				this.queueCanvas = document.getElementById('queue');
-				this.holdCtx = this.holdCanvas.getContext('2d');
-				this.queueCtx = this.queueCanvas.getContext('2d');
-
-				this.board = this.createEmptyBoard();
-				this.fillBag();
-
-				this.spawnPiece();
-				this.registerListeners();
-				requestAnimationFrame(this.loop.bind(this));
-			}
-
-			createEmptyBoard(): Cell[][] {
-				const b: Cell[][] = [];
-				for (let r = 0; r < ROWS; r++)
-				{
-					const row: Cell[] = new Array(COLS).fill(0);
-					b.push(row);
-				}
-				return b;
-			}
-
-			fillBag() {
-				// classic 7-bag randomizer
-				const pieces = Object.keys(TETROMINOES);
-				const bag = [...pieces];
-				for (let i = bag.length - 1; i > 0; i--)
-				{
-					const j = Math.floor(Math.random() * (i + 1));
-					[bag[i], bag[j]] = [bag[j], bag[i]];
-				}
-				this.nextQueue.push(...bag);
-			}
-
-			hold() {
-				if (!this.canHold)
-					return;
-
-				[this.piece, this.holdPiece] = [this.holdPiece, this.piece];
-				if (!this.piece)
-					this.spawnPiece();
-
-				this.piece.x = Math.floor((COLS - this.piece.shape[0].length) / 2);
-				this.piece.y = -2;
-				this.piece.rotationIndex = 0;
-				this.piece.shape = this.piece.rotations[this.piece.rotationIndex];
-
-				this.canHold = false;
-				this.drawHold();
-			}
-
-			spawnPiece() {
-				this.canHold = true;
-				if (this.nextQueue.length < 7)
-					this.fillBag();
-				const type = this.nextQueue.shift()!;
-				this.piece = new Piece(type);
-				// If spawn collides immediately -> game over
-				if (this.collides(this.piece))
-				{
-					this.isGameOver = true;
-				}
-
-				this.drawHold();
-				this.drawQueue();
-			}
-
-			collides(piece: Piece): boolean {
-				for (const cell of piece.getCells())
-					{
-					if (cell.y >= ROWS)
-						return true;
-					if (cell.x < 0 || cell.x >= COLS)
-						return true;
-					if (cell.y >= 0 && this.board[cell.y][cell.x])
-						return true;
-				}
-				return false;
-			}
-
-			getGhostOffset(piece: Piece): boolean {
-				let y: number = 0;
-				while (true)
-				{
-					for (const cell of piece.getCells())
-					{
-						console.log(cell.y + y);
-						if ((cell.y + y >= ROWS) || (cell.y + y >= 0 && this.board[cell.y + y][cell.x]))
-							return y - 1;
-					}
-
-					y++;
-				}
-			}
-
-			lockPiece() {
-				if (!this.piece)
-					return;
-				let isValid:boolean = false;
-				for (const cell of this.piece.getCells())
-				{
-					if (cell.y >= 0 && cell.y < ROWS && cell.x >= 0 && cell.x < COLS)
-						this.board[cell.y][cell.x] = cell.val;
-					if (cell.y < 20)
-						isValid = true;
-				}
-				if (!isValid)
-					this.isGameOver = true;
-
-				this.clearLines();
-				this.spawnPiece();
-			}
-
-			clearLines() {
-				let linesCleared = 0;
-				outer: for (let r = ROWS - 1; r >= 0; r--)
-				{
-					for (let c = 0; c < COLS; c++)
-						if (!this.board[r][c])
-							continue outer;
-
-					this.board.splice(r, 1);
-					this.board.unshift(new Array(COLS).fill(0));
-					linesCleared++;
-					r++;
-				}
-
-				if (linesCleared > 0)
-				{
-					this.lines += linesCleared;
-					// scoring like classic tetris
-					const points = [0, 40, 100, 300, 1200];
-					this.score += (points[linesCleared] || 0) * this.level;
-					// level up every 10 lines (Fixed Goal System)
-					const newLevel = Math.floor(this.lines / 10) + 1;
-					if (newLevel > this.level)
-					{
-						this.level = newLevel;
-						this.dropInterval = Math.max(100, 1000 - (this.level - 1) * 75);
-					}
-				}
-			}
-
-			rotatePiece(dir: 'cw' | 'ccw') {
-				if (!this.piece)
-					return;
-				// Try rotation with wall kicks
-				const originalIndex = this.piece.rotationIndex;
-				if (dir === 'cw')
-					this.piece.rotateCW();
-				else
-					this.piece.rotateCCW();
-				const kicks = [0, -1, 1, -2, 2];
-				for (const k of kicks) {
-					this.piece.x += k;
-					if (!this.collides(this.piece))
-						return;
-					this.piece.x -= k;
-				}
-				// no valid kick, revert
-				this.piece.rotationIndex = originalIndex;
-				this.piece.shape = this.piece.rotations[originalIndex];
-			}
-
-			movePiece(dx: number, dy: number) {
-				if (!this.piece)
-					return;
-				this.piece.x += dx;
-				this.piece.y += dy;
-				if (this.collides(this.piece))
-				{
-					this.piece.x -= dx;
-					this.piece.y -= dy;
-					return false;
-				}
-				return true;
-			}
-
-			hardDrop() {
-				if (!this.piece)
-					return;
-				let dropped = 0;
-				while (this.movePiece(0, 1))
-					dropped++;
-				this.score += dropped * 2;
-				this.lockPiece();
-			}
-
-			softDrop() {
-				if (!this.piece)
-					return;
-				if (!this.movePiece(0, 1))
-					return;
-					//this.lockPiece();
-				else
-					this.score += 1;
-			}
-
-			keys: Record<string, boolean> = {};
-
-			registerListeners() {
-				window.addEventListener('keydown', (e) => {
-					this.keys[e.key] = true;
-
-					if (this.isGameOver) return;
-					if (e.key === 'ArrowLeft')
-						this.movePiece(-1, 0);
-					else if (e.key === 'ArrowRight')
-						this.movePiece(1, 0);
-					else if (e.key === 'ArrowDown')
-						this.softDrop();
-					else if (e.code === 'Space')
-					{
-						e.preventDefault();
-						this.hardDrop();
-					}
-					else if (e.code === 'ShiftLeft')
-					{
-						e.preventDefault();
-						this.hold();
-					}
-					else if (e.key === 'x' || e.key === 'X' || e.key === 'ArrowUp')
-						this.rotatePiece('cw');
-					else if (e.key === 'z' || e.key === 'Z' || e.code === 'ControlLeft')
-						this.rotatePiece('ccw');
-					else if (e.key === 'p' || e.key === 'P' || e.key === 'Escape')
-						this.isPaused = !this.isPaused;
-				});
-
-				document.addEventListener("keyup", e => { this.keys[e.key] = false; });
-			}
-
-			loop(timestamp: number)
-			{
-				if (!this.lastDrop)
-					this.lastDrop = timestamp;
-				if (!this.isPaused && !this.isGameOver)
-				{
-					if (timestamp - this.lastDrop > this.dropInterval)
-					{
-						if (!this.movePiece(0, 1))
-							this.lockPiece();
-						this.lastDrop = timestamp;
-					}
-				}
-				this.draw();
-				requestAnimationFrame(this.loop.bind(this));
-			}
-
-			drawGrid() {
-				const ctx = this.ctx;
-				ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
-				ctx.strokeStyle = '#222';
-				for (let r = 0; r <= ROWS; r++)
-				{
-					// horizontal lines
-					ctx.beginPath();
-					ctx.moveTo(0, r * BLOCK);
-					ctx.lineTo(COLS * BLOCK, r * BLOCK);
-					ctx.stroke();
-				}
-				for (let c = 0; c <= COLS; c++)
-				{
-					ctx.beginPath();
-					ctx.moveTo(c * BLOCK, 0);
-					ctx.lineTo(c * BLOCK, ROWS * BLOCK);
-					ctx.stroke();
-				}
-			}
-
-			drawBoard() {
-				for (let r = 0; r < ROWS; r++)
-				{
-					for (let c = 0; c < COLS; c++)
-					{
-						const val = this.board[r][c];
-						if (val)
-							this.fillBlock(c, r, COLORS[val]);
-						else
-							this.clearBlock(c, r);
-					}
-				}
-			}
-
-			drawPiece() {
-				if (!this.piece)
-					return;
-
-				for (const cell of this.piece.getCells())
-					if (cell.y >= 0)
-						this.fillBlock(cell.x, cell.y, COLORS[cell.val]);
-
-				let offset:number = this.getGhostOffset(this.piece);
-				for (const cell of this.piece.getCells())
-					if (cell.y + offset >= 0)
-						this.fillGhostBlock(cell.x, cell.y + offset, COLORS[cell.val]);
-			}
-
-			drawHold() {
-				if (!this.holdPiece)
-					return ;
-
-				this.holdCtx.clearRect(0, 0, 200, 200)
-				let y: number = 0;
-				for (const row of this.holdPiece.rotations[0])
-				{
-					let x:number = 0;
-					for (const val of row)
-					{
-						if (val)
-						{
-							this.holdCtx.fillStyle = this.canHold ? COLORS[this.holdPiece.findColorIndex()] : "gray";
-							this.holdCtx.fillRect(
-								x * BLOCK + 1 + ((4 - this.holdPiece.rotations[0].length) * 15) + 10,
-								y * BLOCK + 1 + 20,
-								BLOCK - 2, BLOCK - 2);
-						}
-						x++;
-					}
-					y++;
-				}
-			}
-
-
-			drawQueue() {
-				this.queueCtx.clearRect(0, 0, 500, 500)
-				let placement:number = 0;
-				console.log(this.nextQueue.slice(0, 5))
-				for (const nextPiece of this.nextQueue.slice(0, 5))
-				{
-					let y: number = 0;
-					for (const row of TETROMINOES[nextPiece][0])
-					{
-						let x:number = 0;
-						for (const val of row)
-						{
-							if (val)
-							{
-								this.queueCtx.fillStyle = COLORS[['I', 'J', 'L', 'O', 'S', 'T', 'Z'].indexOf(nextPiece) + 1];
-								this.queueCtx.fillRect(
-									x * BLOCK + 1 + ((4 - TETROMINOES[nextPiece][0].length) * 15) + 10,
-									y * BLOCK + 1 + (placement * 80) + 20 - (nextPiece === 'I' ? 15 : 0),
-									BLOCK - 2, BLOCK - 2);
-							}
-							x++;
-						}
-						y++;
-					}
-					placement++;
-				}
-			}
-
-			fillBlock(x: number, y: number, color: string) {
-				const ctx = this.ctx;
-				ctx.fillStyle = color;
-				ctx.fillRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
-			}
-			fillGhostBlock(x: number, y: number, color: string) {
-				const ctx = this.ctx;
-				ctx.strokeStyle = color;
-				ctx.strokeRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
-			}
-
-			clearBlock(x: number, y: number) {
-				const ctx = this.ctx;
-				ctx.clearRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
-			}
-
-			drawHUD() {
-				const ctx = this.ctx;
-				ctx.fillStyle = 'rgba(0,0,0,0.6)';
-				ctx.fillRect(4, 4, 120, 60);
-				ctx.fillStyle = '#fff';
-				ctx.font = '12px Kubasta';
-				ctx.fillText(`Score: ${this.score}`, 8, 20);
-				ctx.fillText(`Lines: ${this.lines}`, 8, 36);
-				ctx.fillText(`Level: ${this.level}`, 8, 52);
-
-				if (this.isPaused)
-				{
-					ctx.fillStyle = 'rgba(0,0,0,0.7)';
-					ctx.fillRect(0, (this.canvas.height / 2) - 24, this.canvas.width, 48);
-					ctx.fillStyle = '#fff';
-					ctx.font = '24px Kubasta';
-					ctx.textAlign = 'center';
-					ctx.fillText('PAUSED', this.canvas.width / 2, this.canvas.height / 2 + 8);
-					ctx.textAlign = 'start';
-				}
-
-				if (this.isGameOver)
-				{
-					ctx.fillStyle = 'rgba(0,0,0,0.7)';
-					ctx.fillRect(0, (this.canvas.height / 2) - 36, this.canvas.width, 72);
-					ctx.fillStyle = '#fff';
-					ctx.font = '28px Kubasta';
-					ctx.textAlign = 'center';
-					ctx.fillText('GAME OVER', this.canvas.width / 2, this.canvas.height / 2 + 8);
-					ctx.textAlign = 'start';
-				}
-			}
-
-			draw() {
-				// clear everything
-				this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
-
-				this.ctx.fillStyle = '#000';
-				this.ctx.fillRect(0, 0, this.canvas.width, this.canvas.height);
-
-				this.ctx.strokeStyle = '#111';
-				for (let r = 0; r <= ROWS; r++)
-				{
-					this.ctx.beginPath();
-					this.ctx.moveTo(0, r * BLOCK);
-					this.ctx.lineTo(COLS * BLOCK, r * BLOCK);
-					this.ctx.stroke();
-				}
-				for (let c = 0; c <= COLS; c++)
-				{
-					this.ctx.beginPath();
-					this.ctx.moveTo(c * BLOCK, 0);
-					this.ctx.lineTo(c * BLOCK, ROWS * BLOCK);
-					this.ctx.stroke();
-				}
-
-				this.drawBoard();
-				this.drawPiece();
-				this.drawHUD();
-			}
-		}
-
-		window.addEventListener('load', () => {
-			try {
-				const canvas = document.getElementById('board');
-				if (!canvas) {
-					console.error('D:');
-					return;
-				}
-				const game = new Game('board');
-			} catch (err) {
-				console.error(err);
-			}
-		});
-	}
+  }
+
+  async run() {
+    dragElement(document.getElementById("window"));
+    const COLS = 10;
+    const ROWS = 20;
+    const BLOCK = 30; // pixels per block
+
+    type Cell = number; // 0 empty, >0 occupied (color index)
+
+    // Tetromino definitions: each piece is an array of rotations, each rotation is a 2D matrix
+    const TETROMINOES: { [key: string]: number[][][] } = {
+      I: [
+        [
+          [0, 0, 0, 0],
+          [1, 1, 1, 1],
+          [0, 0, 0, 0],
+          [0, 0, 0, 0],
+        ],
+
+        [
+          [0, 0, 1, 0],
+          [0, 0, 1, 0],
+          [0, 0, 1, 0],
+          [0, 0, 1, 0],
+        ],
+
+        [
+          [0, 0, 0, 0],
+          [0, 0, 0, 0],
+          [1, 1, 1, 1],
+          [0, 0, 0, 0],
+        ],
+
+        [
+          [0, 1, 0, 0],
+          [0, 1, 0, 0],
+          [0, 1, 0, 0],
+          [0, 1, 0, 0],
+        ],
+      ],
+      J: [
+        [
+          [2, 0, 0],
+          [2, 2, 2],
+          [0, 0, 0],
+        ],
+
+        [
+          [0, 2, 2],
+          [0, 2, 0],
+          [0, 2, 0],
+        ],
+
+        [
+          [0, 0, 0],
+          [2, 2, 2],
+          [0, 0, 2],
+        ],
+
+        [
+          [0, 2, 0],
+          [0, 2, 0],
+          [2, 2, 0],
+        ],
+      ],
+      L: [
+        [
+          [0, 0, 3],
+          [3, 3, 3],
+          [0, 0, 0],
+        ],
+
+        [
+          [0, 3, 0],
+          [0, 3, 0],
+          [0, 3, 3],
+        ],
+
+        [
+          [0, 0, 0],
+          [3, 3, 3],
+          [3, 0, 0],
+        ],
+
+        [
+          [3, 3, 0],
+          [0, 3, 0],
+          [0, 3, 0],
+        ],
+      ],
+      O: [
+        [
+          [4, 4],
+          [4, 4],
+        ],
+      ],
+      S: [
+        [
+          [0, 5, 5],
+          [5, 5, 0],
+          [0, 0, 0],
+        ],
+
+        [
+          [0, 5, 0],
+          [0, 5, 5],
+          [0, 0, 5],
+        ],
+
+        [
+          [0, 0, 0],
+          [0, 5, 5],
+          [5, 5, 0],
+        ],
+
+        [
+          [5, 0, 0],
+          [5, 5, 0],
+          [0, 5, 0],
+        ],
+      ],
+      T: [
+        [
+          [0, 6, 0],
+          [6, 6, 6],
+          [0, 0, 0],
+        ],
+
+        [
+          [0, 6, 0],
+          [0, 6, 6],
+          [0, 6, 0],
+        ],
+
+        [
+          [0, 0, 0],
+          [6, 6, 6],
+          [0, 6, 0],
+        ],
+
+        [
+          [0, 6, 0],
+          [6, 6, 0],
+          [0, 6, 0],
+        ],
+      ],
+      Z: [
+        [
+          [7, 7, 0],
+          [0, 7, 7],
+          [0, 0, 0],
+        ],
+
+        [
+          [0, 0, 7],
+          [0, 7, 7],
+          [0, 7, 0],
+        ],
+
+        [
+          [0, 0, 0],
+          [7, 7, 0],
+          [0, 7, 7],
+        ],
+
+        [
+          [0, 7, 0],
+          [7, 7, 0],
+          [7, 0, 0],
+        ],
+      ],
+    };
+
+    const COLORS = [
+      "#000000", // placeholder for 0
+      "#00ffff", // I - cyan
+      "#0000ff", // J - blue
+      "#ff7f00", // L - orange
+      "#ffff00", // O - yellow
+      "#00ff00", // S - green
+      "#800080", // T - purple
+      "#ff0000", // Z - red
+    ];
+
+    class Piece {
+      shape: number[][];
+      rotations: number[][][];
+      rotationIndex: number;
+      x: number;
+      y: number;
+      colorIndex: number;
+
+      constructor(public type: string) {
+        this.rotations = TETROMINOES[type];
+        this.rotationIndex = 0;
+        this.shape = this.rotations[this.rotationIndex];
+        this.colorIndex = this.findColorIndex();
+
+        this.x = Math.floor((COLS - this.shape[0].length) / 2);
+        this.y = -2; //start on tiles 21 and 22
+      }
+
+      findColorIndex() {
+        for (const row of this.shape) for (const v of row) if (v) return v;
+        return 1;
+      }
+
+      rotateCW() {
+        this.rotationIndex = (this.rotationIndex + 1) % this.rotations.length;
+        this.shape = this.rotations[this.rotationIndex];
+      }
+
+      rotateCCW() {
+        this.rotationIndex =
+          (this.rotationIndex - 1 + this.rotations.length) %
+          this.rotations.length;
+        this.shape = this.rotations[this.rotationIndex];
+      }
+
+      getCells(): { x: number; y: number; val: number }[] {
+        const cells: { x: number; y: number; val: number }[] = [];
+
+        for (let r = 0; r < this.shape.length; r++) {
+          for (let c = 0; c < this.shape[r].length; c++) {
+            const val = this.shape[r][c];
+            if (val) cells.push({ x: this.x + c, y: this.y + r, val });
+          }
+        }
+        return cells;
+      }
+    }
+
+    class Game {
+      board: Cell[][];
+      canvas: HTMLCanvasElement | null;
+      holdCanvas: HTMLCanvasElement | null;
+      queueCanvas: HTMLCanvasElement | null;
+      ctx: CanvasRenderingContext2D;
+      holdCtx: CanvasRenderingContext2D;
+      queueCtx: CanvasRenderingContext2D;
+      piece: Piece | null = null;
+      holdPiece: Piece | null = null;
+      canHold: boolean = true;
+      nextQueue: string[] = [];
+      score = 0;
+      level = 1;
+      lines = 0;
+      dropInterval = 1000;
+      lastDrop = 0;
+      isGameOver = false;
+      isPaused = false;
+
+      constructor(canvasId: string) {
+        const el = document.getElementById(
+          canvasId,
+        ) as HTMLCanvasElement | null;
+        this.canvas = el;
+        this.canvas.width = COLS * BLOCK;
+        this.canvas.height = ROWS * BLOCK;
+        const ctx = this.canvas.getContext("2d");
+        this.ctx = ctx;
+
+        this.holdCanvas = document.getElementById("hold");
+        this.queueCanvas = document.getElementById("queue");
+        this.holdCtx = this.holdCanvas.getContext("2d");
+        this.queueCtx = this.queueCanvas.getContext("2d");
+
+        this.board = this.createEmptyBoard();
+        this.fillBag();
+
+        this.spawnPiece();
+        this.registerListeners();
+        requestAnimationFrame(this.loop.bind(this));
+      }
+
+      createEmptyBoard(): Cell[][] {
+        const b: Cell[][] = [];
+        for (let r = 0; r < ROWS; r++) {
+          const row: Cell[] = new Array(COLS).fill(0);
+          b.push(row);
+        }
+        return b;
+      }
+
+      fillBag() {
+        // classic 7-bag randomizer
+        const pieces = Object.keys(TETROMINOES);
+        const bag = [...pieces];
+        for (let i = bag.length - 1; i > 0; i--) {
+          const j = Math.floor(Math.random() * (i + 1));
+          [bag[i], bag[j]] = [bag[j], bag[i]];
+        }
+        this.nextQueue.push(...bag);
+      }
+
+      hold() {
+        if (!this.canHold) return;
+
+        [this.piece, this.holdPiece] = [this.holdPiece, this.piece];
+        if (!this.piece) this.spawnPiece();
+
+        this.piece.x = Math.floor((COLS - this.piece.shape[0].length) / 2);
+        this.piece.y = -2;
+        this.piece.rotationIndex = 0;
+        this.piece.shape = this.piece.rotations[this.piece.rotationIndex];
+
+        this.canHold = false;
+        this.drawHold();
+      }
+
+      spawnPiece() {
+        this.canHold = true;
+        if (this.nextQueue.length < 7) this.fillBag();
+        const type = this.nextQueue.shift()!;
+        this.piece = new Piece(type);
+        // If spawn collides immediately -> game over
+        if (this.collides(this.piece)) {
+          this.isGameOver = true;
+        }
+
+        this.drawHold();
+        this.drawQueue();
+      }
+
+      collides(piece: Piece): boolean {
+        for (const cell of piece.getCells()) {
+          if (cell.y >= ROWS) return true;
+          if (cell.x < 0 || cell.x >= COLS) return true;
+          if (cell.y >= 0 && this.board[cell.y][cell.x]) return true;
+        }
+        return false;
+      }
+
+      getGhostOffset(piece: Piece): number {
+        let y: number = 0;
+        while (true) {
+          for (const cell of piece.getCells()) {
+            console.log(cell.y + y);
+            if (
+              cell.y + y >= ROWS ||
+              (cell.y + y >= 0 && this.board[cell.y + y][cell.x])
+            )
+              return y - 1;
+          }
+
+          y++;
+        }
+      }
+
+      lockPiece() {
+        if (!this.piece) return;
+        let isValid: boolean = false;
+        for (const cell of this.piece.getCells()) {
+          if (cell.y >= 0 && cell.y < ROWS && cell.x >= 0 && cell.x < COLS)
+            this.board[cell.y][cell.x] = cell.val;
+          if (cell.y < 20) isValid = true;
+        }
+        if (!isValid) this.isGameOver = true;
+
+        this.clearLines();
+        this.spawnPiece();
+      }
+
+      clearLines() {
+        let linesCleared = 0;
+        outer: for (let r = ROWS - 1; r >= 0; r--) {
+          for (let c = 0; c < COLS; c++) if (!this.board[r][c]) continue outer;
+
+          this.board.splice(r, 1);
+          this.board.unshift(new Array(COLS).fill(0));
+          linesCleared++;
+          r++;
+        }
+
+        if (linesCleared > 0) {
+          this.lines += linesCleared;
+          // scoring like classic tetris
+          const points = [0, 40, 100, 300, 1200];
+          this.score += (points[linesCleared] || 0) * this.level;
+          // level up every 10 lines (Fixed Goal System)
+          const newLevel = Math.floor(this.lines / 10) + 1;
+          if (newLevel > this.level) {
+            this.level = newLevel;
+            this.dropInterval = Math.max(100, 1000 - (this.level - 1) * 75);
+          }
+        }
+      }
+
+      rotatePiece(dir: "cw" | "ccw") {
+        if (!this.piece) return;
+        // Try rotation with wall kicks
+        const originalIndex = this.piece.rotationIndex;
+        if (dir === "cw") this.piece.rotateCW();
+        else this.piece.rotateCCW();
+        const kicks = [0, -1, 1, -2, 2];
+        for (const k of kicks) {
+          this.piece.x += k;
+          if (!this.collides(this.piece)) return;
+          this.piece.x -= k;
+        }
+        // no valid kick, revert
+        this.piece.rotationIndex = originalIndex;
+        this.piece.shape = this.piece.rotations[originalIndex];
+      }
+
+      movePiece(dx: number, dy: number) {
+        if (!this.piece) return;
+        this.piece.x += dx;
+        this.piece.y += dy;
+        if (this.collides(this.piece)) {
+          this.piece.x -= dx;
+          this.piece.y -= dy;
+          return false;
+        }
+        return true;
+      }
+
+      hardDrop() {
+        if (!this.piece) return;
+        let dropped = 0;
+        while (this.movePiece(0, 1)) dropped++;
+        this.score += dropped * 2;
+        this.lockPiece();
+      }
+
+      softDrop() {
+        if (!this.piece) return;
+        if (!this.movePiece(0, 1)) return;
+        //this.lockPiece();
+        else this.score += 1;
+      }
+
+      keys: Record<string, boolean> = {};
+
+      registerListeners() {
+        window.addEventListener("keydown", (e) => {
+          this.keys[e.key] = true;
+
+          if (this.isGameOver) return;
+
+          if (e.key === "p" || e.key === "P" || e.key === "Escape")
+            this.isPaused = !this.isPaused;
+
+          if (this.isPaused) return;
+
+          if (e.key === "ArrowLeft") this.movePiece(-1, 0);
+          else if (e.key === "ArrowRight") this.movePiece(1, 0);
+          else if (e.key === "ArrowDown") this.softDrop();
+          else if (e.code === "Space") {
+            e.preventDefault();
+            this.hardDrop();
+          } else if (e.code === "ShiftLeft") {
+            e.preventDefault();
+            this.hold();
+          } else if (e.key === "x" || e.key === "X" || e.key === "ArrowUp")
+            this.rotatePiece("cw");
+          else if (e.key === "z" || e.key === "Z" || e.code === "ControlLeft")
+            this.rotatePiece("ccw");
+        });
+
+        document.addEventListener("keyup", (e) => {
+          this.keys[e.key] = false;
+        });
+      }
+
+      loop(timestamp: number) {
+        if (!this.lastDrop) this.lastDrop = timestamp;
+        if (!this.isPaused && !this.isGameOver) {
+          if (timestamp - this.lastDrop > this.dropInterval) {
+            if (!this.movePiece(0, 1)) this.lockPiece();
+            this.lastDrop = timestamp;
+          }
+        }
+        this.draw();
+        requestAnimationFrame(this.loop.bind(this));
+      }
+
+      drawGrid() {
+        const ctx = this.ctx;
+        ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
+        ctx.strokeStyle = "#222";
+        for (let r = 0; r <= ROWS; r++) {
+          // horizontal lines
+          ctx.beginPath();
+          ctx.moveTo(0, r * BLOCK);
+          ctx.lineTo(COLS * BLOCK, r * BLOCK);
+          ctx.stroke();
+        }
+        for (let c = 0; c <= COLS; c++) {
+          ctx.beginPath();
+          ctx.moveTo(c * BLOCK, 0);
+          ctx.lineTo(c * BLOCK, ROWS * BLOCK);
+          ctx.stroke();
+        }
+      }
+
+      drawBoard() {
+        for (let r = 0; r < ROWS; r++) {
+          for (let c = 0; c < COLS; c++) {
+            const val = this.board[r][c];
+            if (val) this.fillBlock(c, r, COLORS[val]);
+            else this.clearBlock(c, r);
+          }
+        }
+      }
+
+      drawPiece() {
+        if (!this.piece) return;
+
+        for (const cell of this.piece.getCells())
+          if (cell.y >= 0) this.fillBlock(cell.x, cell.y, COLORS[cell.val]);
+
+        let offset: number = this.getGhostOffset(this.piece);
+        for (const cell of this.piece.getCells())
+          if (cell.y + offset >= 0)
+            this.fillGhostBlock(cell.x, cell.y + offset, COLORS[cell.val]);
+      }
+
+      drawHold() {
+        if (!this.holdPiece) return;
+
+        this.holdCtx.clearRect(0, 0, 200, 200);
+        let y: number = 0;
+        for (const row of this.holdPiece.rotations[0]) {
+          let x: number = 0;
+          for (const val of row) {
+            if (val) {
+              this.holdCtx.fillStyle = this.canHold
+                ? COLORS[this.holdPiece.findColorIndex()]
+                : "gray";
+              this.holdCtx.fillRect(
+                x * BLOCK +
+                  1 +
+                  (4 - this.holdPiece.rotations[0].length) * 15 +
+                  10,
+                y * BLOCK + 1 + 20,
+                BLOCK - 2,
+                BLOCK - 2,
+              );
+            }
+            x++;
+          }
+          y++;
+        }
+      }
+
+      drawQueue() {
+        this.queueCtx.clearRect(0, 0, 500, 500);
+        let placement: number = 0;
+        console.log(this.nextQueue.slice(0, 5));
+        for (const nextPiece of this.nextQueue.slice(0, 5)) {
+          let y: number = 0;
+          for (const row of TETROMINOES[nextPiece][0]) {
+            let x: number = 0;
+            for (const val of row) {
+              if (val) {
+                this.queueCtx.fillStyle =
+                  COLORS[
+                    ["I", "J", "L", "O", "S", "T", "Z"].indexOf(nextPiece) + 1
+                  ];
+                this.queueCtx.fillRect(
+                  x * BLOCK +
+                    1 +
+                    (4 - TETROMINOES[nextPiece][0].length) * 15 +
+                    10,
+                  y * BLOCK +
+                    1 +
+                    placement * 80 +
+                    20 -
+                    (nextPiece === "I" ? 15 : 0),
+                  BLOCK - 2,
+                  BLOCK - 2,
+                );
+              }
+              x++;
+            }
+            y++;
+          }
+          placement++;
+        }
+      }
+
+      fillBlock(x: number, y: number, color: string) {
+        const ctx = this.ctx;
+        ctx.fillStyle = color;
+        ctx.fillRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
+      }
+      fillGhostBlock(x: number, y: number, color: string) {
+        const ctx = this.ctx;
+        ctx.strokeStyle = color;
+        ctx.strokeRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
+      }
+
+      clearBlock(x: number, y: number) {
+        const ctx = this.ctx;
+        ctx.clearRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
+      }
+
+      drawHUD() {
+        const ctx = this.ctx;
+        ctx.fillStyle = "rgba(0,0,0,0.6)";
+        ctx.fillRect(4, 4, 120, 60);
+        ctx.fillStyle = "#fff";
+        ctx.font = "12px Kubasta";
+        ctx.fillText(`Score: ${this.score}`, 8, 20);
+        ctx.fillText(`Lines: ${this.lines}`, 8, 36);
+        ctx.fillText(`Level: ${this.level}`, 8, 52);
+
+        if (this.isPaused) {
+          ctx.fillStyle = "rgba(0,0,0,0.7)";
+          ctx.fillRect(0, this.canvas.height / 2 - 24, this.canvas.width, 48);
+          ctx.fillStyle = "#fff";
+          ctx.font = "24px Kubasta";
+          ctx.textAlign = "center";
+          ctx.fillText(
+            "PAUSED",
+            this.canvas.width / 2,
+            this.canvas.height / 2 + 8,
+          );
+          ctx.textAlign = "start";
+        }
+
+        if (this.isGameOver) {
+          ctx.fillStyle = "rgba(0,0,0,0.7)";
+          ctx.fillRect(0, this.canvas.height / 2 - 36, this.canvas.width, 72);
+          ctx.fillStyle = "#fff";
+          ctx.font = "28px Kubasta";
+          ctx.textAlign = "center";
+          ctx.fillText(
+            "GAME OVER",
+            this.canvas.width / 2,
+            this.canvas.height / 2 + 8,
+          );
+          ctx.textAlign = "start";
+        }
+      }
+
+      draw() {
+        // clear everything
+        this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
+
+        this.ctx.fillStyle = "#000";
+        this.ctx.fillRect(0, 0, this.canvas.width, this.canvas.height);
+
+        this.ctx.strokeStyle = "#111";
+        for (let r = 0; r <= ROWS; r++) {
+          this.ctx.beginPath();
+          this.ctx.moveTo(0, r * BLOCK);
+          this.ctx.lineTo(COLS * BLOCK, r * BLOCK);
+          this.ctx.stroke();
+        }
+        for (let c = 0; c <= COLS; c++) {
+          this.ctx.beginPath();
+          this.ctx.moveTo(c * BLOCK, 0);
+          this.ctx.lineTo(c * BLOCK, ROWS * BLOCK);
+          this.ctx.stroke();
+        }
+
+        this.drawBoard();
+        this.drawPiece();
+        this.drawHUD();
+      }
+    }
+
+    const game = new Game("board");
+  }
 }

From d15161dba4dc676a449282cfbcb49ca5baf89ab8 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Mon, 13 Oct 2025 15:10:54 +0200
Subject: [PATCH 033/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat:=20n?=
 =?UTF-8?q?ow=20creating=20user=20on=20the=20user=20api=20when=20registeri?=
 =?UTF-8?q?ng?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example                      |  3 +++
 src/api/auth/gRegisterCallback.js |  3 +++
 src/api/auth/register.js          |  3 +++
 src/utils/authUserCreate.js       | 24 ++++++++++++++++++++++++
 4 files changed, 33 insertions(+)
 create mode 100644 src/utils/authUserCreate.js

diff --git a/.env.example b/.env.example
index 8ecbc62..72ae740 100644
--- a/.env.example
+++ b/.env.example
@@ -24,3 +24,6 @@ SMTP_FROM=<the address to send from>
 SMTP_AUTH_USERNAME=<smtp-user>
 SMTP_AUTH_PASSWORD=<smtp pass>
 EMAIL_TO=<mail to send to>
+
+USER_URL=<the url to the user api>
+AUTH_URL=<the url to the auth api>
diff --git a/src/api/auth/gRegisterCallback.js b/src/api/auth/gRegisterCallback.js
index f79542f..40d8111 100644
--- a/src/api/auth/gRegisterCallback.js
+++ b/src/api/auth/gRegisterCallback.js
@@ -1,6 +1,7 @@
 import axios from 'axios'
 
 import authDB from '../../utils/authDB.js';
+import { authUserCreate } from '../../utils/authUserCreate.js';
 
 var env = process.env.NODE_ENV || 'development';
 
@@ -46,6 +47,8 @@ export async function gRegisterCallback(request, reply, fastify) {
 
 		authDB.addUser(user.username, '');
 
+		authUserCreate(user.username, fastify)
+
 		const token = fastify.jwt.sign(user);
 
 		return reply
diff --git a/src/api/auth/register.js b/src/api/auth/register.js
index 7463452..5e10ff1 100644
--- a/src/api/auth/register.js
+++ b/src/api/auth/register.js
@@ -2,6 +2,7 @@ import bcrypt from 'bcrypt';
 
 import { isValidString } from '../../utils/authUtils.js';
 import authDB from '../../utils/authDB.js';
+import { authUserCreate } from '../../utils/authUserCreate.js';
 
 var env = process.env.NODE_ENV || 'development';
 
@@ -36,6 +37,8 @@ export async function register(request, reply, saltRounds, fastify) {
 		const hash = await bcrypt.hash(password, saltRounds);
 		authDB.addUser(user, hash);
 
+		authUserCreate(user, fastify)
+
 		const token = fastify.jwt.sign({ user });
 
 		return reply
diff --git a/src/utils/authUserCreate.js b/src/utils/authUserCreate.js
new file mode 100644
index 0000000..d453285
--- /dev/null
+++ b/src/utils/authUserCreate.js
@@ -0,0 +1,24 @@
+import axios from 'axios';
+
+/**
+ * @param {string} username
+ * @param {import('fastify').FastifyInstance} fastify
+ */
+export async function authUserCreate(username, fastify) {
+    const payload = {
+        displayName: username,
+    };
+    const cookie = fastify.jwt.sign({ user: "admin" });
+
+	const url = process.env.USER_URL || "http://localhost:3002/"
+
+    await axios.post(
+        "http://localhost:3002/users/" + username,
+        payload,
+        {
+            headers: {
+                'Cookie': 'token=' + cookie,
+            },
+        }
+    );
+}

From cf59dd07612ab00b40dbf49ca4d11608122cc173 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Tue, 14 Oct 2025 13:48:01 +0200
Subject: [PATCH 034/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20now=20redirecting=20on=20/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/gLogCallback.js      | 4 +---
 src/api/auth/gRegisterCallback.js | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/api/auth/gLogCallback.js b/src/api/auth/gLogCallback.js
index 975b7d6..c596cd4 100644
--- a/src/api/auth/gLogCallback.js
+++ b/src/api/auth/gLogCallback.js
@@ -45,9 +45,7 @@ export async function gLogCallback(request, reply, fastify) {
 				path: '/',
 				secure: env !== 'development',
 				sameSite: 'lax',
-			})
-			.code(200)
-			.send({ msg: "Login successful" });
+			}).redirect('/');
 	} catch (error) {
 		fastify.log.error(error);
 		reply.code(500).send({ error: 'Internal server error' });
diff --git a/src/api/auth/gRegisterCallback.js b/src/api/auth/gRegisterCallback.js
index f79542f..bfa8a11 100644
--- a/src/api/auth/gRegisterCallback.js
+++ b/src/api/auth/gRegisterCallback.js
@@ -54,9 +54,7 @@ export async function gRegisterCallback(request, reply, fastify) {
 				path: '/',
 				secure: env !== 'development',
 				sameSite: 'lax',
-			})
-			.code(200)
-			.send({ msg: "Register successful" });
+			}).redirect('/');
 	} catch (error) {
 		fastify.log.error(error);
 		reply.code(500).send({ error: 'Internal server error' });

From 67cae236e1812fa87804c07d49c61c9e0f41faf6 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Tue, 14 Oct 2025 13:49:23 +0200
Subject: [PATCH 035/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20getting=20from=20env=20instead?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/gLogCallback.js      | 2 +-
 src/api/auth/gRegisterCallback.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/auth/gLogCallback.js b/src/api/auth/gLogCallback.js
index c596cd4..a8c2f20 100644
--- a/src/api/auth/gLogCallback.js
+++ b/src/api/auth/gLogCallback.js
@@ -45,7 +45,7 @@ export async function gLogCallback(request, reply, fastify) {
 				path: '/',
 				secure: env !== 'development',
 				sameSite: 'lax',
-			}).redirect('/');
+			}).redirect(process.env.CALLBACK_REDIR);
 	} catch (error) {
 		fastify.log.error(error);
 		reply.code(500).send({ error: 'Internal server error' });
diff --git a/src/api/auth/gRegisterCallback.js b/src/api/auth/gRegisterCallback.js
index bfa8a11..7ef5afc 100644
--- a/src/api/auth/gRegisterCallback.js
+++ b/src/api/auth/gRegisterCallback.js
@@ -54,7 +54,7 @@ export async function gRegisterCallback(request, reply, fastify) {
 				path: '/',
 				secure: env !== 'development',
 				sameSite: 'lax',
-			}).redirect('/');
+			}).redirect(process.env.CALLBACK_REDIR);
 	} catch (error) {
 		fastify.log.error(error);
 		reply.code(500).send({ error: 'Internal server error' });

From 036798ab56f649b70ba9e5f524ae64a3164d0065 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Tue, 14 Oct 2025 13:54:20 +0200
Subject: [PATCH 036/109] =?UTF-8?q?=E3=80=8C=F0=9F=93=9D=E3=80=8D=20doc:?=
 =?UTF-8?q?=20added=20redir=20env?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.env.example b/.env.example
index 8ecbc62..ed35459 100644
--- a/.env.example
+++ b/.env.example
@@ -12,6 +12,8 @@ GRAPH_PORT=3000
 ELK_PORT=5601
 
 GOOGLE_CALLBACK_URL=https://localhost:8443/api/v1
+# the url to which the user will be redirected when it logs with google 
+CALLBACK_REDIR=http://localhost:3000
 GOOGLE_CLIENT_SECRET=susAF
 GOOGLE_CLIENT_ID=Really
 
@@ -24,3 +26,4 @@ SMTP_FROM=<the address to send from>
 SMTP_AUTH_USERNAME=<smtp-user>
 SMTP_AUTH_PASSWORD=<smtp pass>
 EMAIL_TO=<mail to send to>
+

From f3bb3ce5eb9b582010bdf1e9aad98af83973cb29 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Tue, 14 Oct 2025 15:02:31 +0200
Subject: [PATCH 037/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20changed=20to=20env?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example            | 2 ++
 src/api/auth/default.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 8ecbc62..304a913 100644
--- a/.env.example
+++ b/.env.example
@@ -24,3 +24,5 @@ SMTP_FROM=<the address to send from>
 SMTP_AUTH_USERNAME=<smtp-user>
 SMTP_AUTH_PASSWORD=<smtp pass>
 EMAIL_TO=<mail to send to>
+
+CORS_ORIGIN=<the url of origin for cors>
diff --git a/src/api/auth/default.js b/src/api/auth/default.js
index 0650fa1..a39fc99 100644
--- a/src/api/auth/default.js
+++ b/src/api/auth/default.js
@@ -24,7 +24,7 @@ authDB.prepareDB();
 export default async function(fastify, options) {
 
 	fastify.register(cors, {
-		origin: "http://localhost:5173",
+		origin: process.ENV.CORS_ORIGIN || '*',
 		credentials: true,
 		methods: [ "GET", "POST", "DELETE", "OPTIONS" ]
 	});

From 9f194449ac0017e6cc82b55534f5724c910bfc95 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Tue, 14 Oct 2025 15:03:14 +0200
Subject: [PATCH 038/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20change=20default=20to=20vite=20url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/default.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/auth/default.js b/src/api/auth/default.js
index a39fc99..63b9888 100644
--- a/src/api/auth/default.js
+++ b/src/api/auth/default.js
@@ -24,7 +24,7 @@ authDB.prepareDB();
 export default async function(fastify, options) {
 
 	fastify.register(cors, {
-		origin: process.ENV.CORS_ORIGIN || '*',
+		origin: process.ENV.CORS_ORIGIN || 'http://localhost:5173',
 		credentials: true,
 		methods: [ "GET", "POST", "DELETE", "OPTIONS" ]
 	});

From d80beff543f91abe616e007d2007876145821d0b Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Tue, 14 Oct 2025 18:24:22 +0200
Subject: [PATCH 039/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20fixed=20cookie=20with=20google=20callback?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/gLogCallback.js      | 2 +-
 src/api/auth/gRegisterCallback.js | 2 +-
 src/utils/authUserCreate.js       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/auth/gLogCallback.js b/src/api/auth/gLogCallback.js
index a8c2f20..6b3c78b 100644
--- a/src/api/auth/gLogCallback.js
+++ b/src/api/auth/gLogCallback.js
@@ -37,7 +37,7 @@ export async function gLogCallback(request, reply, fastify) {
 			return reply.code(400).send({ error: "User does not exist" });
 		}
 
-		const token = fastify.jwt.sign(user);
+		const token = fastify.jwt.sign({ user: user.username});
 
 		return reply
 			.setCookie('token', token, {
diff --git a/src/api/auth/gRegisterCallback.js b/src/api/auth/gRegisterCallback.js
index 4265413..217fae5 100644
--- a/src/api/auth/gRegisterCallback.js
+++ b/src/api/auth/gRegisterCallback.js
@@ -49,7 +49,7 @@ export async function gRegisterCallback(request, reply, fastify) {
 
 		authUserCreate(user.username, fastify)
 
-		const token = fastify.jwt.sign(user);
+		const token = fastify.jwt.sign({ user: user.username});
 
 		return reply
 			.setCookie('token', token, {
diff --git a/src/utils/authUserCreate.js b/src/utils/authUserCreate.js
index d453285..a1d6bba 100644
--- a/src/utils/authUserCreate.js
+++ b/src/utils/authUserCreate.js
@@ -13,7 +13,7 @@ export async function authUserCreate(username, fastify) {
 	const url = process.env.USER_URL || "http://localhost:3002/"
 
     await axios.post(
-        "http://localhost:3002/users/" + username,
+        url + "users/" + username,
         payload,
         {
             headers: {

From 005e9ebbbb9eb4bb88710df905c47b51ab0c6a1f Mon Sep 17 00:00:00 2001
From: Tzvetan Trave <tzvetan.trave@abadcafe.org>
Date: Wed, 15 Oct 2025 14:02:59 +0200
Subject: [PATCH 040/109] fixed an inconsistency with the documentation

---
 src/api/user/gUser.js         |  2 +-
 src/api/user/pMatchHistory.js | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/api/user/gUser.js b/src/api/user/gUser.js
index 16a8439..4da2426 100644
--- a/src/api/user/gUser.js
+++ b/src/api/user/gUser.js
@@ -5,7 +5,7 @@ export async function gUser(request, reply, fastify, getUserInfo) {
 		if (!userInfo) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
-		return reply.code(200).send({ userInfo });
+		return reply.code(200).send({ username: userInfo.username, displayName: userInfo.displayName, wins: userInfo.wins, losses: userInfo.losses });
 	} catch (err) {
 		fastify.log.error(err);
 		return reply.code(500).send({ error: "Internal server error" });
diff --git a/src/api/user/pMatchHistory.js b/src/api/user/pMatchHistory.js
index d619149..1cf17b4 100644
--- a/src/api/user/pMatchHistory.js
+++ b/src/api/user/pMatchHistory.js
@@ -1,3 +1,12 @@
+async function fetchSave(request, reply, userId, addMatch) {
+	const res = await fetch('http://localhost:3003/', { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ p1: userId, p2: request.body.opponent, p1Score: request.body.myScore, p2Score: request.body.opponentScore }) });
+	if (!res.ok) {
+		throw new Error('Internal server error');
+	}
+	const data = await res.json();
+	addMatch.run(userId, data.id);
+}
+
 export async function pMatchHistory(request, reply, fastify, getUserInfo, addMatch, incWins, incLosses) {
 	try {
 		const userId = request.params.userId;
@@ -16,11 +25,7 @@ export async function pMatchHistory(request, reply, fastify, getUserInfo, addMat
 		if (request.body.opponent === userId) {
 			return reply.code(400).send({ error: "Do you have dementia ? You cannot have played a match against yourself gramps" });
 		}
-		const res = await fetch('http://localhost:3003/', { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ p1: userId, p2: request.body.opponent, p1Score: request.body.myScore, p2Score: request.body.opponentScore }) });
-		if (!res.ok)
-			return reply.code(500).send({ error: "Internal server error" });
-		const data = await res.json();
-		addMatch.run(userId, data.id);
+		await fetchSave(request, reply, userId, addMatch);
 		if (request.body.myScore > request.body.opponentScore) {
 			incWins.run(userId);
 			incLosses.run(request.body.opponent);

From 8d937764446ffaaa79d9cb4d8822abe7e14753d7 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Wed, 15 Oct 2025 16:40:28 +0200
Subject: [PATCH 041/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20added=20cors=20to=20user=20api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user/default.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/api/user/default.js b/src/api/user/default.js
index a5efe65..1c63b59 100644
--- a/src/api/user/default.js
+++ b/src/api/user/default.js
@@ -1,5 +1,6 @@
 import fastifyJWT from '@fastify/jwt';
 import fastifyCookie from '@fastify/cookie';
+import cors from '@fastify/cors'
 import Database from 'better-sqlite3';
 
 var env = process.env.NODE_ENV || 'development';
@@ -56,6 +57,13 @@ const deleteFriends = database.prepare('DELETE FROM friends WHERE username = ?;'
  * @param {import('fastify').FastifyPluginOptions}	options
  */
 export default async function(fastify, options) {
+
+	fastify.register(cors, {
+		origin: process.ENV.CORS_ORIGIN || 'http://localhost:5173',
+		credentials: true,
+		methods: [ "GET", "POST", "DELETE", "OPTIONS" ]
+	});
+
 	fastify.register(fastifyJWT, {
 		secret: process.env.JWT_SECRET || '123456789101112131415161718192021',
 		cookie: {

From 2a252b4af34a087ae7fa7e573c661a60a9806bee Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Wed, 15 Oct 2025 16:42:00 +0200
Subject: [PATCH 042/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip(docker):=20added=20cors=20env=20to=20docker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/api-base/compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/api-base/compose.yml b/docker/api-base/compose.yml
index 76b987e..fa6d469 100644
--- a/docker/api-base/compose.yml
+++ b/docker/api-base/compose.yml
@@ -15,6 +15,7 @@ services:
       - API_TARGET=user
       - LOG_FILE_PATH=/var/log/log.log
       - JWT_SECRET=${JWT_SECRET}
+      - CORS_ORIGIN=${CORS_ORIGIN}
     restart: unless-stopped
   auth-api:
     container_name: transcendence-api-auth
@@ -35,6 +36,7 @@ services:
       - API_TARGET=auth
       - LOG_FILE_PATH=/var/log/log.log
       - JWT_SECRET=${JWT_SECRET}
+      - CORS_ORIGIN=${CORS_ORIGIN}
     restart: unless-stopped
   scorestore-api:
     container_name: transcendence-api-scoreStore

From e4e53e06f67b6cd518a235769c0d039f2568a310 Mon Sep 17 00:00:00 2001
From: Tzvetan Trave <tzvetan.trave@abadcafe.org>
Date: Wed, 15 Oct 2025 18:19:51 +0200
Subject: [PATCH 043/109] added tetris game management

---
 doc/user/user.md               | 49 +++++++++++++++++++---------
 src/api/user/dMatchHistory.js  | 15 +++++++--
 src/api/user/dUser.js          |  3 +-
 src/api/user/default.js        | 58 +++++++++++++++++++++-------------
 src/api/user/gMatchHistory.js  |  7 ++--
 src/api/user/gNumberMatches.js |  6 +++-
 src/api/user/gUser.js          |  2 +-
 src/api/user/gUsers.js         | 14 +++++++-
 src/api/user/pMatchHistory.js  | 30 +++++++++++++-----
 9 files changed, 130 insertions(+), 54 deletions(-)

diff --git a/doc/user/user.md b/doc/user/user.md
index 7821997..da1a991 100644
--- a/doc/user/user.md
+++ b/doc/user/user.md
@@ -87,13 +87,14 @@ Can return:
 }
 ```
 
-## POST `/users/:userId/matchHistory`
+## POST `/users/:userId/matchHistory?game=<pong/tetris>`
 
-Used to add a match result to an user
+Used to add a match result to an user to a specific game
 
 Input needed :
 ```json
 {
+	"game": "<pong/tetris>"
 	"opponent": "<the opponent's username>",
 	"myScore": <my score>,
 	"opponentScore": <the opponent's score>
@@ -107,7 +108,7 @@ Can return:
 	"msg": "Match successfully saved to the blockchain"
 }
 ```
-- 400 with response (if no user is specified in header, or no opponent/p1Score/p2Score is specified in body, or opponent is the user specified in header, or a score is negative)
+- 400 with response (if no user is specified in header, or no opponent/p1Score/p2Score is specified in body, or opponent is the user specified in header, or a score is negative, or the game specified is invalid)
 ```json
 {
 	"error": "<corresponding error>"
@@ -139,8 +140,14 @@ Can return:
 		{
 			"username": "<the username>",
 			"displayName": "<the display name>",
-			"wins": <the number of matches won>,
-			"losses": <the number of matches lost>
+			"pong": {
+				"wins": <the number of pong matches won>,
+				"losses": <the number of pong matches lost>
+			},
+			"tetris": {
+				"wins": <the number of tetris matches won>,
+				"losses": <the number of tetris matches lost>
+			}
 		},
 		...
 	]
@@ -181,8 +188,14 @@ Can return:
 {
 	"username": "<the username>",
 	"displayName": "<the display name>",
-	"wins": <the number of matches won>,
-	"losses": <the number of matches lost>
+	"pong": {
+		"wins": <the number of pong matches won>,
+		"losses": <the number of pong matches lost>
+	},
+	"tetris": {
+		"wins": <the number of tetris matches won>,
+		"losses": <the number of tetris matches lost>
+	}
 }
 ```
 - 404 with response (if user does not exist)
@@ -240,9 +253,9 @@ Can return:
 }
 ```
 
-## GET `/users/:userId/matchHistory?iStart=<starting index (included)>&iEnd=<ending index (excluded)>`
+## GET `/users/:userId/matchHistory?game=<pong/tetris>&iStart=<starting index (included)>&iEnd=<ending index (excluded)>`
 
-Used to get the match history of an user
+Used to get the match history of an user for a specific game
 
 Can return:
 - 200 with response (list of matches results (between iStart and iEnd))
@@ -264,7 +277,7 @@ Can return:
 	]
 }
 ```
-- 400 with response (if iStart/iEnd does not exist, or iEnd < iStart)
+- 400 with response (if iStart/iEnd does not exist, or iEnd < iStart, or the game specified is invalid)
 ```json
 {
 	"error": "<corresponding error>"
@@ -277,9 +290,9 @@ Can return:
 }
 ```
 
-## GET `/users/:userId/matchHistory/count`
+## GET `/users/:userId/matchHistory/count?game=<pong/tetris>`
 
-Used to get the number of matches an user played
+Used to get the number of matches an user played for a specific game
 
 Can return:
 - 200 with response
@@ -288,6 +301,12 @@ Can return:
 	"n_<name of the counted objects>": <number of users>
 }
 ```
+- 400 with response (if game does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
 - 404 with response (if user does not exist)
 ```json
 {
@@ -440,9 +459,9 @@ Can return:
 }
 ```
 
-## DELETE `/users/:userId/matchHistory`
+## DELETE `/users/:userId/matchHistory?game=<pong/tetris>`
 
-Used to delete the match history of an user
+Used to delete the match history of an user for a specific game
 
 Can return:
 - 200 with response
@@ -451,7 +470,7 @@ Can return:
 	"msg": "Match history deleted successfully"
 }
 ```
-- 400 with response (if user specified in header is neither admin nor user)
+- 400 with response (if user specified in header is neither admin nor user, or the game specified is invalid)
 ```json
 {
 	"error": "<corresponding error>"
diff --git a/src/api/user/dMatchHistory.js b/src/api/user/dMatchHistory.js
index 09efa08..8b7cc0e 100644
--- a/src/api/user/dMatchHistory.js
+++ b/src/api/user/dMatchHistory.js
@@ -1,4 +1,4 @@
-export async function dMatchHistory(request, reply, fastify, getUserInfo, deleteMatchHistory, deleteStats) {
+export async function dMatchHistory(request, reply, fastify, getUserInfo, deleteMatchHistory, deleteStatsPong, deleteStatsTetris) {
 	try {
 		if (!request.user) {
 			return reply.code(400).send({ error: "Please specify a user" });
@@ -10,8 +10,17 @@ export async function dMatchHistory(request, reply, fastify, getUserInfo, delete
 		if (request.user !== 'admin' && request.user !== userId) {
 			return reply.code(401).send({ error: "Unauthorized" });
 		}
-		deleteMatchHistory.run(userId);
-		deleteStats.run(userId);
+		const { game } = request.query;
+		if (game !== 'pong' && game !== 'tetris') {
+			return reply.code(400).send({ error: "Specified game does not exist" });
+		}
+		deleteMatchHistory.run(game, userId);
+		if (game === 'pong') {
+			deleteStatsPong.run(userId);
+		}
+		else if (game === 'tetris') {
+			deleteStatsTetris.run(userId);
+		}
 		return reply.code(200).send({ msg: "Match history deleted successfully" });
 	} catch (err) {
 		fastify.log.error(err);
diff --git a/src/api/user/dUser.js b/src/api/user/dUser.js
index 0b0ca0a..d2728af 100644
--- a/src/api/user/dUser.js
+++ b/src/api/user/dUser.js
@@ -3,7 +3,8 @@ export async function dUser(request, reply, fastify, getUserInfo, deleteMatchHis
 		if (!getUserInfo.get(request.params.userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
-		deleteMatchHistory.run(request.params.userId);
+		deleteMatchHistory.run('pong', request.params.userId);
+		deleteMatchHistory.run('tetris', request.params.userId);
 		deleteFriends.run(request.params.userId);
 		deleteUser.run(request.params.userId);
 		return reply.code(200).send({ msg: "User deleted successfully" });
diff --git a/src/api/user/default.js b/src/api/user/default.js
index d122bf9..22ca384 100644
--- a/src/api/user/default.js
+++ b/src/api/user/default.js
@@ -35,11 +35,15 @@ function prepareDB() {
 			id INTEGER PRIMARY KEY AUTOINCREMENT,
 			username TEXT,
 			displayName TEXT,
-			wins INTEGER,
-			losses INTEGER,
+			pongWins INTEGER,
+			pongLosses INTEGER,
+			tetrisWins INTEGER,
+			tetrisLosses INTEGER,
 			UNIQUE(username),
-			CHECK(wins >= 0),
-			CHECK(losses >= 0)
+			CHECK(pongWins >= 0),
+			CHECK(pongLosses >= 0),
+			CHECK(tetrisWins >= 0),
+			CHECK(tetrisLosses >= 0)
 		) STRICT
 	`);
 	database.exec(`
@@ -54,8 +58,12 @@ function prepareDB() {
 	database.exec(`
 		CREATE TABLE IF NOT EXISTS matchHistory (
 			id INTEGER PRIMARY KEY AUTOINCREMENT,
-			username TEXT,
-			matchId INTEGER
+			game TEXT,
+			player1 TEXT,
+			player2 TEXT,
+			matchId INTEGER,
+			CHECK(player1 != player2),
+			CHECK(game = 'pong' OR game = 'tetris')
 		) STRICT
 	`);
 }
@@ -63,34 +71,40 @@ function prepareDB() {
 prepareDB();
 
 // POST
-const createUser = database.prepare('INSERT INTO userData (username, displayName, wins, losses) VALUES (?, ?, 0, 0);');
+const createUser = database.prepare('INSERT INTO userData (username, displayName, pongWins, pongLosses, tetrisWins, tetrisLosses) VALUES (?, ?, 0, 0, 0, 0);');
 const addFriend = database.prepare('INSERT INTO friends (username, friendName) VALUES (?, ?);');
-const addMatch = database.prepare('INSERT INTO matchHistory (username, matchId) VALUES (?, ?);');
-const incWins = database.prepare('UPDATE userData SET wins = wins + 1 WHERE username = ?;');
-const incLosses = database.prepare('UPDATE userData SET losses = losses + 1 WHERE username = ?');
+const addMatch = database.prepare('INSERT INTO matchHistory (game, player1, player2, matchId) VALUES (?, ?, ?, ?);');
+const incWinsPong = database.prepare('UPDATE userData SET pongWins = pongWins + 1 WHERE username = ?;');
+const incLossesPong = database.prepare('UPDATE userData SET pongLosses = pongLosses + 1 WHERE username = ?');
+const incWinsTetris = database.prepare('UPDATE userData SET tetrisWins = tetrisWins + 1 WHERE username = ?;');
+const incLossesTetris = database.prepare('UPDATE userData SET tetrisLosses = tetrisLosses + 1 WHERE username = ?');
 
 // PATCH
 const changeDisplayName = database.prepare('UPDATE userData SET displayName = ? WHERE username = ?;');
 
 // GET
-const getUserData = database.prepare('SELECT username, displayName, wins, losses FROM userData LIMIT ? OFFSET ?;');
-const getUserInfo = database.prepare('SELECT username, displayName, wins, losses FROM userData WHERE username = ?;');
+const getUserData = database.prepare('SELECT username, displayName, pongWins, pongLosses, tetrisWins, tetrisLosses FROM userData LIMIT ? OFFSET ?;');
+const getUserInfo = database.prepare('SELECT username, displayName, pongWins, pongLosses, tetrisWins, tetrisLosses FROM userData WHERE username = ?;');
 const getFriends = database.prepare('SELECT friendName FROM friends WHERE username = ? LIMIT ? OFFSET ?;');
 const getFriend = database.prepare('SELECT friendName FROM friends WHERE username = ? AND friendName = ?;');
-const getMatchHistory = database.prepare('SELECT matchId FROM matchHistory WHERE username = ? LIMIT ? OFFSET ?;');
+const getMatchHistory = database.prepare('SELECT matchId FROM matchHistory WHERE game = ? AND ? IN (player1, player2) LIMIT ? OFFSET ?;');
 const getNumberUsers = database.prepare('SELECT COUNT (DISTINCT username) AS n_users FROM userData;');
 const getNumberFriends = database.prepare('SELECT COUNT (DISTINCT friendName) AS n_friends FROM friends WHERE username = ?;');
-const getNumberMatches = database.prepare('SELECT COUNT (DISTINCT id) AS n_matches FROM matchHistory WHERE username = ?;')
+const getNumberMatches = database.prepare('SELECT COUNT (DISTINCT id) AS n_matches FROM matchHistory WHERE game = ? AND ? IN (player1, player2);')
 
 // DELETE
 const deleteUser = database.prepare('DELETE FROM userData WHERE username = ?;');
 const deleteFriend = database.prepare('DELETE FROM friends WHERE username = ? AND friendName = ?;');
 const deleteFriends = database.prepare('DELETE FROM friends WHERE username = ?;');
-const deleteMatchHistory = database.prepare('DELETE FROM matchHistory WHERE username = ?;');
-const deleteStats = database.prepare('UPDATE userData SET wins = 0, losses = 0 WHERE username = ?;');
+const deleteMatchHistory = database.prepare('DELETE FROM matchHistory WHERE game = ? AND ? IN (player1, player2);');
+const deleteStatsPong = database.prepare('UPDATE userData SET pongWins = 0, pongLosses = 0 WHERE username = ?;');
+const deleteStatsTetris = database.prepare('UPDATE userData SET tetrisWins = 0, tetrisLosses = 0 WHERE username = ?;');
 
 const querySchema = { type: 'object', required: ['iStart', 'iEnd'], properties: { iStart: { type: 'integer', minimum: 0 }, iEnd: { type: 'integer', minimum: 0 } } }
 const bodySchema = { type: 'object', required: ['opponent', 'myScore', 'opponentScore'], properties: { opponent: { type: 'string' }, myScore: { type: 'integer', minimum: 0 }, opponentScore: { type: 'integer', minimum: 0 } } }
+const querySchemaMatchHistory = { type: 'object', required: ['game', 'iStart', 'iEnd'], properties: { game: { type: 'string' }, iStart: { type: 'integer', minimum: 0 }, iEnd: { type: 'integer', minimum: 0 } } }
+const bodySchemaMatchHistory = { type: 'object', required: ['game', 'opponent', 'myScore', 'opponentScore'], properties: { game: { type: 'string' }, opponent: { type: 'string' }, myScore: { type: 'integer', minimum: 0 }, opponentScore: { type: 'integer', minimum: 0 } } }
+const querySchemaMatchHistoryGame = { type: 'object', required: ['game'], properties: { game: { type: 'string' } } }
 
 export default async function(fastify, options) {
 	fastify.register(fastifyJWT, {
@@ -137,10 +151,10 @@ export default async function(fastify, options) {
 	fastify.get('/users/:userId/friends/count', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		return gNumberFriends(request, reply, fastify, getUserInfo, getNumberFriends);
 	});
-	fastify.get('/users/:userId/matchHistory', { preHandler: [fastify.authenticate], schema: { querystring: querySchema } }, async (request, reply) => {
+	fastify.get('/users/:userId/matchHistory', { preHandler: [fastify.authenticate], schema: { querystring: querySchemaMatchHistory } }, async (request, reply) => {
 		return gMatchHistory(request, reply, fastify, getUserInfo, getMatchHistory);
 	});
-	fastify.get('/users/:userId/matchHistory/count', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+	fastify.get('/users/:userId/matchHistory/count', { preHandler: [fastify.authenticate], schema: { query: querySchemaMatchHistoryGame } }, async (request, reply) => {
 		return gNumberMatches(request, reply, fastify, getUserInfo, getNumberMatches);
 	});
 
@@ -151,8 +165,8 @@ export default async function(fastify, options) {
 	fastify.post('/users/:userId/friends/:friendId', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		return pFriend(request, reply, fastify, getUserInfo, getFriend, addFriend);
 	});
-	fastify.post('/users/:userId/matchHistory', { preHandler: [fastify.authenticate], schema: { body: bodySchema } }, async (request, reply) => {
-		return pMatchHistory(request, reply, fastify, getUserInfo, addMatch, incWins, incLosses);
+	fastify.post('/users/:userId/matchHistory', { preHandler: [fastify.authenticate], schema: { body: bodySchemaMatchHistory } }, async (request, reply) => {
+		return pMatchHistory(request, reply, fastify, getUserInfo, addMatch, incWinsPong, incLossesPong, incWinsTetris, incLossesTetris);
 	});
 
 	// PATCH
@@ -173,7 +187,7 @@ export default async function(fastify, options) {
 	fastify.delete('/users/:userId/friends/:friendId', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		return dFriend(request, reply, fastify, getUserInfo, getFriend, deleteFriend);
 	});
-	fastify.delete('/users/:userId/matchHistory', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		return dMatchHistory(request, reply, fastify, getUserInfo, deleteMatchHistory, deleteStats);
+	fastify.delete('/users/:userId/matchHistory', { preHandler: [fastify.authenticate], schema: { query: querySchemaMatchHistoryGame } }, async (request, reply) => {
+		return dMatchHistory(request, reply, fastify, getUserInfo, deleteMatchHistory, deleteStatsPong, deleteStatsTetris);
 	});
 }
diff --git a/src/api/user/gMatchHistory.js b/src/api/user/gMatchHistory.js
index 2566fe3..6fde63e 100644
--- a/src/api/user/gMatchHistory.js
+++ b/src/api/user/gMatchHistory.js
@@ -4,11 +4,14 @@ export async function gMatchHistory(request, reply, fastify, getUserInfo, getMat
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
-		const { iStart, iEnd } = request.query;
+		const { game, iStart, iEnd } = request.query;
+		if (game !== 'pong' && game !== 'tetris') {
+			return reply.code(400).send({ error: "Specified game does not exist" });
+		}
 		if (Number(iEnd) < Number(iStart)) {
 			return reply.code(400).send({ error: "Starting index cannot be strictly inferior to ending index" });
 		}
-		const matchHistoryId = getMatchHistory.all(userId, Number(iEnd) - Number(iStart), Number(iStart));
+		const matchHistoryId = getMatchHistory.all(game, userId, Number(iEnd) - Number(iStart), Number(iStart));
 		if (!matchHistoryId.length) {
 			return reply.code(404).send({ error: "No matches exist in the selected range" });
 		}
diff --git a/src/api/user/gNumberMatches.js b/src/api/user/gNumberMatches.js
index 7abe3a6..f26e628 100644
--- a/src/api/user/gNumberMatches.js
+++ b/src/api/user/gNumberMatches.js
@@ -4,7 +4,11 @@ export async function gNumberMatches(request, reply, fastify, getUserInfo, getNu
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
-		const row = getNumberMatches.get(userId);
+		const { game } = request.query;
+		if (game !== 'pong' && game !== 'tetris') {
+			return reply.code(400).send({ error: "Specified game does not exist" });
+		}
+		const row = getNumberMatches.get(game, userId);
 		return reply.code(200).send({ n_matches: row.n_matches });
 	} catch (err) {
 		fastify.log.error(err);
diff --git a/src/api/user/gUser.js b/src/api/user/gUser.js
index 4da2426..6937e6c 100644
--- a/src/api/user/gUser.js
+++ b/src/api/user/gUser.js
@@ -5,7 +5,7 @@ export async function gUser(request, reply, fastify, getUserInfo) {
 		if (!userInfo) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
-		return reply.code(200).send({ username: userInfo.username, displayName: userInfo.displayName, wins: userInfo.wins, losses: userInfo.losses });
+		return reply.code(200).send({ username: userInfo.username, displayName: userInfo.displayName, pong: { wins: userInfo.pongWins, losses: userInfo.pongLosses }, tetris: { wins: userInfo.tetrisWins, losses: userInfo.tetrisLosses } });
 	} catch (err) {
 		fastify.log.error(err);
 		return reply.code(500).send({ error: "Internal server error" });
diff --git a/src/api/user/gUsers.js b/src/api/user/gUsers.js
index 4a60d6d..bf42f33 100644
--- a/src/api/user/gUsers.js
+++ b/src/api/user/gUsers.js
@@ -8,7 +8,19 @@ export async function gUsers(request, reply, fastify, getUserData) {
 		if (!users.length) {
 			return reply.code(404).send({ error: "No users exist in the selected range" });
 		}
-		return reply.code(200).send({ users });
+		const usersFormat = users.map(obj => ({
+			username: obj.username,
+			displayName: obj.displayName,
+			pong: {
+				wins: obj.pongWins,
+				losses: obj.pongLosses
+			},
+			tetris: {
+				wins: obj.tetrisWins,
+				losses: obj.tetrisLosses
+			}
+		}));
+		return reply.code(200).send({ usersFormat });
 	} catch (err) {
 		fastify.log.error(err);
 		return reply.code(500).send({ error: "Internal server error" });
diff --git a/src/api/user/pMatchHistory.js b/src/api/user/pMatchHistory.js
index 1cf17b4..fc346d1 100644
--- a/src/api/user/pMatchHistory.js
+++ b/src/api/user/pMatchHistory.js
@@ -4,10 +4,10 @@ async function fetchSave(request, reply, userId, addMatch) {
 		throw new Error('Internal server error');
 	}
 	const data = await res.json();
-	addMatch.run(userId, data.id);
+	addMatch.run(request.body.game, userId, request.body.opponent, data.id);
 }
 
-export async function pMatchHistory(request, reply, fastify, getUserInfo, addMatch, incWins, incLosses) {
+export async function pMatchHistory(request, reply, fastify, getUserInfo, addMatch, incWinsPong, incLossesPong, incWinsTetris, incLossesTetris) {
 	try {
 		const userId = request.params.userId;
 		if (!request.user) {
@@ -16,6 +16,9 @@ export async function pMatchHistory(request, reply, fastify, getUserInfo, addMat
 		if (request.user !== 'admin' && request.user !== userId) {
 			return reply.code(401).send({ error: "Unauthorized" });
 		}
+		if (request.body.game !== 'pong' && request.body.game !== 'tetris') {
+			return reply.code(400).send({ error: "Specified game does not exist" });
+		}
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
@@ -26,12 +29,23 @@ export async function pMatchHistory(request, reply, fastify, getUserInfo, addMat
 			return reply.code(400).send({ error: "Do you have dementia ? You cannot have played a match against yourself gramps" });
 		}
 		await fetchSave(request, reply, userId, addMatch);
-		if (request.body.myScore > request.body.opponentScore) {
-			incWins.run(userId);
-			incLosses.run(request.body.opponent);
-		} else if (request.body.myScore < request.body.opponentScore) {
-			incWins.run(request.body.opponent);
-			incLosses.run(userId);
+		if (request.body.game === 'pong') {
+			if (request.body.myScore > request.body.opponentScore) {
+				incWinsPong.run(userId);
+				incLossesPong.run(request.body.opponent);
+			} else if (request.body.myScore < request.body.opponentScore) {
+				incWinsPong.run(request.body.opponent);
+				incLossesPong.run(userId);
+			}
+		}
+		else if (request.body.game === 'tetris') {
+			if (request.body.myScore > request.body.opponentScore) {
+				incWinsTetris.run(userId);
+				incLossesTetris.run(request.body.opponent);
+			} else if (request.body.myScore < request.body.opponentScore) {
+				incWinsTetris.run(request.body.opponent);
+				incLossesTetris.run(userId);
+			}
 		}
 		return reply.code(200).send({ msg: "Match successfully saved to the blockchain" });
 	} catch (err) {

From f689274716965af466496207f6b91191a0c073cf Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 16 Oct 2025 12:29:16 +0200
Subject: [PATCH 044/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip(auth):=20added=20the=20hability=20to=20remove=20user?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/auth/remove.md          | 32 ++++++++++++++++++++++++++++++++
 src/api/auth/default.js     |  3 +++
 src/api/auth/remove.js      | 34 ++++++++++++++++++++++++++++++++++
 src/utils/authUserRemove.js | 19 +++++++++++++++++++
 4 files changed, 88 insertions(+)
 create mode 100644 doc/auth/remove.md
 create mode 100644 src/api/auth/remove.js
 create mode 100644 src/utils/authUserRemove.js

diff --git a/doc/auth/remove.md b/doc/auth/remove.md
new file mode 100644
index 0000000..366c89c
--- /dev/null
+++ b/doc/auth/remove.md
@@ -0,0 +1,32 @@
+# remove user
+
+Available endpoints:
+- DELETE `/`
+
+Common return:
+- 500 with response 
+```json
+{
+    "error": "Internal server error"
+}
+```
+
+## DELETE `/`
+
+User to remove a user from the backend
+
+Inputs: just need a valid JWT cookie
+
+Returns:
+- 200
+```json
+{
+    "msg": "User successfully deleted"
+}
+```
+- 401 || 400
+```json
+{
+    "error": "<corresponding msg>
+}
+```
diff --git a/src/api/auth/default.js b/src/api/auth/default.js
index 0e491ac..422d794 100644
--- a/src/api/auth/default.js
+++ b/src/api/auth/default.js
@@ -11,6 +11,7 @@ import { totpSetup } from './totpSetup.js';
 import { totpDelete } from './totpDelete.js';
 import { totpVerify } from './totpVerify.js';
 import { logout } from './logout.js';
+import { remove } from './remove.js';
 
 const saltRounds = 10;
 export const appName = process.env.APP_NAME || 'knl_meowscendence';
@@ -110,4 +111,6 @@ export default async function(fastify, options) {
 	}, async (request, reply) => { return register(request, reply, saltRounds, fastify); });
 
 	fastify.get('/logout', {}, async (request, reply) => { return logout(reply, fastify); })
+
+	 fastify.delete('/', { preHandler: fastify.authenticate }, async (request, reply) => { return remove(request, reply, fastify)})
 }
diff --git a/src/api/auth/remove.js b/src/api/auth/remove.js
new file mode 100644
index 0000000..90579af
--- /dev/null
+++ b/src/api/auth/remove.js
@@ -0,0 +1,34 @@
+import authDB from '../../utils/authDB';
+import { authUserRemove } from '../../utils/authUserRemove';
+
+/**
+ * @param {import('fastify').FastifyRequest} request
+ * @param {import('fastify').FastifyReply} reply
+ * @param {import('fastify').FastifyInstance} fastify
+ */
+export async function remove(request, reply, fastify) {
+	try {
+		const user = request.user;
+
+		if (authDB.RESERVED_USERNAMES.includes(user)) {
+			return reply.code(400).send({ error: 'Reserved username' });
+		}
+
+		if (authDB.checkUser(user) === false) {
+			return reply.code(400).send({ error: "User does not exist" });
+		}
+
+		authDB.rmUser(user)
+
+		authUserRemove(user, fastify)
+
+		return reply
+			.code(200)
+			.send({
+				msg: "User successfully deleted"
+			})
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/utils/authUserRemove.js b/src/utils/authUserRemove.js
new file mode 100644
index 0000000..071a51f
--- /dev/null
+++ b/src/utils/authUserRemove.js
@@ -0,0 +1,19 @@
+import axios from 'axios'
+
+/**
+ * @param {string} username
+ * @param {import('fastify').FastifyInstance} fastify
+ */
+export async function authUserRemove(username, fastify) {
+	const url = (process.env.USER_URL || "http://localhost:3002/") + "users/" + username;
+	const cookie = fastify.jwt.sign({ user: "admin" });
+
+	await axios.post(
+		url,
+		{
+			headers: {
+				'Cookie': 'token=' + cookie,
+			},
+		}
+	);
+}

From 95cbbc6613273ec17402755298cb60c1b004e34d Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 16 Oct 2025 12:33:49 +0200
Subject: [PATCH 045/109] =?UTF-8?q?=E3=80=8C=F0=9F=93=9D=E3=80=8D=20doc(au?=
 =?UTF-8?q?th):=20added=20doc=20for=202fa=20in=20login?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/auth/login.md     | 11 +++++++++--
 src/api/auth/login.js |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/doc/auth/login.md b/doc/auth/login.md
index 76945d3..eff517d 100644
--- a/doc/auth/login.md
+++ b/doc/auth/login.md
@@ -21,7 +21,8 @@ Input needed :
 ```json
 {
     "user": "<string>",
-    "password": "<string>"
+    "password": "<string>",
+    (optional)"token": "<2fa token>"
 }
 ```
 
@@ -32,7 +33,13 @@ Can return:
     "msg": "Login successfully"
 }
 ```
-- 400 with response
+- 402 with response
+```json
+{
+    "msg": "Please specify a 2fa token"
+}
+```
+- 400 || 401 with response
 ```json
 {
     "error": "<corresponding error>"
diff --git a/src/api/auth/login.js b/src/api/auth/login.js
index 2580383..83d9a76 100644
--- a/src/api/auth/login.js
+++ b/src/api/auth/login.js
@@ -37,8 +37,8 @@ export async function login(request, reply, fastify) {
 
 		const userTOTP = authDB.getUser(user);
 		if (userTOTP.totpEnabled == 1) {
-			if (!request.body.token){
-				return reply.code(401).send({ error: 'Invalid 2FA token' });
+			if (!request.body.token) {
+				return reply.code(402).send({ error: 'Please specify a 2fa token' });
 			}
 			const isValid = verifyTOTP(userTOTP.totpHash, request.body.token);
 			if (!isValid) {

From 2cafd7afac0604906f2e1f635ab7deb6bfb5a7f1 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 16 Oct 2025 13:25:36 +0200
Subject: [PATCH 046/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat:=20a?=
 =?UTF-8?q?dded=20env=20variable=20to=20front?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/api-base/compose.yml | 2 +-
 docker/front/Dockerfile     | 7 +++++--
 docker/front/compose.yml    | 3 +++
 src/utils/authUserCreate.js | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/docker/api-base/compose.yml b/docker/api-base/compose.yml
index 76b987e..85b77c4 100644
--- a/docker/api-base/compose.yml
+++ b/docker/api-base/compose.yml
@@ -29,7 +29,7 @@ services:
       - back
     environment:
       - TZ=Europe/Paris
-      - GOOGLE_CALLBACK_URL=${GOOGLE_CALLBACK_URL}
+      - GOOGLE_CALLBACK_URL=${AUTH_URL}
       - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
       - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
       - API_TARGET=auth
diff --git a/docker/front/Dockerfile b/docker/front/Dockerfile
index b8f2ce2..36fc0e5 100644
--- a/docker/front/Dockerfile
+++ b/docker/front/Dockerfile
@@ -13,6 +13,9 @@ RUN			cd /build \
 
 FROM		node:lts-alpine AS builder-vite
 
+ARG			VITE_USER_URL
+ARG			VITE_AUTH_URL
+
 RUN			npm install -g pnpm
 
 WORKDIR		/app
@@ -24,8 +27,8 @@ RUN			pnpm install --frozen-lockfile
 COPY		vite.config.js tailwind.config.js ./
 COPY		src ./src
 
-RUN			pnpm vite build
-
+RUN			VITE_USER_URL=${VITE_USER_URL} VITE_AUTH_URL=${VITE_AUTH_URL}\
+			pnpm vite build
 
 FROM		alpine:3.22
 
diff --git a/docker/front/compose.yml b/docker/front/compose.yml
index 72b2b67..134b29d 100644
--- a/docker/front/compose.yml
+++ b/docker/front/compose.yml
@@ -4,6 +4,9 @@ services:
     build:
       dockerfile: docker/front/Dockerfile
       context: ../../
+      args:
+        - VITE_USER_URL=${USER_URL}
+        - VITE_AUTH_URL=${AUTH_URL}
     environment:
       - TZ=Europe/Paris
     networks:
diff --git a/src/utils/authUserCreate.js b/src/utils/authUserCreate.js
index a1d6bba..1ee3d38 100644
--- a/src/utils/authUserCreate.js
+++ b/src/utils/authUserCreate.js
@@ -10,7 +10,7 @@ export async function authUserCreate(username, fastify) {
     };
     const cookie = fastify.jwt.sign({ user: "admin" });
 
-	const url = process.env.USER_URL || "http://localhost:3002/"
+	const url = process.env.USER_URL + "/" || "http://localhost:3002/"
 
     await axios.post(
         url + "users/" + username,

From d1838e7722673b62ee9451288bbdec3249f9f7bd Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 16 Oct 2025 13:27:19 +0200
Subject: [PATCH 047/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20fixed=20some=20things.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/authUserRemove.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/authUserRemove.js b/src/utils/authUserRemove.js
index 071a51f..ba892fc 100644
--- a/src/utils/authUserRemove.js
+++ b/src/utils/authUserRemove.js
@@ -5,7 +5,7 @@ import axios from 'axios'
  * @param {import('fastify').FastifyInstance} fastify
  */
 export async function authUserRemove(username, fastify) {
-	const url = (process.env.USER_URL || "http://localhost:3002/") + "users/" + username;
+	const url = ((process.env.USER_URL + "/") || "http://localhost:3002/") + "users/" + username;
 	const cookie = fastify.jwt.sign({ user: "admin" });
 
 	await axios.post(

From 627197f8f3ca5a5d0e09f9064ad45b9059594a5a Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 16 Oct 2025 13:28:07 +0200
Subject: [PATCH 048/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20fixed=20this=20shit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/authUserCreate.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/authUserCreate.js b/src/utils/authUserCreate.js
index 1ee3d38..e8a6771 100644
--- a/src/utils/authUserCreate.js
+++ b/src/utils/authUserCreate.js
@@ -10,10 +10,10 @@ export async function authUserCreate(username, fastify) {
     };
     const cookie = fastify.jwt.sign({ user: "admin" });
 
-	const url = process.env.USER_URL + "/" || "http://localhost:3002/"
+	const url = process.env.USER_URL || "http://localhost:3002"
 
     await axios.post(
-        url + "users/" + username,
+        url + "/users/" + username,
         payload,
         {
             headers: {

From 169386a97c776119b7085d62191ddb07a1f7d6a9 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 16 Oct 2025 13:28:43 +0200
Subject: [PATCH 049/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20fixed=20this=20shit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/authUserRemove.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/authUserRemove.js b/src/utils/authUserRemove.js
index ba892fc..8af7503 100644
--- a/src/utils/authUserRemove.js
+++ b/src/utils/authUserRemove.js
@@ -5,7 +5,7 @@ import axios from 'axios'
  * @param {import('fastify').FastifyInstance} fastify
  */
 export async function authUserRemove(username, fastify) {
-	const url = ((process.env.USER_URL + "/") || "http://localhost:3002/") + "users/" + username;
+	const url = (process.env.USER_URL || "http://localhost:3002") + "/users/" + username;
 	const cookie = fastify.jwt.sign({ user: "admin" });
 
 	await axios.post(

From cd03f63d01553b13849e1a5e4f7d0e8c91a7cb65 Mon Sep 17 00:00:00 2001
From: Adam <45126464+KeyZox71@users.noreply.github.com>
Date: Thu, 16 Oct 2025 15:26:54 +0200
Subject: [PATCH 050/109] =?UTF-8?q?=E3=80=8C=F0=9F=93=9D=E3=80=8D=20doc(RE?=
 =?UTF-8?q?ADME):=20updated=20TODO=20list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Updated module completion status and removed completed tasks.
---
 README.md | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 9d75505..b7c08ae 100644
--- a/README.md
+++ b/README.md
@@ -18,27 +18,27 @@ Press F to pay respect
 ```
 ## Modules done
 
-6 major + 2 minor = 7 full modules
+8 major + 4 minor = 10 full modules
 
 - **Web**
   - [x] Use a framework to build the backend.(node with Fastify) - Major
-  - [ ] Use a framework or toolkit to build the front-end.(Tailwind CSS) - Minor
+  - [x] Use a framework or toolkit to build the front-end.(Tailwind CSS) - Minor
   - [x] Use a database for the backend -and more.(SQLite) - Minor
   - [x] Store the score of a tournament in the Blockchain.(Soldity on Avalanche) - Major
 - **User Management**
-  - [ ] Standard user management, authentication and users across tournaments. - Major
+  - [x] Standard user management, authentication and users across tournaments. - Major
   - [x] Implement remote authentication. - Major
 - **Gameplay and user experience**
-  - [ ] Remote players - Major
-  - [ ] Multiplayer - Major
-  - [ ] Add another game - Major
-  - [ ] Game customization options - Minor
-  - [ ] Live chat - Major
+  - [ ] ~~Remote players - Major~~
+  - [ ] ~~Multiplayer - Major~~
+  - [x] Add another game - Major
+  - [ ] ~~Game customization options - Minor~~
+  - [ ] ~~Live chat - Major~~
 - **AI-Algo**
-  - [ ] AI opponent - Major
+  - [ ] ~~AI opponent - Major~~
   - [ ] User and game stats dashboards - Minor
 - **Cybersecurity**
-  - [ ] WAF/ModSecurity and Hashicorp Vault - Major
+  - [ ] ~~WAF/ModSecurity and Hashicorp Vault - Major~~
   - [ ] RGPD compliance - Minor
   - [x] 2FA and JWT - Major
 - **DevOps**
@@ -46,16 +46,16 @@ Press F to pay respect
   - [x] Monitoring system - Minor
   - [x] Designing the backend in micro-architecture - Major
 - **Graphics**
-  - [ ] Use of advanced 3D techniques - Major
+  - [ ] ~~Use of advanced 3D techniques - Major~~
 - **Accessibility**
-  - [ ] Support on all devices - Minor
-  - [ ] Expanding Browser compatibility - Minor
-  - [ ] Multiple language support - Minor
-  - [ ] Add accessibility for visually impaired users - Minor
-  - [ ] Server-Side Rendering (SSR) integration - Minor
+  - [ ] ~~Support on all devices - Minor~~
+  - [x] Expanding Browser compatibility - Minor
+  - [ ] ~~Multiple language support - Minor~~
+  - [ ] ~~Add accessibility for visually impaired users - Minor~~
+  - [ ] ~~Server-Side Rendering (SSR) integration - Minor~~9
 - **Server-Side Pong**
-  - [ ] Replace basic pong with server-side pong and implementing an API - Major
-  - [ ] Enabling pong gameplay via CLI against web users with API integration - Major
+  - [ ] ~~Replace basic pong with server-side pong and implementing an API - Major~~
+  - [ ] ~~Enabling pong gameplay via CLI against web users with API integration - Major~~
 
 
 ## License

From 1f085ce1fbc1e6f58ad50beed8a0fc92d91710cd Mon Sep 17 00:00:00 2001
From: Tzvetan Trave <tzvetan.trave@abadcafe.org>
Date: Fri, 17 Oct 2025 14:39:46 +0200
Subject: [PATCH 051/109] added date to match objects

---
 doc/user/user.md              | 12 +++++++-----
 src/api/user/default.js       | 10 ++++++----
 src/api/user/gMatchHistory.js |  9 +++++----
 src/api/user/pMatchHistory.js |  2 +-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/doc/user/user.md b/doc/user/user.md
index da1a991..d982e68 100644
--- a/doc/user/user.md
+++ b/doc/user/user.md
@@ -97,7 +97,8 @@ Input needed :
 	"game": "<pong/tetris>"
 	"opponent": "<the opponent's username>",
 	"myScore": <my score>,
-	"opponentScore": <the opponent's score>
+	"opponentScore": <the opponent's score>,
+	"date": <seconds since Epoch (Date.now() return)>
 }
 ```
 
@@ -174,7 +175,7 @@ Always returns:
 - 200 with response
 ```json
 {
-	"n_<name of the counted objects>": <number of users>
+	"n_users": <number of users>
 }
 ```
 
@@ -243,7 +244,7 @@ Can return:
 - 200 with response
 ```json
 {
-	"n_<name of the counted objects>": <number of users>
+	"n_friends": <number of friends>
 }
 ```
 - 404 with response (if user does not exist)
@@ -269,7 +270,8 @@ Can return:
 				"p1": "<the name of the p1>",
 				"p2": "<the name of the p2>",
 				"p1Score": "<the score of the p1>",
-				"p2Score": "<the score of the p2>"
+				"p2Score": "<the score of the p2>",
+				"date": <seconds since Epoch (Date.now() return)>
 			},
 			"tx": "<the transcaction hash>"
 		},
@@ -298,7 +300,7 @@ Can return:
 - 200 with response
 ```json
 {
-	"n_<name of the counted objects>": <number of users>
+	"n_matches": <number of matches played by the user>
 }
 ```
 - 400 with response (if game does not exist)
diff --git a/src/api/user/default.js b/src/api/user/default.js
index 22ca384..a2cc806 100644
--- a/src/api/user/default.js
+++ b/src/api/user/default.js
@@ -59,11 +59,13 @@ function prepareDB() {
 		CREATE TABLE IF NOT EXISTS matchHistory (
 			id INTEGER PRIMARY KEY AUTOINCREMENT,
 			game TEXT,
+			date INTEGER,
 			player1 TEXT,
 			player2 TEXT,
 			matchId INTEGER,
 			CHECK(player1 != player2),
-			CHECK(game = 'pong' OR game = 'tetris')
+			CHECK(game = 'pong' OR game = 'tetris'),
+			CHECK(date >= 0)
 		) STRICT
 	`);
 }
@@ -73,7 +75,7 @@ prepareDB();
 // POST
 const createUser = database.prepare('INSERT INTO userData (username, displayName, pongWins, pongLosses, tetrisWins, tetrisLosses) VALUES (?, ?, 0, 0, 0, 0);');
 const addFriend = database.prepare('INSERT INTO friends (username, friendName) VALUES (?, ?);');
-const addMatch = database.prepare('INSERT INTO matchHistory (game, player1, player2, matchId) VALUES (?, ?, ?, ?);');
+const addMatch = database.prepare('INSERT INTO matchHistory (game, date, player1, player2, matchId) VALUES (?, ?, ?, ?, ?);');
 const incWinsPong = database.prepare('UPDATE userData SET pongWins = pongWins + 1 WHERE username = ?;');
 const incLossesPong = database.prepare('UPDATE userData SET pongLosses = pongLosses + 1 WHERE username = ?');
 const incWinsTetris = database.prepare('UPDATE userData SET tetrisWins = tetrisWins + 1 WHERE username = ?;');
@@ -87,7 +89,7 @@ const getUserData = database.prepare('SELECT username, displayName, pongWins, po
 const getUserInfo = database.prepare('SELECT username, displayName, pongWins, pongLosses, tetrisWins, tetrisLosses FROM userData WHERE username = ?;');
 const getFriends = database.prepare('SELECT friendName FROM friends WHERE username = ? LIMIT ? OFFSET ?;');
 const getFriend = database.prepare('SELECT friendName FROM friends WHERE username = ? AND friendName = ?;');
-const getMatchHistory = database.prepare('SELECT matchId FROM matchHistory WHERE game = ? AND ? IN (player1, player2) LIMIT ? OFFSET ?;');
+const getMatchHistory = database.prepare('SELECT matchId, date FROM matchHistory WHERE game = ? AND ? IN (player1, player2) LIMIT ? OFFSET ?;');
 const getNumberUsers = database.prepare('SELECT COUNT (DISTINCT username) AS n_users FROM userData;');
 const getNumberFriends = database.prepare('SELECT COUNT (DISTINCT friendName) AS n_friends FROM friends WHERE username = ?;');
 const getNumberMatches = database.prepare('SELECT COUNT (DISTINCT id) AS n_matches FROM matchHistory WHERE game = ? AND ? IN (player1, player2);')
@@ -103,7 +105,7 @@ const deleteStatsTetris = database.prepare('UPDATE userData SET tetrisWins = 0,
 const querySchema = { type: 'object', required: ['iStart', 'iEnd'], properties: { iStart: { type: 'integer', minimum: 0 }, iEnd: { type: 'integer', minimum: 0 } } }
 const bodySchema = { type: 'object', required: ['opponent', 'myScore', 'opponentScore'], properties: { opponent: { type: 'string' }, myScore: { type: 'integer', minimum: 0 }, opponentScore: { type: 'integer', minimum: 0 } } }
 const querySchemaMatchHistory = { type: 'object', required: ['game', 'iStart', 'iEnd'], properties: { game: { type: 'string' }, iStart: { type: 'integer', minimum: 0 }, iEnd: { type: 'integer', minimum: 0 } } }
-const bodySchemaMatchHistory = { type: 'object', required: ['game', 'opponent', 'myScore', 'opponentScore'], properties: { game: { type: 'string' }, opponent: { type: 'string' }, myScore: { type: 'integer', minimum: 0 }, opponentScore: { type: 'integer', minimum: 0 } } }
+const bodySchemaMatchHistory = { type: 'object', required: ['game', 'date', 'opponent', 'myScore', 'opponentScore'], properties: { game: { type: 'string' }, date: { type: 'integer', minimum: 0 }, opponent: { type: 'string' }, myScore: { type: 'integer', minimum: 0 }, opponentScore: { type: 'integer', minimum: 0 } } }
 const querySchemaMatchHistoryGame = { type: 'object', required: ['game'], properties: { game: { type: 'string' } } }
 
 export default async function(fastify, options) {
diff --git a/src/api/user/gMatchHistory.js b/src/api/user/gMatchHistory.js
index 6fde63e..7531ca0 100644
--- a/src/api/user/gMatchHistory.js
+++ b/src/api/user/gMatchHistory.js
@@ -15,13 +15,14 @@ export async function gMatchHistory(request, reply, fastify, getUserInfo, getMat
 		if (!matchHistoryId.length) {
 			return reply.code(404).send({ error: "No matches exist in the selected range" });
 		}
-		const ids = matchHistoryId.map(obj => Object.values(obj)[0]);
-		const promises = ids.map(async (id) => {
-			const res = await fetch(`http://localhost:3003/${id}`, { method: "GET" });
+		const promises = matchHistoryId.map(async (match) => {
+			const res = await fetch(`http://localhost:3003/${match.matchId}`, { method: "GET" });
 			if (!res.ok) {
 				throw new Error('Failed to fetch item from blockchain API');
 			}
-			return await res.json();
+			const resJson = await res.json();
+			resJson.score.date = match.date;
+			return resJson;
 		});
 		const matchHistory = await Promise.all(promises);
 		return reply.code(200).send({ matchHistory });
diff --git a/src/api/user/pMatchHistory.js b/src/api/user/pMatchHistory.js
index fc346d1..f22ef38 100644
--- a/src/api/user/pMatchHistory.js
+++ b/src/api/user/pMatchHistory.js
@@ -4,7 +4,7 @@ async function fetchSave(request, reply, userId, addMatch) {
 		throw new Error('Internal server error');
 	}
 	const data = await res.json();
-	addMatch.run(request.body.game, userId, request.body.opponent, data.id);
+	addMatch.run(request.body.game, request.body.date, userId, request.body.opponent, data.id);
 }
 
 export async function pMatchHistory(request, reply, fastify, getUserInfo, addMatch, incWinsPong, incLossesPong, incWinsTetris, incLossesTetris) {

From 0fdbc96dc45acc46edcc561ac74c73c7a84f0367 Mon Sep 17 00:00:00 2001
From: Tzvetan Trave <tzvetan.trave@abadcafe.org>
Date: Fri, 17 Oct 2025 20:06:54 +0200
Subject: [PATCH 052/109] unfinished image API

---
 Justfile                  |   6 +-
 package.json              |   2 +
 pnpm-lock.yaml            | 288 ++++++++++++++++++++++++++++++++++++++
 src/api/auth/remove.js    |   4 +-
 src/api/images/dImage.js  |  10 ++
 src/api/images/default.js |  86 ++++++++++++
 src/api/images/gImage.js  |  13 ++
 src/api/images/pImage.js  |  33 +++++
 src/api/user/TODO         |   8 --
 src/api/user/dAvatar.js   |   9 ++
 src/api/user/default.js   |  55 +++++---
 src/api/user/gAvatar.js   |   9 ++
 src/api/user/pAvatar.js   |  13 ++
 src/api/user/uMember.js   |   2 +-
 src/start.js              |  11 ++
 15 files changed, 518 insertions(+), 31 deletions(-)
 create mode 100644 src/api/images/dImage.js
 create mode 100644 src/api/images/default.js
 create mode 100644 src/api/images/gImage.js
 create mode 100644 src/api/images/pImage.js
 delete mode 100644 src/api/user/TODO
 create mode 100644 src/api/user/dAvatar.js
 create mode 100644 src/api/user/gAvatar.js
 create mode 100644 src/api/user/pAvatar.js

diff --git a/Justfile b/Justfile
index a9024ab..fe4ea0f 100644
--- a/Justfile
+++ b/Justfile
@@ -11,6 +11,10 @@ set dotenv-load
 @user $FASTIFY_LOG_LEVEL="info" $FASTIFY_PRETTY_LOGS="true":
 	fastify start src/api/user/default.js
 
+# For launching the images api
+@images $FASTIFY_LOG_LEVEL="info" $FASTIFY_PRETTY_LOGS="true":
+	fastify start src/api/images/default.js
+
 @scoreStore $FASTIFY_LOG_LEVEL="info" $FASTIFY_PRETTY_LOGS="true":
 	fastify start src/api/scoreStore/default.js
 
@@ -55,4 +59,4 @@ set dotenv-load
 	forge verify-contract --chain-id 43113 --rpc-url=${AVAX_RPC_URL} --watch ${AVAX_CONTRACT_ADDR}
 
 @status:
-	docker compose -f docker/docker-compose.yml ps
\ No newline at end of file
+	docker compose -f docker/docker-compose.yml ps
diff --git a/package.json b/package.json
index 7eedbe9..32cd1ca 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
 		"@fastify/cookie": "^11.0.2",
 		"@fastify/env": "^5.0.2",
 		"@fastify/jwt": "^9.1.0",
+		"@fastify/multipart": "^9.2.1",
 		"axios": "^1.10.0",
 		"base32.js": "^0.1.0",
 		"bcrypt": "^6.0.0",
@@ -13,6 +14,7 @@
 		"fastify-cli": "^7.4.0",
 		"pino": "^9.7.0",
 		"prom-client": "^15.1.3",
+		"sharp": "^0.34.4",
 		"solhint": "^6.0.0"
 	},
 	"type": "module",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 91f44c7..c40ec77 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -20,6 +20,9 @@ importers:
       '@fastify/jwt':
         specifier: ^9.1.0
         version: 9.1.0
+      '@fastify/multipart':
+        specifier: ^9.2.1
+        version: 9.2.1
       axios:
         specifier: ^1.10.0
         version: 1.10.0
@@ -47,6 +50,9 @@ importers:
       prom-client:
         specifier: ^15.1.3
         version: 15.1.3
+      sharp:
+        specifier: ^0.34.4
+        version: 0.34.4
       solhint:
         specifier: ^6.0.0
         version: 6.0.0(typescript@5.8.3)
@@ -88,6 +94,9 @@ packages:
     resolution: {integrity: sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==}
     engines: {node: '>=6.9.0'}
 
+  '@emnapi/runtime@1.5.0':
+    resolution: {integrity: sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ==}
+
   '@esbuild/aix-ppc64@0.25.6':
     resolution: {integrity: sha512-ShbM/3XxwuxjFiuVBHA+d3j5dyac0aEVVq1oluIDf71hUw0aRF59dV/efUsIwFnR6m8JNM2FjZOzmaZ8yG61kw==}
     engines: {node: '>=18'}
@@ -252,12 +261,18 @@ packages:
   '@fastify/ajv-compiler@4.0.2':
     resolution: {integrity: sha512-Rkiu/8wIjpsf46Rr+Fitd3HRP+VsxUFDDeag0hs9L0ksfnwx2g7SPQQTFL0E8Qv+rfXzQOxBJnjUB9ITUDjfWQ==}
 
+  '@fastify/busboy@3.2.0':
+    resolution: {integrity: sha512-m9FVDXU3GT2ITSe0UaMA5rU3QkfC/UXtCU8y0gSN/GugTqtVldOBWIB5V6V3sbmenVZUIpU6f+mPEO2+m5iTaA==}
+
   '@fastify/cookie@11.0.2':
     resolution: {integrity: sha512-GWdwdGlgJxyvNv+QcKiGNevSspMQXncjMZ1J8IvuDQk0jvkzgWWZFNC2En3s+nHndZBGV8IbLwOI/sxCZw/mzA==}
 
   '@fastify/deepmerge@2.0.2':
     resolution: {integrity: sha512-3wuLdX5iiiYeZWP6bQrjqhrcvBIf0NHbQH1Ur1WbHvoiuTYUEItgygea3zs8aHpiitn0lOB8gX20u1qO+FDm7Q==}
 
+  '@fastify/deepmerge@3.1.0':
+    resolution: {integrity: sha512-lCVONBQINyNhM6LLezB6+2afusgEYR4G8xenMsfe+AT+iZ7Ca6upM5Ha8UkZuYSnuMw3GWl/BiPXnLMi/gSxuQ==}
+
   '@fastify/env@5.0.2':
     resolution: {integrity: sha512-4m/jHS3s/G/DBJVODob9sxGUei/Ij8JFbA2PYqBfoihTm+Qqae2xD9xhez68UFZu1d4SNJPIb6uAOwbNvRYw+A==}
 
@@ -276,6 +291,9 @@ packages:
   '@fastify/merge-json-schemas@0.2.1':
     resolution: {integrity: sha512-OA3KGBCy6KtIvLf8DINC5880o5iBlDX4SxzLQS8HorJAbqluzLRn80UXU0bxZn7UOFhFgpRJDasfwn9nG4FG4A==}
 
+  '@fastify/multipart@9.2.1':
+    resolution: {integrity: sha512-U4221XDMfzCUtfzsyV1/PkR4MNgKI0158vUUyn/oF2Tl6RxMc+N7XYLr5fZXQiEC+Fmw5zFaTjxsTGTgtDtK+g==}
+
   '@fastify/proxy-addr@5.0.0':
     resolution: {integrity: sha512-37qVVA1qZ5sgH7KpHkkC4z9SK6StIsIcOmpjvMPXNb3vx2GQxhZocogVYbr2PbbeLCQxYIPDok307xEvRZOzGA==}
 
@@ -283,6 +301,132 @@ packages:
     resolution: {integrity: sha512-RE815I4arJFtt+FVeU1Tgp9/Xvecacji8w/V6XtXsWWH/wz/eNkNbhb+ny/+PlVZjV0rxQpRSQKNKE3lcktHEA==}
     engines: {node: '>=10.10.0'}
 
+  '@img/colour@1.0.0':
+    resolution: {integrity: sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==}
+    engines: {node: '>=18'}
+
+  '@img/sharp-darwin-arm64@0.34.4':
+    resolution: {integrity: sha512-sitdlPzDVyvmINUdJle3TNHl+AG9QcwiAMsXmccqsCOMZNIdW2/7S26w0LyU8euiLVzFBL3dXPwVCq/ODnf2vA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@img/sharp-darwin-x64@0.34.4':
+    resolution: {integrity: sha512-rZheupWIoa3+SOdF/IcUe1ah4ZDpKBGWcsPX6MT0lYniH9micvIU7HQkYTfrx5Xi8u+YqwLtxC/3vl8TQN6rMg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-libvips-darwin-arm64@1.2.3':
+    resolution: {integrity: sha512-QzWAKo7kpHxbuHqUC28DZ9pIKpSi2ts2OJnoIGI26+HMgq92ZZ4vk8iJd4XsxN+tYfNJxzH6W62X5eTcsBymHw==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@img/sharp-libvips-darwin-x64@1.2.3':
+    resolution: {integrity: sha512-Ju+g2xn1E2AKO6YBhxjj+ACcsPQRHT0bhpglxcEf+3uyPY+/gL8veniKoo96335ZaPo03bdDXMv0t+BBFAbmRA==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-libvips-linux-arm64@1.2.3':
+    resolution: {integrity: sha512-I4RxkXU90cpufazhGPyVujYwfIm9Nk1QDEmiIsaPwdnm013F7RIceaCc87kAH+oUB1ezqEvC6ga4m7MSlqsJvQ==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-arm@1.2.3':
+    resolution: {integrity: sha512-x1uE93lyP6wEwGvgAIV0gP6zmaL/a0tGzJs/BIDDG0zeBhMnuUPm7ptxGhUbcGs4okDJrk4nxgrmxpib9g6HpA==}
+    cpu: [arm]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-ppc64@1.2.3':
+    resolution: {integrity: sha512-Y2T7IsQvJLMCBM+pmPbM3bKT/yYJvVtLJGfCs4Sp95SjvnFIjynbjzsa7dY1fRJX45FTSfDksbTp6AGWudiyCg==}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-s390x@1.2.3':
+    resolution: {integrity: sha512-RgWrs/gVU7f+K7P+KeHFaBAJlNkD1nIZuVXdQv6S+fNA6syCcoboNjsV2Pou7zNlVdNQoQUpQTk8SWDHUA3y/w==}
+    cpu: [s390x]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-x64@1.2.3':
+    resolution: {integrity: sha512-3JU7LmR85K6bBiRzSUc/Ff9JBVIFVvq6bomKE0e63UXGeRw2HPVEjoJke1Yx+iU4rL7/7kUjES4dZ/81Qjhyxg==}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-libvips-linuxmusl-arm64@1.2.3':
+    resolution: {integrity: sha512-F9q83RZ8yaCwENw1GieztSfj5msz7GGykG/BA+MOUefvER69K/ubgFHNeSyUu64amHIYKGDs4sRCMzXVj8sEyw==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-libvips-linuxmusl-x64@1.2.3':
+    resolution: {integrity: sha512-U5PUY5jbc45ANM6tSJpsgqmBF/VsL6LnxJmIf11kB7J5DctHgqm0SkuXzVWtIY90GnJxKnC/JT251TDnk1fu/g==}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-linux-arm64@0.34.4':
+    resolution: {integrity: sha512-YXU1F/mN/Wu786tl72CyJjP/Ngl8mGHN1hST4BGl+hiW5jhCnV2uRVTNOcaYPs73NeT/H8Upm3y9582JVuZHrQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-linux-arm@0.34.4':
+    resolution: {integrity: sha512-Xyam4mlqM0KkTHYVSuc6wXRmM7LGN0P12li03jAnZ3EJWZqj83+hi8Y9UxZUbxsgsK1qOEwg7O0Bc0LjqQVtxA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@img/sharp-linux-ppc64@0.34.4':
+    resolution: {integrity: sha512-F4PDtF4Cy8L8hXA2p3TO6s4aDt93v+LKmpcYFLAVdkkD3hSxZzee0rh6/+94FpAynsuMpLX5h+LRsSG3rIciUQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@img/sharp-linux-s390x@0.34.4':
+    resolution: {integrity: sha512-qVrZKE9Bsnzy+myf7lFKvng6bQzhNUAYcVORq2P7bDlvmF6u2sCmK2KyEQEBdYk+u3T01pVsPrkj943T1aJAsw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [s390x]
+    os: [linux]
+
+  '@img/sharp-linux-x64@0.34.4':
+    resolution: {integrity: sha512-ZfGtcp2xS51iG79c6Vhw9CWqQC8l2Ot8dygxoDoIQPTat/Ov3qAa8qpxSrtAEAJW+UjTXc4yxCjNfxm4h6Xm2A==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-linuxmusl-arm64@0.34.4':
+    resolution: {integrity: sha512-8hDVvW9eu4yHWnjaOOR8kHVrew1iIX+MUgwxSuH2XyYeNRtLUe4VNioSqbNkB7ZYQJj9rUTT4PyRscyk2PXFKA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-linuxmusl-x64@0.34.4':
+    resolution: {integrity: sha512-lU0aA5L8QTlfKjpDCEFOZsTYGn3AEiO6db8W5aQDxj0nQkVrZWmN3ZP9sYKWJdtq3PWPhUNlqehWyXpYDcI9Sg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-wasm32@0.34.4':
+    resolution: {integrity: sha512-33QL6ZO/qpRyG7woB/HUALz28WnTMI2W1jgX3Nu2bypqLIKx/QKMILLJzJjI+SIbvXdG9fUnmrxR7vbi1sTBeA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [wasm32]
+
+  '@img/sharp-win32-arm64@0.34.4':
+    resolution: {integrity: sha512-2Q250do/5WXTwxW3zjsEuMSv5sUU4Tq9VThWKlU2EYLm4MB7ZeMwF+SFJutldYODXF6jzc6YEOC+VfX0SZQPqA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [win32]
+
+  '@img/sharp-win32-ia32@0.34.4':
+    resolution: {integrity: sha512-3ZeLue5V82dT92CNL6rsal6I2weKw1cYu+rGKm8fOCCtJTR2gYeUfY3FqUnIJsMUPIH68oS5jmZ0NiJ508YpEw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [ia32]
+    os: [win32]
+
+  '@img/sharp-win32-x64@0.34.4':
+    resolution: {integrity: sha512-xIyj4wpYs8J18sVN3mSQjwrw7fKUqRw+Z5rnHNCy5fYTxigBz81u5mOMPmFumwjcn8+ld1ppptMBCLic1nz6ig==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [win32]
+
   '@isaacs/fs-minipass@4.0.1':
     resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==}
     engines: {node: '>=18.0.0'}
@@ -753,6 +897,10 @@ packages:
     resolution: {integrity: sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==}
     engines: {node: '>=8'}
 
+  detect-libc@2.1.2:
+    resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
+    engines: {node: '>=8'}
+
   dotenv-expand@10.0.0:
     resolution: {integrity: sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==}
     engines: {node: '>=12'}
@@ -1452,6 +1600,10 @@ packages:
   set-cookie-parser@2.7.1:
     resolution: {integrity: sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==}
 
+  sharp@0.34.4:
+    resolution: {integrity: sha512-FUH39xp3SBPnxWvd5iib1X8XY7J0K0X7d93sie9CJg2PO8/7gmg89Nve6OjItK53/MlAushNNxteBYfM6DEuoA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+
   simple-concat@1.0.1:
     resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
 
@@ -1667,6 +1819,11 @@ snapshots:
 
   '@babel/helper-validator-identifier@7.27.1': {}
 
+  '@emnapi/runtime@1.5.0':
+    dependencies:
+      tslib: 2.7.0
+    optional: true
+
   '@esbuild/aix-ppc64@0.25.6':
     optional: true
 
@@ -1753,6 +1910,8 @@ snapshots:
       ajv-formats: 3.0.1(ajv@8.17.1)
       fast-uri: 3.0.6
 
+  '@fastify/busboy@3.2.0': {}
+
   '@fastify/cookie@11.0.2':
     dependencies:
       cookie: 1.0.2
@@ -1760,6 +1919,8 @@ snapshots:
 
   '@fastify/deepmerge@2.0.2': {}
 
+  '@fastify/deepmerge@3.1.0': {}
+
   '@fastify/env@5.0.2':
     dependencies:
       env-schema: 6.0.1
@@ -1785,6 +1946,14 @@ snapshots:
     dependencies:
       dequal: 2.0.3
 
+  '@fastify/multipart@9.2.1':
+    dependencies:
+      '@fastify/busboy': 3.2.0
+      '@fastify/deepmerge': 3.1.0
+      '@fastify/error': 4.2.0
+      fastify-plugin: 5.0.1
+      secure-json-parse: 4.0.0
+
   '@fastify/proxy-addr@5.0.0':
     dependencies:
       '@fastify/forwarded': 3.0.0
@@ -1792,6 +1961,94 @@ snapshots:
 
   '@humanwhocodes/momoa@2.0.4': {}
 
+  '@img/colour@1.0.0': {}
+
+  '@img/sharp-darwin-arm64@0.34.4':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-arm64': 1.2.3
+    optional: true
+
+  '@img/sharp-darwin-x64@0.34.4':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-x64': 1.2.3
+    optional: true
+
+  '@img/sharp-libvips-darwin-arm64@1.2.3':
+    optional: true
+
+  '@img/sharp-libvips-darwin-x64@1.2.3':
+    optional: true
+
+  '@img/sharp-libvips-linux-arm64@1.2.3':
+    optional: true
+
+  '@img/sharp-libvips-linux-arm@1.2.3':
+    optional: true
+
+  '@img/sharp-libvips-linux-ppc64@1.2.3':
+    optional: true
+
+  '@img/sharp-libvips-linux-s390x@1.2.3':
+    optional: true
+
+  '@img/sharp-libvips-linux-x64@1.2.3':
+    optional: true
+
+  '@img/sharp-libvips-linuxmusl-arm64@1.2.3':
+    optional: true
+
+  '@img/sharp-libvips-linuxmusl-x64@1.2.3':
+    optional: true
+
+  '@img/sharp-linux-arm64@0.34.4':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm64': 1.2.3
+    optional: true
+
+  '@img/sharp-linux-arm@0.34.4':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm': 1.2.3
+    optional: true
+
+  '@img/sharp-linux-ppc64@0.34.4':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-ppc64': 1.2.3
+    optional: true
+
+  '@img/sharp-linux-s390x@0.34.4':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-s390x': 1.2.3
+    optional: true
+
+  '@img/sharp-linux-x64@0.34.4':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-x64': 1.2.3
+    optional: true
+
+  '@img/sharp-linuxmusl-arm64@0.34.4':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-arm64': 1.2.3
+    optional: true
+
+  '@img/sharp-linuxmusl-x64@0.34.4':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-x64': 1.2.3
+    optional: true
+
+  '@img/sharp-wasm32@0.34.4':
+    dependencies:
+      '@emnapi/runtime': 1.5.0
+    optional: true
+
+  '@img/sharp-win32-arm64@0.34.4':
+    optional: true
+
+  '@img/sharp-win32-ia32@0.34.4':
+    optional: true
+
+  '@img/sharp-win32-x64@0.34.4':
+    optional: true
+
   '@isaacs/fs-minipass@4.0.1':
     dependencies:
       minipass: 7.1.2
@@ -2183,6 +2440,8 @@ snapshots:
 
   detect-libc@2.0.4: {}
 
+  detect-libc@2.1.2: {}
+
   dotenv-expand@10.0.0: {}
 
   dotenv@16.6.1: {}
@@ -2914,6 +3173,35 @@ snapshots:
 
   set-cookie-parser@2.7.1: {}
 
+  sharp@0.34.4:
+    dependencies:
+      '@img/colour': 1.0.0
+      detect-libc: 2.1.2
+      semver: 7.7.2
+    optionalDependencies:
+      '@img/sharp-darwin-arm64': 0.34.4
+      '@img/sharp-darwin-x64': 0.34.4
+      '@img/sharp-libvips-darwin-arm64': 1.2.3
+      '@img/sharp-libvips-darwin-x64': 1.2.3
+      '@img/sharp-libvips-linux-arm': 1.2.3
+      '@img/sharp-libvips-linux-arm64': 1.2.3
+      '@img/sharp-libvips-linux-ppc64': 1.2.3
+      '@img/sharp-libvips-linux-s390x': 1.2.3
+      '@img/sharp-libvips-linux-x64': 1.2.3
+      '@img/sharp-libvips-linuxmusl-arm64': 1.2.3
+      '@img/sharp-libvips-linuxmusl-x64': 1.2.3
+      '@img/sharp-linux-arm': 0.34.4
+      '@img/sharp-linux-arm64': 0.34.4
+      '@img/sharp-linux-ppc64': 0.34.4
+      '@img/sharp-linux-s390x': 0.34.4
+      '@img/sharp-linux-x64': 0.34.4
+      '@img/sharp-linuxmusl-arm64': 0.34.4
+      '@img/sharp-linuxmusl-x64': 0.34.4
+      '@img/sharp-wasm32': 0.34.4
+      '@img/sharp-win32-arm64': 0.34.4
+      '@img/sharp-win32-ia32': 0.34.4
+      '@img/sharp-win32-x64': 0.34.4
+
   simple-concat@1.0.1: {}
 
   simple-get@4.0.1:
diff --git a/src/api/auth/remove.js b/src/api/auth/remove.js
index 90579af..3f653c6 100644
--- a/src/api/auth/remove.js
+++ b/src/api/auth/remove.js
@@ -1,5 +1,5 @@
-import authDB from '../../utils/authDB';
-import { authUserRemove } from '../../utils/authUserRemove';
+import authDB from '../../utils/authDB.js';
+import { authUserRemove } from '../../utils/authUserRemove.js';
 
 /**
  * @param {import('fastify').FastifyRequest} request
diff --git a/src/api/images/dImage.js b/src/api/images/dImage.js
new file mode 100644
index 0000000..5b18db7
--- /dev/null
+++ b/src/api/images/dImage.js
@@ -0,0 +1,10 @@
+export async function dImage(request, reply, fastify, deleteImage) {
+	try {
+		const imageId = Number(request.params.imageId);
+		deleteImage.run(imageId);
+		return reply.code(200).send({ msg: "Image deleted successfully" });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/images/default.js b/src/api/images/default.js
new file mode 100644
index 0000000..569be87
--- /dev/null
+++ b/src/api/images/default.js
@@ -0,0 +1,86 @@
+import fastifyJWT from '@fastify/jwt';
+import fastifyCookie from '@fastify/cookie';
+import Database from 'better-sqlite3';
+import multipart from '@fastify/multipart';
+
+import { gImage } from './gImage.js';
+import { pImage } from './pImage.js';
+import { dImage } from './dImage.js';
+
+const env = process.env.NODE_ENV || 'development';
+
+let database;
+if (!env || env === 'development') {
+	database = new Database(':memory:', { verbose: console.log });
+} else {
+	const dbPath = process.env.DB_PATH || '/db/db.sqlite'
+	database = new Database(dbPath);
+}
+
+function prepareDB() {
+	database.exec(`
+		CREATE TABLE IF NOT EXISTS images (
+			imageId INTEGER PRIMARY KEY AUTOINCREMENT,
+			fileName TEXT,
+			mimeType TEXT,
+			data BLOB
+		) STRICT
+	`);
+}
+
+prepareDB();
+
+// POST
+const postImage = database.prepare('INSERT INTO images (fileName, mimeType, data) VALUES (?, ?, ?);');
+
+// GET
+const getImage = database.prepare('SELECT fileName, mimeType, data FROM images WHERE imageId = ?;');
+
+// DELETE
+const deleteImage = database.prepare('DELETE FROM images WHERE imageId = ?;');
+
+export default async function(fastify, options) {
+	fastify.register(fastifyJWT, {
+		secret: process.env.JWT_SECRET || '123456789101112131415161718192021',
+		cookie: {
+			cookieName: 'token',
+		},
+	});
+	fastify.register(fastifyCookie);
+	fastify.register(multipart, { limits: { fileSize: 2 * 1024 * 1024 } });
+
+	fastify.decorate('authenticate', async function(request, reply) {
+		try {
+			const jwt = await request.jwtVerify();
+			request.user = jwt.user;
+		} catch (err) {
+			reply.code(401).send({ error: 'Unauthorized' });
+		}
+	});
+
+	fastify.decorate('authenticateAdmin', async function(request, reply) {
+		try {
+			const jwt = await request.jwtVerify();
+			if (jwt.user !== 'admin') {
+				throw ('You lack administrator privileges');
+			}
+		} catch (err) {
+			reply.code(401).send({ error: 'Unauthorized' });
+		}
+	});
+
+	// GET
+	fastify.get('/images/:imageId', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+		return gImage(request, reply, fastify, getImage);
+	});
+
+	// POST
+	fastify.post('/images', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+		return pImage(request, reply, fastify, postImage);
+	});
+
+	// DELETE
+	fastify.delete('/images/:imageId', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+		return dImage(request, reply, fastify, deleteImage);
+	});
+}
diff --git a/src/api/images/gImage.js b/src/api/images/gImage.js
new file mode 100644
index 0000000..abbaa42
--- /dev/null
+++ b/src/api/images/gImage.js
@@ -0,0 +1,13 @@
+export async function gImage(request, reply, fastify, getImage) {
+	try {
+		const imageId = Number(request.params.imageId);
+		const image = getImage.get(imageId);
+		if (!image) {
+			return reply.code(404).send({ error: "Image does not exist" });
+		}
+		return reply.code(200).type(image.mimeType).header('Content-Disposition', `inline; filename="${image.fileName}"`).send(image.data);
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/images/pImage.js b/src/api/images/pImage.js
new file mode 100644
index 0000000..d3b930b
--- /dev/null
+++ b/src/api/images/pImage.js
@@ -0,0 +1,33 @@
+export async function pImage(request, reply, fastify, postImage) {
+	try {
+		const parts = request.parts();
+		for await (const part of parts) {
+			if (part.file) {
+				const chunks = [];
+				for await (const chunk of part.file) {
+					chunks.push(chunk);
+				}
+				const buffer = Buffer.concat(chunks);
+				if (!part.filename || part.filename.trim() === '') {
+					return reply.code(400).send({ error: "Missing filename" });
+				}
+				if (!part.mimetype || part.mimetype.trim() === '') {
+					return reply.code(400).send({ error: "Missing mimetype" });
+				}
+				const ext = part.filename.toLowerCase().substring(part.filename.lastIndexOf('.'));
+				if (ext !== 'webp') {
+					return reply.code(400).send({ error: "Wrong file extension" });
+				}
+				// check size max here ?
+				// convert image to webp using sharp
+				//sharp(buffer, ).toFile();
+				const id = postImage.run(part.filename, part.mimetype, buffer);
+				return reply.code(200).send({ msg: "Image uploaded successfully", imageId: id.lastInsertRowid });
+			}
+		}
+		return reply.code(400).send({ error: "No file uploaded" });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/TODO b/src/api/user/TODO
deleted file mode 100644
index 326da16..0000000
--- a/src/api/user/TODO
+++ /dev/null
@@ -1,8 +0,0 @@
-Todo :
-- create users with an avatar (by default) -> POST/GET/PATCH/DELETE avatar
-- create a whole image upload API that ensures files are not executables, converts to a single type, stores the image and returns a UID to address them
-- add a privacy setting so not anybody can GET friends, match history, etc. (what are the RGPD requirements ?) ?
-
-
-
-Always update API doc
diff --git a/src/api/user/dAvatar.js b/src/api/user/dAvatar.js
new file mode 100644
index 0000000..822c786
--- /dev/null
+++ b/src/api/user/dAvatar.js
@@ -0,0 +1,9 @@
+export async function dAvatar(request, reply, fastify, deleteAvatarId) {
+	try {
+		;
+		return reply.code(200).send({ msg: "Avatar deleted successfully" });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/default.js b/src/api/user/default.js
index a2cc806..1b57c07 100644
--- a/src/api/user/default.js
+++ b/src/api/user/default.js
@@ -2,22 +2,25 @@ import fastifyJWT from '@fastify/jwt';
 import fastifyCookie from '@fastify/cookie';
 import Database from 'better-sqlite3';
 
-import { gUsers } from './gUsers.js'
-import { gUser } from './gUser.js'
-import { gNumberUsers } from './gNumberUsers.js'
-import { gFriends } from './gFriends.js'
-import { gNumberFriends } from './gNumberFriends.js'
-import { gMatchHistory } from './gMatchHistory.js'
-import { gNumberMatches } from './gNumberMatches.js'
-import { pUser } from './pUser.js'
-import { pFriend } from './pFriend.js'
-import { pMatchHistory } from './pMatchHistory.js'
-import { uMember } from './uMember.js'
-import { dUser } from './dUser.js'
-import { dMember } from './dMember.js'
-import { dFriends } from './dFriends.js'
-import { dFriend } from './dFriend.js'
-import { dMatchHistory } from './dMatchHistory.js'
+import { gUsers } from './gUsers.js';
+import { gUser } from './gUser.js';
+import { gNumberUsers } from './gNumberUsers.js';
+import { gFriends } from './gFriends.js';
+import { gNumberFriends } from './gNumberFriends.js';
+import { gMatchHistory } from './gMatchHistory.js';
+import { gNumberMatches } from './gNumberMatches.js';
+import { pUser } from './pUser.js';
+import { pFriend } from './pFriend.js';
+import { pMatchHistory } from './pMatchHistory.js';
+import { uMember } from './uMember.js';
+import { dUser } from './dUser.js';
+import { dMember } from './dMember.js';
+import { dFriends } from './dFriends.js';
+import { dFriend } from './dFriend.js';
+import { dMatchHistory } from './dMatchHistory.js';
+import { pAvatar } from './pAvatar.js';
+import { gAvatar } from './gAvatar.js';
+import { dAvatar } from './dAvatar.js';
 
 const env = process.env.NODE_ENV || 'development';
 
@@ -35,6 +38,7 @@ function prepareDB() {
 			id INTEGER PRIMARY KEY AUTOINCREMENT,
 			username TEXT,
 			displayName TEXT,
+			avatarId INTEGER,
 			pongWins INTEGER,
 			pongLosses INTEGER,
 			tetrisWins INTEGER,
@@ -73,16 +77,18 @@ function prepareDB() {
 prepareDB();
 
 // POST
-const createUser = database.prepare('INSERT INTO userData (username, displayName, pongWins, pongLosses, tetrisWins, tetrisLosses) VALUES (?, ?, 0, 0, 0, 0);');
+const createUser = database.prepare('INSERT INTO userData (username, displayName, avatarId, pongWins, pongLosses, tetrisWins, tetrisLosses) VALUES (?, ?, -1, 0, 0, 0, 0);');
 const addFriend = database.prepare('INSERT INTO friends (username, friendName) VALUES (?, ?);');
 const addMatch = database.prepare('INSERT INTO matchHistory (game, date, player1, player2, matchId) VALUES (?, ?, ?, ?, ?);');
 const incWinsPong = database.prepare('UPDATE userData SET pongWins = pongWins + 1 WHERE username = ?;');
 const incLossesPong = database.prepare('UPDATE userData SET pongLosses = pongLosses + 1 WHERE username = ?');
 const incWinsTetris = database.prepare('UPDATE userData SET tetrisWins = tetrisWins + 1 WHERE username = ?;');
 const incLossesTetris = database.prepare('UPDATE userData SET tetrisLosses = tetrisLosses + 1 WHERE username = ?');
+const setAvatarId = database.prepare('UPDATE userData SET avatarId = ? WHERE username = ?;');
 
 // PATCH
 const changeDisplayName = database.prepare('UPDATE userData SET displayName = ? WHERE username = ?;');
+const changeAvatarId = database.prepare('UPDATE userData SET avatarId = ? WHERE username = ?;');
 
 // GET
 const getUserData = database.prepare('SELECT username, displayName, pongWins, pongLosses, tetrisWins, tetrisLosses FROM userData LIMIT ? OFFSET ?;');
@@ -92,7 +98,8 @@ const getFriend = database.prepare('SELECT friendName FROM friends WHERE usernam
 const getMatchHistory = database.prepare('SELECT matchId, date FROM matchHistory WHERE game = ? AND ? IN (player1, player2) LIMIT ? OFFSET ?;');
 const getNumberUsers = database.prepare('SELECT COUNT (DISTINCT username) AS n_users FROM userData;');
 const getNumberFriends = database.prepare('SELECT COUNT (DISTINCT friendName) AS n_friends FROM friends WHERE username = ?;');
-const getNumberMatches = database.prepare('SELECT COUNT (DISTINCT id) AS n_matches FROM matchHistory WHERE game = ? AND ? IN (player1, player2);')
+const getNumberMatches = database.prepare('SELECT COUNT (DISTINCT id) AS n_matches FROM matchHistory WHERE game = ? AND ? IN (player1, player2);');
+const getAvatarId = database.prepare('SELECT avatarId FROM userData WHERE username = ?;');
 
 // DELETE
 const deleteUser = database.prepare('DELETE FROM userData WHERE username = ?;');
@@ -101,6 +108,7 @@ const deleteFriends = database.prepare('DELETE FROM friends WHERE username = ?;'
 const deleteMatchHistory = database.prepare('DELETE FROM matchHistory WHERE game = ? AND ? IN (player1, player2);');
 const deleteStatsPong = database.prepare('UPDATE userData SET pongWins = 0, pongLosses = 0 WHERE username = ?;');
 const deleteStatsTetris = database.prepare('UPDATE userData SET tetrisWins = 0, tetrisLosses = 0 WHERE username = ?;');
+const deleteAvatarId = database.prepare('UPDATE userData SET avatarId = -1 WHERE username = ?;');
 
 const querySchema = { type: 'object', required: ['iStart', 'iEnd'], properties: { iStart: { type: 'integer', minimum: 0 }, iEnd: { type: 'integer', minimum: 0 } } }
 const bodySchema = { type: 'object', required: ['opponent', 'myScore', 'opponentScore'], properties: { opponent: { type: 'string' }, myScore: { type: 'integer', minimum: 0 }, opponentScore: { type: 'integer', minimum: 0 } } }
@@ -159,6 +167,9 @@ export default async function(fastify, options) {
 	fastify.get('/users/:userId/matchHistory/count', { preHandler: [fastify.authenticate], schema: { query: querySchemaMatchHistoryGame } }, async (request, reply) => {
 		return gNumberMatches(request, reply, fastify, getUserInfo, getNumberMatches);
 	});
+	fastify.get('/users/:userId/avatar', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+		return gAvatar(request, reply, fastify, getAvatarId);
+	});
 
 	// POST
 	fastify.post('/users/:userId', { preHandler: [fastify.authenticateAdmin] }, async (request, reply) => {
@@ -170,10 +181,13 @@ export default async function(fastify, options) {
 	fastify.post('/users/:userId/matchHistory', { preHandler: [fastify.authenticate], schema: { body: bodySchemaMatchHistory } }, async (request, reply) => {
 		return pMatchHistory(request, reply, fastify, getUserInfo, addMatch, incWinsPong, incLossesPong, incWinsTetris, incLossesTetris);
 	});
+	fastify.post('/users/:userId/avatar', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+		return pAvatar(request, reply, fastify, setAvatarId);
+	});
 
 	// PATCH
 	fastify.patch('/users/:userId/:member', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		return uMember(request, reply, fastify, getUserInfo, changeDisplayName);
+		return uMember(request, reply, fastify, getUserInfo, changeDisplayName, changeAvatarId);
 	});
 
 	// DELETE
@@ -192,4 +206,7 @@ export default async function(fastify, options) {
 	fastify.delete('/users/:userId/matchHistory', { preHandler: [fastify.authenticate], schema: { query: querySchemaMatchHistoryGame } }, async (request, reply) => {
 		return dMatchHistory(request, reply, fastify, getUserInfo, deleteMatchHistory, deleteStatsPong, deleteStatsTetris);
 	});
+	fastify.delete('/users/:userId/avatar', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+		return dAvatar(request, reply, fastify, deleteAvatarId);
+	});
 }
diff --git a/src/api/user/gAvatar.js b/src/api/user/gAvatar.js
new file mode 100644
index 0000000..2323220
--- /dev/null
+++ b/src/api/user/gAvatar.js
@@ -0,0 +1,9 @@
+export async function gAvatar(request, reply, fastify, getAvatarId) {
+	try {
+		;
+		return reply.code(200).send({  });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/pAvatar.js b/src/api/user/pAvatar.js
new file mode 100644
index 0000000..e7e9db6
--- /dev/null
+++ b/src/api/user/pAvatar.js
@@ -0,0 +1,13 @@
+export async function pAvatar(request, reply, fastify, setAvatarId) {
+	try {
+/*		const res = await fetch('http://localhost:3004/images', { method: "POST", headers: {  } });
+		if (!res.ok) {
+			return reply.code(500).send({ error: "Internal server error" });
+		}
+		const data = await res.json();*/
+		return reply.code(200).send({ msg: "Avatar uploaded successfully" });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/uMember.js b/src/api/user/uMember.js
index 67997d7..01c1dc5 100644
--- a/src/api/user/uMember.js
+++ b/src/api/user/uMember.js
@@ -1,4 +1,4 @@
-export async function uMember(request, reply, fastify, getUserInfo, changeDisplayName) {
+export async function uMember(request, reply, fastify, getUserInfo, changeDisplayName, changeAvatarId) {
 	try {
 		const userId = request.params.userId;
 		if (!request.user) {
diff --git a/src/start.js b/src/start.js
index df7bc0e..c99534d 100644
--- a/src/start.js
+++ b/src/start.js
@@ -1,6 +1,7 @@
 import Fastify from 'fastify';
 import authApi from './api/auth/default.js';
 import userApi from './api/user/default.js';
+import imagesApi from './api/images/default.js';
 import scoreApi from './api/scoreStore/default.js';
 import fs from 'fs';
 import path from 'path';
@@ -68,6 +69,16 @@ async function start() {
 		servers.push(score);
 	}
 
+	if (target === 'images' || target === 'all') {
+		const images = Fastify({ logger: loggerOption('images') });
+		images.register(imagesApi);
+		const port = target === 'all' ? 3004 : 3000;
+		const host = target === 'all' ? '127.0.0.1' : '0.0.0.0';
+		await images.listen({ port, host });
+		console.log(`Images API listening on http://${host}:${port}`);
+		servers.push(images);
+	}
+
 	// Graceful shutdown on SIGINT
 	process.on('SIGINT', async () => {
 		console.log('SIGINT received, closing servers...');

From f63aec4b9c8c23d59d42b004cd394dffbaff4725 Mon Sep 17 00:00:00 2001
From: Tzvetan Trave <tzvetan.trave@abadcafe.org>
Date: Sat, 18 Oct 2025 07:05:49 +0200
Subject: [PATCH 053/109] updated todo

---
 src/api/TODO | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 src/api/TODO

diff --git a/src/api/TODO b/src/api/TODO
new file mode 100644
index 0000000..0b8e16c
--- /dev/null
+++ b/src/api/TODO
@@ -0,0 +1,21 @@
+Todo :
+- view friend's activity status
+- add a privacy setting so not anybody can GET friends, match history, etc. (what are the RGPD requirements ?) ?
+- test updated score storing (delays)
+
+
+
+User API :
+POST /users/:userId/avatar	+ {image} (calls POST /images, stores returned imageId in DB at :userId)
+GET /users/:userId/avatar	-> {image}
+DELETE /users/:userId/avatar	(calls DELETE /images/:imageId, clears imageId in DB at :userId)
+PATCH /users/:userId/avatar	+ {image} (emulates a DELETE /users/:userId/avatar and a POST /users/:userId/avatar) -> use uMember instead ?
+- provide a random kanel image from Adam's website ?
+
+Image API :
+- convert everything to webp (using @fastify/sharp)
+- test size max
+
+
+
+Always update API docs

From 2314b0bd3a2b3a37769ef7e8a4ddbd2c04f5ee43 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Sat, 18 Oct 2025 20:04:34 +0200
Subject: [PATCH 054/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip:=20starting=20being=20a=20fullstack=20dev?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/main.ts          | 31 +++++++++----------
 src/front/static/ts/views/Friends.ts | 45 ++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 17 deletions(-)
 create mode 100644 src/front/static/ts/views/Friends.ts

diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index 6533fd8..112b5a9 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -7,10 +7,9 @@ export async function isLogged(): Promise<boolean> {
 		method: "GET",
 		credentials: "include",
 	});
-	if (uuid_req.status === 200)
-	{
+	if (uuid_req.status === 200) {
 		let uuid = await uuid_req.json();
-		document.cookie = `uuid=${uuid.user};max-age=${60*60*24*7}`;
+		document.cookie = `uuid=${uuid.user};max-age=${60 * 60 * 24 * 7}`;
 		return true;
 	}
 	else // 401
@@ -40,6 +39,8 @@ const routes = [
 
 	{ path: "/login", view: () => import("./views/LoginPage.ts") },
 	{ path: "/register", view: () => import("./views/RegisterPage.ts") },
+
+	{ path: "/friends", view: () => import("./views/Friends.ts") }
 ];
 
 const router = async () => {
@@ -65,20 +66,18 @@ const router = async () => {
 	view.run();
 };
 
-document.getElementById("profile-button")?.addEventListener("click", () => {profile_view.run();});
+document.getElementById("profile-button")?.addEventListener("click", () => { profile_view.run(); });
 window.addEventListener("popstate", router);
 
 document.addEventListener("DOMContentLoaded", () => {
 	isLogged();
 
-	document.body.addEventListener("click", e=> {
-    if (!e.target.closest("#taskbar-menu") && !e.target.matches("#profile-button"))
-    {
-      profile_view.open = false;
-      document.getElementById("taskbar-menu").innerHTML = "";
-    }
-		if (e.target.matches("[data-link]"))
-		{
+	document.body.addEventListener("click", e => {
+		if (!e.target.closest("#taskbar-menu") && !e.target.matches("#profile-button")) {
+			profile_view.open = false;
+			document.getElementById("taskbar-menu").innerHTML = "";
+		}
+		if (e.target.matches("[data-link]")) {
 			e.preventDefault();
 			navigationManager(e.target.href);
 		}
@@ -86,9 +85,8 @@ document.addEventListener("DOMContentLoaded", () => {
 			e.preventDefault();
 	});
 
-	document.body.addEventListener("dblclick", e=> {
-		if (e.target.closest("[data-icon]"))
-		{
+	document.body.addEventListener("dblclick", e => {
+		if (e.target.closest("[data-icon]")) {
 			e.preventDefault();
 			navigationManager(e.target.closest("[data-icon]").href);
 		}
@@ -99,8 +97,7 @@ document.addEventListener("DOMContentLoaded", () => {
 
 oneko();
 
-function updateClock()
-{
+function updateClock() {
 	const days = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'];
 	const months = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug', 'sep', 'oct', 'nov', 'dec'];
 	const clock = document.getElementById("taskbar-clock");
diff --git a/src/front/static/ts/views/Friends.ts b/src/front/static/ts/views/Friends.ts
new file mode 100644
index 0000000..d384508
--- /dev/null
+++ b/src/front/static/ts/views/Friends.ts
@@ -0,0 +1,45 @@
+import Aview from "./Aview.ts"
+import { setOnekoState } from "../oneko.ts"
+
+export default class extends Aview {
+
+	constructor() {
+		super();
+		this.setTitle("Friends list");
+		setOnekoState("default");
+	}
+
+	async getHTML() {
+		return `
+		<div id="window" class="absolute default-border">
+			<div id="window-header" class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
+				<span class="font-[Kubasta]">friends.ts</span>
+				<div>
+					<button> - </button>
+					<button> □ </button>
+					<a href="/" data-link> × </a>
+				</div>
+			</div>
+
+			<div class="bg-neutrbg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 spcae-y-4 reverse-border">
+			  <p class="text-gray-900 dark:text-white text-lg pt-0 pb-4"></p>
+			</div>
+		</div>
+		`;
+	}
+
+	async run() {
+		let uuid: String;
+
+		uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+
+		const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
+			method: "GET",
+			credentials: "include",
+		});
+		if (userdata_req.status == 404) {
+			console.error("invalid user");
+			return;
+		}
+	}
+}

From 451a7e88a3f0226635228cd61c507529e7821919 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Sat, 18 Oct 2025 21:29:51 +0200
Subject: [PATCH 055/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip:=20friends=20list=20working=20(kinda)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/views/Friends.ts | 65 +++++++++++++++++++++++-----
 1 file changed, 55 insertions(+), 10 deletions(-)

diff --git a/src/front/static/ts/views/Friends.ts b/src/front/static/ts/views/Friends.ts
index d384508..2908abf 100644
--- a/src/front/static/ts/views/Friends.ts
+++ b/src/front/static/ts/views/Friends.ts
@@ -1,5 +1,6 @@
 import Aview from "./Aview.ts"
 import { setOnekoState } from "../oneko.ts"
+import { dragElement } from "./drag.ts";
 
 export default class extends Aview {
 
@@ -21,8 +22,11 @@ export default class extends Aview {
 				</div>
 			</div>
 
-			<div class="bg-neutrbg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 spcae-y-4 reverse-border">
-			  <p class="text-gray-900 dark:text-white text-lg pt-0 pb-4"></p>
+			<div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
+			  <p id="friends_n" class="hidden text-gray-900 dark:text-white text-lg"></p>
+			  <p id="friends-error-message" class="hidden text-red-700 dark:text-red-500"></p>
+			  <ul id="friends_list" class="hidden text-gray-900 dark:text-white text-lg">
+			  </ul>
 			</div>
 		</div>
 		`;
@@ -31,15 +35,56 @@ export default class extends Aview {
 	async run() {
 		let uuid: String;
 
-		uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+		dragElement(document.getElementById("window"));
+		const n_friends = (document.getElementById("friends_n") as HTMLParagraphElement);
+		const friends_error_message = (document.getElementById("friends-error-message") as HTMLParagraphElement);
+		const friends_list = (document.getElementById("friends_list") as HTMLUListElement);
 
-		const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
-			method: "GET",
-			credentials: "include",
-		});
-		if (userdata_req.status == 404) {
-			console.error("invalid user");
-			return;
+		try {
+			uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+			const data_req = await fetch("http://localhost:3002/users/" + uuid + "/friends/count", {
+				method: "GET",
+				headers: {
+					"Content-Type": "application/json",
+				},
+				credentials: "include",
+			});
+			if (data_req.status === 200) {
+				let data = await data_req.json();
+				n_friends.innerHTML = ":D friends count : " + data.n_friends;
+				n_friends.classList.remove("hidden");
+
+				if (data.n_friends > 0) {
+					const list_req = await fetch("http://localhost:3002/users/" + uuid + "/friends?iStart=0&iEnd=20", {
+						method: "GET",
+						headers: {
+							"Content-Type": "application/json",
+						},
+						credentials: "include",
+					});
+					if (list_req.status === 200) {
+						friends_list.classList.remove("hidden")
+
+						let list = (await list_req.json()).friends as JSON;
+
+						for (let i = 0; i < data.n_friends; i++) {
+							let new_friends = document.createElement('li')
+							new_friends.innerHTML = list[i].friendName;
+							friends_list.appendChild(new_friends);
+						}
+					} else {
+						n_friends.classList.add("hidden");
+						friends_error_message.innerHTML = (await list_req.json()).error;
+						friends_error_message.classList.remove("hidden");
+					}
+				} else {
+					friends_error_message.innerHTML = "failed to fetch friends";
+					friends_error_message.classList.remove("hidden");
+				}
+			}
+		} catch (error) {
+			friends_error_message.innerHTML = "failed to fetch friends";
+			friends_error_message.classList.remove("hidden");
 		}
 	}
 }

From c0b019064d78a7cf0d03e9a01df1c1c477365ba2 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Sat, 18 Oct 2025 21:55:49 +0200
Subject: [PATCH 056/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip:=20add=20and=20remove=20working?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/views/Friends.ts | 131 +++++++++++++++++++++------
 1 file changed, 103 insertions(+), 28 deletions(-)

diff --git a/src/front/static/ts/views/Friends.ts b/src/front/static/ts/views/Friends.ts
index 2908abf..054ea3f 100644
--- a/src/front/static/ts/views/Friends.ts
+++ b/src/front/static/ts/views/Friends.ts
@@ -23,6 +23,14 @@ export default class extends Aview {
 			</div>
 
 			<div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
+
+			<form method="dialog" class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
+				<input type="text" id="new-friend" placeholder="new friend" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
+				<button id="add-friends-button" type="submit" class="default-button w-full">add friend</button>
+				<button id="rm-friends-button" class="default-button w-full">remove friend</button>
+				<p id="add-friend-err" class="hidden text-red-700 dark:text-red-500"></p>
+				<p id="add-friend-msg" class="hidden text-gray-900 dark:text-white text-lg"></p>
+			</form>
 			  <p id="friends_n" class="hidden text-gray-900 dark:text-white text-lg"></p>
 			  <p id="friends-error-message" class="hidden text-red-700 dark:text-red-500"></p>
 			  <ul id="friends_list" class="hidden text-gray-900 dark:text-white text-lg">
@@ -34,6 +42,97 @@ export default class extends Aview {
 
 	async run() {
 		let uuid: String;
+		uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+
+		const list_friends = async () => {
+			const data_req = await fetch("http://localhost:3002/users/" + uuid + "/friends/count", {
+				method: "GET",
+				headers: {
+					"Content-Type": "application/json",
+				},
+				credentials: "include",
+			});
+			let data = await data_req.json();
+
+			if (data.n_friends > 0) {
+				const list_req = await fetch("http://localhost:3002/users/" + uuid + "/friends?iStart=0&iEnd=20", {
+					method: "GET",
+					headers: {
+						"Content-Type": "application/json",
+					},
+					credentials: "include",
+				});
+				if (list_req.status === 200) {
+					while (friends_list.firstChild) {
+						friends_list.removeChild(friends_list.firstChild);
+					}
+					friends_list.classList.remove("hidden")
+
+					let list = (await list_req.json()).friends as JSON;
+
+					for (let i = 0; i < data.n_friends; i++) {
+						let new_friends = document.createElement('li')
+						new_friends.innerHTML = "- " + list[i].friendName;
+						friends_list.appendChild(new_friends);
+					}
+				} else {
+					n_friends.classList.add("hidden");
+					friends_error_message.innerHTML = (await list_req.json()).error;
+					friends_error_message.classList.remove("hidden");
+				}
+			} else {
+				friends_error_message.innerHTML = "failed to fetch friends";
+				friends_error_message.classList.remove("hidden");
+			}
+		}
+
+		const add_friend = async () => {
+			const new_friend = (document.getElementById("new-friend") as HTMLInputElement);
+			const add_friend_err = (document.getElementById("add-friend-err") as HTMLParagraphElement);
+			const add_friend_msg = (document.getElementById("add-friend-msg") as HTMLParagraphElement);
+
+			const data_req = await fetch("http://localhost:3002/users/" + uuid + "/friends/" + new_friend.value, {
+				method: "POST",
+				credentials: "include",
+			});
+			let data = await data_req.json()
+			if (data_req.status === 200) {
+				add_friend_msg.innerHTML = data.msg;
+				add_friend_msg.classList.remove("hidden");
+				if (!add_friend_err.classList.contains("hidden"))
+					add_friend_err.classList.add("hidden")
+			} else {
+				add_friend_err.innerHTML = data.error;
+				add_friend_err.classList.remove("hidden");
+				if (!add_friend_msg.classList.contains("hidden"))
+					add_friend_msg.classList.add("hidden")
+			}
+			list_friends()
+		}
+
+		const rm_friend = async () => {
+			const new_friend = (document.getElementById("new-friend") as HTMLInputElement);
+			const add_friend_err = (document.getElementById("add-friend-err") as HTMLParagraphElement);
+			const add_friend_msg = (document.getElementById("add-friend-msg") as HTMLParagraphElement);
+
+			const data_req = await fetch("http://localhost:3002/users/" + uuid + "/friends/" + new_friend.value, {
+				method: "DELETE",
+				credentials: "include",
+			});
+			let data = await data_req.json()
+			if (data_req.status === 200) {
+				add_friend_msg.innerHTML = data.msg;
+				add_friend_msg.classList.remove("hidden");
+				if (!add_friend_err.classList.contains("hidden"))
+					add_friend_err.classList.add("hidden")
+			} else {
+				add_friend_err.innerHTML = data.error;
+				add_friend_err.classList.remove("hidden");
+				if (!add_friend_msg.classList.contains("hidden"))
+					add_friend_msg.classList.add("hidden")
+			}
+			list_friends()
+		}
 
 		dragElement(document.getElementById("window"));
 		const n_friends = (document.getElementById("friends_n") as HTMLParagraphElement);
@@ -41,7 +140,6 @@ export default class extends Aview {
 		const friends_list = (document.getElementById("friends_list") as HTMLUListElement);
 
 		try {
-			uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
 			const data_req = await fetch("http://localhost:3002/users/" + uuid + "/friends/count", {
 				method: "GET",
 				headers: {
@@ -54,37 +152,14 @@ export default class extends Aview {
 				n_friends.innerHTML = ":D friends count : " + data.n_friends;
 				n_friends.classList.remove("hidden");
 
-				if (data.n_friends > 0) {
-					const list_req = await fetch("http://localhost:3002/users/" + uuid + "/friends?iStart=0&iEnd=20", {
-						method: "GET",
-						headers: {
-							"Content-Type": "application/json",
-						},
-						credentials: "include",
-					});
-					if (list_req.status === 200) {
-						friends_list.classList.remove("hidden")
-
-						let list = (await list_req.json()).friends as JSON;
-
-						for (let i = 0; i < data.n_friends; i++) {
-							let new_friends = document.createElement('li')
-							new_friends.innerHTML = list[i].friendName;
-							friends_list.appendChild(new_friends);
-						}
-					} else {
-						n_friends.classList.add("hidden");
-						friends_error_message.innerHTML = (await list_req.json()).error;
-						friends_error_message.classList.remove("hidden");
-					}
-				} else {
-					friends_error_message.innerHTML = "failed to fetch friends";
-					friends_error_message.classList.remove("hidden");
-				}
+				list_friends()
 			}
 		} catch (error) {
 			friends_error_message.innerHTML = "failed to fetch friends";
 			friends_error_message.classList.remove("hidden");
 		}
+		document.getElementById("add-friends-button")?.addEventListener("click", add_friend);
+		document.getElementById("rm-friends-button")?.addEventListener("click", rm_friend);
 	}
+
 }

From 426bee20f05d45b98f55b93be648d92d701de998 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Sat, 18 Oct 2025 22:23:33 +0200
Subject: [PATCH 057/109] =?UTF-8?q?=E3=80=8C=F0=9F=97=91=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20clean:=20cleaned=20project.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/views/Friends.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/front/static/ts/views/Friends.ts b/src/front/static/ts/views/Friends.ts
index 054ea3f..a47cf86 100644
--- a/src/front/static/ts/views/Friends.ts
+++ b/src/front/static/ts/views/Friends.ts
@@ -23,14 +23,13 @@ export default class extends Aview {
 			</div>
 
 			<div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
-
-			<form method="dialog" class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
+			  <form method="dialog" class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
 				<input type="text" id="new-friend" placeholder="new friend" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
 				<button id="add-friends-button" type="submit" class="default-button w-full">add friend</button>
 				<button id="rm-friends-button" class="default-button w-full">remove friend</button>
 				<p id="add-friend-err" class="hidden text-red-700 dark:text-red-500"></p>
 				<p id="add-friend-msg" class="hidden text-gray-900 dark:text-white text-lg"></p>
-			</form>
+			  </form>
 			  <p id="friends_n" class="hidden text-gray-900 dark:text-white text-lg"></p>
 			  <p id="friends-error-message" class="hidden text-red-700 dark:text-red-500"></p>
 			  <ul id="friends_list" class="hidden text-gray-900 dark:text-white text-lg">
@@ -161,5 +160,4 @@ export default class extends Aview {
 		document.getElementById("add-friends-button")?.addEventListener("click", add_friend);
 		document.getElementById("rm-friends-button")?.addEventListener("click", rm_friend);
 	}
-
 }

From ed2aa325e5a55d1e71349c3eee7b409d7ca14aa9 Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Sun, 19 Oct 2025 09:29:33 +0200
Subject: [PATCH 058/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip(front):=20profile=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/index.html                      |   4 +-
 src/front/static/css/style.css            |   9 ++
 src/front/static/ts/main.ts               |  11 +-
 src/front/static/ts/oneko.ts              |  17 +--
 src/front/static/ts/views/Game.ts         |  43 +++++--
 src/front/static/ts/views/LoginPage.ts    |  34 ++++--
 src/front/static/ts/views/Profile.ts      | 139 ++++++++++++----------
 src/front/static/ts/views/ProfileMenu.ts  |  86 +++++++++++++
 src/front/static/ts/views/RegisterPage.ts |  34 ++++--
 src/front/static/ts/views/Settings.ts     |  84 +++++++++++++
 src/front/static/ts/views/Tetris.ts       | 115 ++++++++++++++----
 11 files changed, 448 insertions(+), 128 deletions(-)
 create mode 100644 src/front/static/ts/views/ProfileMenu.ts
 create mode 100644 src/front/static/ts/views/Settings.ts

diff --git a/src/front/index.html b/src/front/index.html
index 233ae24..6471bae 100644
--- a/src/front/index.html
+++ b/src/front/index.html
@@ -42,8 +42,8 @@
 				<div class="flex px-4 items-center content-center space-x-2">
 				    <button id="profile-button" class="taskbar-button flex flex-row justify-center items-center"><img class="object-scale-down mr-2 h-5 w-5" src="https://api.kanel.ovh/id?id=65" /> start</button>
 					<div class="text-neutral-700 dark:text-neutral-400">|</div>
-					<a class="taskbar-button" href="https://rusty.42angouleme.fr/">rusty</a>
-					<a class="taskbar-button" href="/tetris" data-link>tetris</a>
+					<a target="_blank" class="taskbar-button" href="https://rusty.42angouleme.fr/">rusty</a>
+					<a target="_blank" class="taskbar-button" href="https://dn720004.ca.archive.org/0/items/2009-tetris-variant-concepts_202201/2009%20Tetris%20Design%20Guideline.pdf">tetris-guideline.pdf</a>
 				</div>
 				<div class="reverse-border m-1.5 h-8/10 content-center">
 					<span id="taskbar-clock" class="text- neutral-900 dark:text-white px-4">12:37</span>
diff --git a/src/front/static/css/style.css b/src/front/static/css/style.css
index 35cd827..56bb708 100644
--- a/src/front/static/css/style.css
+++ b/src/front/static/css/style.css
@@ -1,4 +1,13 @@
 @import "tailwindcss";
+@layer utilities {
+  .no-scrollbar::-webkit-scrollbar {
+    display: none;
+  }
+  .no-scrollbar {
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+  }
+}
 
 @font-face {
   font-family: Kubasta;
diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index 6533fd8..7473ebc 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -1,6 +1,6 @@
 import { oneko } from "./oneko.ts";
-import Profile from "./views/Profile.ts";
-let profile_view = new Profile;
+import ProfileMenu from "./views/ProfileMenu.ts";
+let profile_view = new ProfileMenu;
 
 export async function isLogged(): Promise<boolean> {
 	let uuid_req = await fetch("http://localhost:3001/me", {
@@ -40,6 +40,9 @@ const routes = [
 
 	{ path: "/login", view: () => import("./views/LoginPage.ts") },
 	{ path: "/register", view: () => import("./views/RegisterPage.ts") },
+
+	{ path: "/profile", view: () => import("./views/Profile.ts") },
+	{ path: "/settings", view: () => import("./views/Settings.ts") },
 ];
 
 const router = async () => {
@@ -97,8 +100,6 @@ document.addEventListener("DOMContentLoaded", () => {
 	router();
 });
 
-oneko();
-
 function updateClock()
 {
 	const days = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'];
@@ -116,3 +117,5 @@ function updateClock()
 
 setInterval(updateClock, 5000);
 updateClock();
+
+oneko();
diff --git a/src/front/static/ts/oneko.ts b/src/front/static/ts/oneko.ts
index 9c579d4..a2a159b 100644
--- a/src/front/static/ts/oneko.ts
+++ b/src/front/static/ts/oneko.ts
@@ -18,20 +18,23 @@ export function setOnekoState(state: string) {
 		default:
 			oneko_state = 0;
 	}
+  return;
 }
 
 export function setOnekoOffset() {
-	if (oneko_state == 1)
+	if (oneko_state != 0)
 	{
 		offsetX = document.getElementById("window").offsetLeft + 44;
 		offsetY = document.getElementById("window").offsetTop + 44 + 24;
-		console.log(offsetX, offsetY);
 	}
+  return;
 }
 
-export function setBallPos(x: number, y: number) {
+export function setBallPos(x: number, y: number)
+{
 	mousePosX = x + offsetX;
 	mousePosY = y + offsetY;
+  return;
 }
 
 export function oneko() {
@@ -39,7 +42,7 @@ export function oneko() {
     window.matchMedia(`(prefers-reduced-motion: reduce)`) === true ||
     window.matchMedia(`(prefers-reduced-motion: reduce)`).matches === true;
 
-  if (isReducedMotion) return;
+  if (isReducedMotion) return ;
 
   const nekoEl = document.createElement("div");
 
@@ -141,15 +144,15 @@ export function oneko() {
       {
         mousePosX = event.clientX;
         mousePosY = event.clientY;
-	  }
+      }
     });
 
     window.requestAnimationFrame(onAnimationFrame);
   }
 
-  let lastFrameTimestamp;
+  let lastFrameTimestamp: number;
 
-  function onAnimationFrame(timestamp) {
+  function onAnimationFrame(timestamp: number) {
     // Stops execution if the neko element is removed from DOM
     if (!nekoEl.isConnected) {
       return;
diff --git a/src/front/static/ts/views/Game.ts b/src/front/static/ts/views/Game.ts
index 2b73777..5e29d7b 100644
--- a/src/front/static/ts/views/Game.ts
+++ b/src/front/static/ts/views/Game.ts
@@ -4,7 +4,7 @@ import { dragElement } from "./drag.js"
 import { setOnekoState, setBallPos, setOnekoOffset } from "../oneko.ts"
 
 export default class extends Aview {
-	
+
 	running: boolean;
 
 	constructor()
@@ -27,7 +27,7 @@ export default class extends Aview {
 				</div>
 			</div>
 
-				
+
 			<div id="main-div" class="bg-neutral-200 dark:bg-neutral-800 text-center p-10 space-y-4 reverse-border">
 				<div id="player-inputs" class="flex flex-col space-y-4">
 					<div class="flex flex-row">
@@ -46,6 +46,7 @@ export default class extends Aview {
 
 	async run() {
 		dragElement(document.getElementById("window"));
+    let uuid: string;
 
 		let start: number = 0;
 		let elapsed: number;
@@ -103,7 +104,7 @@ export default class extends Aview {
 			ballSpeedY = ballSpeed * Math.sin(theta);
 		}
 
-		function moveBall() {
+		async function moveBall() {
 			let length = Math.sqrt(ballSpeedX * ballSpeedX + ballSpeedY * ballSpeedY);
 			let scale = ballSpeed / length;
 			ballX += (ballSpeedX * scale) * elapsed;
@@ -142,6 +143,17 @@ export default class extends Aview {
 
 				if (p1_score === 3 || p2_score === 3)
 				{
+          console.log(isLogged());
+          if (await isLogged())
+          {
+            let uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+            fetch(`http://localhost:3002/users/${uuid}/matchHistory`, {
+              method: "POST",
+              headers: { "Content-Type": "application/json", },
+              credentials: "include",
+              body: JSON.stringify({ "opponent": p2_name, "myScore": p1_score, "opponentScore": p2_score })
+            });
+          }
 					// ------------------------------------------------------------------------------------------------------------------------------------------
 					//
 					// insert the fetch to the ScoreStore api here
@@ -225,13 +237,13 @@ export default class extends Aview {
 			}
 		}
 
-		const gameLoop = (timestamp: number) => {
+		const gameLoop = async (timestamp: number) => {
 			elapsed = (timestamp - start) / 1000;
 			start = timestamp;
 			if (game_playing)
 			{
 				movePaddles();
-				moveBall();
+				await moveBall();
 			}
 			draw();
 			if (!game_playing)
@@ -257,13 +269,26 @@ export default class extends Aview {
 
 		p2_input.value = "Player 2";
 		if (await isLogged())
-			p1_input.value = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+		{
+      uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+      const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
+  			method: "GET",
+  			credentials: "include",
+  		});
+  		if (userdata_req.status == 404)
+  		{
+  			console.error("invalid user");
+  			return ;
+  		}
+      let userdata = await userdata_req.json();
+			p1_input.value = userdata.displayName;
+		}
 		else
 			p1_input.value = "Player 1";
 
 		document.getElementById("game-start")?.addEventListener("click", () => {
-			p1_name = p1_input.value;
-			p2_name = p2_input.value;
+      p1_name = p1_input.value.length > 16 ? p1_input.value.substring(0, 16) + "." : p1_input.value;
+			p2_name = p2_input.value.length > 16 ? p2_input.value.substring(0, 16) + "." : p2_input.value;
 			document.getElementById("player-inputs").remove();
 
 			canvas = document.createElement("canvas");
@@ -272,7 +297,7 @@ export default class extends Aview {
 
 			document.getElementById("main-div").prepend(canvas);
 
-			ctx = canvas.getContext("2d");
+			ctx = canvas.getContext("2d", {alpha: false});
 			ctx.canvas.width  = 600;
 			ctx.canvas.height = 600;
 
diff --git a/src/front/static/ts/views/LoginPage.ts b/src/front/static/ts/views/LoginPage.ts
index f1b04bd..0311473 100644
--- a/src/front/static/ts/views/LoginPage.ts
+++ b/src/front/static/ts/views/LoginPage.ts
@@ -24,14 +24,30 @@ export default class extends Aview {
 				</div>
 			</div>
 
-		  <form method="dialog" class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
-				<h1 class="text-gray-900 dark:text-white text-lg pt-0 pb-4">welcome back ! please login.</h1>
-				<input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
-				<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
-				<p id="login-error-message" class="hidden text-red-700 dark:text-red-500"></p>
-				</br>
-				<button id="login-button" type="submit" class="default-button w-full">login</button>
-			</form>
+		  <div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 reverse-border flex flex-col items-center">
+				<form method="dialog" class="space-y-4">
+				  <h1 class="text-gray-900 dark:text-white text-lg pt-0 pb-4">welcome back ! please login.</h1>
+					<input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
+					<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
+					<p id="login-error-message" class="hidden text-red-700 dark:text-red-500"></p>
+					</br>
+					<button id="login-button" type="submit" class="default-button w-full">login</button>
+				</form>
+
+				<hr class="my-4 w-64 reverse-border">
+
+				<div class="flex flex-col space-y-4 w-full">
+				  <a target="_blank" href="http://localhost:3001/login/google" class="default-button inline-flex items-center justify-center w-full">
+						<img src="https://upload.wikimedia.org/wikipedia/commons/c/c1/Google_%22G%22_logo.svg" height=20 width=20 class="mr-2 justify-self-start" />
+						login with John Google
+					</a>
+					<a target="_blank" href="http://localhost:3001/login/google" class="default-button inline-flex items-center justify-center w-full">
+					  <img src="https://rusty.42angouleme.fr/assets/favicon-bb06adc80c8495db.ico" height=20 width=20 class="mr-2 justify-self-start" />
+						login with Rusty
+					</a>
+				</div>
+			</div>
+
 		</div>
 		`;
 	}
@@ -49,7 +65,6 @@ export default class extends Aview {
 					credentials: "include",
 					body: JSON.stringify({ user: username, password: password }),
 				});
-				const data = await data_req.json();
 
 				if (data_req.status === 200)
 				{
@@ -58,6 +73,7 @@ export default class extends Aview {
 				}
 				else if (data_req.status === 400)
 				{
+				  const data = await data_req.json();
 					document.getElementById("login-error-message").innerHTML = "error: " + data.error;
 					document.getElementById("login-error-message").classList.remove("hidden");
 				}
diff --git a/src/front/static/ts/views/Profile.ts b/src/front/static/ts/views/Profile.ts
index 502b15c..e233f52 100644
--- a/src/front/static/ts/views/Profile.ts
+++ b/src/front/static/ts/views/Profile.ts
@@ -1,29 +1,38 @@
 import Aview from "./Aview.ts"
+import { dragElement } from "./drag.ts";
+import { setOnekoState } from "../oneko.ts"
 import { isLogged, navigationManager } from "../main.ts"
 
+
 export default class extends Aview {
 
 	constructor()
 	{
 		super();
 		this.setTitle("profile");
+		setOnekoState("default");
 	}
 
 	async getHTML() {
 		return `
-		<div id="main-window" class="default-border shadow-2x1 bg-neutral-200 dark:bg-neutral-800">
-		  <div class="flex flex-row items-stretch">
-				<div class="inline-block bg-linear-to-b from-orange-200 to-orange-300 min-h-84 w-6 relative">
-				  <!--div class="absolute bottom-1 left-full whitespace-nowrap origin-bottom-left -rotate-90 font-bold">knl_meowscendence</div-->
-				  <div class="absolute bottom-1 left-full whitespace-nowrap origin-bottom-left -rotate-90 font-bold">girls kissing :3</div>
+		<div id="window" class="absolute default-border">
+			<div id="window-header" class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
+				<span class="font-[Kubasta]">profile.ts</span>
+				<div>
+					<button> - </button>
+					<button> □ </button>
+					<a href="/" data-link> × </a>
 				</div>
-
-				<div class="flex flex-col items-center">
-				  <div id="profile-items" class="flex flex-col items-center">
+			</div>
+			<div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
+				<div class="flex flex-col space-y-4 w-full">
+				  <div id="profile-profile" class="default-border h-24 flex flex-row place-content-stretch content-center items-center space-x-6 pr-4">
 					</div>
-				  <div id="menu-bottom-div" class="hidden mt-auto flex flex-col items-center">
-						<hr class="my-2 w-32 reverse-border">
-						<button id="menu-logout" class="menu-default-button">logout</button>
+					<div class="flex flex-row space-x-4 w-full min-w-145">
+					  <ul id="profile-scorelist" class="reverse-border bg-neutral-300 dark:bg-neutral-900 h-48 w-full overflow-scroll no-scrollbar">
+						</ul>
+				    <div id="graph-ig-idk-im-scared" class="reverse-border bg-neutral-300 dark:bg-neutral-900 h-48 w-full">
+						</div>
 					</div>
 				</div>
 			</div>
@@ -31,43 +40,15 @@ export default class extends Aview {
 		`;
 	}
 
-	open: boolean = false;
+  async run() {
+    if (!await isLogged())
+      navigationManager("/");
 
-	async run() {
-	  let uuid: String;
-    if (this.open)
-    {
-      this.open = false;
-      document.getElementById("taskbar-menu").innerHTML = "";
-      return ;
-    }
-    this.open = true;
-    document.getElementById("taskbar-menu").innerHTML = await this.getHTML();
+    dragElement(document.getElementById("window"));
+    let uuid: String;
+    uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
 
-    async function getMainHTML() {
-      if (!(await isLogged()))
-      {
-        document.getElementById("menu-bottom-div").classList.add("hidden");
-        return `
-     			<a class="menu-default-button inline-flex items-center justify-center" href="/login" data-link>login</a>
-     			<a class="menu-default-button inline-flex items-center justify-center" href="/register" data-link>register</a>
-          `;
-      }
-      document.getElementById("menu-bottom-div").classList.remove("hidden");
-
-      uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
-      return `
-        <span class="menu-default-label inline-flex items-center justify-center">hi, ${uuid} !</span>
-				<hr class="my-2 w-32 reverse-border">
-				<button class="menu-default-button">profile</button>
-				<button class="menu-default-button">settings</button>
-      `;
-    }
-
-
-    document.getElementById("profile-items").innerHTML = await getMainHTML();
-
-		/*const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
+    const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
 			method: "GET",
 			credentials: "include",
 		});
@@ -78,28 +59,56 @@ export default class extends Aview {
 		}
 		let userdata = await userdata_req.json();
 
-		console.log(userdata_req);*/
+    const matchCount_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory/count`, {
+      method: "GET",
+      credentials: "include",
+    });
+    const matchCount = await matchCount_req.json();
 
-		/*const main = document.getElementById("profile-profile");
-		const nametag = main.appendChild(document.createElement("span"));
+    const matches_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory?iStart=0&iEnd=${matchCount.n_matches}`, {
+      method: "GET",
+      credentials: "include",
+    });
+    const matches = await matches_req.json();
 
-		nametag.innerHTML = `Hiiiiii ${userdata.displayName} ! :D`;
+    const main = document.getElementById("profile-scorelist");
+    if (!main)
+      return console.error("what");
+
+    console.log(matches);
+    if (matches.matchHistory)
+    {
+      for (let match of matches.matchHistory)
+      {
+        const newEntry = document.createElement("li");
+        newEntry.classList.add("m-2", "default-button", "bg-neutral-200", "dark:bg-neutral-800", "text-neutral-900", "dark:text-white");
+        newEntry.innerHTML = match.score.p1Score > match.score.p2Score ? `${match.score.p1} - winner` : `${match.score.p2} - winner`;
+        main.insertBefore(newEntry, main.firstChild);
+        console.log(match.tx);
+      }
+    }
+
+		const profile = document.getElementById("profile-profile");
+    if (!profile) return;
+
+		const picture = profile.appendChild(document.createElement("img"));
+		picture.src = "https://api.kanel.ovh/pp";
+		picture.classList.add("text-neutral-900", "dark:text-white", "center", "h-18", "w-18", "mx-3");
+
+		const nametag = profile.appendChild(document.createElement("div"));
+		nametag.innerHTML = `
+		  <div class="text-lg">Hi ${userdata.displayName} ! :D</div>
+			<div class="italic">${uuid}<div>
+		`;
 		nametag.classList.add("text-neutral-900", "dark:text-white");
 
-		const winrate = main.appendChild(document.createElement("div"));
+		const winrate = profile.appendChild(document.createElement("div"));
 
-		winrate.innerHTML = `wins: ${userdata.wins} | losses: ${userdata.losses} | winrate: ${userdata.wins / (userdata.wins + userdata.losses)}`;
-		winrate.classList.add("text-neutral-900", "dark:text-white");*/
-    //console.log(document.getElementById("menu-logout"));
-    document.getElementById("menu-logout").addEventListener("click", async () => {
-      let req = await fetch("http://localhost:3001/logout", {
-        method: "GET",
-        credentials: "include",
-      });
-      if (req.status === 200)
-        this.run();
-      else
-        console.error("logout failed");
-    });
-	}
+		winrate.innerHTML = `
+		  <div> wins: ${userdata.wins} </div>
+			<div> losses: ${userdata.losses} </div>
+			<div> winrate: ${Math.round(userdata.wins / (userdata.wins + userdata.losses) * 100)} % </div>
+		`;
+    winrate.classList.add("text-neutral-900", "dark:text-white", "grow", "content-center");
+  }
 }
diff --git a/src/front/static/ts/views/ProfileMenu.ts b/src/front/static/ts/views/ProfileMenu.ts
new file mode 100644
index 0000000..0113c08
--- /dev/null
+++ b/src/front/static/ts/views/ProfileMenu.ts
@@ -0,0 +1,86 @@
+import Aview from "./Aview.ts"
+import { isLogged, navigationManager } from "../main.ts"
+
+export default class extends Aview {
+
+	async getHTML() {
+		return `
+		<div id="main-window" class="default-border shadow-2x1 bg-neutral-200 dark:bg-neutral-800">
+		  <div class="flex flex-row items-stretch">
+				<div class="inline-block bg-linear-to-b from-orange-200 to-orange-300 min-h-84 w-6 relative">
+				  <!--div class="absolute bottom-1 left-full whitespace-nowrap origin-bottom-left -rotate-90 font-bold">knl_meowscendence</div-->
+				  <div class="absolute bottom-1 left-full whitespace-nowrap origin-bottom-left -rotate-90 font-bold">girls kissing :3</div>
+				</div>
+
+				<div class="flex flex-col items-center">
+				  <div id="profile-items" class="flex flex-col items-center">
+					</div>
+				  <div id="menu-bottom-div" class="hidden mt-auto flex flex-col items-center">
+						<hr class="my-2 w-32 reverse-border">
+						<button id="menu-logout" class="menu-default-button">logout</button>
+					</div>
+				</div>
+			</div>
+		</div>
+		`;
+	}
+
+	open: boolean = false;
+
+	async run() {
+	  let uuid: String;
+    if (this.open)
+    {
+      this.open = false;
+      document.getElementById("taskbar-menu").innerHTML = "";
+      return ;
+    }
+    this.open = true;
+    document.getElementById("taskbar-menu").innerHTML = await this.getHTML();
+
+    async function getMainHTML() {
+      if (!(await isLogged()))
+      {
+        document.getElementById("menu-bottom-div").classList.add("hidden");
+        return `
+     			<a class="menu-default-button inline-flex items-center justify-center" href="/login" data-link>login</a>
+     			<a class="menu-default-button inline-flex items-center justify-center" href="/register" data-link>register</a>
+          `;
+      }
+      document.getElementById("menu-bottom-div").classList.remove("hidden");
+
+      uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+	  const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
+		method: "GET",
+		credentials: "include",
+	  });
+	  if (userdata_req.status == 404)
+	  {
+		console.error("invalid user");
+		return ;
+	  }
+	  let userdata = await userdata_req.json();
+
+      return `
+        <span class="menu-default-label inline-flex items-center justify-center">hi, ${ userdata.displayName.length > 8 ? userdata.displayName.substring(0, 8) + "." : userdata.displayName } !</span>
+				<hr class="my-2 w-32 reverse-border">
+     			<a class="menu-default-button inline-flex items-center justify-center" href="/profile" data-link>profile</a>
+     			<a class="menu-default-button inline-flex items-center justify-center" href="/settings" data-link>settings</a>
+      `;
+    }
+
+
+    document.getElementById("profile-items").innerHTML = await getMainHTML();
+
+    document.getElementById("menu-logout").addEventListener("click", async () => {
+      let req = await fetch("http://localhost:3001/logout", {
+        method: "GET",
+        credentials: "include",
+      });
+      if (req.status === 200)
+        this.run();
+      else
+        console.error("logout failed");
+    });
+	}
+}
diff --git a/src/front/static/ts/views/RegisterPage.ts b/src/front/static/ts/views/RegisterPage.ts
index 67c828f..429cc09 100644
--- a/src/front/static/ts/views/RegisterPage.ts
+++ b/src/front/static/ts/views/RegisterPage.ts
@@ -1,7 +1,7 @@
 import Aview from "./Aview.ts"
+import { dragElement } from "./drag.ts";
 import { setOnekoState } from "../oneko.ts"
 import { isLogged, navigationManager } from "../main.ts"
-import { dragElement } from "./drag.ts";
 
 export default class extends Aview {
 
@@ -24,14 +24,30 @@ export default class extends Aview {
 						</div>
 					</div>
 
-		<form method="dialog" class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
-			  <p class="text-gray-900 dark:text-white text-lg pt-0 pb-4">welcome ! please register.</p>
-			  <input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
-			  <input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
-			  <p id="login-error-message" class="hidden text-red-700 dark:text-red-500"></p>
-			  </br>
-				<button id="register-button" type="submit" class="default-button w-full">register</button>
-			</form>
+			<div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 reverse-border flex flex-col items-center">
+		    <form method="dialog" class="space-y-4">
+				  <p class="text-gray-900 dark:text-white text-lg pt-0 pb-4">welcome ! please register.</p>
+			    <input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
+					<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
+			    <p id="login-error-message" class="hidden text-red-700 dark:text-red-500"></p>
+					</br>
+					<button id="register-button" type="submit" class="default-button w-full">register</button>
+				</form>
+
+				<hr class="my-4 w-64 reverse-border">
+
+			  <div class="flex flex-col space-y-4 w-full">
+			    <a target="_blank" href="http://localhost:3001/register/google" class="default-button inline-flex items-center justify-center w-full">
+					  <img src="https://upload.wikimedia.org/wikipedia/commons/c/c1/Google_%22G%22_logo.svg" height=20 width=20 class="mr-2 justify-self-start" />
+					  register with John Google
+					</a>
+				  <a target="_blank" href="https://rusty.42angouleme.fr/issues/all" class="default-button inline-flex items-center justify-center w-full">
+		        <img src="https://rusty.42angouleme.fr/assets/favicon-bb06adc80c8495db.ico" height=20 width=20 class="mr-2 justify-self-start" />
+						register with Rusty
+					</a>
+				</div>
+			</div>
+
 		</div>
 		`;
 	}
diff --git a/src/front/static/ts/views/Settings.ts b/src/front/static/ts/views/Settings.ts
new file mode 100644
index 0000000..fb5fbc6
--- /dev/null
+++ b/src/front/static/ts/views/Settings.ts
@@ -0,0 +1,84 @@
+import Aview from "./Aview.ts"
+import { dragElement } from "./drag.ts";
+import { setOnekoState } from "../oneko.ts"
+import { isLogged, navigationManager } from "../main.ts"
+
+
+export default class extends Aview {
+
+	constructor()
+	{
+		super();
+		this.setTitle("profile");
+		setOnekoState("default");
+	}
+
+	async getHTML() {
+		return `
+		<div id="window" class="absolute default-border">
+			<div id="window-header" class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
+				<span class="font-[Kubasta]">settings.ts</span>
+				<div>
+					<button> - </button>
+					<button> □ </button>
+					<a href="/" data-link> × </a>
+				</div>
+			</div>
+			<div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
+			  <input type="text" id="displayName-input" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
+				<button id="displayName-button" type="submit" class="default-button w-full">change display name</button>
+				<button id="deleteAccount-button" type="submit" class="default-button w-full">delete your account</button>
+			</div>
+		</div>
+		`;
+	}
+
+  async run() {
+    if (!await isLogged())
+      navigationManager("/");
+
+    dragElement(document.getElementById("window"));
+
+    let uuid: String;
+    uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+    const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
+      method: "GET",
+      credentials: "include",
+    });
+    if (userdata_req.status == 404) {
+      console.error("invalid user");
+      return;
+    }
+    let userdata = await userdata_req.json();
+
+    (document.getElementById("displayName-input") as HTMLInputElement).placeholder = userdata.displayName;
+    (document.getElementById("displayName-input") as HTMLInputElement).value = userdata.displayName;
+
+    document.getElementById("displayName-button")?.addEventListener("click", async () => {
+      const changeDisplayName_req = await fetch(`http://localhost:3002/users/${uuid}/displayName`, {
+        method: "PATCH",
+        headers: { "Content-Type": "application/json", },
+        credentials: "include",
+        body: JSON.stringify({ displayName: (document.getElementById("displayName-input") as HTMLInputElement).value })
+      });
+      if (changeDisplayName_req.status == 200) {
+        // idk display success
+      }
+      else {
+        // display error ig, uuuh it's in await changeDisplayName.json().error
+      }
+    });
+
+    document.getElementById("deleteAccount-button")?.addEventListener("click", async () => {
+      const delete_req = await fetch(`http://localhost:3002/users/${uuid}`, {
+        method: "DELETE",
+        credentials: "include",
+      });
+
+      if (delete_req.status == 200)
+        navigationManager("/");
+      else
+        console.error("xd"); // should never happen, wtf
+    });
+  }
+}
diff --git a/src/front/static/ts/views/Tetris.ts b/src/front/static/ts/views/Tetris.ts
index f01eb08..a6d43c9 100644
--- a/src/front/static/ts/views/Tetris.ts
+++ b/src/front/static/ts/views/Tetris.ts
@@ -1,5 +1,6 @@
 import Aview from "./Aview.ts";
 import { dragElement } from "./drag.js";
+import { setOnekoState, setBallPos, setOnekoOffset } from "../oneko.ts"
 
 export default class extends Aview {
   running: boolean;
@@ -7,6 +8,7 @@ export default class extends Aview {
   constructor() {
     super();
     this.setTitle("tetris (local match)");
+    setOnekoState("tetris");
     this.running = true;
   }
 
@@ -274,33 +276,42 @@ export default class extends Aview {
       canvas: HTMLCanvasElement | null;
       holdCanvas: HTMLCanvasElement | null;
       queueCanvas: HTMLCanvasElement | null;
-      ctx: CanvasRenderingContext2D;
-      holdCtx: CanvasRenderingContext2D;
-      queueCtx: CanvasRenderingContext2D;
+      ctx: CanvasRenderingContext2D | null;
+      holdCtx: CanvasRenderingContext2D | null;
+      queueCtx: CanvasRenderingContext2D | null;
       piece: Piece | null = null;
       holdPiece: Piece | null = null;
       canHold: boolean = true;
       nextQueue: string[] = [];
-      score = 0;
-      level = 1;
-      lines = 0;
-      dropInterval = 1000;
-      lastDrop = 0;
-      isGameOver = false;
-      isPaused = false;
+      score: number = 0;
+      level: number = 1;
+      lines: number = 0;
+      dropInterval: number = 1000;
+      lastDrop: number = 0;
+      isLocking: boolean = false;
+      lockRotationCount: number = 0;
+      lockLastRotationCount: number = 0;
+      isGameOver: boolean = false;
+      isPaused: boolean = false;
 
       constructor(canvasId: string) {
         const el = document.getElementById(
           canvasId,
         ) as HTMLCanvasElement | null;
         this.canvas = el;
+        if (!this.canvas)
+          throw console.error("no canvas :c");
         this.canvas.width = COLS * BLOCK;
         this.canvas.height = ROWS * BLOCK;
         const ctx = this.canvas.getContext("2d");
         this.ctx = ctx;
+        if (!this.ctx)
+          throw console.error("no ctx D:");
 
-        this.holdCanvas = document.getElementById("hold");
-        this.queueCanvas = document.getElementById("queue");
+        this.holdCanvas = document.getElementById("hold") as HTMLCanvasElement;
+        this.queueCanvas = document.getElementById("queue") as HTMLCanvasElement;
+        if (!this.holdCanvas || !this.queueCanvas)
+          throw console.error("no canvas :c");
         this.holdCtx = this.holdCanvas.getContext("2d");
         this.queueCtx = this.queueCanvas.getContext("2d");
 
@@ -337,6 +348,7 @@ export default class extends Aview {
 
         [this.piece, this.holdPiece] = [this.holdPiece, this.piece];
         if (!this.piece) this.spawnPiece();
+        if (!this.piece) return;
 
         this.piece.x = Math.floor((COLS - this.piece.shape[0].length) / 2);
         this.piece.y = -2;
@@ -352,7 +364,6 @@ export default class extends Aview {
         if (this.nextQueue.length < 7) this.fillBag();
         const type = this.nextQueue.shift()!;
         this.piece = new Piece(type);
-        // If spawn collides immediately -> game over
         if (this.collides(this.piece)) {
           this.isGameOver = true;
         }
@@ -374,12 +385,11 @@ export default class extends Aview {
         let y: number = 0;
         while (true) {
           for (const cell of piece.getCells()) {
-            console.log(cell.y + y);
             if (
               cell.y + y >= ROWS ||
               (cell.y + y >= 0 && this.board[cell.y + y][cell.x])
             )
-              return y - 1;
+            return y - 1;
           }
 
           y++;
@@ -388,11 +398,12 @@ export default class extends Aview {
 
       lockPiece() {
         if (!this.piece) return;
+        this.isLocking = false;
         let isValid: boolean = false;
         for (const cell of this.piece.getCells()) {
           if (cell.y >= 0 && cell.y < ROWS && cell.x >= 0 && cell.x < COLS)
             this.board[cell.y][cell.x] = cell.val;
-          if (cell.y < 20) isValid = true;
+          if (cell.y > 0) isValid = true;
         }
         if (!isValid) this.isGameOver = true;
 
@@ -427,6 +438,8 @@ export default class extends Aview {
 
       rotatePiece(dir: "cw" | "ccw") {
         if (!this.piece) return;
+        if (this.isLocking && this.lockRotationCount < 15)
+          this.lockRotationCount++;
         // Try rotation with wall kicks
         const originalIndex = this.piece.rotationIndex;
         if (dir === "cw") this.piece.rotateCW();
@@ -446,6 +459,7 @@ export default class extends Aview {
         if (!this.piece) return;
         this.piece.x += dx;
         this.piece.y += dy;
+
         if (this.collides(this.piece)) {
           this.piece.x -= dx;
           this.piece.y -= dy;
@@ -470,6 +484,26 @@ export default class extends Aview {
       }
 
       keys: Record<string, boolean> = {};
+      direction: number = 0;
+      inputDelay = 200;
+      inputTimestamp = Date.now();
+      move: boolean = false;
+
+      inputManager() {
+        if (this.move || Date.now() > this.inputTimestamp + this.inputDelay)
+        {
+          if (this.keys["ArrowLeft"] && !this.keys["ArrowRight"])
+            this.movePiece(-1, 0);
+          else if (!this.keys["ArrowLeft"] && this.keys["ArrowRight"])
+            this.movePiece(1, 0);
+          else if (this.keys["ArrowLeft"] && this.keys["ArrowRight"])
+            this.movePiece(this.direction, 0);
+          this.move = false;
+        }
+
+        /*if (this.keys["ArrowDown"])
+          this.softDrop();*/
+      }
 
       registerListeners() {
         window.addEventListener("keydown", (e) => {
@@ -482,8 +516,18 @@ export default class extends Aview {
 
           if (this.isPaused) return;
 
-          if (e.key === "ArrowLeft") this.movePiece(-1, 0);
-          else if (e.key === "ArrowRight") this.movePiece(1, 0);
+          if (e.key === "ArrowLeft")
+          {
+            this.inputTimestamp = Date.now();
+            this.direction = -1;//this.movePiece(-1, 0);
+            this.move = true;
+          }
+          else if (e.key === "ArrowRight")
+          {
+            this.inputTimestamp = Date.now();
+            this.direction = 1;//this.movePiece(1, 0);
+            this.move = true;
+          }
           else if (e.key === "ArrowDown") this.softDrop();
           else if (e.code === "Space") {
             e.preventDefault();
@@ -504,9 +548,25 @@ export default class extends Aview {
 
       loop(timestamp: number) {
         if (!this.lastDrop) this.lastDrop = timestamp;
-        if (!this.isPaused && !this.isGameOver) {
-          if (timestamp - this.lastDrop > this.dropInterval) {
-            if (!this.movePiece(0, 1)) this.lockPiece();
+        if (!this.isPaused && !this.isGameOver)
+        {
+          this.inputManager();
+          if (this.isLocking ? timestamp - this.lastDrop > 500 : timestamp - this.lastDrop > this.dropInterval)
+          {
+            if (this.isLocking && this.lockRotationCount == this.lockLastRotationCount)
+              this.lockPiece();
+            this.lockLastRotationCount = this.lockRotationCount;
+            if (!this.movePiece(0, 1))
+            {
+              if (!this.isLocking)
+              {
+                this.lockRotationCount = 0;
+                this.lockLastRotationCount = 0;
+                this.isLocking = true;
+              }
+            }
+            else if (this.isLocking)
+              this.lockRotationCount = 0;
             this.lastDrop = timestamp;
           }
         }
@@ -516,6 +576,8 @@ export default class extends Aview {
 
       drawGrid() {
         const ctx = this.ctx;
+        if (!ctx || !this.canvas)
+          return;
         ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
         ctx.strokeStyle = "#222";
         for (let r = 0; r <= ROWS; r++) {
@@ -556,7 +618,7 @@ export default class extends Aview {
       }
 
       drawHold() {
-        if (!this.holdPiece) return;
+        if (!this.holdPiece || !this.holdCtx) return;
 
         this.holdCtx.clearRect(0, 0, 200, 200);
         let y: number = 0;
@@ -567,6 +629,7 @@ export default class extends Aview {
               this.holdCtx.fillStyle = this.canHold
                 ? COLORS[this.holdPiece.findColorIndex()]
                 : "gray";
+              console.log(this.holdCtx.fillStyle);
               this.holdCtx.fillRect(
                 x * BLOCK +
                   1 +
@@ -584,9 +647,9 @@ export default class extends Aview {
       }
 
       drawQueue() {
+        if (!this.queueCtx) return ;
         this.queueCtx.clearRect(0, 0, 500, 500);
         let placement: number = 0;
-        console.log(this.nextQueue.slice(0, 5));
         for (const nextPiece of this.nextQueue.slice(0, 5)) {
           let y: number = 0;
           for (const row of TETROMINOES[nextPiece][0]) {
@@ -620,22 +683,26 @@ export default class extends Aview {
       }
 
       fillBlock(x: number, y: number, color: string) {
+        if (!this.ctx) return;
         const ctx = this.ctx;
         ctx.fillStyle = color;
         ctx.fillRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
       }
       fillGhostBlock(x: number, y: number, color: string) {
+        if (!this.ctx) return;
         const ctx = this.ctx;
         ctx.strokeStyle = color;
         ctx.strokeRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
       }
 
       clearBlock(x: number, y: number) {
+        if (!this.ctx) return;
         const ctx = this.ctx;
         ctx.clearRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
       }
 
       drawHUD() {
+        if (!this.ctx || !this.canvas) return;
         const ctx = this.ctx;
         ctx.fillStyle = "rgba(0,0,0,0.6)";
         ctx.fillRect(4, 4, 120, 60);
@@ -675,6 +742,7 @@ export default class extends Aview {
       }
 
       draw() {
+        if (!this.ctx || !this.canvas) return;
         // clear everything
         this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
 
@@ -698,6 +766,7 @@ export default class extends Aview {
         this.drawBoard();
         this.drawPiece();
         this.drawHUD();
+        this.drawQueue();
       }
     }
 

From 48d5648c2285b57f8ad12d876e9551325d5c644f Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Sun, 19 Oct 2025 11:27:44 +0200
Subject: [PATCH 059/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip:=20don't=20know=20what=20happend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/views/Tetris.ts | 112 +++++++++++++++++++++-------
 1 file changed, 86 insertions(+), 26 deletions(-)

diff --git a/src/front/static/ts/views/Tetris.ts b/src/front/static/ts/views/Tetris.ts
index a6d43c9..1fc2d2d 100644
--- a/src/front/static/ts/views/Tetris.ts
+++ b/src/front/static/ts/views/Tetris.ts
@@ -213,14 +213,14 @@ export default class extends Aview {
     };
 
     const COLORS = [
-      "#000000", // placeholder for 0
-      "#00ffff", // I - cyan
-      "#0000ff", // J - blue
-      "#ff7f00", // L - orange
-      "#ffff00", // O - yellow
-      "#00ff00", // S - green
-      "#800080", // T - purple
-      "#ff0000", // Z - red
+      [ "#000000", "#000000" ] , // placeholder for 0
+      [ "#00d2e1", "#0080a8" ], // I - cyan
+      [ "#0092e9", "#001fbf" ], // J - blue
+      [ "#e79700", "#c75700" ], // L - orange
+      [ "#d8c800", "#8f7700" ], // O - yellow
+      [ "#59e000", "#038b00" ], // S - green
+      [ "#de1fdf", "#870087" ], // T - purple
+      [ "#f06600", "#c10d07" ], // Z - red
     ];
 
     class Piece {
@@ -548,7 +548,7 @@ export default class extends Aview {
 
       loop(timestamp: number) {
         if (!this.lastDrop) this.lastDrop = timestamp;
-        if (!this.isPaused && !this.isGameOver)
+        if (!this.isPaused)
         {
           this.inputManager();
           if (this.isLocking ? timestamp - this.lastDrop > 500 : timestamp - this.lastDrop > this.dropInterval)
@@ -571,6 +571,8 @@ export default class extends Aview {
           }
         }
         this.draw();
+        if (this.isGameOver)
+          return;
         requestAnimationFrame(this.loop.bind(this));
       }
 
@@ -599,7 +601,7 @@ export default class extends Aview {
         for (let r = 0; r < ROWS; r++) {
           for (let c = 0; c < COLS; c++) {
             const val = this.board[r][c];
-            if (val) this.fillBlock(c, r, COLORS[val]);
+            if (val) this.fillBlock(c, r, COLORS[val], this.ctx);
             else this.clearBlock(c, r);
           }
         }
@@ -609,11 +611,11 @@ export default class extends Aview {
         if (!this.piece) return;
 
         for (const cell of this.piece.getCells())
-          if (cell.y >= 0) this.fillBlock(cell.x, cell.y, COLORS[cell.val]);
+          if (cell.y >= 0) this.fillBlock(cell.x, cell.y, COLORS[cell.val], this.ctx);
 
         let offset: number = this.getGhostOffset(this.piece);
         for (const cell of this.piece.getCells())
-          if (cell.y + offset >= 0)
+          if (cell.y + offset >= 0 && offset > 0)
             this.fillGhostBlock(cell.x, cell.y + offset, COLORS[cell.val]);
       }
 
@@ -626,10 +628,8 @@ export default class extends Aview {
           let x: number = 0;
           for (const val of row) {
             if (val) {
-              this.holdCtx.fillStyle = this.canHold
-                ? COLORS[this.holdPiece.findColorIndex()]
-                : "gray";
-              console.log(this.holdCtx.fillStyle);
+              this.fillBlock(x, y, this.canHold ? COLORS[this.holdPiece.findColorIndex()] : ["#8c8c84", "#393934"], this.holdCtx);
+              /*this.holdCtx.fillStyle = ;
               this.holdCtx.fillRect(
                 x * BLOCK +
                   1 +
@@ -638,7 +638,7 @@ export default class extends Aview {
                 y * BLOCK + 1 + 20,
                 BLOCK - 2,
                 BLOCK - 2,
-              );
+                );*/
             }
             x++;
           }
@@ -659,7 +659,7 @@ export default class extends Aview {
                 this.queueCtx.fillStyle =
                   COLORS[
                     ["I", "J", "L", "O", "S", "T", "Z"].indexOf(nextPiece) + 1
-                  ];
+                    ][0];
                 this.queueCtx.fillRect(
                   x * BLOCK +
                     1 +
@@ -682,17 +682,77 @@ export default class extends Aview {
         }
       }
 
-      fillBlock(x: number, y: number, color: string) {
-        if (!this.ctx) return;
-        const ctx = this.ctx;
-        ctx.fillStyle = color;
-        ctx.fillRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
+      adjustColor(hex: string, amount: number): string {
+        let color = hex.startsWith('#') ? hex.slice(1) : hex;
+        const num = parseInt(color, 16);
+        let r = (num >> 16) + amount;
+        let g = ((num >> 8) & 0x00FF) + amount;
+        let b = (num & 0x0000FF) + amount;
+        r = Math.max(Math.min(255, r), 0);
+        g = Math.max(Math.min(255, g), 0);
+        b = Math.max(Math.min(255, b), 0);
+        return `#${(r << 16 | g << 8 | b).toString(16).padStart(6, '0')}`;
       }
-      fillGhostBlock(x: number, y: number, color: string) {
+
+      fillBlock(x: number, y: number, color: string[], ctx) {
+        if (!ctx) return;
+        //const ctx = this.ctx;
+        //ctx.fillStyle = color;
+        const grad = ctx.createLinearGradient(x * BLOCK, y * BLOCK, x * BLOCK, y * BLOCK + BLOCK);
+        grad.addColorStop(0, color[0]);
+        grad.addColorStop(1, color[1]);
+        ctx.fillStyle = grad;
+        ctx.fillRect(x * BLOCK + 4, y * BLOCK + 4, BLOCK - 4, BLOCK - 4);
+        const X = x * BLOCK;
+        const Y = y * BLOCK;
+        const W = BLOCK;
+        const H = BLOCK;
+        const S = 4;
+
+        ctx.lineWidth = S;
+        ctx.beginPath();
+        ctx.strokeStyle = color[0];
+        ctx.moveTo(X, Y + S / 2);
+        ctx.lineTo(X + W, Y + S / 2);
+        ctx.moveTo(X + S / 2, Y);
+        ctx.lineTo(X + S / 2, Y + H);
+        ctx.stroke();
+
+        ctx.beginPath();
+        ctx.strokeStyle = this.adjustColor(color[1], -20);
+        ctx.moveTo(X, Y + H - S / 2);
+        ctx.lineTo(X + W, Y + H - S / 2);
+        ctx.moveTo(X + W - S / 2, Y);
+        ctx.lineTo(X + W - S / 2, Y + H);
+        ctx.stroke();
+      }
+      fillGhostBlock(x: number, y: number, color: string[]) {
         if (!this.ctx) return;
         const ctx = this.ctx;
-        ctx.strokeStyle = color;
-        ctx.strokeRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
+
+        const X = x * BLOCK;
+        const Y = y * BLOCK;
+        const W = BLOCK;
+        const H = BLOCK;
+        const S = 4;
+
+        ctx.lineWidth = S;
+        ctx.beginPath();
+        ctx.strokeStyle = this.adjustColor(color[0], -40);
+        ctx.moveTo(X, Y + S / 2);
+        ctx.lineTo(X + W, Y + S / 2);
+        ctx.moveTo(X + S / 2, Y);
+        ctx.lineTo(X + S / 2, Y + H);
+        ctx.stroke();
+
+        ctx.beginPath();
+        ctx.strokeStyle = this.adjustColor(color[1], -60);
+        ctx.moveTo(X, Y + H - S / 2);
+        ctx.lineTo(X + W, Y + H - S / 2);
+        ctx.moveTo(X + W - S / 2, Y);
+        ctx.lineTo(X + W - S / 2, Y + H);
+        ctx.stroke();
+        //ctx.strokeRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
       }
 
       clearBlock(x: number, y: number) {

From d61abd559ce3573b2b0628e2f661f25d58591458 Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Sun, 19 Oct 2025 14:56:38 +0200
Subject: [PATCH 060/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip(front):=20iswearimnotonlyworkingonthistetrisgame?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/views/Profile.ts      | 50 +++++++-------
 src/front/static/ts/views/RegisterPage.ts |  4 +-
 src/front/static/ts/views/Tetris.ts       | 83 +++++++++--------------
 3 files changed, 59 insertions(+), 78 deletions(-)

diff --git a/src/front/static/ts/views/Profile.ts b/src/front/static/ts/views/Profile.ts
index e233f52..fe4f4c2 100644
--- a/src/front/static/ts/views/Profile.ts
+++ b/src/front/static/ts/views/Profile.ts
@@ -49,15 +49,14 @@ export default class extends Aview {
     uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
 
     const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
-			method: "GET",
-			credentials: "include",
-		});
-		if (userdata_req.status == 404)
-		{
-			console.error("invalid user");
-			return ;
-		}
-		let userdata = await userdata_req.json();
+      method: "GET",
+      credentials: "include",
+    });
+    if (userdata_req.status == 404) {
+      console.error("invalid user");
+      return;
+    }
+    let userdata = await userdata_req.json();
 
     const matchCount_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory/count`, {
       method: "GET",
@@ -75,39 +74,40 @@ export default class extends Aview {
     if (!main)
       return console.error("what");
 
-    console.log(matches);
-    if (matches.matchHistory)
-    {
-      for (let match of matches.matchHistory)
-      {
+    if (matches.matchHistory) {
+      for (let match of matches.matchHistory) {
         const newEntry = document.createElement("li");
         newEntry.classList.add("m-2", "default-button", "bg-neutral-200", "dark:bg-neutral-800", "text-neutral-900", "dark:text-white");
         newEntry.innerHTML = match.score.p1Score > match.score.p2Score ? `${match.score.p1} - winner` : `${match.score.p2} - winner`;
         main.insertBefore(newEntry, main.firstChild);
+        // ###########################################################################################################################################
+        //
+        // ADD TX LINK : https://testnet.snowscan.xyz/tx/${match.tx}
+        //
+        // ###########################################################################################################################################
         console.log(match.tx);
       }
     }
 
-		const profile = document.getElementById("profile-profile");
+    const profile = document.getElementById("profile-profile");
     if (!profile) return;
 
-		const picture = profile.appendChild(document.createElement("img"));
-		picture.src = "https://api.kanel.ovh/pp";
-		picture.classList.add("text-neutral-900", "dark:text-white", "center", "h-18", "w-18", "mx-3");
+    const picture = profile.appendChild(document.createElement("img"));
+    picture.src = "https://api.kanel.ovh/pp";
+    picture.classList.add("text-neutral-900", "dark:text-white", "center", "h-18", "w-18", "mx-3");
 
-		const nametag = profile.appendChild(document.createElement("div"));
-		nametag.innerHTML = `
+    const nametag = profile.appendChild(document.createElement("div"));
+    nametag.innerHTML = `
 		  <div class="text-lg">Hi ${userdata.displayName} ! :D</div>
 			<div class="italic">${uuid}<div>
 		`;
-		nametag.classList.add("text-neutral-900", "dark:text-white");
+    nametag.classList.add("text-neutral-900", "dark:text-white");
 
-		const winrate = profile.appendChild(document.createElement("div"));
-
-		winrate.innerHTML = `
+    const winrate = profile.appendChild(document.createElement("div"));
+    winrate.innerHTML = `
 		  <div> wins: ${userdata.wins} </div>
 			<div> losses: ${userdata.losses} </div>
-			<div> winrate: ${Math.round(userdata.wins / (userdata.wins + userdata.losses) * 100)} % </div>
+			<div> winrate: ${ (userdata.wins != 0 && userdata.losses != 0) ? Math.round(userdata.wins / (userdata.wins + userdata.losses) * 100) + " %" : "-" }</div>
 		`;
     winrate.classList.add("text-neutral-900", "dark:text-white", "grow", "content-center");
   }
diff --git a/src/front/static/ts/views/RegisterPage.ts b/src/front/static/ts/views/RegisterPage.ts
index 429cc09..7e374a5 100644
--- a/src/front/static/ts/views/RegisterPage.ts
+++ b/src/front/static/ts/views/RegisterPage.ts
@@ -29,11 +29,11 @@ export default class extends Aview {
 				  <p class="text-gray-900 dark:text-white text-lg pt-0 pb-4">welcome ! please register.</p>
 			    <input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
 					<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
-			    <p id="login-error-message" class="hidden text-red-700 dark:text-red-500"></p>
-					</br>
 					<button id="register-button" type="submit" class="default-button w-full">register</button>
 				</form>
 
+				<p id="login-error-message" class="hidden text-red-700 dark:text-red-500 pt-4"></p>
+
 				<hr class="my-4 w-64 reverse-border">
 
 			  <div class="flex flex-col space-y-4 w-full">
diff --git a/src/front/static/ts/views/Tetris.ts b/src/front/static/ts/views/Tetris.ts
index 1fc2d2d..2b84fa3 100644
--- a/src/front/static/ts/views/Tetris.ts
+++ b/src/front/static/ts/views/Tetris.ts
@@ -16,7 +16,7 @@ export default class extends Aview {
     return `
 		<div id="window" class="absolute default-border">
 			<div id="window-header" class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
-				<span class="font-[Kubasta]">pong_game.ts</span>
+				<span class="font-[Kubasta]">tetris_game.ts</span>
 				<div>
 					<button> - </button>
 					<button> □ </button>
@@ -27,13 +27,13 @@ export default class extends Aview {
 
 			<div id="main-div" class="bg-neutral-200 dark:bg-neutral-800 text-center p-10 space-y-4 reverse-border">
 				<div class="flex flex-row justify-center items-start space-x-4">
-					<canvas id="hold" class="reverse-border" width="140" heigth="80"></canvas>
+					<canvas id="hold" class="reverse-border" width="140" height="100"></canvas>
 					<canvas id="board" class="reverse-border" width="300" height="600"></canvas>
 					<canvas id="queue" class="reverse-border" width="140" height="420"></canvas>
 				</div>
-				<div id="game-buttons" class="hidden flex">
-					<button id="game-retry" class="default-button">play again</button>
-					<a id="game-back" class="default-button" href="/tetris" data-link>back</a>
+				<div id="game-buttons" class="hidden flex mt-4">
+					<button id="game-retry" class="default-button w-full mx-4 py-2">play again</button>
+					<a id="game-back" class="default-button w-full mx-4 py-2" href="/tetris" data-link>back</a>
 				</div>
 			</div>
 		</div>
@@ -242,7 +242,10 @@ export default class extends Aview {
       }
 
       findColorIndex() {
-        for (const row of this.shape) for (const v of row) if (v) return v;
+        for (const row of this.shape)
+          for (const v of row)
+            if (v)
+              return v;
         return 1;
       }
 
@@ -314,6 +317,11 @@ export default class extends Aview {
           throw console.error("no canvas :c");
         this.holdCtx = this.holdCanvas.getContext("2d");
         this.queueCtx = this.queueCanvas.getContext("2d");
+        if (!this.holdCtx || !this.queueCtx)
+          return;
+
+        this.holdCtx.clearRect(0, 0, 200, 200);
+        this.queueCtx.clearRect(0, 0, 500, 500);
 
         this.board = this.createEmptyBoard();
         this.fillBag();
@@ -424,7 +432,6 @@ export default class extends Aview {
 
         if (linesCleared > 0) {
           this.lines += linesCleared;
-          // scoring like classic tetris
           const points = [0, 40, 100, 300, 1200];
           this.score += (points[linesCleared] || 0) * this.level;
           // level up every 10 lines (Fixed Goal System)
@@ -440,7 +447,7 @@ export default class extends Aview {
         if (!this.piece) return;
         if (this.isLocking && this.lockRotationCount < 15)
           this.lockRotationCount++;
-        // Try rotation with wall kicks
+        // Try wall kicks
         const originalIndex = this.piece.rotationIndex;
         if (dir === "cw") this.piece.rotateCW();
         else this.piece.rotateCCW();
@@ -450,7 +457,7 @@ export default class extends Aview {
           if (!this.collides(this.piece)) return;
           this.piece.x -= k;
         }
-        // no valid kick, revert
+        // no kick, revert
         this.piece.rotationIndex = originalIndex;
         this.piece.shape = this.piece.rotations[originalIndex];
       }
@@ -479,7 +486,6 @@ export default class extends Aview {
       softDrop() {
         if (!this.piece) return;
         if (!this.movePiece(0, 1)) return;
-        //this.lockPiece();
         else this.score += 1;
       }
 
@@ -571,8 +577,12 @@ export default class extends Aview {
           }
         }
         this.draw();
+
         if (this.isGameOver)
-          return;
+        {
+          document.getElementById("game-buttons")?.classList.remove("hidden");
+          return ;
+        }
         requestAnimationFrame(this.loop.bind(this));
       }
 
@@ -627,19 +637,8 @@ export default class extends Aview {
         for (const row of this.holdPiece.rotations[0]) {
           let x: number = 0;
           for (const val of row) {
-            if (val) {
-              this.fillBlock(x, y, this.canHold ? COLORS[this.holdPiece.findColorIndex()] : ["#8c8c84", "#393934"], this.holdCtx);
-              /*this.holdCtx.fillStyle = ;
-              this.holdCtx.fillRect(
-                x * BLOCK +
-                  1 +
-                  (4 - this.holdPiece.rotations[0].length) * 15 +
-                  10,
-                y * BLOCK + 1 + 20,
-                BLOCK - 2,
-                BLOCK - 2,
-                );*/
-            }
+            if (val)
+              this.fillBlock(x + (4 - this.holdPiece.rotations[0].length)/ 2 + 0.35, y + 0.5, this.canHold ? COLORS[this.holdPiece.findColorIndex()] : ["#8c8c84", "#393934"], this.holdCtx);
             x++;
           }
           y++;
@@ -655,25 +654,8 @@ export default class extends Aview {
           for (const row of TETROMINOES[nextPiece][0]) {
             let x: number = 0;
             for (const val of row) {
-              if (val) {
-                this.queueCtx.fillStyle =
-                  COLORS[
-                    ["I", "J", "L", "O", "S", "T", "Z"].indexOf(nextPiece) + 1
-                    ][0];
-                this.queueCtx.fillRect(
-                  x * BLOCK +
-                    1 +
-                    (4 - TETROMINOES[nextPiece][0].length) * 15 +
-                    10,
-                  y * BLOCK +
-                    1 +
-                    placement * 80 +
-                    20 -
-                    (nextPiece === "I" ? 15 : 0),
-                  BLOCK - 2,
-                  BLOCK - 2,
-                );
-              }
+              if (val)
+                this.fillBlock(x + (4 - TETROMINOES[nextPiece][0].length) / 2 + 0.25, y + 0.5 + placement * 2.69 - (nextPiece ==="I" ? 0.35 : 0), COLORS[["I", "J", "L", "O", "S", "T", "Z"].indexOf(nextPiece) + 1], this.queueCtx);
               x++;
             }
             y++;
@@ -694,17 +676,15 @@ export default class extends Aview {
         return `#${(r << 16 | g << 8 | b).toString(16).padStart(6, '0')}`;
       }
 
-      fillBlock(x: number, y: number, color: string[], ctx) {
+      fillBlock(x: number, y: number, color: string[], ctx: CanvasRenderingContext2D | null) {
         if (!ctx) return;
-        //const ctx = this.ctx;
-        //ctx.fillStyle = color;
         const grad = ctx.createLinearGradient(x * BLOCK, y * BLOCK, x * BLOCK, y * BLOCK + BLOCK);
         grad.addColorStop(0, color[0]);
         grad.addColorStop(1, color[1]);
         ctx.fillStyle = grad;
-        ctx.fillRect(x * BLOCK + 4, y * BLOCK + 4, BLOCK - 4, BLOCK - 4);
-        const X = x * BLOCK;
-        const Y = y * BLOCK;
+        ctx.fillRect(Math.round(x * BLOCK) + 4, Math.round(y * BLOCK) + 4, BLOCK - 4, BLOCK - 4);
+        const X = Math.round(x * BLOCK);
+        const Y = Math.round(y * BLOCK);
         const W = BLOCK;
         const H = BLOCK;
         const S = 4;
@@ -779,7 +759,7 @@ export default class extends Aview {
           ctx.font = "24px Kubasta";
           ctx.textAlign = "center";
           ctx.fillText(
-            "PAUSED",
+            "paused",
             this.canvas.width / 2,
             this.canvas.height / 2 + 8,
           );
@@ -793,7 +773,7 @@ export default class extends Aview {
           ctx.font = "28px Kubasta";
           ctx.textAlign = "center";
           ctx.fillText(
-            "GAME OVER",
+            "game over",
             this.canvas.width / 2,
             this.canvas.height / 2 + 8,
           );
@@ -830,6 +810,7 @@ export default class extends Aview {
       }
     }
 
+    document.getElementById("game-retry")?.addEventListener("click", () => { document.getElementById("game-buttons")?.classList.add("hidden"); const game = new Game("board"); });
     const game = new Game("board");
   }
 }

From 62aaa32b9da81049ca563507261b59ad8ee80dd7 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Sun, 19 Oct 2025 16:42:00 +0200
Subject: [PATCH 061/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat:=20a?=
 =?UTF-8?q?dded=20ping=20routes=20for=20activity=20time?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user/default.js | 20 ++++++++++++++++++++
 src/api/user/gPing.js   | 21 +++++++++++++++++++++
 src/api/user/pPing.js   | 21 +++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 src/api/user/gPing.js
 create mode 100644 src/api/user/pPing.js

diff --git a/src/api/user/default.js b/src/api/user/default.js
index 1b57c07..cef0c30 100644
--- a/src/api/user/default.js
+++ b/src/api/user/default.js
@@ -21,6 +21,8 @@ import { dMatchHistory } from './dMatchHistory.js';
 import { pAvatar } from './pAvatar.js';
 import { gAvatar } from './gAvatar.js';
 import { dAvatar } from './dAvatar.js';
+import { pPing } from './pPing.js';
+import { gPing } from './gPing.js';
 
 const env = process.env.NODE_ENV || 'development';
 
@@ -72,6 +74,12 @@ function prepareDB() {
 			CHECK(date >= 0)
 		) STRICT
 	`);
+	database.exec(`
+		CREATE TABLE IF NOT EXISTS activityTime (
+			username TEXT PRIMARY KEY,
+			time TEXT
+		) STRICT
+	`);
 }
 
 prepareDB();
@@ -85,6 +93,11 @@ const incLossesPong = database.prepare('UPDATE userData SET pongLosses = pongLos
 const incWinsTetris = database.prepare('UPDATE userData SET tetrisWins = tetrisWins + 1 WHERE username = ?;');
 const incLossesTetris = database.prepare('UPDATE userData SET tetrisLosses = tetrisLosses + 1 WHERE username = ?');
 const setAvatarId = database.prepare('UPDATE userData SET avatarId = ? WHERE username = ?;');
+const setActivityTime = database.prepare(`
+  INSERT INTO activityTime (username, time)
+  VALUES (?, ?)
+  ON CONFLICT(username) DO UPDATE SET time = excluded.time;
+`);
 
 // PATCH
 const changeDisplayName = database.prepare('UPDATE userData SET displayName = ? WHERE username = ?;');
@@ -100,6 +113,7 @@ const getNumberUsers = database.prepare('SELECT COUNT (DISTINCT username) AS n_u
 const getNumberFriends = database.prepare('SELECT COUNT (DISTINCT friendName) AS n_friends FROM friends WHERE username = ?;');
 const getNumberMatches = database.prepare('SELECT COUNT (DISTINCT id) AS n_matches FROM matchHistory WHERE game = ? AND ? IN (player1, player2);');
 const getAvatarId = database.prepare('SELECT avatarId FROM userData WHERE username = ?;');
+const getActivityTime = database.prepare('SELECT time FROM activityTime WHERE username = ?;')
 
 // DELETE
 const deleteUser = database.prepare('DELETE FROM userData WHERE username = ?;');
@@ -170,6 +184,9 @@ export default async function(fastify, options) {
 	fastify.get('/users/:userId/avatar', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		return gAvatar(request, reply, fastify, getAvatarId);
 	});
+	fastify.get('/ping/:userId', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+		return gPing(request, reply, fastify, getActivityTime);
+	});
 
 	// POST
 	fastify.post('/users/:userId', { preHandler: [fastify.authenticateAdmin] }, async (request, reply) => {
@@ -184,6 +201,9 @@ export default async function(fastify, options) {
 	fastify.post('/users/:userId/avatar', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		return pAvatar(request, reply, fastify, setAvatarId);
 	});
+	fastify.post('/ping', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+		return pPing(request, reply, fastify, setActivityTime);
+	})
 
 	// PATCH
 	fastify.patch('/users/:userId/:member', { preHandler: [fastify.authenticate] }, async (request, reply) => {
diff --git a/src/api/user/gPing.js b/src/api/user/gPing.js
new file mode 100644
index 0000000..2d2d018
--- /dev/null
+++ b/src/api/user/gPing.js
@@ -0,0 +1,21 @@
+/**
+ *	@param {import('fastify').FastifyRequest} request
+ *	@param {import('fastify').FastifyReply} reply
+ *	@param {import('fastify').FastifyInstance} fastify
+ */
+export async function gPing(request, reply, fastify, getActivityTime) {
+	try {
+		const user = request.params.userId;
+
+		const time = getActivityTime.get(user);
+		console.log(time)
+
+		return reply.code(200)
+			.send({
+				lastSeenTime: time.time
+			});
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/api/user/pPing.js b/src/api/user/pPing.js
new file mode 100644
index 0000000..b7ff9fd
--- /dev/null
+++ b/src/api/user/pPing.js
@@ -0,0 +1,21 @@
+/**
+ *	@param {import('fastify').FastifyRequest} request
+ *	@param {import('fastify').FastifyReply} request
+ *	@param {import('fastify').Fastify} fastify
+ */
+export async function pPing(request, reply, fastify, setActivityTime) {
+	try {
+		const user = request.user;
+		const currentTime = new Date().toISOString();
+
+		setActivityTime.run(user, currentTime);
+
+		return reply.code(200)
+			.send({
+				msg: "last seen time updated successfully"
+			});
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}

From 2757c5796d1b9cb6111d0ce95fe021e5f4a203cc Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Sun, 19 Oct 2025 16:47:24 +0200
Subject: [PATCH 062/109] =?UTF-8?q?=E3=80=8C=F0=9F=93=9D=E3=80=8D=20doc:?=
 =?UTF-8?q?=20added=20doc=20to=20this?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/user/ping.md | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 doc/user/ping.md

diff --git a/doc/user/ping.md b/doc/user/ping.md
new file mode 100644
index 0000000..8051bf1
--- /dev/null
+++ b/doc/user/ping.md
@@ -0,0 +1,41 @@
+# ping
+
+Available endpoints:
+- POST `/ping`
+- GET `/ping/:userId`
+
+Common return:
+- 500 with response 
+```json
+{
+    "error": "Internal server error"
+}
+```
+
+## POST `/ping`
+
+Used to send a ping and update the lastSeenTime (can be used for activity time)
+
+Input needed : just need a valid token
+
+Can return:
+- 200
+```json
+{
+    "msg": "last seen time updated successfully"
+}
+```
+
+## GET `/ping/:userId`
+
+Used to retrive the lastSeenTime of a user
+
+Input needed : just need a valid token
+
+Can return:
+- 200
+```json
+{
+    "lastSeenTime": "<last seen time>"
+}
+```

From c4403de09966313e1c72e2d0d8a68c62a51092e2 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Sun, 19 Oct 2025 17:02:27 +0200
Subject: [PATCH 063/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20change=20to=20isLogged=20boolean?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/user/ping.md      |  2 +-
 src/api/user/gPing.js | 37 ++++++++++++++++++++++---------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/doc/user/ping.md b/doc/user/ping.md
index 8051bf1..1e6dded 100644
--- a/doc/user/ping.md
+++ b/doc/user/ping.md
@@ -36,6 +36,6 @@ Can return:
 - 200
 ```json
 {
-    "lastSeenTime": "<last seen time>"
+    "isLogged": "<true/false>"
 }
 ```
diff --git a/src/api/user/gPing.js b/src/api/user/gPing.js
index 2d2d018..b14f003 100644
--- a/src/api/user/gPing.js
+++ b/src/api/user/gPing.js
@@ -1,21 +1,28 @@
 /**
- *	@param {import('fastify').FastifyRequest} request
- *	@param {import('fastify').FastifyReply} reply
- *	@param {import('fastify').FastifyInstance} fastify
+ * @param {import('fastify').FastifyRequest} request
+ * @param {import('fastify').FastifyReply} reply
+ * @param {import('fastify').FastifyInstance} fastify
  */
 export async function gPing(request, reply, fastify, getActivityTime) {
-	try {
-		const user = request.params.userId;
+    try {
+        const user = request.params.userId;
+        const time = getActivityTime.get(user);
 
-		const time = getActivityTime.get(user);
-		console.log(time)
+        if (!time || !time.time) {
+            return reply.code(404).send({ error: "User not found or no activity time recorded" });
+        }
 
-		return reply.code(200)
-			.send({
-				lastSeenTime: time.time
-			});
-	} catch (err) {
-		fastify.log.error(err);
-		return reply.code(500).send({ error: "Internal server error" });
-	}
+        const lastSeenTime = new Date(time.time);
+        const now = new Date();
+        const oneMinuteAgo = new Date(now.getTime() - 60000); // 60,000 ms = 1 minute
+
+        const isActiveInLastMinute = lastSeenTime >= oneMinuteAgo;
+
+        return reply.code(200).send({
+            isLogged: isActiveInLastMinute
+        });
+    } catch (err) {
+        fastify.log.error(err);
+        return reply.code(500).send({ error: "Internal server error" });
+    }
 }

From 000685c98060203414a31c4c5c2f739773635fe8 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Sun, 19 Oct 2025 17:40:43 +0200
Subject: [PATCH 064/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip:=20implemented=20log=20status?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/views/Friends.ts | 35 +++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/front/static/ts/views/Friends.ts b/src/front/static/ts/views/Friends.ts
index 90ff80b..2a9d0b3 100644
--- a/src/front/static/ts/views/Friends.ts
+++ b/src/front/static/ts/views/Friends.ts
@@ -69,6 +69,18 @@ export default class extends Aview {
 			}
 		}
 
+		async function isFriendLogged(name: string): Promise<Boolean> {
+			const data_req = await fetch("http://localhost:3002/ping/" + name, {
+				method: "GET",
+				credentials: "include",
+			});
+
+			if (data_req.status === 404)
+				return false;
+
+			return (await data_req.json()).isLogged
+		}
+
 		const list_friends = async () => {
 			const data_req = await fetch("http://localhost:3002/users/" + uuid + "/friends/count", {
 				method: "GET",
@@ -77,6 +89,8 @@ export default class extends Aview {
 				},
 				credentials: "include",
 			});
+			if (data_req.status === 404) {
+			}
 			let data = await data_req.json();
 
 			if (data.n_friends > 0) {
@@ -87,7 +101,10 @@ export default class extends Aview {
 					},
 					credentials: "include",
 				});
-				if (list_req.status === 200) {
+				if (list_req.status == 404) {
+					friends_list.classList.add("hidden")
+					return;
+				} else if (list_req.status === 200) {
 					while (friends_list.firstChild) {
 						friends_list.removeChild(friends_list.firstChild);
 					}
@@ -97,8 +114,18 @@ export default class extends Aview {
 
 					for (let i = 0; i < data.n_friends; i++) {
 						let new_friends = document.createElement('li');
-						
+
+						const activitySpan = document.createElement('span');
+						const isLogged = await isFriendLogged(list[i].friendName)
+						activitySpan.textContent = "•";
+						if (isLogged == true)
+							activitySpan.className = "px-0 text-green-500";
+						else 
+							activitySpan.className = "px-0 text-red-500";
+
+
 						const span = document.createElement('span');
+						span.className = "px-3";
 						span.textContent = list[i].friendName;
 
 						const but = document.createElement('button');
@@ -109,6 +136,7 @@ export default class extends Aview {
 							list_friends()
 						}
 
+						new_friends.appendChild(activitySpan);
 						new_friends.appendChild(span);
 						new_friends.appendChild(but);
 						friends_list.appendChild(new_friends);
@@ -123,7 +151,7 @@ export default class extends Aview {
 				friends_message.classList.remove("hidden");
 			}
 		}
-		
+
 
 		const add_friend = async () => {
 			const data_req = await fetch("http://localhost:3002/users/" + uuid + "/friends/" + new_friend.value, {
@@ -168,5 +196,6 @@ export default class extends Aview {
 			friends_error_message.classList.remove("hidden");
 		}
 		document.getElementById("add-friends-button")?.addEventListener("click", add_friend);
+		setInterval(list_friends, 30000);
 	}
 }

From 3a9d726f577adf4138a810f687c5498598ac1456 Mon Sep 17 00:00:00 2001
From: Tzvetan Trave <tzvetan.trave@abadcafe.org>
Date: Sun, 19 Oct 2025 22:02:01 +0200
Subject: [PATCH 065/109] cleaned doc & friends provided with display names

---
 doc/user/friend.md       | 155 ++++++++++++++++++++++
 doc/user/matchHistory.md | 148 +++++++++++++++++++++
 doc/user/user.md         | 280 ---------------------------------------
 src/api/user/gFriends.js |  10 +-
 4 files changed, 311 insertions(+), 282 deletions(-)
 create mode 100644 doc/user/friend.md
 create mode 100644 doc/user/matchHistory.md

diff --git a/doc/user/friend.md b/doc/user/friend.md
new file mode 100644
index 0000000..377af5c
--- /dev/null
+++ b/doc/user/friend.md
@@ -0,0 +1,155 @@
+# Friend
+
+Available endpoints:
+- POST `/users/:userId/friends`
+- GET `/users/:userId/friends`
+- GET `/users/:userId/friends/count`
+- DELETE `/users/:userId/friends`
+- DELETE `/users/:userId/friends/:friendId`
+
+Common return:
+- 500 with response 
+```json
+{
+	"error": "Internal server error"
+}
+```
+
+## POST `/users/:userId/friends/:friendId`
+
+Used to add a friend to an user
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "Friend added successfully"
+}
+```
+- 400 with response (if no user is specified in header, or friend is the user specified in header, or friend is already added)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if user does not exist, or friend does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 401 with response (if user specified in header is neither admin nor user)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## GET `/users/:userId/friends?iStart=<starting index (included)>&iEnd=<ending index (excluded)>`
+
+Used to get the friends of an user
+
+Can return:
+- 200 with response (list of friend objects (between iStart and iEnd))
+```json
+{
+	"friends":
+	[
+		{
+			"friendName": "<the friend's username>",
+			"friendDisplayName": "<the friend's display name>"
+		},
+		...
+	]
+}
+```
+- 400 with response (if iStart/iEnd is missing, or iEnd < iStart)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if user does not exist, or no friends exist in the selected range)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## GET `/users/:userId/friends/count`
+
+Used to get the number of friends of an user
+
+Can return:
+- 200 with response
+```json
+{
+	"n_friends": <number of friends>
+}
+```
+- 404 with response (if user does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## DELETE `/users/:userId/friends`
+
+Used to delete the friends of an user
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "Friends deleted successfully"
+}
+```
+- 400 with response (if user specified in header is neither admin nor user)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 401 with response (if user specified in header is neither admin nor user)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if user does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## DELETE `/users/:userId/friends/:friendId`
+
+Used to delete a friend of an user
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "Friend deleted successfully"
+}
+```
+- 400 with response (if user specified in header is neither admin nor user)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 401 with response (if user specified in header is neither admin nor user)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if user does not exist, or friend does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
diff --git a/doc/user/matchHistory.md b/doc/user/matchHistory.md
new file mode 100644
index 0000000..9293169
--- /dev/null
+++ b/doc/user/matchHistory.md
@@ -0,0 +1,148 @@
+# Match History
+
+Available endpoints:
+- POST `/users/:userId/matchHistory`
+- GET `/users/:userId/matchHistory`
+- GET `/users/:userId/matchHistory/count`
+- DELETE `/users/:userId/matchHistory`
+
+Common return:
+- 500 with response 
+```json
+{
+	"error": "Internal server error"
+}
+```
+
+## POST `/users/:userId/matchHistory?game=<pong/tetris>`
+
+Used to add a match result to an user to a specific game
+
+Input needed :
+```json
+{
+	"game": "<pong/tetris>"
+	"opponent": "<the opponent's username>",
+	"myScore": <my score>,
+	"opponentScore": <the opponent's score>,
+	"date": <seconds since Epoch (Date.now() return)>
+}
+```
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "Match successfully saved to the blockchain"
+}
+```
+- 400 with response (if no user is specified in header, or no opponent/p1Score/p2Score is specified in body, or opponent is the user specified in header, or a score is negative, or the game specified is invalid)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if user does not exist, or opponent does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 401 with response (if user specified in header is neither admin nor user)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## GET `/users/:userId/matchHistory?game=<pong/tetris>&iStart=<starting index (included)>&iEnd=<ending index (excluded)>`
+
+Used to get the match history of an user for a specific game
+
+Can return:
+- 200 with response (list of matches results (between iStart and iEnd))
+```json
+{
+	"matchHistory":
+	[
+		{
+			"score":
+			{
+				"p1": "<the name of the p1>",
+				"p2": "<the name of the p2>",
+				"p1Score": "<the score of the p1>",
+				"p2Score": "<the score of the p2>",
+				"date": <seconds since Epoch (Date.now() return)>
+			},
+			"tx": "<the transcaction hash>"
+		},
+		...
+	]
+}
+```
+- 400 with response (if iStart/iEnd does not exist, or iEnd < iStart, or the game specified is invalid)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if user does not exist, or no matches exist in the selected range)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## GET `/users/:userId/matchHistory/count?game=<pong/tetris>`
+
+Used to get the number of matches an user played for a specific game
+
+Can return:
+- 200 with response
+```json
+{
+	"n_matches": <number of matches played by the user>
+}
+```
+- 400 with response (if game does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if user does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## DELETE `/users/:userId/matchHistory?game=<pong/tetris>`
+
+Used to delete the match history of an user for a specific game
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "Match history deleted successfully"
+}
+```
+- 400 with response (if user specified in header is neither admin nor user, or the game specified is invalid)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 401 with response (if user specified in header is neither admin nor user)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if user does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
diff --git a/doc/user/user.md b/doc/user/user.md
index d982e68..1f57d58 100644
--- a/doc/user/user.md
+++ b/doc/user/user.md
@@ -2,21 +2,12 @@
 
 Available endpoints:
 - POST `/users/:userId`
-- POST `/users/:userId/friends`
-- POST `/users/:userId/matchHistory`
 - GET `/users`
 - GET `/users/count`
 - GET `/users/:userId`
-- GET `/users/:userId/friends`
-- GET `/users/:userId/friends/count`
-- GET `/users/:userId/matchHistory`
-- GET `/users/:userId/matchHistory/count`
 - PATCH `/users/:userId/:member`
 - DELETE `/users/:userId`
 - DELETE `/users/:userId/:member`
-- DELETE `/users/:userId/friends`
-- DELETE `/users/:userId/friends/:friendId`
-- DELETE `/users/:userId/matchHistory`
 
 Common return:
 - 500 with response 
@@ -57,77 +48,6 @@ Can return:
 }
 ```
 
-## POST `/users/:userId/friends/:friendId`
-
-Used to add a friend to an user
-
-Can return:
-- 200 with response
-```json
-{
-	"msg": "Friend added successfully"
-}
-```
-- 400 with response (if no user is specified in header, or friend is the user specified in header, or friend is already added)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-- 404 with response (if user does not exist, or friend does not exist)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-- 401 with response (if user specified in header is neither admin nor user)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-
-## POST `/users/:userId/matchHistory?game=<pong/tetris>`
-
-Used to add a match result to an user to a specific game
-
-Input needed :
-```json
-{
-	"game": "<pong/tetris>"
-	"opponent": "<the opponent's username>",
-	"myScore": <my score>,
-	"opponentScore": <the opponent's score>,
-	"date": <seconds since Epoch (Date.now() return)>
-}
-```
-
-Can return:
-- 200 with response
-```json
-{
-	"msg": "Match successfully saved to the blockchain"
-}
-```
-- 400 with response (if no user is specified in header, or no opponent/p1Score/p2Score is specified in body, or opponent is the user specified in header, or a score is negative, or the game specified is invalid)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-- 404 with response (if user does not exist, or opponent does not exist)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-- 401 with response (if user specified in header is neither admin nor user)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-
 ## GET `/users?iStart=<starting index (included)>&iEnd=<ending index (excluded)>`
 
 Used to get the list of users
@@ -206,116 +126,6 @@ Can return:
 }
 ```
 
-## GET `/users/:userId/friends?iStart=<starting index (included)>&iEnd=<ending index (excluded)>`
-
-Used to get the friends of an user
-
-Can return:
-- 200 with response (list of friend objects (between iStart and iEnd))
-```json
-{
-	"friends":
-	[
-		{
-			"friendName": "<the friend's username>"
-		},
-		...
-	]
-}
-```
-- 400 with response (if iStart/iEnd is missing, or iEnd < iStart)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-- 404 with response (if user does not exist, or no friends exist in the selected range)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-
-## GET `/users/:userId/friends/count`
-
-Used to get the number of friends of an user
-
-Can return:
-- 200 with response
-```json
-{
-	"n_friends": <number of friends>
-}
-```
-- 404 with response (if user does not exist)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-
-## GET `/users/:userId/matchHistory?game=<pong/tetris>&iStart=<starting index (included)>&iEnd=<ending index (excluded)>`
-
-Used to get the match history of an user for a specific game
-
-Can return:
-- 200 with response (list of matches results (between iStart and iEnd))
-```json
-{
-	"matchHistory":
-	[
-		{
-			"score":
-			{
-				"p1": "<the name of the p1>",
-				"p2": "<the name of the p2>",
-				"p1Score": "<the score of the p1>",
-				"p2Score": "<the score of the p2>",
-				"date": <seconds since Epoch (Date.now() return)>
-			},
-			"tx": "<the transcaction hash>"
-		},
-		...
-	]
-}
-```
-- 400 with response (if iStart/iEnd does not exist, or iEnd < iStart, or the game specified is invalid)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-- 404 with response (if user does not exist, or no matches exist in the selected range)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-
-## GET `/users/:userId/matchHistory/count?game=<pong/tetris>`
-
-Used to get the number of matches an user played for a specific game
-
-Can return:
-- 200 with response
-```json
-{
-	"n_matches": <number of matches played by the user>
-}
-```
-- 400 with response (if game does not exist)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-- 404 with response (if user does not exist)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-
 ## PATCH `/users/:userId/:member`
 
 Used to modify a member of an user (only displayName can be modified)
@@ -400,93 +210,3 @@ Can return:
 	"error": "<corresponding error>"
 }
 ```
-
-## DELETE `/users/:userId/friends`
-
-Used to delete the friends of an user
-
-Can return:
-- 200 with response
-```json
-{
-	"msg": "Friends deleted successfully"
-}
-```
-- 400 with response (if user specified in header is neither admin nor user)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-- 401 with response (if user specified in header is neither admin nor user)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-- 404 with response (if user does not exist)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-
-## DELETE `/users/:userId/friends/:friendId`
-
-Used to delete a friend of an user
-
-Can return:
-- 200 with response
-```json
-{
-	"msg": "Friend deleted successfully"
-}
-```
-- 400 with response (if user specified in header is neither admin nor user)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-- 401 with response (if user specified in header is neither admin nor user)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-- 404 with response (if user does not exist, or friend does not exist)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-
-## DELETE `/users/:userId/matchHistory?game=<pong/tetris>`
-
-Used to delete the match history of an user for a specific game
-
-Can return:
-- 200 with response
-```json
-{
-	"msg": "Match history deleted successfully"
-}
-```
-- 400 with response (if user specified in header is neither admin nor user, or the game specified is invalid)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-- 401 with response (if user specified in header is neither admin nor user)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
-- 404 with response (if user does not exist)
-```json
-{
-	"error": "<corresponding error>"
-}
-```
diff --git a/src/api/user/gFriends.js b/src/api/user/gFriends.js
index cc24986..5fbb941 100644
--- a/src/api/user/gFriends.js
+++ b/src/api/user/gFriends.js
@@ -8,10 +8,16 @@ export async function gFriends(request, reply, fastify, getUserInfo, getFriends)
 		if (Number(iEnd) < Number(iStart)) {
 			return reply.code(400).send({ error: "Starting index cannot be strictly inferior to ending index" });
 		}
-		const friends = getFriends.all(userId, Number(iEnd) - Number(iStart), Number(iStart));
-		if (!friends.length) {
+		const friendNames = getFriends.all(userId, Number(iEnd) - Number(iStart), Number(iStart));
+		if (!friendNames.length) {
 			return reply.code(404).send({ error: "No friends exist in the selected range" });
 		}
+		const promises = friendNames.map(async (friendName) => {
+			const friend = getUserInfo.get(friendName.friendName);
+			friendName.friendDisplayName = friend.displayName;
+			return friendName;
+		});
+		const friends = await Promise.all(promises);
 		return reply.code(200).send({ friends });
 	} catch (err) {
 		fastify.log.error(err);

From e316992cb6e2082d7648a47dd067047f29649892 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Mon, 20 Oct 2025 00:00:56 +0200
Subject: [PATCH 066/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20workign=20freingd=20list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/index.html                     |  8 ++-
 src/front/static/ts/main.ts              | 11 +++-
 src/front/static/ts/views/Friends.ts     | 67 ++++++++++++------------
 src/front/static/ts/views/ProfileMenu.ts |  1 -
 4 files changed, 49 insertions(+), 38 deletions(-)

diff --git a/src/front/index.html b/src/front/index.html
index 6471bae..de47004 100644
--- a/src/front/index.html
+++ b/src/front/index.html
@@ -36,6 +36,7 @@
 		</div>
 
 		<div id="taskbar-menu" class="absolute bottom-13 left-0"></div>
+		<div id="friends-menu" class="absolute bottom-13 right-0"></div>
 
 		<div class="border-t-2 border-neutral-300 dark:border-neutral-800 sticky bottom-0">
 			<nav class="bg-neutral-200 dark:bg-neutral-900 shadow-md border-t-2 border-neutral-400 dark:border-neutral-700 flex justify-between h-12 items-center content-center space-x-6 font-[Kubasta]">
@@ -45,8 +46,11 @@
 					<a target="_blank" class="taskbar-button" href="https://rusty.42angouleme.fr/">rusty</a>
 					<a target="_blank" class="taskbar-button" href="https://dn720004.ca.archive.org/0/items/2009-tetris-variant-concepts_202201/2009%20Tetris%20Design%20Guideline.pdf">tetris-guideline.pdf</a>
 				</div>
-				<div class="reverse-border m-1.5 h-8/10 content-center">
-					<span id="taskbar-clock" class="text- neutral-900 dark:text-white px-4">12:37</span>
+				<div class="flex px-4 items-center content-center space-x-2">
+				  <button id="friends-btn" class="taskbar-button">friends</button>
+				  <div class="reverse-border m-1.5 h-8/10 content-center">
+					  <span id="taskbar-clock" class="text-neutral-900 dark:text-white px-4">12:37</span>
+				  </div>
 				</div>
 			</nav>
 		</div>
diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index 5301e4e..731a972 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -1,6 +1,8 @@
 import { oneko } from "./oneko.ts";
 import ProfileMenu from "./views/ProfileMenu.ts";
+import FriendsMenu from "./views/Friends.ts";
 let profile_view = new ProfileMenu;
+let friends_view = new FriendsMenu;
 
 export async function isLogged(): Promise<boolean> {
 	let uuid_req = await fetch("http://localhost:3001/me", {
@@ -40,7 +42,6 @@ const routes = [
 	{ path: "/login", view: () => import("./views/LoginPage.ts") },
 	{ path: "/register", view: () => import("./views/RegisterPage.ts") },
 
-	{ path: "/friends", view: () => import("./views/Friends.ts") },
 	{ path: "/profile", view: () => import("./views/Profile.ts") },
 	{ path: "/settings", view: () => import("./views/Settings.ts") },
 ];
@@ -74,11 +75,17 @@ window.addEventListener("popstate", router);
 document.addEventListener("DOMContentLoaded", () => {
 	isLogged();
 
+
+
 	document.body.addEventListener("click", e => {
 		if (!e.target.closest("#taskbar-menu") && !e.target.matches("#profile-button")) {
 			profile_view.open = false;
 			document.getElementById("taskbar-menu").innerHTML = "";
 		}
+		if (e.target.matches("#friends-btn")) {
+			friends_view.open = !friends_view.open;
+			friends_view.run();
+		}
 		if (e.target.matches("[data-link]")) {
 			e.preventDefault();
 			navigationManager(e.target.href);
@@ -114,6 +121,8 @@ function updateClock()
 	clock.innerHTML = `${days[now.getDay()]} ${now.getDate()} ${months[now.getMonth()]} ` + hours + ":" + minutes;
 }
 
+friends_view.run();
+
 setInterval(updateClock, 5000);
 updateClock();
 
diff --git a/src/front/static/ts/views/Friends.ts b/src/front/static/ts/views/Friends.ts
index 2a9d0b3..7e11e4e 100644
--- a/src/front/static/ts/views/Friends.ts
+++ b/src/front/static/ts/views/Friends.ts
@@ -5,6 +5,8 @@ import { isLogged, navigationManager } from "../main.ts"
 
 export default class extends Aview {
 
+	open: Boolean = false;
+
 	constructor() {
 		super();
 		this.setTitle("friends list");
@@ -13,28 +15,22 @@ export default class extends Aview {
 
 	async getHTML() {
 		return `
-		<div id="window" class="absolute default-border">
-			<div id="window-header" class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
+		<div class="relative b-0 default-border bg-neutral-200">
+			<div class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-40 justify-between px-2">
 				<span class="font-[Kubasta]">friends.ts</span>
-				<div>
-					<button> - </button>
-					<button> □ </button>
-					<a href="/" data-link> × </a>
-				</div>
 			</div>
 
-			<div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
-			  <form method="dialog" class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
-				<input type="text" id="new-friend" placeholder="new friend" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
-				<button id="add-friends-button" type="submit" class="default-button w-full">add friend</button>
+			<div class="bg-neutral-200 pb-5 dark:bg-neutral-800 justify-center text-center reverse-border">
+			  <form method="dialog" class="justify-center bg-neutral-200 dark:bg-neutral-800 space-y-4 space-x-2 px-4 pt-4">
+				<input type="text" id="new-friend" placeholder="new friend" class="bg-white text-neutral-900 input-border" required></input>
+				<button id="add-friends-button" type="submit" class="default-button text-center mx-0 my-0">add friend</button>
 				<p id="add-friend-err" class="hidden text-red-700 dark:text-red-500"></p>
 				<p id="add-friend-msg" class="hidden text-gray-900 dark:text-white text-lg"></p>
 			  </form>
-			  <p id="friends_n" class="hidden text-gray-900 dark:text-white text-lg"></p>
 			  <p id="friends-error-message" class="hidden text-red-700 dark:text-red-500"></p>
 			  <p id="friend-msg" class="hidden text-gray-900 dark:text-white text-lg"></p>
-			  <div class="flex flex-row space-x-4 w-full min-w-145">
-				<ul id="friends_list" class="reverse-border space-y-2 hidden text-gray-900 dark:text-white text-lg overflow-scroll h-48 w-full">
+			  <div class="flex flex-row space-x-4 w-full min-w-60 px-4 py-2">
+				<ul id="friends_list" class="bg-neutral-300 dark:bg-neutral-900 reverse-border space-y-2 hidden text-gray-900 dark:text-white overflow-scroll h-48 w-full">
 				</ul>
 		      </div>
 			</div>
@@ -46,27 +42,37 @@ export default class extends Aview {
 		if (!await isLogged())
 			navigationManager("/");
 
-		dragElement(document.getElementById("window"));
+		if (this.open === true) {
+			document.getElementById("friends-menu").innerHTML = await this.getHTML();
+		} else {
+			document.getElementById("friends-menu").innerHTML = "";
+			return;
+		}
+
 		let uuid: String;
 		uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
-		const n_friends = (document.getElementById("friends_n") as HTMLParagraphElement);
 		const friends_error_message = (document.getElementById("friends-error-message") as HTMLParagraphElement);
-		const friends_message = (document.getElementById("friends-msg") as HTMLParagraphElement)
 		const friends_list = (document.getElementById("friends_list") as HTMLUListElement);
 		const new_friend = (document.getElementById("new-friend") as HTMLInputElement);
 		const add_friend_err = (document.getElementById("add-friend-err") as HTMLParagraphElement);
 		const add_friend_msg = (document.getElementById("add-friend-msg") as HTMLParagraphElement);
 
-		async function removeFriend(name) {
+		async function removeFriend(name: String) {
 			const data_req = await fetch("http://localhost:3002/users/" + uuid + "/friends/" + name, {
 				method: "DELETE",
 				credentials: "include",
 			});
 			if (data_req.status === 200) {
-				console.log("friends removed success fully");
+				console.log("friends removed successfully");
 			} else {
 				console.log("could not remove friend");
 			}
+			list_friends();
+			list_friends();
+			list_friends();
+			list_friends();
+			list_friends();
+			list_friends();
 		}
 
 		async function isFriendLogged(name: string): Promise<Boolean> {
@@ -92,6 +98,9 @@ export default class extends Aview {
 			if (data_req.status === 404) {
 			}
 			let data = await data_req.json();
+			while (friends_list.firstChild) {
+				friends_list.removeChild(friends_list.firstChild);
+			}
 
 			if (data.n_friends > 0) {
 				const list_req = await fetch("http://localhost:3002/users/" + uuid + "/friends?iStart=0&iEnd=2147483647", {
@@ -105,9 +114,6 @@ export default class extends Aview {
 					friends_list.classList.add("hidden")
 					return;
 				} else if (list_req.status === 200) {
-					while (friends_list.firstChild) {
-						friends_list.removeChild(friends_list.firstChild);
-					}
 					friends_list.classList.remove("hidden")
 
 					let list = (await list_req.json()).friends as JSON;
@@ -120,7 +126,7 @@ export default class extends Aview {
 						activitySpan.textContent = "•";
 						if (isLogged == true)
 							activitySpan.className = "px-0 text-green-500";
-						else 
+						else
 							activitySpan.className = "px-0 text-red-500";
 
 
@@ -130,11 +136,10 @@ export default class extends Aview {
 
 						const but = document.createElement('button');
 						but.textContent = "-";
-						but.className = "bg-red-500 text-white px-2 py-0 rounded hover:bg-red-600";
+						but.classList.add("px-0", "py-0", "taskbar-button");
 						but.onclick = function() {
 							removeFriend(list[i].friendName);
-							list_friends()
-						}
+						};
 
 						new_friends.appendChild(activitySpan);
 						new_friends.appendChild(span);
@@ -142,17 +147,14 @@ export default class extends Aview {
 						friends_list.appendChild(new_friends);
 					}
 				} else {
-					n_friends.classList.add("hidden");
 					friends_error_message.innerHTML = (await list_req.json()).error;
 					friends_error_message.classList.remove("hidden");
 				}
 			} else {
-				friends_message.innerHTML = "you have no friends D:";
-				friends_message.classList.remove("hidden");
+				friends_list.classList.add("hidden")
 			}
 		}
 
-
 		const add_friend = async () => {
 			const data_req = await fetch("http://localhost:3002/users/" + uuid + "/friends/" + new_friend.value, {
 				method: "POST",
@@ -185,10 +187,7 @@ export default class extends Aview {
 				credentials: "include",
 			});
 			if (data_req.status === 200) {
-				let data = await data_req.json();
-				n_friends.innerHTML = ":D friends count : " + data.n_friends;
-				n_friends.classList.remove("hidden");
-
+				// let data = await data_req.json();
 				list_friends()
 			}
 		} catch (error) {
diff --git a/src/front/static/ts/views/ProfileMenu.ts b/src/front/static/ts/views/ProfileMenu.ts
index 9409360..c2937d5 100644
--- a/src/front/static/ts/views/ProfileMenu.ts
+++ b/src/front/static/ts/views/ProfileMenu.ts
@@ -2,7 +2,6 @@ import Aview from "./Aview.ts"
 import { isLogged, navigationManager } from "../main.ts"
 
 export default class extends Aview {
-
 	async getHTML() {
 		return `
 		<div id="main-window" class="default-border shadow-2x1 bg-neutral-200 dark:bg-neutral-800">

From 8a9224bd88581b4eb1d6319ec4fbd26099d8c632 Mon Sep 17 00:00:00 2001
From: Adam <45126464+KeyZox71@users.noreply.github.com>
Date: Mon, 20 Oct 2025 12:52:00 +0200
Subject: [PATCH 067/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat:=20a?=
 =?UTF-8?q?dded=20clock=20for=20ping=20activity=20(#59)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

:D
---
 src/front/static/ts/main.ts | 40 +++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index 7473ebc..f3005fe 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -7,10 +7,9 @@ export async function isLogged(): Promise<boolean> {
 		method: "GET",
 		credentials: "include",
 	});
-	if (uuid_req.status === 200)
-	{
+	if (uuid_req.status === 200) {
 		let uuid = await uuid_req.json();
-		document.cookie = `uuid=${uuid.user};max-age=${60*60*24*7}`;
+		document.cookie = `uuid=${uuid.user};max-age=${60 * 60 * 24 * 7}`;
 		return true;
 	}
 	else // 401
@@ -68,20 +67,18 @@ const router = async () => {
 	view.run();
 };
 
-document.getElementById("profile-button")?.addEventListener("click", () => {profile_view.run();});
+document.getElementById("profile-button")?.addEventListener("click", () => { profile_view.run(); });
 window.addEventListener("popstate", router);
 
 document.addEventListener("DOMContentLoaded", () => {
 	isLogged();
 
-	document.body.addEventListener("click", e=> {
-    if (!e.target.closest("#taskbar-menu") && !e.target.matches("#profile-button"))
-    {
-      profile_view.open = false;
-      document.getElementById("taskbar-menu").innerHTML = "";
-    }
-		if (e.target.matches("[data-link]"))
-		{
+	document.body.addEventListener("click", e => {
+		if (!e.target.closest("#taskbar-menu") && !e.target.matches("#profile-button")) {
+			profile_view.open = false;
+			document.getElementById("taskbar-menu").innerHTML = "";
+		}
+		if (e.target.matches("[data-link]")) {
 			e.preventDefault();
 			navigationManager(e.target.href);
 		}
@@ -89,9 +86,8 @@ document.addEventListener("DOMContentLoaded", () => {
 			e.preventDefault();
 	});
 
-	document.body.addEventListener("dblclick", e=> {
-		if (e.target.closest("[data-icon]"))
-		{
+	document.body.addEventListener("dblclick", e => {
+		if (e.target.closest("[data-icon]")) {
 			e.preventDefault();
 			navigationManager(e.target.closest("[data-icon]").href);
 		}
@@ -100,8 +96,7 @@ document.addEventListener("DOMContentLoaded", () => {
 	router();
 });
 
-function updateClock()
-{
+function updateClock() {
 	const days = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'];
 	const months = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug', 'sep', 'oct', 'nov', 'dec'];
 	const clock = document.getElementById("taskbar-clock");
@@ -115,7 +110,18 @@ function updateClock()
 	clock.innerHTML = `${days[now.getDay()]} ${now.getDate()} ${months[now.getMonth()]} ` + hours + ":" + minutes;
 }
 
+async function pingClock() {
+	if (await isLogged()) {
+		fetch(`http://localhost:3002/ping`, {
+			method: "POST",
+		credentials: "include"
+		});
+	}
+}
+
 setInterval(updateClock, 5000);
 updateClock();
 
+setInterval(pingClock, 30000);
+
 oneko();

From a05aba6668c8e213d98c6de8a2b778bebee25879 Mon Sep 17 00:00:00 2001
From: Adam <45126464+KeyZox71@users.noreply.github.com>
Date: Mon, 20 Oct 2025 16:01:57 +0200
Subject: [PATCH 068/109] no rgpd

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b7c08ae..4406191 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Press F to pay respect
   - [ ] User and game stats dashboards - Minor
 - **Cybersecurity**
   - [ ] ~~WAF/ModSecurity and Hashicorp Vault - Major~~
-  - [ ] RGPD compliance - Minor
+  - [ ] ~~RGPD compliance - Minor~~
   - [x] 2FA and JWT - Major
 - **DevOps**
   - [x] Infrasctructure setup for log management - Major

From b5a91f0bab86cf03472edc122896bba232a33cf2 Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Mon, 20 Oct 2025 16:18:48 +0200
Subject: [PATCH 069/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat(fron?=
 =?UTF-8?q?t):=20added=20tetris=20front=20and=20some=20minor=20fixes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/main.ts                 |   2 +-
 src/front/static/ts/views/Game.ts           |  15 +-
 src/front/static/ts/views/LoginPage.ts      |   6 +-
 src/front/static/ts/views/Profile.ts        |   4 +-
 src/front/static/ts/views/RegisterPage.ts   |  18 +-
 src/front/static/ts/views/Tetris.ts         |  25 +-
 src/front/static/ts/views/TetrisVersus.ts   | 888 ++++++++++++++++++++
 src/front/static/ts/views/TournamentMenu.ts |  12 +-
 8 files changed, 938 insertions(+), 32 deletions(-)
 create mode 100644 src/front/static/ts/views/TetrisVersus.ts

diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index f3005fe..b18641f 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -35,7 +35,7 @@ const routes = [
 
 	{ path: "/tetris", view: () => import("./views/TetrisMenu.ts") },
 	{ path: "/tetris/solo", view: () => import("./views/Tetris.ts") },
-	{ path: "/tetris/versus", view: () => import("./views/Tetris.ts") },
+	{ path: "/tetris/versus", view: () => import("./views/TetrisVersus.ts") },
 
 	{ path: "/login", view: () => import("./views/LoginPage.ts") },
 	{ path: "/register", view: () => import("./views/RegisterPage.ts") },
diff --git a/src/front/static/ts/views/Game.ts b/src/front/static/ts/views/Game.ts
index 5e29d7b..07d72b8 100644
--- a/src/front/static/ts/views/Game.ts
+++ b/src/front/static/ts/views/Game.ts
@@ -147,18 +147,19 @@ export default class extends Aview {
           if (await isLogged())
           {
             let uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
-            fetch(`http://localhost:3002/users/${uuid}/matchHistory`, {
+            fetch(`http://localhost:3002/users/${uuid}/matchHistory?game=pong`, {
               method: "POST",
               headers: { "Content-Type": "application/json", },
               credentials: "include",
-              body: JSON.stringify({ "opponent": p2_name, "myScore": p1_score, "opponentScore": p2_score })
+              body: JSON.stringify({
+                "game": "pong",
+                "opponent": p2_name,
+                "myScore": p1_score,
+                "opponentScore": p2_score,
+                "date": Date.now(),
+              }),
             });
           }
-					// ------------------------------------------------------------------------------------------------------------------------------------------
-					//
-					// insert the fetch to the ScoreStore api here
-					//
-					// ------------------------------------------------------------------------------------------------------------------------------------------
 					match_over = true;
 				}
 				else
diff --git a/src/front/static/ts/views/LoginPage.ts b/src/front/static/ts/views/LoginPage.ts
index 0311473..0ed05c1 100644
--- a/src/front/static/ts/views/LoginPage.ts
+++ b/src/front/static/ts/views/LoginPage.ts
@@ -1,5 +1,5 @@
 import Aview from "./Aview.ts"
-import { dragElement } from "./drag.js"
+import { dragElement } from "./drag.ts"
 import { setOnekoState } from "../oneko.ts"
 import { isLogged, navigationManager } from "../main.ts"
 
@@ -29,11 +29,11 @@ export default class extends Aview {
 				  <h1 class="text-gray-900 dark:text-white text-lg pt-0 pb-4">welcome back ! please login.</h1>
 					<input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
 					<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
-					<p id="login-error-message" class="hidden text-red-700 dark:text-red-500"></p>
-					</br>
 					<button id="login-button" type="submit" class="default-button w-full">login</button>
 				</form>
 
+				<p id="login-error-message" class="hidden text-red-700 dark:text-red-500"></p>
+
 				<hr class="my-4 w-64 reverse-border">
 
 				<div class="flex flex-col space-y-4 w-full">
diff --git a/src/front/static/ts/views/Profile.ts b/src/front/static/ts/views/Profile.ts
index fe4f4c2..2f2f899 100644
--- a/src/front/static/ts/views/Profile.ts
+++ b/src/front/static/ts/views/Profile.ts
@@ -58,13 +58,13 @@ export default class extends Aview {
     }
     let userdata = await userdata_req.json();
 
-    const matchCount_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory/count`, {
+    const matchCount_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory/count?game=tetris`, {
       method: "GET",
       credentials: "include",
     });
     const matchCount = await matchCount_req.json();
 
-    const matches_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory?iStart=0&iEnd=${matchCount.n_matches}`, {
+    const matches_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory?game=tetris&iStart=0&iEnd=${matchCount.n_matches}`, {
       method: "GET",
       credentials: "include",
     });
diff --git a/src/front/static/ts/views/RegisterPage.ts b/src/front/static/ts/views/RegisterPage.ts
index 7e374a5..30618f1 100644
--- a/src/front/static/ts/views/RegisterPage.ts
+++ b/src/front/static/ts/views/RegisterPage.ts
@@ -15,18 +15,18 @@ export default class extends Aview {
 	async getHTML() {
 		return `
 		<div id="window" class="absolute default-border">
-					<div id="window-header" class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
-						<span class="font-[Kubasta]">register.ts</span>
-						<div>
-							<button> - </button>
-							<button> □ </button>
-							<a href="/" data-link> × </a>
-						</div>
-					</div>
+			<div id="window-header" class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
+				<span class="font-[Kubasta]">register.ts</span>
+				<div>
+					<button> - </button>
+					<button> □ </button>
+					<a href="/" data-link> × </a>
+				</div>
+			</div>
 
 			<div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 reverse-border flex flex-col items-center">
 		    <form method="dialog" class="space-y-4">
-				  <p class="text-gray-900 dark:text-white text-lg pt-0 pb-4">welcome ! please register.</p>
+				  <h1 class="text-gray-900 dark:text-white text-lg pt-0 pb-4">welcome ! please register.</h1>
 			    <input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
 					<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
 					<button id="register-button" type="submit" class="default-button w-full">register</button>
diff --git a/src/front/static/ts/views/Tetris.ts b/src/front/static/ts/views/Tetris.ts
index 2b84fa3..bdf9ede 100644
--- a/src/front/static/ts/views/Tetris.ts
+++ b/src/front/static/ts/views/Tetris.ts
@@ -1,6 +1,7 @@
 import Aview from "./Aview.ts";
+import { isLogged } from "../main.js";
 import { dragElement } from "./drag.js";
-import { setOnekoState, setBallPos, setOnekoOffset } from "../oneko.ts"
+import { setOnekoState, setBallPos, setOnekoOffset } from "../oneko.ts";
 
 export default class extends Aview {
   running: boolean;
@@ -538,12 +539,12 @@ export default class extends Aview {
           else if (e.code === "Space") {
             e.preventDefault();
             this.hardDrop();
-          } else if (e.code === "ShiftLeft") {
+          } else if (e.key === "Shift" || e.key === "c" || e.key === "C") {
             e.preventDefault();
             this.hold();
           } else if (e.key === "x" || e.key === "X" || e.key === "ArrowUp")
             this.rotatePiece("cw");
-          else if (e.key === "z" || e.key === "Z" || e.code === "ControlLeft")
+          else if (e.key === "z" || e.key === "Z" || e.key === "Control")
             this.rotatePiece("ccw");
         });
 
@@ -552,7 +553,7 @@ export default class extends Aview {
         });
       }
 
-      loop(timestamp: number) {
+      async loop(timestamp: number) {
         if (!this.lastDrop) this.lastDrop = timestamp;
         if (!this.isPaused)
         {
@@ -580,6 +581,22 @@ export default class extends Aview {
 
         if (this.isGameOver)
         {
+          if (await isLogged())
+          {
+            let uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+            fetch(`http://localhost:3002/users/${uuid}/matchHistory?game=tetris`, {
+              method: "POST",
+              headers: { "Content-Type": "application/json", },
+              credentials: "include",
+              body: JSON.stringify({
+                "game": "tetris",
+                "opponent": "xd",
+                "myScore": this.score,
+                "opponentScore": 0,
+                "date": Date.now(),
+              }),
+            });
+          }
           document.getElementById("game-buttons")?.classList.remove("hidden");
           return ;
         }
diff --git a/src/front/static/ts/views/TetrisVersus.ts b/src/front/static/ts/views/TetrisVersus.ts
new file mode 100644
index 0000000..bdc4426
--- /dev/null
+++ b/src/front/static/ts/views/TetrisVersus.ts
@@ -0,0 +1,888 @@
+import Aview from "./Aview.ts";
+import { isLogged } from "../main.js";
+import { dragElement } from "./drag.js";
+import { setOnekoState, setBallPos, setOnekoOffset } from "../oneko.ts";
+
+export default class extends Aview {
+  running: boolean;
+
+  constructor() {
+    super();
+    this.setTitle("tetris (local match)");
+    setOnekoState("tetris");
+    this.running = true;
+  }
+
+  async getHTML() {
+    return `
+		<div id="window" class="absolute default-border">
+			<div id="window-header" class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
+				<span class="font-[Kubasta]">tetris_game.ts</span>
+				<div>
+					<button> - </button>
+					<button> □ </button>
+					<a href="/" data-link> × </a>
+				</div>
+			</div>
+
+
+			<div id="main-div" class="bg-neutral-200 dark:bg-neutral-800 text-center p-10 space-y-4 reverse-border">
+				<div class="flex flex-row justify-center items-start space-x-4">
+					<canvas id="board1-hold" class="reverse-border" width="140" height="100"></canvas>
+					<canvas id="board1-board" class="reverse-border" width="300" height="600"></canvas>
+					<canvas id="board1-queue" class="reverse-border" width="140" height="420"></canvas>
+					<canvas id="board2-hold" class="reverse-border" width="140" height="100"></canvas>
+					<canvas id="board2-board" class="reverse-border" width="300" height="600"></canvas>
+					<canvas id="board2-queue" class="reverse-border" width="140" height="420"></canvas>
+				</div>
+				<div id="game-buttons" class="hidden flex mt-4">
+					<button id="game-retry" class="default-button w-full mx-4 py-2">play again</button>
+					<a id="game-back" class="default-button w-full mx-4 py-2" href="/tetris" data-link>back</a>
+				</div>
+			</div>
+		</div>
+		`;
+  }
+
+  async run() {
+    let game1: Game;
+    let game2: Game;
+    dragElement(document.getElementById("window"));
+    const COLS = 10;
+    const ROWS = 20;
+    const BLOCK = 30; // pixels per block
+
+    type Cell = number; // 0 empty, >0 occupied (color index)
+
+    // Tetromino definitions: each piece is an array of rotations, each rotation is a 2D matrix
+    const TETROMINOES: { [key: string]: number[][][] } = {
+      I: [
+        [
+          [0, 0, 0, 0],
+          [1, 1, 1, 1],
+          [0, 0, 0, 0],
+          [0, 0, 0, 0],
+        ],
+
+        [
+          [0, 0, 1, 0],
+          [0, 0, 1, 0],
+          [0, 0, 1, 0],
+          [0, 0, 1, 0],
+        ],
+
+        [
+          [0, 0, 0, 0],
+          [0, 0, 0, 0],
+          [1, 1, 1, 1],
+          [0, 0, 0, 0],
+        ],
+
+        [
+          [0, 1, 0, 0],
+          [0, 1, 0, 0],
+          [0, 1, 0, 0],
+          [0, 1, 0, 0],
+        ],
+      ],
+      J: [
+        [
+          [2, 0, 0],
+          [2, 2, 2],
+          [0, 0, 0],
+        ],
+
+        [
+          [0, 2, 2],
+          [0, 2, 0],
+          [0, 2, 0],
+        ],
+
+        [
+          [0, 0, 0],
+          [2, 2, 2],
+          [0, 0, 2],
+        ],
+
+        [
+          [0, 2, 0],
+          [0, 2, 0],
+          [2, 2, 0],
+        ],
+      ],
+      L: [
+        [
+          [0, 0, 3],
+          [3, 3, 3],
+          [0, 0, 0],
+        ],
+
+        [
+          [0, 3, 0],
+          [0, 3, 0],
+          [0, 3, 3],
+        ],
+
+        [
+          [0, 0, 0],
+          [3, 3, 3],
+          [3, 0, 0],
+        ],
+
+        [
+          [3, 3, 0],
+          [0, 3, 0],
+          [0, 3, 0],
+        ],
+      ],
+      O: [
+        [
+          [4, 4],
+          [4, 4],
+        ],
+      ],
+      S: [
+        [
+          [0, 5, 5],
+          [5, 5, 0],
+          [0, 0, 0],
+        ],
+
+        [
+          [0, 5, 0],
+          [0, 5, 5],
+          [0, 0, 5],
+        ],
+
+        [
+          [0, 0, 0],
+          [0, 5, 5],
+          [5, 5, 0],
+        ],
+
+        [
+          [5, 0, 0],
+          [5, 5, 0],
+          [0, 5, 0],
+        ],
+      ],
+      T: [
+        [
+          [0, 6, 0],
+          [6, 6, 6],
+          [0, 0, 0],
+        ],
+
+        [
+          [0, 6, 0],
+          [0, 6, 6],
+          [0, 6, 0],
+        ],
+
+        [
+          [0, 0, 0],
+          [6, 6, 6],
+          [0, 6, 0],
+        ],
+
+        [
+          [0, 6, 0],
+          [6, 6, 0],
+          [0, 6, 0],
+        ],
+      ],
+      Z: [
+        [
+          [7, 7, 0],
+          [0, 7, 7],
+          [0, 0, 0],
+        ],
+
+        [
+          [0, 0, 7],
+          [0, 7, 7],
+          [0, 7, 0],
+        ],
+
+        [
+          [0, 0, 0],
+          [7, 7, 0],
+          [0, 7, 7],
+        ],
+
+        [
+          [0, 7, 0],
+          [7, 7, 0],
+          [7, 0, 0],
+        ],
+      ],
+    };
+
+    const COLORS = [
+      [ "#000000", "#000000" ] , // placeholder for 0
+      [ "#00d2e1", "#0080a8" ], // I - cyan
+      [ "#0092e9", "#001fbf" ], // J - blue
+      [ "#e79700", "#c75700" ], // L - orange
+      [ "#d8c800", "#8f7700" ], // O - yellow
+      [ "#59e000", "#038b00" ], // S - green
+      [ "#de1fdf", "#870087" ], // T - purple
+      [ "#f06600", "#c10d07" ], // Z - red
+      [ "#8c8c84", "#393934" ], // garbage - gray
+    ];
+
+    class Piece {
+      shape: number[][];
+      rotations: number[][][];
+      rotationIndex: number;
+      x: number;
+      y: number;
+      colorIndex: number;
+
+      constructor(public type: string) {
+        this.rotations = TETROMINOES[type];
+        this.rotationIndex = 0;
+        this.shape = this.rotations[this.rotationIndex];
+        this.colorIndex = this.findColorIndex();
+
+        this.x = Math.floor((COLS - this.shape[0].length) / 2);
+        this.y = -2; //start on tiles 21 and 22
+      }
+
+      findColorIndex() {
+        for (const row of this.shape)
+          for (const v of row)
+            if (v)
+              return v;
+        return 1;
+      }
+
+      rotateCW() {
+        this.rotationIndex = (this.rotationIndex + 1) % this.rotations.length;
+        this.shape = this.rotations[this.rotationIndex];
+      }
+
+      rotateCCW() {
+        this.rotationIndex =
+          (this.rotationIndex - 1 + this.rotations.length) %
+          this.rotations.length;
+        this.shape = this.rotations[this.rotationIndex];
+      }
+
+      getCells(): { x: number; y: number; val: number }[] {
+        const cells: { x: number; y: number; val: number }[] = [];
+
+        for (let r = 0; r < this.shape.length; r++) {
+          for (let c = 0; c < this.shape[r].length; c++) {
+            const val = this.shape[r][c];
+            if (val) cells.push({ x: this.x + c, y: this.y + r, val });
+          }
+        }
+        return cells;
+      }
+    }
+
+    class Game {
+      board: Cell[][];
+      canvas: HTMLCanvasElement | null;
+      holdCanvas: HTMLCanvasElement | null;
+      queueCanvas: HTMLCanvasElement | null;
+      ctx: CanvasRenderingContext2D | null;
+      holdCtx: CanvasRenderingContext2D | null;
+      queueCtx: CanvasRenderingContext2D | null;
+      piece: Piece | null = null;
+      holdPiece: Piece | null = null;
+      canHold: boolean = true;
+      nextQueue: string[] = [];
+      score: number = 0;
+      level: number = 1;
+      lines: number = 0;
+      garbage: number = 0;
+      dropInterval: number = 1000;
+      lastDrop: number = 0;
+      isLocking: boolean = false;
+      lockRotationCount: number = 0;
+      lockLastRotationCount: number = 0;
+      isGameOver: boolean = false;
+      isPaused: boolean = false;
+      id: number;
+
+      constructor(canvasId: string, id: number) {
+        this.id = id;
+        const el = document.getElementById(
+          canvasId + "-board",
+        ) as HTMLCanvasElement | null;
+        this.canvas = el;
+        if (!this.canvas)
+          throw console.error("no canvas :c");
+        this.canvas.width = COLS * BLOCK;
+        this.canvas.height = ROWS * BLOCK;
+        const ctx = this.canvas.getContext("2d");
+        this.ctx = ctx;
+        if (!this.ctx)
+          throw console.error("no ctx D:");
+
+        this.holdCanvas = document.getElementById(canvasId + "-hold") as HTMLCanvasElement;
+        this.queueCanvas = document.getElementById(canvasId + "-queue") as HTMLCanvasElement;
+        if (!this.holdCanvas || !this.queueCanvas)
+          throw console.error("no canvas :c");
+        this.holdCtx = this.holdCanvas.getContext("2d");
+        this.queueCtx = this.queueCanvas.getContext("2d");
+        if (!this.holdCtx || !this.queueCtx)
+          return;
+
+        this.holdCtx.clearRect(0, 0, 200, 200);
+        this.queueCtx.clearRect(0, 0, 500, 500);
+
+        this.board = this.createEmptyBoard();
+        if (id == 0)
+          this.fillBag();
+        else
+          this.nextQueue = game1.nextQueue;
+
+        this.spawnPiece();
+        if (id != 0)
+          this.piece.type = game1.piece.type;
+        this.registerListeners();
+        requestAnimationFrame(this.loop.bind(this));
+      }
+
+      createEmptyBoard(): Cell[][] {
+        const b: Cell[][] = [];
+        for (let r = 0; r < ROWS; r++) {
+          const row: Cell[] = new Array(COLS).fill(0);
+          b.push(row);
+        }
+        return b;
+      }
+
+      fillBag() {
+        // classic 7-bag randomizer
+        const pieces = Object.keys(TETROMINOES);
+        const bag = [...pieces];
+        for (let i = bag.length - 1; i > 0; i--) {
+          const j = Math.floor(Math.random() * (i + 1));
+          [bag[i], bag[j]] = [bag[j], bag[i]];
+        }
+        this.nextQueue.push(...bag);
+      }
+
+      hold() {
+        if (!this.canHold) return;
+
+        [this.piece, this.holdPiece] = [this.holdPiece, this.piece];
+        if (!this.piece) this.spawnPiece();
+        if (!this.piece) return;
+
+        this.piece.x = Math.floor((COLS - this.piece.shape[0].length) / 2);
+        this.piece.y = -2;
+        this.piece.rotationIndex = 0;
+        this.piece.shape = this.piece.rotations[this.piece.rotationIndex];
+
+        this.canHold = false;
+        this.drawHold();
+      }
+
+      spawnPiece() {
+        this.canHold = true;
+        if (this.nextQueue.length < 7) this.fillBag();
+        const type = this.nextQueue.shift()!;
+        this.piece = new Piece(type);
+        if (this.collides(this.piece)) {
+          this.isGameOver = true;
+        }
+
+        this.drawHold();
+        this.drawQueue();
+      }
+
+      collides(piece: Piece): boolean {
+        for (const cell of piece.getCells()) {
+          if (cell.y >= ROWS) return true;
+          if (cell.x < 0 || cell.x >= COLS) return true;
+          if (cell.y >= 0 && this.board[cell.y][cell.x]) return true;
+        }
+        return false;
+      }
+
+      getGhostOffset(piece: Piece): number {
+        let y: number = 0;
+        while (true) {
+          for (const cell of piece.getCells()) {
+            if (
+              cell.y + y >= ROWS ||
+              (cell.y + y >= 0 && this.board[cell.y + y][cell.x])
+            )
+            return y - 1;
+          }
+
+          y++;
+        }
+      }
+
+      lockPiece() {
+        if (!this.piece) return;
+        this.isLocking = false;
+        let isValid: boolean = false;
+        for (const cell of this.piece.getCells()) {
+          if (cell.y >= 0 && cell.y < ROWS && cell.x >= 0 && cell.x < COLS)
+            this.board[cell.y][cell.x] = cell.val;
+          if (cell.y > 0) isValid = true;
+        }
+        if (!isValid) this.isGameOver = true;
+
+        if (this.garbage)
+        {
+          const empty_spot = Math.floor(Math.random() * 10);
+          while (this.garbage)
+          {
+            //if () // if anything else than 0 on top, die >:3
+            this.board.shift();
+            this.board.push(Array(COLS).fill(8));
+            this.board[19][empty_spot] = 0;
+            this.garbage--;
+          }
+        }
+        this.clearLines();
+        this.spawnPiece();
+      }
+
+      addGarbage(lines: number) {
+        this.garbage += lines;
+      }
+
+      clearLines() {
+        let linesCleared = 0;
+        outer: for (let r = ROWS - 1; r >= 0; r--) {
+          for (let c = 0; c < COLS; c++) if (!this.board[r][c]) continue outer;
+
+          this.board.splice(r, 1);
+          this.board.unshift(new Array(COLS).fill(0));
+          linesCleared++;
+          r++;
+        }
+
+        if (linesCleared > 0) {
+          this.lines += linesCleared;
+          const points = [0, 40, 100, 300, 1200];
+          this.score += (points[linesCleared] || 0) * this.level;
+          // level up every 10 lines (Fixed Goal System)
+          const newLevel = Math.floor(this.lines / 10) + 1;
+          if (newLevel > this.level) {
+            this.level = newLevel;
+            this.dropInterval = Math.max(100, 1000 - (this.level - 1) * 75);
+          }
+
+          if (this.garbage)
+          {
+            while (linesCleared)
+            {
+              this.garbage--;
+              linesCleared--;
+              if (!this.garbage)
+                break;
+            }
+          }
+          if (this.id == 0 && linesCleared)
+            game2.addGarbage(linesCleared < 4 ? linesCleared - 1 : linesCleared);
+          else
+            game1.addGarbage(linesCleared < 4 ? linesCleared - 1 : linesCleared);
+        }
+      }
+
+      rotatePiece(dir: "cw" | "ccw") {
+        if (!this.piece) return;
+        if (this.isLocking && this.lockRotationCount < 15)
+          this.lockRotationCount++;
+        // Try wall kicks
+        const originalIndex = this.piece.rotationIndex;
+        if (dir === "cw") this.piece.rotateCW();
+        else this.piece.rotateCCW();
+        const kicks = [0, -1, 1, -2, 2];
+        for (const k of kicks) {
+          this.piece.x += k;
+          if (!this.collides(this.piece)) return;
+          this.piece.x -= k;
+        }
+        // no kick, revert
+        this.piece.rotationIndex = originalIndex;
+        this.piece.shape = this.piece.rotations[originalIndex];
+      }
+
+      movePiece(dx: number, dy: number) {
+        if (!this.piece) return;
+        this.piece.x += dx;
+        this.piece.y += dy;
+
+        if (this.collides(this.piece)) {
+          this.piece.x -= dx;
+          this.piece.y -= dy;
+          return false;
+        }
+        return true;
+      }
+
+      hardDrop() {
+        if (!this.piece) return;
+        let dropped = 0;
+        while (this.movePiece(0, 1)) dropped++;
+        this.score += dropped * 2;
+        this.lockPiece();
+      }
+
+      softDrop() {
+        if (!this.piece) return;
+        if (!this.movePiece(0, 1)) return;
+        else this.score += 1;
+      }
+
+      keys: Record<string, boolean> = {};
+      direction: number = 0;
+      inputDelay = 200;
+      inputTimestamp = Date.now();
+      move: boolean = false;
+
+      inputManager() {
+        const left = this.id === 0 ? this.keys["KeyA"] : this.keys["Numpad4"]
+        const right = this.id === 0 ? this.keys["KeyD"] : this.keys["Numpad6"]
+        if (this.move || Date.now() > this.inputTimestamp + this.inputDelay)
+        {
+          if (left && !right)
+            this.movePiece(-1, 0);
+          else if (!left && right)
+            this.movePiece(1, 0);
+          else if (left && right)
+            this.movePiece(this.direction, 0);
+          this.move = false;
+        }
+
+        /*if (this.keys["ArrowDown"])
+          this.softDrop();*/
+      }
+
+      registerListeners() {
+        window.addEventListener("keydown", (e) => {
+          this.keys[e.code] = true;
+
+          if (this.isGameOver) return;
+
+          if (e.key === "p" || e.key === "P" || e.key === "Escape")
+            this.isPaused = !this.isPaused;
+
+          if (this.isPaused) return;
+
+          if (this.id === 0 ? e.code === "KeyA" : e.code === "Numpad4")
+          {
+            this.inputTimestamp = Date.now();
+            this.direction = -1;//this.movePiece(-1, 0);
+            this.move = true;
+          }
+          else if (this.id === 0 ? e.code === "KeyD" : e.code === "Numpad6")
+          {
+            this.inputTimestamp = Date.now();
+            this.direction = 1;//this.movePiece(1, 0);
+            this.move = true;
+          }
+          else if (this.id === 0 ? e.code === "KeyS" : e.code === "Numpad5") this.softDrop();
+          else if (this.id === 0 ? e.code === "Space" : e.code === "Numpad0") {
+            e.preventDefault();
+            this.hardDrop();
+          } else if (this.id === 0 ? e.code === "ShiftLeft" : e.code === "NumpadEnter") {
+            e.preventDefault();
+            this.hold();
+          } else if (this.id === 0 ? e.code === "KeyE" : e.code === "Numpad9")
+            this.rotatePiece("cw");
+          else if (this.id === 0 ? e.code === "KeyQ" : e.code === "Numpad7")
+            this.rotatePiece("ccw");
+        });
+
+        document.addEventListener("keyup", (e) => {
+          this.keys[e.code] = false;
+        });
+      }
+
+      async loop(timestamp: number) {
+        if (!this.lastDrop) this.lastDrop = timestamp;
+        if (!this.isPaused)
+        {
+          this.inputManager();
+          if (this.isLocking ? timestamp - this.lastDrop > 500 : timestamp - this.lastDrop > this.dropInterval)
+          {
+            if (this.isLocking && this.lockRotationCount == this.lockLastRotationCount)
+              this.lockPiece();
+            this.lockLastRotationCount = this.lockRotationCount;
+            if (!this.movePiece(0, 1))
+            {
+              if (!this.isLocking)
+              {
+                this.lockRotationCount = 0;
+                this.lockLastRotationCount = 0;
+                this.isLocking = true;
+              }
+            }
+            else if (this.isLocking)
+              this.lockRotationCount = 0;
+            this.lastDrop = timestamp;
+          }
+        }
+        this.draw();
+
+        if (this.isGameOver)
+        {
+          if (await isLogged())
+          {
+            let uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+            fetch(`http://localhost:3002/users/${uuid}/matchHistory?game=tetris`, {
+              method: "POST",
+              headers: { "Content-Type": "application/json", },
+              credentials: "include",
+              body: JSON.stringify({
+                "game": "tetris",
+                "opponent": "xd",
+                "myScore": this.score,
+                "opponentScore": 0,
+                "date": Date.now(),
+              }),
+            });
+          }
+          document.getElementById("game-buttons")?.classList.remove("hidden");
+          return ;
+        }
+        requestAnimationFrame(this.loop.bind(this));
+      }
+
+      drawGrid() {
+        const ctx = this.ctx;
+        if (!ctx || !this.canvas)
+          return;
+        ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
+        ctx.strokeStyle = "#222";
+        for (let r = 0; r <= ROWS; r++) {
+          // horizontal lines
+          ctx.beginPath();
+          ctx.moveTo(0, r * BLOCK);
+          ctx.lineTo(COLS * BLOCK, r * BLOCK);
+          ctx.stroke();
+        }
+        for (let c = 0; c <= COLS; c++) {
+          ctx.beginPath();
+          ctx.moveTo(c * BLOCK, 0);
+          ctx.lineTo(c * BLOCK, ROWS * BLOCK);
+          ctx.stroke();
+        }
+      }
+
+      drawBoard() {
+        for (let r = 0; r < ROWS; r++) {
+          for (let c = 0; c < COLS; c++) {
+            const val = this.board[r][c];
+            if (val) this.fillBlock(c, r, COLORS[val], this.ctx);
+            else this.clearBlock(c, r);
+          }
+        }
+      }
+
+      drawPiece() {
+        if (!this.piece) return;
+
+        for (const cell of this.piece.getCells())
+          if (cell.y >= 0) this.fillBlock(cell.x, cell.y, COLORS[cell.val], this.ctx);
+
+        let offset: number = this.getGhostOffset(this.piece);
+        for (const cell of this.piece.getCells())
+          if (cell.y + offset >= 0 && offset > 0)
+            this.fillGhostBlock(cell.x, cell.y + offset, COLORS[cell.val]);
+      }
+
+      drawHold() {
+        if (!this.holdPiece || !this.holdCtx) return;
+
+        this.holdCtx.clearRect(0, 0, 200, 200);
+        let y: number = 0;
+        for (const row of this.holdPiece.rotations[0]) {
+          let x: number = 0;
+          for (const val of row) {
+            if (val)
+              this.fillBlock(x + (4 - this.holdPiece.rotations[0].length)/ 2 + 0.35, y + 0.5, this.canHold ? COLORS[this.holdPiece.findColorIndex()] : COLORS[8], this.holdCtx);
+            x++;
+          }
+          y++;
+        }
+      }
+
+      drawQueue() {
+        if (!this.queueCtx) return ;
+        this.queueCtx.clearRect(0, 0, 500, 500);
+        let placement: number = 0;
+        for (const nextPiece of this.nextQueue.slice(0, 5)) {
+          let y: number = 0;
+          for (const row of TETROMINOES[nextPiece][0]) {
+            let x: number = 0;
+            for (const val of row) {
+              if (val)
+                this.fillBlock(x + (4 - TETROMINOES[nextPiece][0].length) / 2 + 0.25, y + 0.5 + placement * 2.69 - (nextPiece ==="I" ? 0.35 : 0), COLORS[["I", "J", "L", "O", "S", "T", "Z"].indexOf(nextPiece) + 1], this.queueCtx);
+              x++;
+            }
+            y++;
+          }
+          placement++;
+        }
+      }
+
+      adjustColor(hex: string, amount: number): string {
+        let color = hex.startsWith('#') ? hex.slice(1) : hex;
+        const num = parseInt(color, 16);
+        let r = (num >> 16) + amount;
+        let g = ((num >> 8) & 0x00FF) + amount;
+        let b = (num & 0x0000FF) + amount;
+        r = Math.max(Math.min(255, r), 0);
+        g = Math.max(Math.min(255, g), 0);
+        b = Math.max(Math.min(255, b), 0);
+        return `#${(r << 16 | g << 8 | b).toString(16).padStart(6, '0')}`;
+      }
+
+      fillBlock(x: number, y: number, color: string[], ctx: CanvasRenderingContext2D | null) {
+        if (!ctx) return;
+        const grad = ctx.createLinearGradient(x * BLOCK, y * BLOCK, x * BLOCK, y * BLOCK + BLOCK);
+        grad.addColorStop(0, color[0]);
+        grad.addColorStop(1, color[1]);
+        ctx.fillStyle = grad;
+        ctx.fillRect(Math.round(x * BLOCK) + 4, Math.round(y * BLOCK) + 4, BLOCK - 4, BLOCK - 4);
+        const X = Math.round(x * BLOCK);
+        const Y = Math.round(y * BLOCK);
+        const W = BLOCK;
+        const H = BLOCK;
+        const S = 4;
+
+        ctx.lineWidth = S;
+        ctx.beginPath();
+        ctx.strokeStyle = color[0];
+        ctx.moveTo(X, Y + S / 2);
+        ctx.lineTo(X + W, Y + S / 2);
+        ctx.moveTo(X + S / 2, Y);
+        ctx.lineTo(X + S / 2, Y + H);
+        ctx.stroke();
+
+        ctx.beginPath();
+        ctx.strokeStyle = this.adjustColor(color[1], -20);
+        ctx.moveTo(X, Y + H - S / 2);
+        ctx.lineTo(X + W, Y + H - S / 2);
+        ctx.moveTo(X + W - S / 2, Y);
+        ctx.lineTo(X + W - S / 2, Y + H);
+        ctx.stroke();
+      }
+      fillGhostBlock(x: number, y: number, color: string[]) {
+        if (!this.ctx) return;
+        const ctx = this.ctx;
+
+        const X = x * BLOCK;
+        const Y = y * BLOCK;
+        const W = BLOCK;
+        const H = BLOCK;
+        const S = 4;
+
+        ctx.lineWidth = S;
+        ctx.beginPath();
+        ctx.strokeStyle = this.adjustColor(color[0], -40);
+        ctx.moveTo(X, Y + S / 2);
+        ctx.lineTo(X + W, Y + S / 2);
+        ctx.moveTo(X + S / 2, Y);
+        ctx.lineTo(X + S / 2, Y + H);
+        ctx.stroke();
+
+        ctx.beginPath();
+        ctx.strokeStyle = this.adjustColor(color[1], -60);
+        ctx.moveTo(X, Y + H - S / 2);
+        ctx.lineTo(X + W, Y + H - S / 2);
+        ctx.moveTo(X + W - S / 2, Y);
+        ctx.lineTo(X + W - S / 2, Y + H);
+        ctx.stroke();
+        //ctx.strokeRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
+      }
+
+      clearBlock(x: number, y: number) {
+        if (!this.ctx) return;
+        const ctx = this.ctx;
+        ctx.clearRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
+      }
+
+      drawHUD() {
+        if (!this.ctx || !this.canvas) return;
+        const ctx = this.ctx;
+
+        if (this.garbage)
+        {
+          ctx.fillStyle ="red";
+          ctx.fillRect(0, this.canvas.height - BLOCK * this.garbage, 6, BLOCK * this.garbage);
+        }
+
+        ctx.fillStyle = "rgba(0,0,0,0.6)";
+        ctx.fillRect(4, 4, 120, 60);
+        ctx.fillStyle = "#fff";
+        ctx.font = "12px Kubasta";
+        ctx.fillText(`Score: ${this.score}`, 8, 20);
+        ctx.fillText(`Lines: ${this.lines}`, 8, 36);
+        ctx.fillText(`Level: ${this.level}`, 8, 52);
+
+        if (this.isPaused) {
+          ctx.fillStyle = "rgba(0,0,0,0.7)";
+          ctx.fillRect(0, this.canvas.height / 2 - 24, this.canvas.width, 48);
+          ctx.fillStyle = "#fff";
+          ctx.font = "24px Kubasta";
+          ctx.textAlign = "center";
+          ctx.fillText(
+            "paused",
+            this.canvas.width / 2,
+            this.canvas.height / 2 + 8,
+          );
+          ctx.textAlign = "start";
+        }
+
+        if (this.isGameOver) {
+          ctx.fillStyle = "rgba(0,0,0,0.7)";
+          ctx.fillRect(0, this.canvas.height / 2 - 36, this.canvas.width, 72);
+          ctx.fillStyle = "#fff";
+          ctx.font = "28px Kubasta";
+          ctx.textAlign = "center";
+          ctx.fillText(
+            "game over",
+            this.canvas.width / 2,
+            this.canvas.height / 2 + 8,
+          );
+          ctx.textAlign = "start";
+        }
+      }
+
+      draw() {
+        if (!this.ctx || !this.canvas) return;
+        // clear everything
+        this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
+
+        this.ctx.fillStyle = "#000";
+        this.ctx.fillRect(0, 0, this.canvas.width, this.canvas.height);
+
+        this.ctx.strokeStyle = "#111";
+        for (let r = 0; r <= ROWS; r++) {
+          this.ctx.beginPath();
+          this.ctx.moveTo(0, r * BLOCK);
+          this.ctx.lineTo(COLS * BLOCK, r * BLOCK);
+          this.ctx.stroke();
+        }
+        for (let c = 0; c <= COLS; c++) {
+          this.ctx.beginPath();
+          this.ctx.moveTo(c * BLOCK, 0);
+          this.ctx.lineTo(c * BLOCK, ROWS * BLOCK);
+          this.ctx.stroke();
+        }
+
+        this.drawBoard();
+        this.drawPiece();
+        this.drawHUD();
+        this.drawQueue();
+      }
+    }
+
+    document.getElementById("game-retry")?.addEventListener("click", () => { document.getElementById("game-buttons")?.classList.add("hidden"); game1 = new Game("board1", 0); game2 = new Game("board2", 1); });
+    game1 = new Game("board1", 0);
+    game2 = new Game("board2", 1);
+  }
+}
diff --git a/src/front/static/ts/views/TournamentMenu.ts b/src/front/static/ts/views/TournamentMenu.ts
index 1f798ae..bc2bbd6 100644
--- a/src/front/static/ts/views/TournamentMenu.ts
+++ b/src/front/static/ts/views/TournamentMenu.ts
@@ -26,7 +26,7 @@ export default class extends Aview {
 	async run() {
 		const generateBracket = async (playerCount: number) => {
 			document.getElementById("bracket").innerHTML = "";
-			
+
 			const rounds = Math.ceil(Math.log2(playerCount));
 			const totalSlots = 2 ** rounds;
 			const byes = totalSlots - playerCount;
@@ -34,10 +34,10 @@ export default class extends Aview {
 			let odd = 0;
 			if (playerCount % 2)
 			{
-				console.error("odd numbers are temporarily invalids");
-				return ;
-				/*++odd;
-				--playerCount;*/
+				//console.error("odd numbers are temporarily invalids");
+				//return ;
+				++odd;
+				--playerCount;
 			}
 
 			let notPowPlayersCount = 0;
@@ -106,7 +106,7 @@ export default class extends Aview {
 					input.placeholder = `Player ${++playerCount}`;
 					input.className =
 						"w-32 h-10 p-2 text-sm border rounded bg-white shadow disabled:bg-gray-200";
-					roundColumn.appendChild(input);	
+					roundColumn.appendChild(input);
 					--notPowPlayersCount;
 					nextRound.push("");
 				}

From b52b43b250746e6bb5195d8b14dab62712665b53 Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Tue, 21 Oct 2025 14:05:02 +0200
Subject: [PATCH 070/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat(fron?=
 =?UTF-8?q?t):=20front=20mainly=20done,=20waiting=20for=20image=20api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/index.html                          |   7 +-
 src/front/static/ts/main.ts                   |  14 +-
 src/front/static/ts/views/MainMenu.ts         |   1 +
 .../static/ts/views/{Game.ts => Pong.ts}      |   8 +-
 src/front/static/ts/views/Profile.ts          | 105 ++++++++++++---
 src/front/static/ts/views/ProfileMenu.ts      |   1 +
 src/front/static/ts/views/Settings.ts         |   4 +-
 src/front/static/ts/views/Tetris.ts           |  37 ++++--
 src/front/static/ts/views/TetrisVersus.ts     | 121 ++++++++++++++----
 9 files changed, 235 insertions(+), 63 deletions(-)
 rename src/front/static/ts/views/{Game.ts => Pong.ts} (96%)

diff --git a/src/front/index.html b/src/front/index.html
index de47004..8532da2 100644
--- a/src/front/index.html
+++ b/src/front/index.html
@@ -26,10 +26,10 @@
 				<img src="./static/assets/tetrio.svg" width=32 height=32 />
 				<span class="text-white font-[Kubasta]">tetris_game.ts</span>
 			</a>
-			<a class="flex flex-col items-center" href="https://tetr.io/">
+			<!--a class="flex flex-col items-center" href="https://tetr.io/">
 				<img src="./static/assets/tetrio.svg" width=32 height=32 />
 				<span class="text-white font-[Kubasta]">tetr.io</span>
-			</a>
+			</a-->
 		</div>
 
 		<div id="app" class="flex-1 flex items-center justify-center">
@@ -46,8 +46,7 @@
 					<a target="_blank" class="taskbar-button" href="https://rusty.42angouleme.fr/">rusty</a>
 					<a target="_blank" class="taskbar-button" href="https://dn720004.ca.archive.org/0/items/2009-tetris-variant-concepts_202201/2009%20Tetris%20Design%20Guideline.pdf">tetris-guideline.pdf</a>
 				</div>
-				<div class="flex px-4 items-center content-center space-x-2">
-				  <button id="friends-btn" class="taskbar-button">friends</button>
+				<div id="taskbar-trail" class="flex px-4 items-center content-center space-x-2">
 				  <div class="reverse-border m-1.5 h-8/10 content-center">
 					  <span id="taskbar-clock" class="text-neutral-900 dark:text-white px-4">12:37</span>
 				  </div>
diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index 6abfa27..831d203 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -12,11 +12,21 @@ export async function isLogged(): Promise<boolean> {
 	if (uuid_req.status === 200) {
 		let uuid = await uuid_req.json();
 		document.cookie = `uuid=${uuid.user};max-age=${60 * 60 * 24 * 7}`;
+		if (!document.getElementById("friends-btn"))
+		{
+      const btn: HTMLButtonElement = document.createElement("button") as HTMLButtonElement;
+      btn.id = "friends-btn";
+      btn?.classList.add("taskbar-button");
+      btn.innerText = "friends";
+      document.getElementById("taskbar-trail")?.prepend(btn);
+		}
 		return true;
 	}
 	else // 401
 	{
 		document.cookie = `uuid=;max-age=0`;
+    const btn = document.getElementById("friends-btn") as HTMLButtonElement;
+    if (btn) btn.remove();
 		return false;
 	}
 }
@@ -32,7 +42,7 @@ const routes = [
 	{ path: "/", view: () => import("./views/MainMenu.ts") },
 
 	{ path: "/pong", view: () => import("./views/PongMenu.ts") },
-	{ path: "/pong/local", view: () => import("./views/Game.ts") },
+	{ path: "/pong/local", view: () => import("./views/Pong.ts") },
 	{ path: "/pong/tournament", view: () => import("./views/TournamentMenu.ts") },
 
 	{ path: "/tetris", view: () => import("./views/TetrisMenu.ts") },
@@ -102,8 +112,6 @@ document.addEventListener("DOMContentLoaded", () => {
 	router();
 });
 
-oneko();
-
 function updateClock()
 {
 	const days = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'];
diff --git a/src/front/static/ts/views/MainMenu.ts b/src/front/static/ts/views/MainMenu.ts
index 6451c2d..8639808 100644
--- a/src/front/static/ts/views/MainMenu.ts
+++ b/src/front/static/ts/views/MainMenu.ts
@@ -1,4 +1,5 @@
 import Aview from "./Aview.ts"
+import { isLogged} from "../main.ts"
 import { setOnekoState } from "../oneko.ts"
 
 export default class extends Aview {
diff --git a/src/front/static/ts/views/Game.ts b/src/front/static/ts/views/Pong.ts
similarity index 96%
rename from src/front/static/ts/views/Game.ts
rename to src/front/static/ts/views/Pong.ts
index 07d72b8..f103684 100644
--- a/src/front/static/ts/views/Game.ts
+++ b/src/front/static/ts/views/Pong.ts
@@ -28,8 +28,9 @@ export default class extends Aview {
 			</div>
 
 
-			<div id="main-div" class="bg-neutral-200 dark:bg-neutral-800 text-center p-10 space-y-4 reverse-border">
+			<div id="main-div" class="bg-neutral-200 dark:bg-neutral-800 text-center p-5 space-y-4 reverse-border">
 				<div id="player-inputs" class="flex flex-col space-y-4">
+          <h1 class="text-lg text-neutral-900 dark:text-white font-bold mt-2">enter the users ids/names</h1>
 					<div class="flex flex-row">
 						<span class="reverse-border w-full ml-2"><input type="text" id="player1" placeholder="Player 1" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input></span>
 						<span class="reverse-border w-full ml-2"><input type="text" id="player2" placeholder="Player 2" class="bg-white text-neutral-900 px-4 py-2 w-full input-border" required></input></span>
@@ -265,8 +266,8 @@ export default class extends Aview {
 			countdown = 3;
 			countdownTimer = performance.now();
 		});
-		let p1_input = document.getElementById("player1");
-		let p2_input = document.getElementById("player2");
+		let p1_input: HTMLInputElement = document.getElementById("player1") as HTMLInputElement;
+		let p2_input: HTMLInputElement = document.getElementById("player2") as HTMLInputElement;
 
 		p2_input.value = "Player 2";
 		if (await isLogged())
@@ -283,6 +284,7 @@ export default class extends Aview {
   		}
       let userdata = await userdata_req.json();
 			p1_input.value = userdata.displayName;
+			p1_input.readOnly = true;
 		}
 		else
 			p1_input.value = "Player 1";
diff --git a/src/front/static/ts/views/Profile.ts b/src/front/static/ts/views/Profile.ts
index 2f2f899..b80bd0b 100644
--- a/src/front/static/ts/views/Profile.ts
+++ b/src/front/static/ts/views/Profile.ts
@@ -28,11 +28,11 @@ export default class extends Aview {
 				<div class="flex flex-col space-y-4 w-full">
 				  <div id="profile-profile" class="default-border h-24 flex flex-row place-content-stretch content-center items-center space-x-6 pr-4">
 					</div>
-					<div class="flex flex-row space-x-4 w-full min-w-145">
-					  <ul id="profile-scorelist" class="reverse-border bg-neutral-300 dark:bg-neutral-900 h-48 w-full overflow-scroll no-scrollbar">
+					<div class="flex flex-row space-x-4 w-full min-w-175">
+					  <ul id="profile-pong-scorelist" class="reverse-border bg-neutral-300 dark:bg-neutral-900 h-48 w-full overflow-scroll no-scrollbar">
+						</ul>
+				    <ul id="profile-tetris-scorelist" class="reverse-border bg-neutral-300 dark:bg-neutral-900 h-48 w-full overflow-scroll no-scrollbar">
 						</ul>
-				    <div id="graph-ig-idk-im-scared" class="reverse-border bg-neutral-300 dark:bg-neutral-900 h-48 w-full">
-						</div>
 					</div>
 				</div>
 			</div>
@@ -58,33 +58,108 @@ export default class extends Aview {
     }
     let userdata = await userdata_req.json();
 
-    const matchCount_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory/count?game=tetris`, {
+    let matchCount_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory/count?game=pong`, {
       method: "GET",
       credentials: "include",
     });
-    const matchCount = await matchCount_req.json();
+    let matchCount = await matchCount_req.json();
 
-    const matches_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory?game=tetris&iStart=0&iEnd=${matchCount.n_matches}`, {
+    let matches_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory?game=pong&iStart=0&iEnd=${matchCount.n_matches}`, {
       method: "GET",
       credentials: "include",
     });
-    const matches = await matches_req.json();
+    let matches = await matches_req.json();
 
-    const main = document.getElementById("profile-scorelist");
+    let main = document.getElementById("profile-pong-scorelist");
     if (!main)
       return console.error("what");
 
     if (matches.matchHistory) {
       for (let match of matches.matchHistory) {
         const newEntry = document.createElement("li");
-        newEntry.classList.add("m-2", "default-button", "bg-neutral-200", "dark:bg-neutral-800", "text-neutral-900", "dark:text-white");
+        newEntry.classList.add("m-1", "default-button", "bg-neutral-200", "dark:bg-neutral-800", "text-neutral-900", "dark:text-white");
         newEntry.innerHTML = match.score.p1Score > match.score.p2Score ? `${match.score.p1} - winner` : `${match.score.p2} - winner`;
         main.insertBefore(newEntry, main.firstChild);
-        // ###########################################################################################################################################
-        //
-        // ADD TX LINK : https://testnet.snowscan.xyz/tx/${match.tx}
-        //
-        // ###########################################################################################################################################
+
+        const popup: HTMLDivElement = document.createElement("div");
+        const id: number = Math.floor(Math.random() * 100000000000);
+        popup.id = `${id}`;
+        popup.classList.add("z-10", "absolute", "default-border");
+        const header = popup.appendChild(document.createElement("div"));
+        header.classList.add("bg-linear-to-r", "from-orange-200", "to-orange-300", "flex", "flex-row", "min-w-35", "justify-between", "px-2");
+        header.id = `${id}-header`;
+        header.appendChild(document.createElement("span")).innerText = "score.ts";
+        const btn = header.appendChild(document.createElement("button"));
+        btn.innerText = " × ";
+        btn.onclick = () => { document.getElementById(`${id}`).remove();  };
+
+        const popup_content: HTMLSpanElement = popup.appendChild(document.createElement("div"));
+        popup_content.classList.add("flex", "flex-col", "bg-neutral-200", "dark:bg-neutral-800", "p-6", "pt-4", "text-neutral-900", "dark:text-white", "space-y-4");
+        const date = new Date(match.score.date);
+        popup_content.appendChild(document.createElement("span")).innerText = `${date.toDateString()} ${date.getHours()}:${date.getMinutes().toString().padStart(2, '0')}`;
+        const score = popup_content.appendChild(document.createElement("span"));
+        score.classList.add();
+        score.innerText = `${match.score.p1} : ${match.score.p1Score} - ${match.score.p2Score} : ${match.score.p2}`;
+        const tx = popup_content.appendChild(document.createElement("a"));
+        tx.href = `https://testnet.snowscan.xyz/tx/${match.tx}`;
+        tx.innerText = "transaction proof";
+        tx.target = "_blank";
+        tx.classList.add("default-button", "items-center", "justify-center", "text-center");
+
+        newEntry.onclick = () => { document.getElementById("app")?.appendChild(popup); dragElement(document.getElementById(`${id}`)); };
+        console.log(match.tx);
+      }
+    }
+
+    matchCount_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory/count?game=tetris`, {
+      method: "GET",
+      credentials: "include",
+    });
+    matchCount = await matchCount_req.json();
+
+    matches_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory?game=tetris&iStart=0&iEnd=${matchCount.n_matches}`, {
+      method: "GET",
+      credentials: "include",
+    });
+    matches = await matches_req.json();
+
+    main = document.getElementById("profile-tetris-scorelist");
+    if (!main)
+      return console.error("what");
+
+    if (matches.matchHistory) {
+      for (let match of matches.matchHistory) {
+        const newEntry = document.createElement("li");
+        newEntry.classList.add("m-1", "default-button", "bg-neutral-200", "dark:bg-neutral-800", "text-neutral-900", "dark:text-white");
+        newEntry.innerHTML = match.score.p1Score > match.score.p2Score ? `${match.score.p1} - winner` : `${match.score.p2} - winner`;
+        main.insertBefore(newEntry, main.firstChild);
+
+        const popup: HTMLDivElement = document.createElement("div");
+        const id: number = Math.floor(Math.random() * 100000000000);
+        popup.id = `${id}`;
+        popup.classList.add("z-10", "absolute", "default-border");
+        const header = popup.appendChild(document.createElement("div"));
+        header.classList.add("bg-linear-to-r", "from-orange-200", "to-orange-300", "flex", "flex-row", "min-w-35", "justify-between", "px-2");
+        header.id = `${id}-header`;
+        header.appendChild(document.createElement("span")).innerText = "score.ts";
+        const btn = header.appendChild(document.createElement("button"));
+        btn.innerText = " × ";
+        btn.onclick = () => { document.getElementById(`${id}`).remove();  };
+
+        const popup_content: HTMLSpanElement = popup.appendChild(document.createElement("div"));
+        popup_content.classList.add("flex", "flex-col", "bg-neutral-200", "dark:bg-neutral-800", "p-6", "pt-4", "text-neutral-900", "dark:text-white", "space-y-4");
+        const date = new Date(match.score.date);
+        popup_content.appendChild(document.createElement("span")).innerText = `${date.toDateString()} ${date.getHours()}:${date.getMinutes().toString().padStart(2, '0')}`;
+        const score = popup_content.appendChild(document.createElement("span"));
+        score.classList.add();
+        score.innerText = `${match.score.p1} : ${match.score.p1Score} - ${match.score.p2Score} : ${match.score.p2}`;
+        const tx = popup_content.appendChild(document.createElement("a"));
+        tx.href = `https://testnet.snowscan.xyz/tx/${match.tx}`;
+        tx.innerText = "transaction proof";
+        tx.target = "_blank";
+        tx.classList.add("default-button", "items-center", "justify-center", "text-center");
+
+        newEntry.onclick = () => { document.getElementById("app")?.appendChild(popup); dragElement(document.getElementById(`${id}`)); };
         console.log(match.tx);
       }
     }
diff --git a/src/front/static/ts/views/ProfileMenu.ts b/src/front/static/ts/views/ProfileMenu.ts
index c2937d5..68317c0 100644
--- a/src/front/static/ts/views/ProfileMenu.ts
+++ b/src/front/static/ts/views/ProfileMenu.ts
@@ -77,6 +77,7 @@ export default class extends Aview {
         method: "GET",
         credentials: "include",
       });
+      isLogged();
       if (req.status === 200)
         this.run();
       else
diff --git a/src/front/static/ts/views/Settings.ts b/src/front/static/ts/views/Settings.ts
index fb5fbc6..5c70167 100644
--- a/src/front/static/ts/views/Settings.ts
+++ b/src/front/static/ts/views/Settings.ts
@@ -70,7 +70,7 @@ export default class extends Aview {
     });
 
     document.getElementById("deleteAccount-button")?.addEventListener("click", async () => {
-      const delete_req = await fetch(`http://localhost:3002/users/${uuid}`, {
+      const delete_req = await fetch(`http://localhost:3001/`, {
         method: "DELETE",
         credentials: "include",
       });
@@ -78,7 +78,7 @@ export default class extends Aview {
       if (delete_req.status == 200)
         navigationManager("/");
       else
-        console.error("xd"); // should never happen, wtf
+        console.error("xd"); // xd?????????????
     });
   }
 }
diff --git a/src/front/static/ts/views/Tetris.ts b/src/front/static/ts/views/Tetris.ts
index bdf9ede..61c309a 100644
--- a/src/front/static/ts/views/Tetris.ts
+++ b/src/front/static/ts/views/Tetris.ts
@@ -47,6 +47,8 @@ export default class extends Aview {
     const ROWS = 20;
     const BLOCK = 30; // pixels per block
 
+    const view = this;
+
     type Cell = number; // 0 empty, >0 occupied (color index)
 
     // Tetromino definitions: each piece is an array of rotations, each rotation is a 2D matrix
@@ -542,10 +544,13 @@ export default class extends Aview {
           } else if (e.key === "Shift" || e.key === "c" || e.key === "C") {
             e.preventDefault();
             this.hold();
-          } else if (e.key === "x" || e.key === "X" || e.key === "ArrowUp")
+          } else if (e.key === "x" || e.key === "X" || e.key === "ArrowUp") {
+            e.preventDefault();
             this.rotatePiece("cw");
-          else if (e.key === "z" || e.key === "Z" || e.key === "Control")
+          }  else if (e.key === "z" || e.key === "Z" || e.key === "Control") {
+          e.preventDefault();
             this.rotatePiece("ccw");
+          }
         });
 
         document.addEventListener("keyup", (e) => {
@@ -554,6 +559,7 @@ export default class extends Aview {
       }
 
       async loop(timestamp: number) {
+        if (!view.running) return;
         if (!this.lastDrop) this.lastDrop = timestamp;
         if (!this.isPaused)
         {
@@ -608,7 +614,7 @@ export default class extends Aview {
         if (!ctx || !this.canvas)
           return;
         ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
-        ctx.strokeStyle = "#222";
+        ctx.strokeStyle = window.matchMedia('(prefers-color-scheme: dark)').matches ? "oklch(14.5% 0 0)" : "oklch(55.6% 0 0)";
         for (let r = 0; r <= ROWS; r++) {
           // horizontal lines
           ctx.beginPath();
@@ -625,6 +631,7 @@ export default class extends Aview {
       }
 
       drawBoard() {
+        this.drawGrid();
         for (let r = 0; r < ROWS; r++) {
           for (let c = 0; c < COLS; c++) {
             const val = this.board[r][c];
@@ -647,15 +654,18 @@ export default class extends Aview {
       }
 
       drawHold() {
-        if (!this.holdPiece || !this.holdCtx) return;
+        if (!this.holdCtx || !this.holdCanvas) return;
 
-        this.holdCtx.clearRect(0, 0, 200, 200);
+        this.holdCtx.fillStyle = window.matchMedia('(prefers-color-scheme: dark)').matches ? "oklch(20.5% 0 0)" : "oklch(70.8% 0 0)";
+        this.holdCtx.fillRect(0, 0, this.holdCanvas.width, this.holdCanvas.height);
+
+        if (!this.holdPiece) return;
         let y: number = 0;
         for (const row of this.holdPiece.rotations[0]) {
           let x: number = 0;
           for (const val of row) {
             if (val)
-              this.fillBlock(x + (4 - this.holdPiece.rotations[0].length)/ 2 + 0.35, y + 0.5, this.canHold ? COLORS[this.holdPiece.findColorIndex()] : ["#8c8c84", "#393934"], this.holdCtx);
+              this.fillBlock(x + (4 - this.holdPiece.rotations[0].length)/ 2 + 0.35, y + 0.65, this.canHold ? COLORS[this.holdPiece.findColorIndex()] : ["#8c8c84", "#393934"], this.holdCtx);
             x++;
           }
           y++;
@@ -663,8 +673,10 @@ export default class extends Aview {
       }
 
       drawQueue() {
-        if (!this.queueCtx) return ;
-        this.queueCtx.clearRect(0, 0, 500, 500);
+        if (!this.queueCtx || !this.queueCanvas) return ;
+
+        this.queueCtx.fillStyle = window.matchMedia('(prefers-color-scheme: dark)').matches ? "oklch(20.5% 0 0)" : "oklch(70.8% 0 0)";
+        this.queueCtx.fillRect(0, 0, this.queueCanvas.width, this.queueCanvas.height);
         let placement: number = 0;
         for (const nextPiece of this.nextQueue.slice(0, 5)) {
           let y: number = 0;
@@ -755,7 +767,8 @@ export default class extends Aview {
       clearBlock(x: number, y: number) {
         if (!this.ctx) return;
         const ctx = this.ctx;
-        ctx.clearRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
+     	ctx.fillStyle = window.matchMedia('(prefers-color-scheme: dark)').matches ? "oklch(20.5% 0 0)" : "oklch(70.8% 0 0)";
+			ctx.fillRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
       }
 
       drawHUD() {
@@ -765,9 +778,9 @@ export default class extends Aview {
         ctx.fillRect(4, 4, 120, 60);
         ctx.fillStyle = "#fff";
         ctx.font = "12px Kubasta";
-        ctx.fillText(`Score: ${this.score}`, 8, 20);
-        ctx.fillText(`Lines: ${this.lines}`, 8, 36);
-        ctx.fillText(`Level: ${this.level}`, 8, 52);
+        ctx.fillText(`score: ${this.score}`, 8, 20);
+        ctx.fillText(`lines: ${this.lines}`, 8, 36);
+        ctx.fillText(`level: ${this.level}`, 8, 52);
 
         if (this.isPaused) {
           ctx.fillStyle = "rgba(0,0,0,0.7)";
diff --git a/src/front/static/ts/views/TetrisVersus.ts b/src/front/static/ts/views/TetrisVersus.ts
index bdc4426..efa045d 100644
--- a/src/front/static/ts/views/TetrisVersus.ts
+++ b/src/front/static/ts/views/TetrisVersus.ts
@@ -26,8 +26,16 @@ export default class extends Aview {
 			</div>
 
 
-			<div id="main-div" class="bg-neutral-200 dark:bg-neutral-800 text-center p-10 space-y-4 reverse-border">
-				<div class="flex flex-row justify-center items-start space-x-4">
+			<div id="main-div" class="bg-neutral-200 dark:bg-neutral-800 text-center p-5 pt-2 space-y-4 reverse-border">
+			<div id="player-inputs" class="flex flex-col space-y-4">
+	      <h1 class="text-lg text-neutral-900 dark:text-white font-bold mt-2">enter the users ids/names</h1>
+				<div class="flex flex-row">
+					<span class="reverse-border w-full ml-2"><input type="text" id="player1" placeholder="Player 1" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input></span>
+					<span class="reverse-border w-full ml-2"><input type="text" id="player2" placeholder="Player 2" class="bg-white text-neutral-900 px-4 py-2 w-full input-border" required></input></span>
+				</div>
+				<button id="game-start" class="default-button">play</button>
+			</div>
+				<div id="game-boards" class="hidden flex flex-row justify-center items-start space-x-4">
 					<canvas id="board1-hold" class="reverse-border" width="140" height="100"></canvas>
 					<canvas id="board1-board" class="reverse-border" width="300" height="600"></canvas>
 					<canvas id="board1-queue" class="reverse-border" width="140" height="420"></canvas>
@@ -45,14 +53,22 @@ export default class extends Aview {
   }
 
   async run() {
-    let game1: Game;
-    let game2: Game;
     dragElement(document.getElementById("window"));
     const COLS = 10;
     const ROWS = 20;
     const BLOCK = 30; // pixels per block
 
-    type Cell = number; // 0 empty, >0 occupied (color index)
+    let uuid: string;
+    let game1: Game;
+    let game2: Game;
+    let p1_score: number = 0;
+		let p2_score: number = 0;
+		let p1_name: string;
+		let p2_name: string;
+
+    const view = this;
+
+    type Cell = number;
 
     // Tetromino definitions: each piece is an array of rotations, each rotation is a 2D matrix
     const TETROMINOES: { [key: string]: number[][][] } = {
@@ -388,7 +404,8 @@ export default class extends Aview {
         const type = this.nextQueue.shift()!;
         this.piece = new Piece(type);
         if (this.collides(this.piece)) {
-          this.isGameOver = true;
+          game1.isGameOver = true;
+          game2.isGameOver = true;
         }
 
         this.drawHold();
@@ -428,7 +445,12 @@ export default class extends Aview {
             this.board[cell.y][cell.x] = cell.val;
           if (cell.y > 0) isValid = true;
         }
-        if (!isValid) this.isGameOver = true;
+        if (!isValid)
+        {
+          this.id == 0 ? p2_score++ : p1_score++;
+          game1.isGameOver = true;
+          game2.isGameOver = true;
+        }
 
         if (this.garbage)
         {
@@ -589,10 +611,13 @@ export default class extends Aview {
           } else if (this.id === 0 ? e.code === "ShiftLeft" : e.code === "NumpadEnter") {
             e.preventDefault();
             this.hold();
-          } else if (this.id === 0 ? e.code === "KeyE" : e.code === "Numpad9")
+          } else if (this.id === 0 ? (e.code === "KeyE" || e.code === "KeyW") : (e.code === "Numpad9" || e.code === "Numpad8")) {
+            e.preventDefault();
             this.rotatePiece("cw");
-          else if (this.id === 0 ? e.code === "KeyQ" : e.code === "Numpad7")
+          }  else if (this.id === 0 ? (e.code === "KeyQ" || e.code === "ControlLeft") : e.code === "Numpad7") {
+            e.preventDefault();
             this.rotatePiece("ccw");
+          }
         });
 
         document.addEventListener("keyup", (e) => {
@@ -601,6 +626,7 @@ export default class extends Aview {
       }
 
       async loop(timestamp: number) {
+        if (!view.running) return;
         if (!this.lastDrop) this.lastDrop = timestamp;
         if (!this.isPaused)
         {
@@ -628,7 +654,16 @@ export default class extends Aview {
 
         if (this.isGameOver)
         {
-          if (await isLogged())
+          if (p1_score != 3 && p2_score != 3)
+          {
+            if (this.id == 0)
+            {
+              game1 = new Game("board1", 0);
+              game2 = new Game("board2", 1);
+            }
+            return ;
+          }
+          if (await isLogged() && this.id == 0)
           {
             let uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
             fetch(`http://localhost:3002/users/${uuid}/matchHistory?game=tetris`, {
@@ -637,9 +672,9 @@ export default class extends Aview {
               credentials: "include",
               body: JSON.stringify({
                 "game": "tetris",
-                "opponent": "xd",
-                "myScore": this.score,
-                "opponentScore": 0,
+                "opponent": p2_name,
+                "myScore": p1_score,
+                "opponentScore": p2_score,
                 "date": Date.now(),
               }),
             });
@@ -655,7 +690,7 @@ export default class extends Aview {
         if (!ctx || !this.canvas)
           return;
         ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
-        ctx.strokeStyle = "#222";
+        ctx.strokeStyle = window.matchMedia('(prefers-color-scheme: dark)').matches ? "oklch(14.5% 0 0)" : "oklch(55.6% 0 0)";
         for (let r = 0; r <= ROWS; r++) {
           // horizontal lines
           ctx.beginPath();
@@ -672,6 +707,7 @@ export default class extends Aview {
       }
 
       drawBoard() {
+        this.drawGrid();
         for (let r = 0; r < ROWS; r++) {
           for (let c = 0; c < COLS; c++) {
             const val = this.board[r][c];
@@ -694,9 +730,12 @@ export default class extends Aview {
       }
 
       drawHold() {
-        if (!this.holdPiece || !this.holdCtx) return;
+        if (!this.holdCtx || !this.holdCanvas) return;
 
-        this.holdCtx.clearRect(0, 0, 200, 200);
+        this.holdCtx.fillStyle = window.matchMedia('(prefers-color-scheme: dark)').matches ? "oklch(20.5% 0 0)" : "oklch(70.8% 0 0)";
+        this.holdCtx.fillRect(0, 0, this.holdCanvas.width, this.holdCanvas.height);
+
+        if (!this.holdPiece) return;
         let y: number = 0;
         for (const row of this.holdPiece.rotations[0]) {
           let x: number = 0;
@@ -710,8 +749,10 @@ export default class extends Aview {
       }
 
       drawQueue() {
-        if (!this.queueCtx) return ;
-        this.queueCtx.clearRect(0, 0, 500, 500);
+        if (!this.queueCtx || !this.queueCanvas) return ;
+
+        this.queueCtx.fillStyle = window.matchMedia('(prefers-color-scheme: dark)').matches ? "oklch(20.5% 0 0)" : "oklch(70.8% 0 0)";
+        this.queueCtx.fillRect(0, 0, this.queueCanvas.width, this.queueCanvas.height);
         let placement: number = 0;
         for (const nextPiece of this.nextQueue.slice(0, 5)) {
           let y: number = 0;
@@ -802,7 +843,8 @@ export default class extends Aview {
       clearBlock(x: number, y: number) {
         if (!this.ctx) return;
         const ctx = this.ctx;
-        ctx.clearRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
+       	ctx.fillStyle = window.matchMedia('(prefers-color-scheme: dark)').matches ? "oklch(20.5% 0 0)" : "oklch(70.8% 0 0)";
+        ctx.fillRect(x * BLOCK + 1, y * BLOCK + 1, BLOCK - 2, BLOCK - 2);
       }
 
       drawHUD() {
@@ -819,9 +861,9 @@ export default class extends Aview {
         ctx.fillRect(4, 4, 120, 60);
         ctx.fillStyle = "#fff";
         ctx.font = "12px Kubasta";
-        ctx.fillText(`Score: ${this.score}`, 8, 20);
-        ctx.fillText(`Lines: ${this.lines}`, 8, 36);
-        ctx.fillText(`Level: ${this.level}`, 8, 52);
+        ctx.fillText(`${this.id == 0 ? p1_name : p2_name}: ${this.id == 0 ? p1_score : p2_score}`, 8, 20);
+        ctx.fillText(`score: ${this.score}`, 8, 36);
+        ctx.fillText(`lines: ${this.lines}`, 8, 52);
 
         if (this.isPaused) {
           ctx.fillStyle = "rgba(0,0,0,0.7)";
@@ -882,7 +924,38 @@ export default class extends Aview {
     }
 
     document.getElementById("game-retry")?.addEventListener("click", () => { document.getElementById("game-buttons")?.classList.add("hidden"); game1 = new Game("board1", 0); game2 = new Game("board2", 1); });
-    game1 = new Game("board1", 0);
-    game2 = new Game("board2", 1);
+
+    let p1_input: HTMLInputElement = document.getElementById("player1") as HTMLInputElement;
+		let p2_input: HTMLInputElement = document.getElementById("player2") as HTMLInputElement;
+
+		p2_input.value = "Player 2";
+		if (await isLogged())
+		{
+          uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+          const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
+      			method: "GET",
+      			credentials: "include",
+      		});
+      		if (userdata_req.status == 404)
+      		{
+      			console.error("invalid user");
+      			return ;
+      		}
+          let userdata = await userdata_req.json();
+			p1_input.value = userdata.displayName;
+      p1_input.readOnly = true;
+		}
+		else
+			p1_input.value = "Player 1";
+
+    document.getElementById("game-start")?.addEventListener("click", () => {
+      p1_name = p1_input.value.length > 16 ? p1_input.value.substring(0, 16) + "." : p1_input.value;
+      p2_name = p2_input.value.length > 16 ? p2_input.value.substring(0, 16) + "." : p2_input.value;
+      document.getElementById("player-inputs").remove();
+      document.getElementById("game-boards").classList.remove("hidden");
+      game1 = new Game("board1", 0);
+      game2 = new Game("board2", 1);
+    });
+
   }
 }

From fa0449ba168019d73438f997bc619e9bcfb9aaed Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Tue, 21 Oct 2025 21:50:50 +0200
Subject: [PATCH 071/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat(fron?=
 =?UTF-8?q?t):=20removed=20ugly=20caps=20ew?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/views/Pong.ts         | 4 ++--
 src/front/static/ts/views/TetrisVersus.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/front/static/ts/views/Pong.ts b/src/front/static/ts/views/Pong.ts
index f103684..526812c 100644
--- a/src/front/static/ts/views/Pong.ts
+++ b/src/front/static/ts/views/Pong.ts
@@ -269,7 +269,7 @@ export default class extends Aview {
 		let p1_input: HTMLInputElement = document.getElementById("player1") as HTMLInputElement;
 		let p2_input: HTMLInputElement = document.getElementById("player2") as HTMLInputElement;
 
-		p2_input.value = "Player 2";
+		p2_input.value = "player 2";
 		if (await isLogged())
 		{
       uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
@@ -287,7 +287,7 @@ export default class extends Aview {
 			p1_input.readOnly = true;
 		}
 		else
-			p1_input.value = "Player 1";
+			p1_input.value = "player 1";
 
 		document.getElementById("game-start")?.addEventListener("click", () => {
       p1_name = p1_input.value.length > 16 ? p1_input.value.substring(0, 16) + "." : p1_input.value;
diff --git a/src/front/static/ts/views/TetrisVersus.ts b/src/front/static/ts/views/TetrisVersus.ts
index efa045d..330b8e6 100644
--- a/src/front/static/ts/views/TetrisVersus.ts
+++ b/src/front/static/ts/views/TetrisVersus.ts
@@ -928,7 +928,7 @@ export default class extends Aview {
     let p1_input: HTMLInputElement = document.getElementById("player1") as HTMLInputElement;
 		let p2_input: HTMLInputElement = document.getElementById("player2") as HTMLInputElement;
 
-		p2_input.value = "Player 2";
+		p2_input.value = "player 2";
 		if (await isLogged())
 		{
           uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
@@ -946,7 +946,7 @@ export default class extends Aview {
       p1_input.readOnly = true;
 		}
 		else
-			p1_input.value = "Player 1";
+			p1_input.value = "player 1";
 
     document.getElementById("game-start")?.addEventListener("click", () => {
       p1_name = p1_input.value.length > 16 ? p1_input.value.substring(0, 16) + "." : p1_input.value;

From 300e5a2b33b8dad33143653cae5ba57f2c511c85 Mon Sep 17 00:00:00 2001
From: Tzvetan Trave <tzvetan.trave@abadcafe.org>
Date: Wed, 22 Oct 2025 00:20:35 +0200
Subject: [PATCH 072/109] fixed single-player tetris games

---
 doc/user/matchHistory.md      | 10 +++++-----
 src/api/TODO                  | 21 ---------------------
 src/api/scoreStore/default.js |  2 +-
 src/api/user/dAvatar.js       |  8 ++++++--
 src/api/user/default.js       | 13 ++++++-------
 src/api/user/gAvatar.js       | 26 +++++++++++++++++++++++---
 src/api/user/gMatchHistory.js |  4 ++++
 src/api/user/pAvatar.js       | 12 +++++++++---
 src/api/user/pMatchHistory.js | 27 +++++++++++++++++++--------
 9 files changed, 73 insertions(+), 50 deletions(-)
 delete mode 100644 src/api/TODO

diff --git a/doc/user/matchHistory.md b/doc/user/matchHistory.md
index 9293169..6145a8d 100644
--- a/doc/user/matchHistory.md
+++ b/doc/user/matchHistory.md
@@ -22,9 +22,9 @@ Input needed :
 ```json
 {
 	"game": "<pong/tetris>"
-	"opponent": "<the opponent's username>",
+	"opponent": "<the opponent's username>",	<= item only present if the match involved 2 players
 	"myScore": <my score>,
-	"opponentScore": <the opponent's score>,
+	"opponentScore": <the opponent's score>,	<= item only present if the match involved 2 players
 	"date": <seconds since Epoch (Date.now() return)>
 }
 ```
@@ -36,7 +36,7 @@ Can return:
 	"msg": "Match successfully saved to the blockchain"
 }
 ```
-- 400 with response (if no user is specified in header, or no opponent/p1Score/p2Score is specified in body, or opponent is the user specified in header, or a score is negative, or the game specified is invalid)
+- 400 with response (if no user is specified in header, or no opponent/p1Score/p2Score is specified in body, or opponent is the user specified in header, or a score is negative, or the game specified is invalid, or the game should involve more players than was specified)
 ```json
 {
 	"error": "<corresponding error>"
@@ -69,9 +69,9 @@ Can return:
 			"score":
 			{
 				"p1": "<the name of the p1>",
-				"p2": "<the name of the p2>",
+				"p2": "<the name of the p2>",		<= item only present if the match involved 2 players
 				"p1Score": "<the score of the p1>",
-				"p2Score": "<the score of the p2>",
+				"p2Score": "<the score of the p2>",	<= item only present if the match involved 2 players
 				"date": <seconds since Epoch (Date.now() return)>
 			},
 			"tx": "<the transcaction hash>"
diff --git a/src/api/TODO b/src/api/TODO
deleted file mode 100644
index 0b8e16c..0000000
--- a/src/api/TODO
+++ /dev/null
@@ -1,21 +0,0 @@
-Todo :
-- view friend's activity status
-- add a privacy setting so not anybody can GET friends, match history, etc. (what are the RGPD requirements ?) ?
-- test updated score storing (delays)
-
-
-
-User API :
-POST /users/:userId/avatar	+ {image} (calls POST /images, stores returned imageId in DB at :userId)
-GET /users/:userId/avatar	-> {image}
-DELETE /users/:userId/avatar	(calls DELETE /images/:imageId, clears imageId in DB at :userId)
-PATCH /users/:userId/avatar	+ {image} (emulates a DELETE /users/:userId/avatar and a POST /users/:userId/avatar) -> use uMember instead ?
-- provide a random kanel image from Adam's website ?
-
-Image API :
-- convert everything to webp (using @fastify/sharp)
-- test size max
-
-
-
-Always update API docs
diff --git a/src/api/scoreStore/default.js b/src/api/scoreStore/default.js
index 954fcc8..c6b39ea 100644
--- a/src/api/scoreStore/default.js
+++ b/src/api/scoreStore/default.js
@@ -20,7 +20,7 @@ export default async function(fastify, options) {
 				required: ['p1', 'p2', 'p1Score', 'p2Score'],
 				properties: {
 					p1: { type: 'string', minLength: 1 },
-					p2: { type: 'string', minLength: 1 },
+					p2: { type: 'string', minLength: 0 },
 					p1Score: { type: 'integer', minimum: 0 },
 					p2Score: { type: 'integer', minimum: 0 },
 				}
diff --git a/src/api/user/dAvatar.js b/src/api/user/dAvatar.js
index 822c786..56f9db4 100644
--- a/src/api/user/dAvatar.js
+++ b/src/api/user/dAvatar.js
@@ -1,6 +1,10 @@
-export async function dAvatar(request, reply, fastify, deleteAvatarId) {
+export async function dAvatar(request, reply, fastify, getUserInfo, deleteAvatarId) {
 	try {
-		;
+		const userId = request.params.userId;
+		if (!getUserInfo.get(userId)) {
+			return reply.cose(404).send({ error: "User does not exist" });
+		}
+		deleteAvatarId.run(userId);
 		return reply.code(200).send({ msg: "Avatar deleted successfully" });
 	} catch (err) {
 		fastify.log.error(err);
diff --git a/src/api/user/default.js b/src/api/user/default.js
index cef0c30..204e2c7 100644
--- a/src/api/user/default.js
+++ b/src/api/user/default.js
@@ -69,9 +69,9 @@ function prepareDB() {
 			player1 TEXT,
 			player2 TEXT,
 			matchId INTEGER,
-			CHECK(player1 != player2),
 			CHECK(game = 'pong' OR game = 'tetris'),
-			CHECK(date >= 0)
+			CHECK(date >= 0),
+			CHECK(player1 != player2)
 		) STRICT
 	`);
 	database.exec(`
@@ -125,9 +125,8 @@ const deleteStatsTetris = database.prepare('UPDATE userData SET tetrisWins = 0,
 const deleteAvatarId = database.prepare('UPDATE userData SET avatarId = -1 WHERE username = ?;');
 
 const querySchema = { type: 'object', required: ['iStart', 'iEnd'], properties: { iStart: { type: 'integer', minimum: 0 }, iEnd: { type: 'integer', minimum: 0 } } }
-const bodySchema = { type: 'object', required: ['opponent', 'myScore', 'opponentScore'], properties: { opponent: { type: 'string' }, myScore: { type: 'integer', minimum: 0 }, opponentScore: { type: 'integer', minimum: 0 } } }
 const querySchemaMatchHistory = { type: 'object', required: ['game', 'iStart', 'iEnd'], properties: { game: { type: 'string' }, iStart: { type: 'integer', minimum: 0 }, iEnd: { type: 'integer', minimum: 0 } } }
-const bodySchemaMatchHistory = { type: 'object', required: ['game', 'date', 'opponent', 'myScore', 'opponentScore'], properties: { game: { type: 'string' }, date: { type: 'integer', minimum: 0 }, opponent: { type: 'string' }, myScore: { type: 'integer', minimum: 0 }, opponentScore: { type: 'integer', minimum: 0 } } }
+const bodySchemaMatchHistory = { type: 'object', required: ['game', 'date', 'myScore'], properties: { game: { type: 'string' }, date: { type: 'integer', minimum: 0 }, opponent: { type: 'string' }, myScore: { type: 'integer', minimum: 0 }, opponentScore: { type: 'integer', minimum: 0 } } }
 const querySchemaMatchHistoryGame = { type: 'object', required: ['game'], properties: { game: { type: 'string' } } }
 
 export default async function(fastify, options) {
@@ -182,7 +181,7 @@ export default async function(fastify, options) {
 		return gNumberMatches(request, reply, fastify, getUserInfo, getNumberMatches);
 	});
 	fastify.get('/users/:userId/avatar', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		return gAvatar(request, reply, fastify, getAvatarId);
+		return gAvatar(request, reply, fastify, getUserInfo, getAvatarId);
 	});
 	fastify.get('/ping/:userId', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		return gPing(request, reply, fastify, getActivityTime);
@@ -199,7 +198,7 @@ export default async function(fastify, options) {
 		return pMatchHistory(request, reply, fastify, getUserInfo, addMatch, incWinsPong, incLossesPong, incWinsTetris, incLossesTetris);
 	});
 	fastify.post('/users/:userId/avatar', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		return pAvatar(request, reply, fastify, setAvatarId);
+		return pAvatar(request, reply, fastify, getUserInfo, setAvatarId);
 	});
 	fastify.post('/ping', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		return pPing(request, reply, fastify, setActivityTime);
@@ -227,6 +226,6 @@ export default async function(fastify, options) {
 		return dMatchHistory(request, reply, fastify, getUserInfo, deleteMatchHistory, deleteStatsPong, deleteStatsTetris);
 	});
 	fastify.delete('/users/:userId/avatar', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		return dAvatar(request, reply, fastify, deleteAvatarId);
+		return dAvatar(request, reply, fastify, getUserInfo, deleteAvatarId);
 	});
 }
diff --git a/src/api/user/gAvatar.js b/src/api/user/gAvatar.js
index 2323220..362aa2f 100644
--- a/src/api/user/gAvatar.js
+++ b/src/api/user/gAvatar.js
@@ -1,7 +1,27 @@
-export async function gAvatar(request, reply, fastify, getAvatarId) {
+export async function gAvatar(request, reply, fastify, getUserInfo, getAvatarId) {
 	try {
-		;
-		return reply.code(200).send({  });
+		const userId = request.params.userId;
+		if (!getUserInfo.get(userId)) {
+			return reply.code(404).send({ error: "User does not exist" });
+		}
+		const imageId = 1;//getAvatarId.get(userId);
+		if (imageId === -1) {
+			;// return random kanel image
+		}
+		const res = await fetch(`http://localhost:3004/images/${imageId}`, { method: "GET" });
+		if (!res.ok) {
+			console.log("====================================\nAn error on the image API has occured");
+			return reply.code(500).send({ error: "Internal server error" });
+		}
+		for (const [key, value] of res.headers) {
+			reply.header(key, value);
+		}
+		if (res.body) {
+			reply.code(res.statusCode).send(res.body);
+		} else {
+			reply.code(res.statusCode).send();
+		}
+		//return reply.code(200).type(res.header).send(res.body);
 	} catch (err) {
 		fastify.log.error(err);
 		return reply.code(500).send({ error: "Internal server error" });
diff --git a/src/api/user/gMatchHistory.js b/src/api/user/gMatchHistory.js
index 7531ca0..6999c9b 100644
--- a/src/api/user/gMatchHistory.js
+++ b/src/api/user/gMatchHistory.js
@@ -22,6 +22,10 @@ export async function gMatchHistory(request, reply, fastify, getUserInfo, getMat
 			}
 			const resJson = await res.json();
 			resJson.score.date = match.date;
+			if (resJson.score.p2 === "" && resJson.score.p2Score === 0) {
+				delete resJson.score.p2;
+				delete resJson.score.p2Score;
+			}
 			return resJson;
 		});
 		const matchHistory = await Promise.all(promises);
diff --git a/src/api/user/pAvatar.js b/src/api/user/pAvatar.js
index e7e9db6..71fd6ca 100644
--- a/src/api/user/pAvatar.js
+++ b/src/api/user/pAvatar.js
@@ -1,10 +1,16 @@
-export async function pAvatar(request, reply, fastify, setAvatarId) {
+export async function pAvatar(request, reply, fastify, getUserInfo, setAvatarId) {
 	try {
-/*		const res = await fetch('http://localhost:3004/images', { method: "POST", headers: {  } });
+		const userId = request.params.userId;
+		if (!getUserInfo.get(userId)) {
+			return reply.cose(404).send({ error: "User does not exist" });
+		}
+		console.log("====================================\n", request.headers);//==========
+		const res = await fetch('http://localhost:3004/images', { method: "POST", headers: { "Content-Type": "image/webp" }, body: request.body ? JSON.stringify(request.body) : undefined });
 		if (!res.ok) {
 			return reply.code(500).send({ error: "Internal server error" });
 		}
-		const data = await res.json();*/
+		const data = await res.json();
+		setAvatarId.run(data.imageId, userId);
 		return reply.code(200).send({ msg: "Avatar uploaded successfully" });
 	} catch (err) {
 		fastify.log.error(err);
diff --git a/src/api/user/pMatchHistory.js b/src/api/user/pMatchHistory.js
index f22ef38..584b53e 100644
--- a/src/api/user/pMatchHistory.js
+++ b/src/api/user/pMatchHistory.js
@@ -1,10 +1,16 @@
 async function fetchSave(request, reply, userId, addMatch) {
-	const res = await fetch('http://localhost:3003/', { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ p1: userId, p2: request.body.opponent, p1Score: request.body.myScore, p2Score: request.body.opponentScore }) });
+	let opponentName = '';
+	let opponentScore = 0;
+	if (request.body.opponent && request.body.opponentScore) {
+		opponentName = request.body.opponent;
+		opponentScore = request.body.opponentScore;
+	}
+	const res = await fetch('http://localhost:3003/', { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ p1: userId, p2: opponentName, p1Score: request.body.myScore, p2Score: opponentScore }) });
 	if (!res.ok) {
 		throw new Error('Internal server error');
 	}
 	const data = await res.json();
-	addMatch.run(request.body.game, request.body.date, userId, request.body.opponent, data.id);
+	addMatch.run(request.body.game, request.body.date, userId, opponentName, data.id);
 }
 
 export async function pMatchHistory(request, reply, fastify, getUserInfo, addMatch, incWinsPong, incLossesPong, incWinsTetris, incLossesTetris) {
@@ -19,14 +25,19 @@ export async function pMatchHistory(request, reply, fastify, getUserInfo, addMat
 		if (request.body.game !== 'pong' && request.body.game !== 'tetris') {
 			return reply.code(400).send({ error: "Specified game does not exist" });
 		}
+		if (request.body.game === 'pong' && (!request.body.opponent || !request.body.opponentScore)) {
+			return reply.code(400).send({ error: "Game requires two players" });
+		}
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
-		if (!getUserInfo.get(request.body.opponent)) {
-			return reply.code(404).send({ error: "Opponent does not exist" });
-		}
-		if (request.body.opponent === userId) {
-			return reply.code(400).send({ error: "Do you have dementia ? You cannot have played a match against yourself gramps" });
+		if (request.body.opponent) {
+			if (!getUserInfo.get(request.body.opponent)) {
+				return reply.code(404).send({ error: "Opponent does not exist" });
+			}
+			if (request.body.opponent === userId) {
+				return reply.code(400).send({ error: "Do you have dementia ? You cannot have played a match against yourself gramps" });
+			}
 		}
 		await fetchSave(request, reply, userId, addMatch);
 		if (request.body.game === 'pong') {
@@ -38,7 +49,7 @@ export async function pMatchHistory(request, reply, fastify, getUserInfo, addMat
 				incLossesPong.run(userId);
 			}
 		}
-		else if (request.body.game === 'tetris') {
+		else if (request.body.game === 'tetris' && request.body.opponent && request.body.opponentScore) {
 			if (request.body.myScore > request.body.opponentScore) {
 				incWinsTetris.run(userId);
 				incLossesTetris.run(request.body.opponent);

From 86b08240eab689b5c99b8c4a2e91174eb84ee2c6 Mon Sep 17 00:00:00 2001
From: Adam <45126464+KeyZox71@users.noreply.github.com>
Date: Wed, 22 Oct 2025 11:50:05 +0200
Subject: [PATCH 073/109] Add contract directory for smart contract files

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 4406191..24e7168 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@ Press F to pay respect
 │   └── volumes.yml          # Docker volume definitions
 ├── src/                     # Application source code
 │   ├── api/                 # Backend logic (auth, user management)
+│   ├── contract/            # Smart contract files
 │   ├── front/               # Frontend files
 │   └── utils/               # Utility modules (auth, TOTP, etc.)
 ├── flake.nix & flake.lock   # Nix flake configuration

From 6a08241493031f038f1917df3460449243a0179a Mon Sep 17 00:00:00 2001
From: Tzvetan Trave <tzvetan.trave@abadcafe.org>
Date: Wed, 22 Oct 2025 19:46:25 +0200
Subject: [PATCH 074/109] merged image API in user API

---
 Justfile                  |   4 --
 doc/user/avatar.md        | 120 ++++++++++++++++++++++++++++++++++++++
 src/api/images/dImage.js  |  10 ----
 src/api/images/default.js |  86 ---------------------------
 src/api/images/gImage.js  |  13 -----
 src/api/images/pImage.js  |  33 -----------
 src/api/user/dAvatar.js   |   7 ++-
 src/api/user/default.js   |  25 ++++++--
 src/api/user/gAvatar.js   |  25 +++-----
 src/api/user/pAvatar.js   |  36 +++++++++---
 src/api/user/uAvatar.js   |  45 ++++++++++++++
 src/start.js              |  11 ----
 12 files changed, 228 insertions(+), 187 deletions(-)
 create mode 100644 doc/user/avatar.md
 delete mode 100644 src/api/images/dImage.js
 delete mode 100644 src/api/images/default.js
 delete mode 100644 src/api/images/gImage.js
 delete mode 100644 src/api/images/pImage.js
 create mode 100644 src/api/user/uAvatar.js

diff --git a/Justfile b/Justfile
index fe4ea0f..ad2eb32 100644
--- a/Justfile
+++ b/Justfile
@@ -11,10 +11,6 @@ set dotenv-load
 @user $FASTIFY_LOG_LEVEL="info" $FASTIFY_PRETTY_LOGS="true":
 	fastify start src/api/user/default.js
 
-# For launching the images api
-@images $FASTIFY_LOG_LEVEL="info" $FASTIFY_PRETTY_LOGS="true":
-	fastify start src/api/images/default.js
-
 @scoreStore $FASTIFY_LOG_LEVEL="info" $FASTIFY_PRETTY_LOGS="true":
 	fastify start src/api/scoreStore/default.js
 
diff --git a/doc/user/avatar.md b/doc/user/avatar.md
new file mode 100644
index 0000000..d3232e4
--- /dev/null
+++ b/doc/user/avatar.md
@@ -0,0 +1,120 @@
+# Avatar
+
+Available endpoints:
+- POST `/users/:userId/avatar`
+- GET `/users/:userId/avatar`
+- PATCH `/users/:userId/avatar`
+- DELETE `/users/:userId/avatar`
+
+Common return:
+- 500 with response 
+```json
+{
+    "error": "Internal server error"
+}
+```
+
+## POST /users/:userId/avatar
+
+Used to upload an avatar
+
+Input needed :
+```json
+{
+	<FormData object containing the file>
+}
+```
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "Avatar uploaded successfully"
+}
+```
+- 400 with response (if the file is too large, or file is missing, or it is missing a file name, or it is missing a mime type)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if the user does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## GET /users/:userId/avatar
+
+Used to download an avatar
+
+Input needed :
+```json
+{
+	<FormData object containing the file>
+}
+```
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "Avatar uploaded successfully"
+}
+```
+- 404 with response (if the user does not exist, or the user does not have an assigned avatar, or the image does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## PATCH /users/:userId/avatar
+
+Used to modify an avatar
+
+Input needed :
+```json
+{
+	<FormData object containing the file>
+}
+```
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "Avatar modified successfully"
+}
+```
+- 400 with response (if the file is too large, or file is missing, or it is missing a file name, or it is missing a mime type)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+- 404 with response (if the user does not exist)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
+
+## DELETE /users/:userId/avatar
+
+Used to delete an avatar
+
+Can return:
+- 200 with response
+```json
+{
+	"msg": "Avatar deleted successfully"
+}
+```
+- 404 with response (if the user does not exist, or the user does not have an assigned avatar)
+```json
+{
+	"error": "<corresponding error>"
+}
+```
diff --git a/src/api/images/dImage.js b/src/api/images/dImage.js
deleted file mode 100644
index 5b18db7..0000000
--- a/src/api/images/dImage.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export async function dImage(request, reply, fastify, deleteImage) {
-	try {
-		const imageId = Number(request.params.imageId);
-		deleteImage.run(imageId);
-		return reply.code(200).send({ msg: "Image deleted successfully" });
-	} catch (err) {
-		fastify.log.error(err);
-		return reply.code(500).send({ error: "Internal server error" });
-	}
-}
diff --git a/src/api/images/default.js b/src/api/images/default.js
deleted file mode 100644
index 569be87..0000000
--- a/src/api/images/default.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import fastifyJWT from '@fastify/jwt';
-import fastifyCookie from '@fastify/cookie';
-import Database from 'better-sqlite3';
-import multipart from '@fastify/multipart';
-
-import { gImage } from './gImage.js';
-import { pImage } from './pImage.js';
-import { dImage } from './dImage.js';
-
-const env = process.env.NODE_ENV || 'development';
-
-let database;
-if (!env || env === 'development') {
-	database = new Database(':memory:', { verbose: console.log });
-} else {
-	const dbPath = process.env.DB_PATH || '/db/db.sqlite'
-	database = new Database(dbPath);
-}
-
-function prepareDB() {
-	database.exec(`
-		CREATE TABLE IF NOT EXISTS images (
-			imageId INTEGER PRIMARY KEY AUTOINCREMENT,
-			fileName TEXT,
-			mimeType TEXT,
-			data BLOB
-		) STRICT
-	`);
-}
-
-prepareDB();
-
-// POST
-const postImage = database.prepare('INSERT INTO images (fileName, mimeType, data) VALUES (?, ?, ?);');
-
-// GET
-const getImage = database.prepare('SELECT fileName, mimeType, data FROM images WHERE imageId = ?;');
-
-// DELETE
-const deleteImage = database.prepare('DELETE FROM images WHERE imageId = ?;');
-
-export default async function(fastify, options) {
-	fastify.register(fastifyJWT, {
-		secret: process.env.JWT_SECRET || '123456789101112131415161718192021',
-		cookie: {
-			cookieName: 'token',
-		},
-	});
-	fastify.register(fastifyCookie);
-	fastify.register(multipart, { limits: { fileSize: 2 * 1024 * 1024 } });
-
-	fastify.decorate('authenticate', async function(request, reply) {
-		try {
-			const jwt = await request.jwtVerify();
-			request.user = jwt.user;
-		} catch (err) {
-			reply.code(401).send({ error: 'Unauthorized' });
-		}
-	});
-
-	fastify.decorate('authenticateAdmin', async function(request, reply) {
-		try {
-			const jwt = await request.jwtVerify();
-			if (jwt.user !== 'admin') {
-				throw ('You lack administrator privileges');
-			}
-		} catch (err) {
-			reply.code(401).send({ error: 'Unauthorized' });
-		}
-	});
-
-	// GET
-	fastify.get('/images/:imageId', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		return gImage(request, reply, fastify, getImage);
-	});
-
-	// POST
-	fastify.post('/images', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		return pImage(request, reply, fastify, postImage);
-	});
-
-	// DELETE
-	fastify.delete('/images/:imageId', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		return dImage(request, reply, fastify, deleteImage);
-	});
-}
diff --git a/src/api/images/gImage.js b/src/api/images/gImage.js
deleted file mode 100644
index abbaa42..0000000
--- a/src/api/images/gImage.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export async function gImage(request, reply, fastify, getImage) {
-	try {
-		const imageId = Number(request.params.imageId);
-		const image = getImage.get(imageId);
-		if (!image) {
-			return reply.code(404).send({ error: "Image does not exist" });
-		}
-		return reply.code(200).type(image.mimeType).header('Content-Disposition', `inline; filename="${image.fileName}"`).send(image.data);
-	} catch (err) {
-		fastify.log.error(err);
-		return reply.code(500).send({ error: "Internal server error" });
-	}
-}
diff --git a/src/api/images/pImage.js b/src/api/images/pImage.js
deleted file mode 100644
index d3b930b..0000000
--- a/src/api/images/pImage.js
+++ /dev/null
@@ -1,33 +0,0 @@
-export async function pImage(request, reply, fastify, postImage) {
-	try {
-		const parts = request.parts();
-		for await (const part of parts) {
-			if (part.file) {
-				const chunks = [];
-				for await (const chunk of part.file) {
-					chunks.push(chunk);
-				}
-				const buffer = Buffer.concat(chunks);
-				if (!part.filename || part.filename.trim() === '') {
-					return reply.code(400).send({ error: "Missing filename" });
-				}
-				if (!part.mimetype || part.mimetype.trim() === '') {
-					return reply.code(400).send({ error: "Missing mimetype" });
-				}
-				const ext = part.filename.toLowerCase().substring(part.filename.lastIndexOf('.'));
-				if (ext !== 'webp') {
-					return reply.code(400).send({ error: "Wrong file extension" });
-				}
-				// check size max here ?
-				// convert image to webp using sharp
-				//sharp(buffer, ).toFile();
-				const id = postImage.run(part.filename, part.mimetype, buffer);
-				return reply.code(200).send({ msg: "Image uploaded successfully", imageId: id.lastInsertRowid });
-			}
-		}
-		return reply.code(400).send({ error: "No file uploaded" });
-	} catch (err) {
-		fastify.log.error(err);
-		return reply.code(500).send({ error: "Internal server error" });
-	}
-}
diff --git a/src/api/user/dAvatar.js b/src/api/user/dAvatar.js
index 56f9db4..dbd634a 100644
--- a/src/api/user/dAvatar.js
+++ b/src/api/user/dAvatar.js
@@ -1,9 +1,14 @@
-export async function dAvatar(request, reply, fastify, getUserInfo, deleteAvatarId) {
+export async function dAvatar(request, reply, fastify, getUserInfo, getAvatarId, deleteAvatarId, deleteImage) {
 	try {
 		const userId = request.params.userId;
 		if (!getUserInfo.get(userId)) {
 			return reply.cose(404).send({ error: "User does not exist" });
 		}
+		const imageId = getAvatarId.get(userId);
+		if (imageId.avatarId === -1) {
+			return reply.code(404).send({ error: "User does not have an avatar" });
+		}
+		deleteImage.run(imageId.avatarId);
 		deleteAvatarId.run(userId);
 		return reply.code(200).send({ msg: "Avatar deleted successfully" });
 	} catch (err) {
diff --git a/src/api/user/default.js b/src/api/user/default.js
index 204e2c7..bbce5ab 100644
--- a/src/api/user/default.js
+++ b/src/api/user/default.js
@@ -1,6 +1,7 @@
 import fastifyJWT from '@fastify/jwt';
 import fastifyCookie from '@fastify/cookie';
 import Database from 'better-sqlite3';
+import multipart from '@fastify/multipart';
 
 import { gUsers } from './gUsers.js';
 import { gUser } from './gUser.js';
@@ -20,6 +21,7 @@ import { dFriend } from './dFriend.js';
 import { dMatchHistory } from './dMatchHistory.js';
 import { pAvatar } from './pAvatar.js';
 import { gAvatar } from './gAvatar.js';
+import { uAvatar } from './uAvatar.js';
 import { dAvatar } from './dAvatar.js';
 import { pPing } from './pPing.js';
 import { gPing } from './gPing.js';
@@ -80,6 +82,14 @@ function prepareDB() {
 			time TEXT
 		) STRICT
 	`);
+	database.exec(`
+		CREATE TABLE IF NOT EXISTS images (
+			imageId INTEGER PRIMARY KEY AUTOINCREMENT,
+			fileName TEXT,
+			mimeType TEXT,
+			data BLOB
+		) STRICT
+	`);
 }
 
 prepareDB();
@@ -93,6 +103,7 @@ const incLossesPong = database.prepare('UPDATE userData SET pongLosses = pongLos
 const incWinsTetris = database.prepare('UPDATE userData SET tetrisWins = tetrisWins + 1 WHERE username = ?;');
 const incLossesTetris = database.prepare('UPDATE userData SET tetrisLosses = tetrisLosses + 1 WHERE username = ?');
 const setAvatarId = database.prepare('UPDATE userData SET avatarId = ? WHERE username = ?;');
+const postImage = database.prepare('INSERT INTO images (fileName, mimeType, data) VALUES (?, ?, ?);');
 const setActivityTime = database.prepare(`
   INSERT INTO activityTime (username, time)
   VALUES (?, ?)
@@ -113,6 +124,7 @@ const getNumberUsers = database.prepare('SELECT COUNT (DISTINCT username) AS n_u
 const getNumberFriends = database.prepare('SELECT COUNT (DISTINCT friendName) AS n_friends FROM friends WHERE username = ?;');
 const getNumberMatches = database.prepare('SELECT COUNT (DISTINCT id) AS n_matches FROM matchHistory WHERE game = ? AND ? IN (player1, player2);');
 const getAvatarId = database.prepare('SELECT avatarId FROM userData WHERE username = ?;');
+const getImage = database.prepare('SELECT fileName, mimeType, data FROM images WHERE imageId = ?;');
 const getActivityTime = database.prepare('SELECT time FROM activityTime WHERE username = ?;')
 
 // DELETE
@@ -123,6 +135,7 @@ const deleteMatchHistory = database.prepare('DELETE FROM matchHistory WHERE game
 const deleteStatsPong = database.prepare('UPDATE userData SET pongWins = 0, pongLosses = 0 WHERE username = ?;');
 const deleteStatsTetris = database.prepare('UPDATE userData SET tetrisWins = 0, tetrisLosses = 0 WHERE username = ?;');
 const deleteAvatarId = database.prepare('UPDATE userData SET avatarId = -1 WHERE username = ?;');
+const deleteImage = database.prepare('DELETE FROM images WHERE imageId = ?;');
 
 const querySchema = { type: 'object', required: ['iStart', 'iEnd'], properties: { iStart: { type: 'integer', minimum: 0 }, iEnd: { type: 'integer', minimum: 0 } } }
 const querySchemaMatchHistory = { type: 'object', required: ['game', 'iStart', 'iEnd'], properties: { game: { type: 'string' }, iStart: { type: 'integer', minimum: 0 }, iEnd: { type: 'integer', minimum: 0 } } }
@@ -137,6 +150,7 @@ export default async function(fastify, options) {
 		},
 	});
 	fastify.register(fastifyCookie);
+	fastify.register(multipart, { limits: { fileSize: 2 * 1024 * 1024 + 1 } });
 
 	fastify.decorate('authenticate', async function(request, reply) {
 		try {
@@ -181,7 +195,7 @@ export default async function(fastify, options) {
 		return gNumberMatches(request, reply, fastify, getUserInfo, getNumberMatches);
 	});
 	fastify.get('/users/:userId/avatar', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		return gAvatar(request, reply, fastify, getUserInfo, getAvatarId);
+		return gAvatar(request, reply, fastify, getUserInfo, getAvatarId, getImage);
 	});
 	fastify.get('/ping/:userId', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		return gPing(request, reply, fastify, getActivityTime);
@@ -197,14 +211,17 @@ export default async function(fastify, options) {
 	fastify.post('/users/:userId/matchHistory', { preHandler: [fastify.authenticate], schema: { body: bodySchemaMatchHistory } }, async (request, reply) => {
 		return pMatchHistory(request, reply, fastify, getUserInfo, addMatch, incWinsPong, incLossesPong, incWinsTetris, incLossesTetris);
 	});
-	fastify.post('/users/:userId/avatar', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		return pAvatar(request, reply, fastify, getUserInfo, setAvatarId);
+	fastify.post('/users/:userId/avatar',/* { preHandler: [fastify.authenticate] },*/ async (request, reply) => {
+		return pAvatar(request, reply, fastify, getUserInfo, setAvatarId, postImage);
 	});
 	fastify.post('/ping', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		return pPing(request, reply, fastify, setActivityTime);
 	})
 
 	// PATCH
+	fastify.patch('/users/:userId/avatar', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+		return uAvatar(request, reply, fastify, getUserInfo, setAvatarId, getAvatarId, deleteAvatarId, postImage, deleteImage);
+	});
 	fastify.patch('/users/:userId/:member', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		return uMember(request, reply, fastify, getUserInfo, changeDisplayName, changeAvatarId);
 	});
@@ -226,6 +243,6 @@ export default async function(fastify, options) {
 		return dMatchHistory(request, reply, fastify, getUserInfo, deleteMatchHistory, deleteStatsPong, deleteStatsTetris);
 	});
 	fastify.delete('/users/:userId/avatar', { preHandler: [fastify.authenticate] }, async (request, reply) => {
-		return dAvatar(request, reply, fastify, getUserInfo, deleteAvatarId);
+		return dAvatar(request, reply, fastify, getUserInfo, getAvatarId, deleteAvatarId, deleteImage);
 	});
 }
diff --git a/src/api/user/gAvatar.js b/src/api/user/gAvatar.js
index 362aa2f..6c0d3f6 100644
--- a/src/api/user/gAvatar.js
+++ b/src/api/user/gAvatar.js
@@ -1,27 +1,18 @@
-export async function gAvatar(request, reply, fastify, getUserInfo, getAvatarId) {
+export async function gAvatar(request, reply, fastify, getUserInfo, getAvatarId, getImage) {
 	try {
 		const userId = request.params.userId;
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
-		const imageId = 1;//getAvatarId.get(userId);
-		if (imageId === -1) {
-			;// return random kanel image
+		const imageId = getAvatarId.get(userId);
+		if (imageId.avatarId === -1) {
+			return reply.code(404).send({ error: "User does not have an avatar" });
 		}
-		const res = await fetch(`http://localhost:3004/images/${imageId}`, { method: "GET" });
-		if (!res.ok) {
-			console.log("====================================\nAn error on the image API has occured");
-			return reply.code(500).send({ error: "Internal server error" });
+		const image = getImage.get(imageId.avatarId);
+		if (!image) {
+			return reply.code(404).send({ error: "Avatar does not exist" });
 		}
-		for (const [key, value] of res.headers) {
-			reply.header(key, value);
-		}
-		if (res.body) {
-			reply.code(res.statusCode).send(res.body);
-		} else {
-			reply.code(res.statusCode).send();
-		}
-		//return reply.code(200).type(res.header).send(res.body);
+		return reply.code(200).type(image.mimeType).send(image.data);
 	} catch (err) {
 		fastify.log.error(err);
 		return reply.code(500).send({ error: "Internal server error" });
diff --git a/src/api/user/pAvatar.js b/src/api/user/pAvatar.js
index 71fd6ca..a49ef02 100644
--- a/src/api/user/pAvatar.js
+++ b/src/api/user/pAvatar.js
@@ -1,17 +1,37 @@
-export async function pAvatar(request, reply, fastify, getUserInfo, setAvatarId) {
+import sharp from 'sharp';
+
+export async function pAvatar(request, reply, fastify, getUserInfo, setAvatarId, postImage) {
 	try {
 		const userId = request.params.userId;
 		if (!getUserInfo.get(userId)) {
 			return reply.cose(404).send({ error: "User does not exist" });
 		}
-		console.log("====================================\n", request.headers);//==========
-		const res = await fetch('http://localhost:3004/images', { method: "POST", headers: { "Content-Type": "image/webp" }, body: request.body ? JSON.stringify(request.body) : undefined });
-		if (!res.ok) {
-			return reply.code(500).send({ error: "Internal server error" });
+		const parts = request.parts();
+		for await (const part of parts) {
+			if (part.file) {
+				let size = 0;
+				const chunks = [];
+				for await (const chunk of part.file) {
+					size += chunk.length;
+					chunks.push(chunk);
+				}
+				if (size === 2 * 1024 * 1024 + 1) {
+					return reply.code(400).send({ error: "File too large" });
+				}
+				const buffer = Buffer.concat(chunks);
+				if (!part.filename || part.filename.trim() === '') {
+					return reply.code(400).send({ error: "Missing filename" });
+				}
+				if (!part.mimetype || part.mimetype.trim() === '') {
+					return reply.code(400).send({ error: "Missing mimetype" });
+				}
+				const webpBuffer = await sharp(buffer).toFormat('webp').toBuffer();
+				const imageId = postImage.run(part.filename, part.mimetype, webpBuffer);
+				setAvatarId.run(imageId.lastInsertRowid, userId);
+				return reply.code(200).send({ msg: "Avatar uploaded successfully" });
+			}
 		}
-		const data = await res.json();
-		setAvatarId.run(data.imageId, userId);
-		return reply.code(200).send({ msg: "Avatar uploaded successfully" });
+		return reply.code(400).send({ error: "No avatar uploaded" });
 	} catch (err) {
 		fastify.log.error(err);
 		return reply.code(500).send({ error: "Internal server error" });
diff --git a/src/api/user/uAvatar.js b/src/api/user/uAvatar.js
new file mode 100644
index 0000000..b5b8b72
--- /dev/null
+++ b/src/api/user/uAvatar.js
@@ -0,0 +1,45 @@
+import sharp from 'sharp';
+
+export async function uAvatar(request, reply, fastify, getUserInfo, setAvatarId, getAvatarId, deleteAvatarId, postImage, deleteImage) {
+	try {
+		const userId = request.params.userId;
+		if (!getUserInfo.get(userId)) {
+			return reply.cose(404).send({ error: "User does not exist" });
+		}
+		deleteAvatarId.run(userId);
+		const parts = request.parts();
+		for await (const part of parts) {
+			if (part.file) {
+				let size = 0;
+				const chunks = [];
+				for await (const chunk of part.file) {
+					size += chunk.length;
+					chunks.push(chunk);
+				}
+				if (size === 2 * 1024 * 1024 + 1) {
+					return reply.code(400).send({ error: "File too large" });
+				}
+				const buffer = Buffer.concat(chunks);
+				if (!part.filename || part.filename.trim() === '') {
+					return reply.code(400).send({ error: "Missing filename" });
+				}
+				if (!part.mimetype || part.mimetype.trim() === '') {
+					return reply.code(400).send({ error: "Missing mimetype" });
+				}
+				const webpBuffer = await sharp(buffer).toFormat('webp').toBuffer();
+				const imageId = postImage.run(part.filename, part.mimetype, webpBuffer);
+				const oldImageId = getAvatarId.get(userId);
+				if (oldImageId.avatarId !== -1) {
+					deleteImage.run(oldImageId.avatarId);
+					deleteAvatarId.run(userId);
+				}
+				setAvatarId.run(imageId.lastInsertRowid, userId);
+				return reply.code(200).send({ msg: "Avatar modified successfully" });
+			}
+		}
+		return reply.code(400).send({ error: "No avatar modified" });
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}
diff --git a/src/start.js b/src/start.js
index c99534d..df7bc0e 100644
--- a/src/start.js
+++ b/src/start.js
@@ -1,7 +1,6 @@
 import Fastify from 'fastify';
 import authApi from './api/auth/default.js';
 import userApi from './api/user/default.js';
-import imagesApi from './api/images/default.js';
 import scoreApi from './api/scoreStore/default.js';
 import fs from 'fs';
 import path from 'path';
@@ -69,16 +68,6 @@ async function start() {
 		servers.push(score);
 	}
 
-	if (target === 'images' || target === 'all') {
-		const images = Fastify({ logger: loggerOption('images') });
-		images.register(imagesApi);
-		const port = target === 'all' ? 3004 : 3000;
-		const host = target === 'all' ? '127.0.0.1' : '0.0.0.0';
-		await images.listen({ port, host });
-		console.log(`Images API listening on http://${host}:${port}`);
-		servers.push(images);
-	}
-
 	// Graceful shutdown on SIGINT
 	process.on('SIGINT', async () => {
 		console.log('SIGINT received, closing servers...');

From 469e761f8dfec42c131792e0d023161b879473b2 Mon Sep 17 00:00:00 2001
From: Tzvetan Trave <tzvetan.trave@abadcafe.org>
Date: Wed, 22 Oct 2025 20:04:57 +0200
Subject: [PATCH 075/109] finished avatars

---
 src/api/user/default.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/api/user/default.js b/src/api/user/default.js
index bbce5ab..a2bb2aa 100644
--- a/src/api/user/default.js
+++ b/src/api/user/default.js
@@ -137,10 +137,11 @@ const deleteStatsTetris = database.prepare('UPDATE userData SET tetrisWins = 0,
 const deleteAvatarId = database.prepare('UPDATE userData SET avatarId = -1 WHERE username = ?;');
 const deleteImage = database.prepare('DELETE FROM images WHERE imageId = ?;');
 
-const querySchema = { type: 'object', required: ['iStart', 'iEnd'], properties: { iStart: { type: 'integer', minimum: 0 }, iEnd: { type: 'integer', minimum: 0 } } }
-const querySchemaMatchHistory = { type: 'object', required: ['game', 'iStart', 'iEnd'], properties: { game: { type: 'string' }, iStart: { type: 'integer', minimum: 0 }, iEnd: { type: 'integer', minimum: 0 } } }
-const bodySchemaMatchHistory = { type: 'object', required: ['game', 'date', 'myScore'], properties: { game: { type: 'string' }, date: { type: 'integer', minimum: 0 }, opponent: { type: 'string' }, myScore: { type: 'integer', minimum: 0 }, opponentScore: { type: 'integer', minimum: 0 } } }
-const querySchemaMatchHistoryGame = { type: 'object', required: ['game'], properties: { game: { type: 'string' } } }
+const querySchema = { type: 'object', required: ['iStart', 'iEnd'], properties: { iStart: { type: 'integer', minimum: 0 }, iEnd: { type: 'integer', minimum: 0 } } };
+const bodySchemaMember = { type: 'object', properties: { displayName: { type: 'string' } } };
+const querySchemaMatchHistory = { type: 'object', required: ['game', 'iStart', 'iEnd'], properties: { game: { type: 'string' }, iStart: { type: 'integer', minimum: 0 }, iEnd: { type: 'integer', minimum: 0 } } };
+const bodySchemaMatchHistory = { type: 'object', required: ['game', 'date', 'myScore'], properties: { game: { type: 'string' }, date: { type: 'integer', minimum: 0 }, opponent: { type: 'string' }, myScore: { type: 'integer', minimum: 0 }, opponentScore: { type: 'integer', minimum: 0 } } };
+const querySchemaMatchHistoryGame = { type: 'object', required: ['game'], properties: { game: { type: 'string' } } };
 
 export default async function(fastify, options) {
 	fastify.register(fastifyJWT, {
@@ -211,7 +212,7 @@ export default async function(fastify, options) {
 	fastify.post('/users/:userId/matchHistory', { preHandler: [fastify.authenticate], schema: { body: bodySchemaMatchHistory } }, async (request, reply) => {
 		return pMatchHistory(request, reply, fastify, getUserInfo, addMatch, incWinsPong, incLossesPong, incWinsTetris, incLossesTetris);
 	});
-	fastify.post('/users/:userId/avatar',/* { preHandler: [fastify.authenticate] },*/ async (request, reply) => {
+	fastify.post('/users/:userId/avatar', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		return pAvatar(request, reply, fastify, getUserInfo, setAvatarId, postImage);
 	});
 	fastify.post('/ping', { preHandler: [fastify.authenticate] }, async (request, reply) => {
@@ -222,7 +223,7 @@ export default async function(fastify, options) {
 	fastify.patch('/users/:userId/avatar', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		return uAvatar(request, reply, fastify, getUserInfo, setAvatarId, getAvatarId, deleteAvatarId, postImage, deleteImage);
 	});
-	fastify.patch('/users/:userId/:member', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+	fastify.patch('/users/:userId/:member', { preHandler: [fastify.authenticate], schema: { body: bodySchemaMember } }, async (request, reply) => {
 		return uMember(request, reply, fastify, getUserInfo, changeDisplayName, changeAvatarId);
 	});
 

From c256dd833a1c223692ec34331e931e905e4c11d7 Mon Sep 17 00:00:00 2001
From: Tzvetan Trave <tzvetan.trave@abadcafe.org>
Date: Wed, 22 Oct 2025 20:13:46 +0200
Subject: [PATCH 076/109] increased max pfp size

---
 src/api/user/pAvatar.js | 2 +-
 src/api/user/uAvatar.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/user/pAvatar.js b/src/api/user/pAvatar.js
index a49ef02..5b9f3a9 100644
--- a/src/api/user/pAvatar.js
+++ b/src/api/user/pAvatar.js
@@ -15,7 +15,7 @@ export async function pAvatar(request, reply, fastify, getUserInfo, setAvatarId,
 					size += chunk.length;
 					chunks.push(chunk);
 				}
-				if (size === 2 * 1024 * 1024 + 1) {
+				if (size === 5 * 1024 * 1024 + 1) {
 					return reply.code(400).send({ error: "File too large" });
 				}
 				const buffer = Buffer.concat(chunks);
diff --git a/src/api/user/uAvatar.js b/src/api/user/uAvatar.js
index b5b8b72..1076e44 100644
--- a/src/api/user/uAvatar.js
+++ b/src/api/user/uAvatar.js
@@ -16,7 +16,7 @@ export async function uAvatar(request, reply, fastify, getUserInfo, setAvatarId,
 					size += chunk.length;
 					chunks.push(chunk);
 				}
-				if (size === 2 * 1024 * 1024 + 1) {
+				if (size === 5 * 1024 * 1024 + 1) {
 					return reply.code(400).send({ error: "File too large" });
 				}
 				const buffer = Buffer.concat(chunks);

From 5bbda2ab816a4394b12cc622df8d151bb5750a9d Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 13:20:13 +0200
Subject: [PATCH 077/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat:=20a?=
 =?UTF-8?q?dded=202fa=20to=20login=20page=20:D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/views/LoginPage.ts | 97 +++++++++++++++++++++++++-
 src/front/static/ts/views/Profile.ts   |  1 +
 2 files changed, 95 insertions(+), 3 deletions(-)

diff --git a/src/front/static/ts/views/LoginPage.ts b/src/front/static/ts/views/LoginPage.ts
index 0ed05c1..a7159cb 100644
--- a/src/front/static/ts/views/LoginPage.ts
+++ b/src/front/static/ts/views/LoginPage.ts
@@ -53,7 +53,40 @@ export default class extends Aview {
 	}
 
 	async run() {
-    dragElement(document.getElementById("window"));
+		dragElement(document.getElementById("window"));
+
+		const totpVerify = async () => {
+			const username = (document.getElementById("username") as HTMLInputElement).value;
+			const password = (document.getElementById("password") as HTMLInputElement).value;
+			const totpPin = (document.getElementById('totpPin') as HTMLInputElement).value;
+			try {
+				const data_req = await fetch("http://localhost:3001/login", {
+					method: "POST",
+					headers: { "Content-Type": "application/json", },
+					credentials: "include",
+					body: JSON.stringify({ user: username, password: password, token: totpPin }),
+				});
+				if (data_req.status === 200) {
+					isLogged();
+					navigationManager("/");
+				} else if (data_req.status === 401) {
+					const data = await data_req.json();
+
+					const error = document.createElement("p");
+					error.innerHTML = data.error;
+					error.classList.add("text-red-700", "dark:text-red-500");
+
+					idWindow.appendChild(error);
+				} else {
+					console.log(data_req.status)
+					console.log(await data_req.json())
+					// throw new Error("invalid response");
+				}
+			} catch (error) {
+				console.error(error);
+			}
+		}
+
 		const login = async () => {
 			const username = (document.getElementById("username") as HTMLInputElement).value;
 			const password = (document.getElementById("password") as HTMLInputElement).value;
@@ -71,11 +104,69 @@ export default class extends Aview {
 					isLogged();
 					navigationManager("/");
 				}
+				else if (data_req.status === 402) {
+					const popup: HTMLDivElement = document.createElement("div");
+					popup.id = "2fa-popup";
+					popup.classList.add("z-10", "absolute", "default-border");
+					const header = popup.appendChild(document.createElement("div"));;
+					header.classList.add("bg-linear-to-r", "from-orange-200", "to-orange-300", "flex", "flex-row", "min-w-35", "justify-between", "px-2");
+					header.id = "2fa-header";
+					header.appendChild(document.createElement("span")).innerText = "2fa.ts";
+					const btn = header.appendChild(document.createElement("button"));
+					btn.innerText = " × ";
+					btn.onclick = () => { document.getElementById("2fa-popup").remove();  };
+
+					const popup_content: HTMLSpanElement = popup.appendChild(document.createElement("div"));
+					popup_content.id = "2fa-popup-content";
+					popup_content.classList.add("flex", "flex-col", "bg-neutral-200", "dark:bg-neutral-800", "p-6", "pt-4", "text-neutral-900", "dark:text-white", "space-y-4");
+
+					const tokenInput = document.createElement("input");
+					tokenInput.type = "tel";
+					tokenInput.id = "totpPin";
+					tokenInput.name = "totpPin";
+					tokenInput.placeholder = "TOTP code";
+					tokenInput.required = true;
+					tokenInput.autocomplete = "off";
+					tokenInput.pattern = "[0-9]*";
+					tokenInput.setAttribute("inputmode", "numeric");
+					tokenInput.classList.add("bg-white", "text-neutral-900","w-full", "px-4", "py-2", "input-border");
+
+					const tokenSubmit = document.createElement("button");
+					tokenSubmit.type = "submit";
+					tokenSubmit.classList.add("default-button", "w-full");
+					tokenSubmit.id = "totp-submit";
+					tokenSubmit.innerHTML = "submit";
+
+					const tokenTitle = document.createElement("h1");
+					tokenTitle.innerHTML = `hey ${username}, please submit your 2fa code below :`;
+					tokenTitle.classList.add("text-gray-900", "dark_text-white", "text-lg", "pt-0", "pb-4", "justify-center");
+
+					const form = document.createElement("form");
+					form.method = "dialog";
+					form.classList.add("space-y-4");
+					form.appendChild(tokenTitle);
+					form.appendChild(tokenInput);
+					form.appendChild(tokenSubmit);
+
+					popup_content.appendChild(form);
+
+					const uu = document.getElementById("username") as HTMLInputElement;
+					const pass = document.getElementById("password") as HTMLInputElement;
+
+					uu.disabled = true;
+					pass.disabled = true;
+
+					document.getElementById("app")?.appendChild(popup); 
+					tokenInput.focus();
+					dragElement(document.getElementById("2fa-popup")); 
+
+					document.getElementById("totp-submit")?.addEventListener("click", totpVerify);
+				}
 				else if (data_req.status === 400)
 				{
 				  const data = await data_req.json();
-					document.getElementById("login-error-message").innerHTML = "error: " + data.error;
-					document.getElementById("login-error-message").classList.remove("hidden");
+				  document.getElementById("login-error-message").innerHTML = "error: " + data.error;
+				  document.getElementById("login-error-message").classList.remove("hidden");
 				}
 				else
 				{
diff --git a/src/front/static/ts/views/Profile.ts b/src/front/static/ts/views/Profile.ts
index b80bd0b..fda349f 100644
--- a/src/front/static/ts/views/Profile.ts
+++ b/src/front/static/ts/views/Profile.ts
@@ -127,6 +127,7 @@ export default class extends Aview {
     if (!main)
       return console.error("what");
 
+  // don't read this shit for you mental health
     if (matches.matchHistory) {
       for (let match of matches.matchHistory) {
         const newEntry = document.createElement("li");

From 8da2193d9ef786974bf78ecb0f3c575f37752777 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 14:15:54 +0200
Subject: [PATCH 078/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20working=20error=20handling?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/views/LoginPage.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/front/static/ts/views/LoginPage.ts b/src/front/static/ts/views/LoginPage.ts
index a7159cb..da0deec 100644
--- a/src/front/static/ts/views/LoginPage.ts
+++ b/src/front/static/ts/views/LoginPage.ts
@@ -59,6 +59,7 @@ export default class extends Aview {
 			const username = (document.getElementById("username") as HTMLInputElement).value;
 			const password = (document.getElementById("password") as HTMLInputElement).value;
 			const totpPin = (document.getElementById('totpPin') as HTMLInputElement).value;
+			const idWindow = (document.getElementById('2fa-popup-content') as HTMLInputElement);
 			try {
 				const data_req = await fetch("http://localhost:3001/login", {
 					method: "POST",

From 182452e931c915418057fdf1092fc94037f087c9 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 14:16:31 +0200
Subject: [PATCH 079/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20now=20a=20good=20wallpaper=20for=20whilte=20theme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/front/index.html b/src/front/index.html
index 8532da2..ee61724 100644
--- a/src/front/index.html
+++ b/src/front/index.html
@@ -12,7 +12,7 @@
 
 
 	<!--body class="bg-gray-100 dark:bg-neutral-950 h-screen flex flex-col"-->
-	<body class="bg-[url(https://y-syo.me/res/bg.jpg)] dark:bg-[url(https://api.kanel.ovh/random)] bg-center bg-cover h-screen flex flex-col">
+	<body class="bg-[url(https://api.kanel.ovh/random)] dark:bg-[url(https://api.kanel.ovh/random)] bg-center bg-cover h-screen flex flex-col">
 		<!--script src="https://kanel.ovh/oneko.js"></script-->
 		<!--script src="./static/ts/oneko.js"></script-->
 

From d20597ee6a11203242d0d4e9e64392c9256bb724 Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Thu, 23 Oct 2025 14:46:15 +0200
Subject: [PATCH 080/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip(front):=20partial=20avatar=20implementation=20(a=20lot?=
 =?UTF-8?q?=20of=20reworks=20to=20do)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/index.html                        |  5 +-
 src/front/static/css/style.css              |  1 +
 src/front/static/ts/views/LoginPage.ts      |  2 +-
 src/front/static/ts/views/Profile.ts        | 37 ++++++++---
 src/front/static/ts/views/ProfileMenu.ts    |  1 -
 src/front/static/ts/views/Settings.ts       | 49 ++++++++++++++-
 src/front/static/ts/views/Tetris.ts         | 53 +++++++++++++---
 src/front/static/ts/views/TetrisVersus.ts   |  8 +--
 src/front/static/ts/views/TournamentMenu.ts | 69 ++++++++++++++-------
 tailwind.config.js                          |  8 ++-
 10 files changed, 181 insertions(+), 52 deletions(-)

diff --git a/src/front/index.html b/src/front/index.html
index 8532da2..fd32cc8 100644
--- a/src/front/index.html
+++ b/src/front/index.html
@@ -11,10 +11,7 @@
 
 
 
-	<!--body class="bg-gray-100 dark:bg-neutral-950 h-screen flex flex-col"-->
-	<body class="bg-[url(https://y-syo.me/res/bg.jpg)] dark:bg-[url(https://api.kanel.ovh/random)] bg-center bg-cover h-screen flex flex-col">
-		<!--script src="https://kanel.ovh/oneko.js"></script-->
-		<!--script src="./static/ts/oneko.js"></script-->
+	<body class="bg-[url(https://y-syo.me/res/bg.jpg)] dark:bg-[url(https://api.kanel.ovh/random)] bg-center bg-cover h-screen flex flex-col font-[Lexend]">
 
 		<div class="absolute flex flex-col items-center space-y-5 top-4 left-5">
 			<!--a class="absolute flex flex-col items-center top-4 left-5" href="/pong" data-icon-->
diff --git a/src/front/static/css/style.css b/src/front/static/css/style.css
index 56bb708..65bae17 100644
--- a/src/front/static/css/style.css
+++ b/src/front/static/css/style.css
@@ -1,3 +1,4 @@
+@import url('https://fonts.googleapis.com/css2?family=Lexend:wght@100..900&display=swap');
 @import "tailwindcss";
 @layer utilities {
   .no-scrollbar::-webkit-scrollbar {
diff --git a/src/front/static/ts/views/LoginPage.ts b/src/front/static/ts/views/LoginPage.ts
index 0ed05c1..cffe8fb 100644
--- a/src/front/static/ts/views/LoginPage.ts
+++ b/src/front/static/ts/views/LoginPage.ts
@@ -41,7 +41,7 @@ export default class extends Aview {
 						<img src="https://upload.wikimedia.org/wikipedia/commons/c/c1/Google_%22G%22_logo.svg" height=20 width=20 class="mr-2 justify-self-start" />
 						login with John Google
 					</a>
-					<a target="_blank" href="http://localhost:3001/login/google" class="default-button inline-flex items-center justify-center w-full">
+					<a target="_blank" href="https://rusty.42angouleme.fr/issues/all" class="default-button inline-flex items-center justify-center w-full">
 					  <img src="https://rusty.42angouleme.fr/assets/favicon-bb06adc80c8495db.ico" height=20 width=20 class="mr-2 justify-self-start" />
 						login with Rusty
 					</a>
diff --git a/src/front/static/ts/views/Profile.ts b/src/front/static/ts/views/Profile.ts
index b80bd0b..24faa0a 100644
--- a/src/front/static/ts/views/Profile.ts
+++ b/src/front/static/ts/views/Profile.ts
@@ -44,6 +44,7 @@ export default class extends Aview {
     if (!await isLogged())
       navigationManager("/");
 
+    let pc: number = 0;
     dragElement(document.getElementById("window"));
     let uuid: String;
     uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
@@ -63,6 +64,7 @@ export default class extends Aview {
       credentials: "include",
     });
     let matchCount = await matchCount_req.json();
+    pc += matchCount.n_matches;
 
     let matches_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory?game=pong&iStart=0&iEnd=${matchCount.n_matches}`, {
       method: "GET",
@@ -88,7 +90,9 @@ export default class extends Aview {
         const header = popup.appendChild(document.createElement("div"));
         header.classList.add("bg-linear-to-r", "from-orange-200", "to-orange-300", "flex", "flex-row", "min-w-35", "justify-between", "px-2");
         header.id = `${id}-header`;
-        header.appendChild(document.createElement("span")).innerText = "score.ts";
+        const title = header.appendChild(document.createElement("span"));
+        title.classList.add("font-[Kubasta]");
+        title.innerText = "score-pong.ts";
         const btn = header.appendChild(document.createElement("button"));
         btn.innerText = " × ";
         btn.onclick = () => { document.getElementById(`${id}`).remove();  };
@@ -116,6 +120,7 @@ export default class extends Aview {
       credentials: "include",
     });
     matchCount = await matchCount_req.json();
+    pc += matchCount.n_matches;
 
     matches_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory?game=tetris&iStart=0&iEnd=${matchCount.n_matches}`, {
       method: "GET",
@@ -131,7 +136,11 @@ export default class extends Aview {
       for (let match of matches.matchHistory) {
         const newEntry = document.createElement("li");
         newEntry.classList.add("m-1", "default-button", "bg-neutral-200", "dark:bg-neutral-800", "text-neutral-900", "dark:text-white");
-        newEntry.innerHTML = match.score.p1Score > match.score.p2Score ? `${match.score.p1} - winner` : `${match.score.p2} - winner`;
+        newEntry.innerHTML = match.score.p2 != undefined ?
+          (match.score.p1Score > match.score.p2Score ? `${match.score.p1} - winner` : `${match.score.p2} - winner`)
+        :
+          (`solo game - ${match.score.p1Score}`)
+        ;
         main.insertBefore(newEntry, main.firstChild);
 
         const popup: HTMLDivElement = document.createElement("div");
@@ -141,7 +150,9 @@ export default class extends Aview {
         const header = popup.appendChild(document.createElement("div"));
         header.classList.add("bg-linear-to-r", "from-orange-200", "to-orange-300", "flex", "flex-row", "min-w-35", "justify-between", "px-2");
         header.id = `${id}-header`;
-        header.appendChild(document.createElement("span")).innerText = "score.ts";
+        const title = header.appendChild(document.createElement("span"));
+        title.classList.add("font-[Kubasta]");
+        title.innerText = "score-tetris.ts";
         const btn = header.appendChild(document.createElement("button"));
         btn.innerText = " × ";
         btn.onclick = () => { document.getElementById(`${id}`).remove();  };
@@ -152,7 +163,11 @@ export default class extends Aview {
         popup_content.appendChild(document.createElement("span")).innerText = `${date.toDateString()} ${date.getHours()}:${date.getMinutes().toString().padStart(2, '0')}`;
         const score = popup_content.appendChild(document.createElement("span"));
         score.classList.add();
-        score.innerText = `${match.score.p1} : ${match.score.p1Score} - ${match.score.p2Score} : ${match.score.p2}`;
+        score.innerText = match.score.p2 != undefined ?
+          (`${match.score.p1} : ${match.score.p1Score} - ${match.score.p2Score} : ${match.score.p2}`)
+        :
+          (`${match.score.p1} : ${match.score.p1Score}`)
+        ;
         const tx = popup_content.appendChild(document.createElement("a"));
         tx.href = `https://testnet.snowscan.xyz/tx/${match.tx}`;
         tx.innerText = "transaction proof";
@@ -168,8 +183,12 @@ export default class extends Aview {
     if (!profile) return;
 
     const picture = profile.appendChild(document.createElement("img"));
-    picture.src = "https://api.kanel.ovh/pp";
-    picture.classList.add("text-neutral-900", "dark:text-white", "center", "h-18", "w-18", "mx-3");
+    const a = await fetch(`http://localhost:3002/users/${uuid}/avatar`, {
+      method: "GET",
+      credentials: "include",
+    });
+    picture.src = a.status === 200 ? `http://localhost:3002/users/${uuid}/avatar` : "https://api.kanel.ovh/pp";
+    picture.classList.add("text-neutral-900", "dark:text-white", "center", "h-18", "w-18", "mx-3", "reverse-border");
 
     const nametag = profile.appendChild(document.createElement("div"));
     nametag.innerHTML = `
@@ -180,9 +199,9 @@ export default class extends Aview {
 
     const winrate = profile.appendChild(document.createElement("div"));
     winrate.innerHTML = `
-		  <div> wins: ${userdata.wins} </div>
-			<div> losses: ${userdata.losses} </div>
-			<div> winrate: ${ (userdata.wins != 0 && userdata.losses != 0) ? Math.round(userdata.wins / (userdata.wins + userdata.losses) * 100) + " %" : "-" }</div>
+		  <div> total playcount: ${pc} </div>
+			<div> pong winrate: ${ (userdata.pong.wins == 0 && userdata.pong.losses == 0) ? "-" : Math.round(userdata.pong.wins / (userdata.pong.wins + userdata.pong.losses) * 100) + " %" } </div>
+			<div> tetris winrate: ${ (userdata.tetris.wins == 0 && userdata.tetris.losses == 0) ? "-" : Math.round(userdata.tetris.wins / (userdata.tetris.wins + userdata.tetris.losses) * 100) + " %" } </div>
 		`;
     winrate.classList.add("text-neutral-900", "dark:text-white", "grow", "content-center");
   }
diff --git a/src/front/static/ts/views/ProfileMenu.ts b/src/front/static/ts/views/ProfileMenu.ts
index 68317c0..40d68f6 100644
--- a/src/front/static/ts/views/ProfileMenu.ts
+++ b/src/front/static/ts/views/ProfileMenu.ts
@@ -65,7 +65,6 @@ export default class extends Aview {
 				<hr class="my-2 w-32 reverse-border">
      			<a class="menu-default-button inline-flex items-center justify-center" href="/profile" data-link>profile</a>
      			<a class="menu-default-button inline-flex items-center justify-center" href="/settings" data-link>settings</a>
-				<a class="menu-default-button inline-flex items-center justify-center" href="/friends" data-link>friends</a>
       `;
     }
 
diff --git a/src/front/static/ts/views/Settings.ts b/src/front/static/ts/views/Settings.ts
index 5c70167..06632fa 100644
--- a/src/front/static/ts/views/Settings.ts
+++ b/src/front/static/ts/views/Settings.ts
@@ -24,9 +24,18 @@ export default class extends Aview {
 					<a href="/" data-link> × </a>
 				</div>
 			</div>
-			<div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
-			  <input type="text" id="displayName-input" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
-				<button id="displayName-button" type="submit" class="default-button w-full">change display name</button>
+			<div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-8 reverse-border">
+			  <div class="flex flex-row items-center place-items-center space-x-4">
+					<input type="text" id="displayName-input" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
+					<button id="displayName-button" type="submit" class="default-button w-full">change display name</button>
+				</div>
+				<div id="upload" class="flex flex-row items-center place-items-center space-x-8">
+				  <div id="upload-preview" class="hidden flex flex-col items-center place-items-center space-y-4">
+						<img id="upload-preview-img" class="w-20 h-20" />
+						<button id="upload-submit" type="submit" class="default-button">change avatar</button>
+					</div>
+			    <label for="upload-file" class="default-button">select an avatar...</label><input type="file" id="upload-file" class="hidden" accept="image/*" />
+				</div>
 				<button id="deleteAccount-button" type="submit" class="default-button w-full">delete your account</button>
 			</div>
 		</div>
@@ -80,5 +89,39 @@ export default class extends Aview {
       else
         console.error("xd"); // xd?????????????
     });
+
+    const upload = document.getElementById("upload-file") as HTMLInputElement;
+    upload.addEventListener("change", () => {
+      const fileList: FileList | null = upload.files;
+      if (!fileList)
+        return console.error("empty");
+      if (!fileList[0].type.startsWith("image/")) {
+        console.error("invalid file");
+        return;
+      }
+
+      document.getElementById("upload-preview")?.classList.remove("hidden");
+      const img = document.getElementById("upload-preview-img") as HTMLImageElement;
+      img.classList.remove("hidden");
+
+      const reader = new FileReader();
+      reader.onload = (e) => {
+        if (!e.target)
+          return;
+        img.src = e.target.result as string;
+      };
+
+      reader.readAsDataURL(fileList[0]);
+    });
+
+    (document.getElementById("upload-submit") as HTMLButtonElement).onclick = async () => {
+      const up_req = await fetch(`http://localhost:3002/users/${uuid}/avatar`, {
+        method: "POST",
+        headers: { "Content-Type": upload.files[0].type } ,
+        credentials: "include",
+        body: upload.files[0], //upload uuuh whatever i have to upload
+      });
+      console.log(up_req.status);
+    };
   }
 }
diff --git a/src/front/static/ts/views/Tetris.ts b/src/front/static/ts/views/Tetris.ts
index 61c309a..f5a20d3 100644
--- a/src/front/static/ts/views/Tetris.ts
+++ b/src/front/static/ts/views/Tetris.ts
@@ -509,13 +509,10 @@ export default class extends Aview {
             this.movePiece(this.direction, 0);
           this.move = false;
         }
-
-        /*if (this.keys["ArrowDown"])
-          this.softDrop();*/
       }
 
-      registerListeners() {
-        window.addEventListener("keydown", (e) => {
+      removeListeners() {
+        window.removeEventListener("keydown", (e) => {
           this.keys[e.key] = true;
 
           if (this.isGameOver) return;
@@ -553,13 +550,55 @@ export default class extends Aview {
           }
         });
 
+        document.removeEventListener("keyup", (e) => {
+          this.keys[e.key] = false;
+        });
+      }
+
+      registerListeners() {
+        window.addEventListener("keydown", (e) => {
+          this.keys[e.key] = true;
+
+          if (this.isGameOver) return;
+
+          if (e.key === "p" || e.key === "P" || e.key === "Escape")
+            this.isPaused = !this.isPaused;
+
+          if (this.isPaused) return;
+
+          if (e.key === "ArrowLeft")
+          {
+            this.inputTimestamp = Date.now();
+            this.direction = -1;//this.movePiece(-1, 0);
+            this.move = true;
+          }
+          else if (e.key === "ArrowRight")
+          {
+            this.inputTimestamp = Date.now();
+            this.direction = 1;//this.movePiece(1, 0);
+            this.move = true;
+          }
+          else if (e.key === "ArrowDown") this.softDrop();
+          else if (e.code === "Space") {
+            //e.preventDefault();
+            this.hardDrop();
+          } else if (e.key === "Shift" || e.key === "c" || e.key === "C") {
+            this.hold();
+          } else if (e.key === "x" || e.key === "X" || e.key === "ArrowUp") {
+            //e.preventDefault();
+            this.rotatePiece("cw");
+          }  else if (e.key === "z" || e.key === "Z" || e.key === "Control") {
+            this.rotatePiece("ccw");
+          }
+        });
+
         document.addEventListener("keyup", (e) => {
           this.keys[e.key] = false;
         });
       }
 
       async loop(timestamp: number) {
-        if (!view.running) return;
+        if (!view.running) return this.removeListeners();
         if (!this.lastDrop) this.lastDrop = timestamp;
         if (!this.isPaused)
         {
@@ -596,9 +635,7 @@ export default class extends Aview {
               credentials: "include",
               body: JSON.stringify({
                 "game": "tetris",
-                "opponent": "xd",
                 "myScore": this.score,
-                "opponentScore": 0,
                 "date": Date.now(),
               }),
             });
diff --git a/src/front/static/ts/views/TetrisVersus.ts b/src/front/static/ts/views/TetrisVersus.ts
index 330b8e6..f9debac 100644
--- a/src/front/static/ts/views/TetrisVersus.ts
+++ b/src/front/static/ts/views/TetrisVersus.ts
@@ -606,16 +606,16 @@ export default class extends Aview {
           }
           else if (this.id === 0 ? e.code === "KeyS" : e.code === "Numpad5") this.softDrop();
           else if (this.id === 0 ? e.code === "Space" : e.code === "Numpad0") {
-            e.preventDefault();
+            //e.preventDefault();
             this.hardDrop();
           } else if (this.id === 0 ? e.code === "ShiftLeft" : e.code === "NumpadEnter") {
-            e.preventDefault();
+            //e.preventDefault();
             this.hold();
           } else if (this.id === 0 ? (e.code === "KeyE" || e.code === "KeyW") : (e.code === "Numpad9" || e.code === "Numpad8")) {
-            e.preventDefault();
+            //e.preventDefault();
             this.rotatePiece("cw");
           }  else if (this.id === 0 ? (e.code === "KeyQ" || e.code === "ControlLeft") : e.code === "Numpad7") {
-            e.preventDefault();
+            //e.preventDefault();
             this.rotatePiece("ccw");
           }
         });
diff --git a/src/front/static/ts/views/TournamentMenu.ts b/src/front/static/ts/views/TournamentMenu.ts
index bc2bbd6..00538a8 100644
--- a/src/front/static/ts/views/TournamentMenu.ts
+++ b/src/front/static/ts/views/TournamentMenu.ts
@@ -1,4 +1,5 @@
 import Aview from "./Aview.ts"
+import { dragElement } from "./drag.ts";
 import { setOnekoState, setBallPos } from "../oneko.ts"
 
 export default class extends Aview {
@@ -12,18 +13,37 @@ export default class extends Aview {
 
 	async getHTML() {
 		return `
-		<div class="text-center p-12 bg-white dark:bg-neutral-800 rounded-xl shadow space-y-4">
-			<p class="text-gray-700 dark:text-white text-lg font-bold pb-4">how many players ?</p>
-			<div class="flex flex-col space-y-4">
-				<input type="number" id="playerNumber" value="6" placeholder="number of players" class="bg-white text-neutral-900 border rounded-md w-full px-4 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500"></input>
-				<button type="submit" id="bracket-generate" class="bg-blue-600 text-white hover:bg-blue-500 w-full py-2 rounded-md transition-colors">create the bracket</button>
-				<div id="bracket"></div>
+		<div id="window" class="absolute default-border">
+			<div id="window-header" class="bg-linear-to-r from-orange-200 to-orange-300 flex flex-row min-w-75 justify-between px-2">
+				<span class="font-[Kubasta]">pong_game.ts</span>
+				<div>
+					<button> - </button>
+					<button> □ </button>
+					<a href="/" data-link> × </a>
+				</div>
 			</div>
+
+		<div class="bg-neutral-200 dark:bg-neutral-800 text-center p-10 pt-5 space-y-4 reverse-border">
+			<p class="text-neutral-900 dark:text-white text-lg font-bold pb-4">how many players ?</p>
+			<div class="flex flex-col space-y-4">
+			  <select id="playerNumber" class="bg-white text-shadow-neutral-900 p-2 input-border">
+					<option value="">-- player number --</option>
+					<option value="2">2 players</option>
+					<option value="3">3 players</option>
+					<option value="4">4 players</option>
+					<option value="6">6 players</option>
+					<option value="8">8 players</option>
+				</select>
+				<button type="submit" id="bracket-generate" class="default-button">create the bracket</button>
+				<div id="bracket" class="flex flex-col space-y-6 items-center"></div>
+			</div>
+		</div>
 		</div>
 		`;
 	}
 
 	async run() {
+    dragElement(document.getElementById("window"));
 		const generateBracket = async (playerCount: number) => {
 			document.getElementById("bracket").innerHTML = "";
 
@@ -32,12 +52,10 @@ export default class extends Aview {
 			const byes = totalSlots - playerCount;
 
 			let odd = 0;
-			if (playerCount % 2)
+			if (playerCount > 9 || (playerCount != 3 && playerCount % 2 != 0))
 			{
-				//console.error("odd numbers are temporarily invalids");
-				//return ;
-				++odd;
-				--playerCount;
+				console.error("odd numbers are temporarily invalids");
+				return ;
 			}
 
 			let notPowPlayersCount = 0;
@@ -46,9 +64,8 @@ export default class extends Aview {
 				notPowPlayersCount = playerCount - (2 ** Math.floor(Math.log2(playerCount)));
 
 
-			let initialPlayers = Array.from({ length: 2 ** Math.floor(Math.log2(playerCount))}, (_, i) => `Player ${i + 1}`);
+			let initialPlayers = Array.from({ length: 2 ** Math.floor(Math.log2(playerCount))}, (_, i) => `player ${i + 1}`);
 			playerCount = 2 ** Math.floor(Math.log2(playerCount));
-			//let initialPlayers = Array.from({ length: playerCount }, (_, i) => `Player ${i + 1}`);
 
 			const bracketWrapper = document.createElement("div");
 			bracketWrapper.className = "flex space-x-8 overflow-x-auto";
@@ -63,8 +80,7 @@ export default class extends Aview {
 				input.id = `playerName${i}`;
 				input.value = "";
 				input.placeholder = name;
-				input.className =
-					"w-32 h-10 p-2 text-sm border rounded bg-white shadow disabled:bg-gray-200";
+				input.className = "w-32 h-10 p-2 text-sm bg-white disabled:bg-gray-200 input-border";
 				playerInputColumn.appendChild(input);
 			});
 
@@ -87,10 +103,10 @@ export default class extends Aview {
 						const input = document.createElement("input");
 						input.type = "text";
 						input.id = `playerName${playerCount}`;
-						input.value = "";
-						input.placeholder = `Player ${++playerCount}`;
+            input.value = `player ${++playerCount}`;
+						input.placeholder = `player ${++playerCount}`;
 						input.className =
-							"w-32 h-10 p-2 text-sm border rounded bg-white shadow disabled:bg-gray-200";
+							"w-32 h-10 p-2 text-sm bg-white disabled:bg-gray-200 input-border";
 						roundColumn.appendChild(input);
 						odd--;
 						nextRound.push("");
@@ -103,9 +119,9 @@ export default class extends Aview {
 					input.type = "text";
 					input.id = `playerName${playerCount}`;
 					input.value = "";
-					input.placeholder = `Player ${++playerCount}`;
+					input.placeholder = `player ${++playerCount}`;
 					input.className =
-						"w-32 h-10 p-2 text-sm border rounded bg-white shadow disabled:bg-gray-200";
+						"w-32 h-10 p-2 text-sm bg-white disabled:bg-gray-200 input-border";
 					roundColumn.appendChild(input);
 					--notPowPlayersCount;
 					nextRound.push("");
@@ -118,7 +134,7 @@ export default class extends Aview {
 
 					const matchDiv = document.createElement("div");
 					matchDiv.className =
-						"w-32 h-10 flex items-center justify-center bg-white border rounded shadow text-center text-sm";
+						"w-32 h-10 flex items-center justify-center bg-white text-center text-sm input-border";
 
 					matchDiv.textContent = "";
 					nextRound.push("");
@@ -130,11 +146,22 @@ export default class extends Aview {
 				currentRound = nextRound;
 			}
 
+			document.getElementById("bracket").appendChild(document.createElement("hr")).classList.add("my-4", "mb-8", "w-64", "reverse-border");
 			document.getElementById("bracket").appendChild(bracketWrapper);
+      const btn = document.getElementById("bracket").appendChild(document.createElement("button"));
+      btn.classList.add("default-button", "w-full");
+      btn.id = "tournament-play";
+      btn.onclick = () => {
+        console.log("ok");
+      };
+      btn.innerText = "start tournament !!";
+
 		};
 
 		document.getElementById("bracket-generate")?.addEventListener("click", () => {
 			const input: HTMLInputElement = document.getElementById("playerNumber") as HTMLInputElement;
+      if (input.value == "")
+        return;
 			generateBracket(+input.value);
 		});
 
diff --git a/tailwind.config.js b/tailwind.config.js
index 9bd8368..53376f7 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,7 +1,13 @@
 export default {
 	content: ['./src/front/**/*.{html,js,ts,css}'],
   theme: {
-    extend: {},
+    extend: {
+      fontFamily: {
+        jersey: ['"Jersey 10"', 'sans-serif'],
+      },
+    },
+  },
+	},
   },
   plugins: [],
 }

From 494612a160007adb525e232c0d769c2c924f5b1e Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 14:54:53 +0200
Subject: [PATCH 081/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip:=20started=20adding=20enable=202fa?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/views/Settings.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/front/static/ts/views/Settings.ts b/src/front/static/ts/views/Settings.ts
index 5c70167..94e6500 100644
--- a/src/front/static/ts/views/Settings.ts
+++ b/src/front/static/ts/views/Settings.ts
@@ -28,6 +28,8 @@ export default class extends Aview {
 			  <input type="text" id="displayName-input" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
 				<button id="displayName-button" type="submit" class="default-button w-full">change display name</button>
 				<button id="deleteAccount-button" type="submit" class="default-button w-full">delete your account</button>
+				<hr class="my-2 w-full reverse-border">
+				<button id="2fa-button" type="submit" class="default-button w-full">enable 2FA</button>
 			</div>
 		</div>
 		`;
@@ -80,5 +82,9 @@ export default class extends Aview {
       else
         console.error("xd"); // xd?????????????
     });
+
+	document.getElementById("2fa-button")?.addEventListener("click", async () => {
+		
+	});
   }
 }

From bcc8b2006ae6789eb51f023b06f1b0cb39908061 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 14:57:51 +0200
Subject: [PATCH 082/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix(au?=
 =?UTF-8?q?thapi):=20remove=20should=20be=20working=20now?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/authDB.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/utils/authDB.js b/src/utils/authDB.js
index a4f4595..4aee3c1 100644
--- a/src/utils/authDB.js
+++ b/src/utils/authDB.js
@@ -82,9 +82,16 @@ function getUser(user) {
 	return stmt.get(user);
 }
 
+function rmUser(user) {
+	const stmt = database.prepare('DELETE * FROM credentials WHERE username = ?');
+	stmt.run(user);
+}
+
+
 const authDB = {
 	prepareDB,
 	checkUser,
+	rmUser,
 	addUser,
 	passwordQuery,
 	setTOTPSecret,

From c4221d946348442eb8d6ce0441aae305345fc13f Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 15:22:47 +0200
Subject: [PATCH 083/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix(av?=
 =?UTF-8?q?atar):=20fix=20this=20shit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json            |  1 -
 pnpm-lock.yaml          | 24 ------------------
 pnpm-workspace.yaml     |  1 +
 src/api/user/default.js |  9 +++++--
 src/api/user/pAvatar.js | 55 ++++++++++++++++++++++-------------------
 src/utils/authDB.js     |  1 -
 6 files changed, 37 insertions(+), 54 deletions(-)

diff --git a/package.json b/package.json
index 32cd1ca..797d338 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,6 @@
 		"@fastify/cookie": "^11.0.2",
 		"@fastify/env": "^5.0.2",
 		"@fastify/jwt": "^9.1.0",
-		"@fastify/multipart": "^9.2.1",
 		"axios": "^1.10.0",
 		"base32.js": "^0.1.0",
 		"bcrypt": "^6.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c40ec77..41a1bb9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -20,9 +20,6 @@ importers:
       '@fastify/jwt':
         specifier: ^9.1.0
         version: 9.1.0
-      '@fastify/multipart':
-        specifier: ^9.2.1
-        version: 9.2.1
       axios:
         specifier: ^1.10.0
         version: 1.10.0
@@ -261,18 +258,12 @@ packages:
   '@fastify/ajv-compiler@4.0.2':
     resolution: {integrity: sha512-Rkiu/8wIjpsf46Rr+Fitd3HRP+VsxUFDDeag0hs9L0ksfnwx2g7SPQQTFL0E8Qv+rfXzQOxBJnjUB9ITUDjfWQ==}
 
-  '@fastify/busboy@3.2.0':
-    resolution: {integrity: sha512-m9FVDXU3GT2ITSe0UaMA5rU3QkfC/UXtCU8y0gSN/GugTqtVldOBWIB5V6V3sbmenVZUIpU6f+mPEO2+m5iTaA==}
-
   '@fastify/cookie@11.0.2':
     resolution: {integrity: sha512-GWdwdGlgJxyvNv+QcKiGNevSspMQXncjMZ1J8IvuDQk0jvkzgWWZFNC2En3s+nHndZBGV8IbLwOI/sxCZw/mzA==}
 
   '@fastify/deepmerge@2.0.2':
     resolution: {integrity: sha512-3wuLdX5iiiYeZWP6bQrjqhrcvBIf0NHbQH1Ur1WbHvoiuTYUEItgygea3zs8aHpiitn0lOB8gX20u1qO+FDm7Q==}
 
-  '@fastify/deepmerge@3.1.0':
-    resolution: {integrity: sha512-lCVONBQINyNhM6LLezB6+2afusgEYR4G8xenMsfe+AT+iZ7Ca6upM5Ha8UkZuYSnuMw3GWl/BiPXnLMi/gSxuQ==}
-
   '@fastify/env@5.0.2':
     resolution: {integrity: sha512-4m/jHS3s/G/DBJVODob9sxGUei/Ij8JFbA2PYqBfoihTm+Qqae2xD9xhez68UFZu1d4SNJPIb6uAOwbNvRYw+A==}
 
@@ -291,9 +282,6 @@ packages:
   '@fastify/merge-json-schemas@0.2.1':
     resolution: {integrity: sha512-OA3KGBCy6KtIvLf8DINC5880o5iBlDX4SxzLQS8HorJAbqluzLRn80UXU0bxZn7UOFhFgpRJDasfwn9nG4FG4A==}
 
-  '@fastify/multipart@9.2.1':
-    resolution: {integrity: sha512-U4221XDMfzCUtfzsyV1/PkR4MNgKI0158vUUyn/oF2Tl6RxMc+N7XYLr5fZXQiEC+Fmw5zFaTjxsTGTgtDtK+g==}
-
   '@fastify/proxy-addr@5.0.0':
     resolution: {integrity: sha512-37qVVA1qZ5sgH7KpHkkC4z9SK6StIsIcOmpjvMPXNb3vx2GQxhZocogVYbr2PbbeLCQxYIPDok307xEvRZOzGA==}
 
@@ -1910,8 +1898,6 @@ snapshots:
       ajv-formats: 3.0.1(ajv@8.17.1)
       fast-uri: 3.0.6
 
-  '@fastify/busboy@3.2.0': {}
-
   '@fastify/cookie@11.0.2':
     dependencies:
       cookie: 1.0.2
@@ -1919,8 +1905,6 @@ snapshots:
 
   '@fastify/deepmerge@2.0.2': {}
 
-  '@fastify/deepmerge@3.1.0': {}
-
   '@fastify/env@5.0.2':
     dependencies:
       env-schema: 6.0.1
@@ -1946,14 +1930,6 @@ snapshots:
     dependencies:
       dequal: 2.0.3
 
-  '@fastify/multipart@9.2.1':
-    dependencies:
-      '@fastify/busboy': 3.2.0
-      '@fastify/deepmerge': 3.1.0
-      '@fastify/error': 4.2.0
-      fastify-plugin: 5.0.1
-      secure-json-parse: 4.0.0
-
   '@fastify/proxy-addr@5.0.0':
     dependencies:
       '@fastify/forwarded': 3.0.0
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index a8eee40..8a8cca4 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -5,3 +5,4 @@ ignoredBuiltDependencies:
 
 onlyBuiltDependencies:
   - better-sqlite3
+  - sharp
diff --git a/src/api/user/default.js b/src/api/user/default.js
index a2bb2aa..79b5786 100644
--- a/src/api/user/default.js
+++ b/src/api/user/default.js
@@ -1,7 +1,6 @@
 import fastifyJWT from '@fastify/jwt';
 import fastifyCookie from '@fastify/cookie';
 import Database from 'better-sqlite3';
-import multipart from '@fastify/multipart';
 
 import { gUsers } from './gUsers.js';
 import { gUser } from './gUser.js';
@@ -151,7 +150,13 @@ export default async function(fastify, options) {
 		},
 	});
 	fastify.register(fastifyCookie);
-	fastify.register(multipart, { limits: { fileSize: 2 * 1024 * 1024 + 1 } });
+
+	fastify.addContentTypeParser(
+		['image/jpeg', 'image/png', 'image/gif', 'image/webp'],
+		{ parseAs: 'buffer' },
+		async (request, payload) => payload
+	);
+
 
 	fastify.decorate('authenticate', async function(request, reply) {
 		try {
diff --git a/src/api/user/pAvatar.js b/src/api/user/pAvatar.js
index 5b9f3a9..a567589 100644
--- a/src/api/user/pAvatar.js
+++ b/src/api/user/pAvatar.js
@@ -1,37 +1,40 @@
 import sharp from 'sharp';
 
+/**
+ *	@param {import('fastify').FastifyRequest} request
+ *	@param {import('fastify').FastifyReply} reply
+ *	@param {import('fastify').FastifyInstance} fastify
+ */
 export async function pAvatar(request, reply, fastify, getUserInfo, setAvatarId, postImage) {
 	try {
 		const userId = request.params.userId;
 		if (!getUserInfo.get(userId)) {
-			return reply.cose(404).send({ error: "User does not exist" });
+			return reply.code(404).send({ error: "User does not exist" });
 		}
-		const parts = request.parts();
-		for await (const part of parts) {
-			if (part.file) {
-				let size = 0;
-				const chunks = [];
-				for await (const chunk of part.file) {
-					size += chunk.length;
-					chunks.push(chunk);
-				}
-				if (size === 5 * 1024 * 1024 + 1) {
-					return reply.code(400).send({ error: "File too large" });
-				}
-				const buffer = Buffer.concat(chunks);
-				if (!part.filename || part.filename.trim() === '') {
-					return reply.code(400).send({ error: "Missing filename" });
-				}
-				if (!part.mimetype || part.mimetype.trim() === '') {
-					return reply.code(400).send({ error: "Missing mimetype" });
-				}
-				const webpBuffer = await sharp(buffer).toFormat('webp').toBuffer();
-				const imageId = postImage.run(part.filename, part.mimetype, webpBuffer);
-				setAvatarId.run(imageId.lastInsertRowid, userId);
-				return reply.code(200).send({ msg: "Avatar uploaded successfully" });
-			}
+
+		// Read the raw body as a Buffer
+		const buffer = request.body;
+
+		if (!buffer) {
+			return reply.code(400).send({ error: "No file uploaded" });
 		}
-		return reply.code(400).send({ error: "No avatar uploaded" });
+
+		// Check file size (5MB limit)
+		if (buffer.length > 5 * 1024 * 1024) {
+			return reply.code(400).send({ error: "File too large" });
+		}
+
+		// Convert to WebP
+		const webpBuffer = await sharp(buffer).toFormat('webp').toBuffer();
+
+		// Save the image and update the user's avatar
+		const mimeType = request.headers['content-type'];
+		const fileName = `avatar_${userId}.webp`;
+		const imageId = postImage.run(fileName, mimeType, webpBuffer);
+
+		setAvatarId.run(imageId.lastInsertRowid, userId);
+
+		return reply.code(200).send({ msg: "Avatar uploaded successfully" });
 	} catch (err) {
 		fastify.log.error(err);
 		return reply.code(500).send({ error: "Internal server error" });
diff --git a/src/utils/authDB.js b/src/utils/authDB.js
index 4aee3c1..69d1bde 100644
--- a/src/utils/authDB.js
+++ b/src/utils/authDB.js
@@ -87,7 +87,6 @@ function rmUser(user) {
 	stmt.run(user);
 }
 
-
 const authDB = {
 	prepareDB,
 	checkUser,

From 0c9f5950474678a4d4e0a25ec45cbb737e8f6f57 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 15:49:35 +0200
Subject: [PATCH 084/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix(us?=
 =?UTF-8?q?er-management):=20fix=20the=20fact=20the=20no=20fucking=20route?=
 =?UTF-8?q?=20was=20protected?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user/dAvatar.js        |  6 ++++++
 src/api/user/dFriend.js        |  6 +++---
 src/api/user/dFriends.js       |  9 +++------
 src/api/user/dMatchHistory.js  |  9 +++------
 src/api/user/dMember.js        | 17 +++++++----------
 src/api/user/dUser.js          |  6 +++++-
 src/api/user/default.js        |  1 +
 src/api/user/gAvatar.js        |  3 +++
 src/api/user/gFriends.js       |  3 +++
 src/api/user/gMatchHistory.js  |  3 +++
 src/api/user/gNumberFriends.js |  4 ++++
 src/api/user/gNumberMatches.js |  3 +++
 src/api/user/gUser.js          | 19 ++++++++++++++++---
 src/api/user/pAvatar.js        |  3 +++
 src/api/user/pFriend.js        |  7 ++-----
 src/api/user/pMatchHistory.js  |  8 ++++----
 src/api/user/pUser.js          |  5 +----
 src/api/user/uAvatar.js        |  5 ++++-
 src/api/user/uMember.js        |  7 ++-----
 19 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/src/api/user/dAvatar.js b/src/api/user/dAvatar.js
index dbd634a..cfbea1c 100644
--- a/src/api/user/dAvatar.js
+++ b/src/api/user/dAvatar.js
@@ -1,6 +1,12 @@
 export async function dAvatar(request, reply, fastify, getUserInfo, getAvatarId, deleteAvatarId, deleteImage) {
 	try {
 		const userId = request.params.userId;
+		if (request.user !== userId && request.user !== 'admin') {
+			return reply.code(401).send({ error: 'Unauthorized' });
+		}
+		if (!getUserInfo.get(userId)) {
+			return reply.code(404).send({ error: "User does not exist" });
+		}
 		if (!getUserInfo.get(userId)) {
 			return reply.cose(404).send({ error: "User does not exist" });
 		}
diff --git a/src/api/user/dFriend.js b/src/api/user/dFriend.js
index 333bd93..1f3fddd 100644
--- a/src/api/user/dFriend.js
+++ b/src/api/user/dFriend.js
@@ -1,9 +1,9 @@
 export async function dFriend(request, reply, fastify, getUserInfo, getFriend, deleteFriend) {
 	try {
-		if (!request.user) {
-			return reply.code(400).send({ error: "Please specify a user" });
-		}
 		const userId = request.params.userId;
+		if (request.user !== userId && request.user !== 'admin') {
+			return reply.code(401).send({ error: 'Unauthorized' });
+		}
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
diff --git a/src/api/user/dFriends.js b/src/api/user/dFriends.js
index 803dd89..11d4423 100644
--- a/src/api/user/dFriends.js
+++ b/src/api/user/dFriends.js
@@ -1,15 +1,12 @@
 export async function dFriends(request, reply, fastify, getUserInfo, deleteFriends) {
 	try {
-		if (!request.user) {
-			return reply.code(400).send({ error: "Please specify a user" });
-		}
 		const userId = request.params.userId;
+		if (request.user !== userId && request.user !== 'admin') {
+			return reply.code(401).send({ error: 'Unauthorized' });
+		}
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
-		if (request.user !== 'admin' && request.user !== userId) {
-			return reply.code(401).send({ error: "Unauthorized" });
-		}
 		deleteFriends.run(userId);
 		return reply.code(200).send({ msg: "Friends deleted successfully" });
 	} catch (err) {
diff --git a/src/api/user/dMatchHistory.js b/src/api/user/dMatchHistory.js
index 8b7cc0e..241813b 100644
--- a/src/api/user/dMatchHistory.js
+++ b/src/api/user/dMatchHistory.js
@@ -1,15 +1,12 @@
 export async function dMatchHistory(request, reply, fastify, getUserInfo, deleteMatchHistory, deleteStatsPong, deleteStatsTetris) {
 	try {
-		if (!request.user) {
-			return reply.code(400).send({ error: "Please specify a user" });
-		}
 		const userId = request.params.userId;
+		if (request.user !== userId && request.user !== 'admin') {
+			return reply.code(401).send({ error: 'Unauthorized' });
+		}
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
-		if (request.user !== 'admin' && request.user !== userId) {
-			return reply.code(401).send({ error: "Unauthorized" });
-		}
 		const { game } = request.query;
 		if (game !== 'pong' && game !== 'tetris') {
 			return reply.code(400).send({ error: "Specified game does not exist" });
diff --git a/src/api/user/dMember.js b/src/api/user/dMember.js
index 240a297..32630b9 100644
--- a/src/api/user/dMember.js
+++ b/src/api/user/dMember.js
@@ -1,22 +1,19 @@
 export async function dMember(request, reply, fastify, getUserInfo, changeDisplayName) {
 	try {
-		if (!request.user) {
-			return reply.code(400).send({ error: "Please specify a user" });
-		}
 		const userId = request.params.userId;
+		if (request.user !== userId && request.user !== 'admin') {
+			return reply.code(401).send({ error: 'Unauthorized' });
+		}
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
 		const user = request.user;
 		const member = request.params.member;
-		if (user === 'admin' || user === request.params.userId) {
-			if (member === 'displayName') {
-				changeDisplayName.run("", request.params.userId);
-				return reply.code(200).send({ msg: "Display name deleted successfully" });
-			}
-			return reply.code(400).send({ msg: "Member does not exist" })
+		if (member === 'displayName') {
+			changeDisplayName.run("", request.params.userId);
+			return reply.code(200).send({ msg: "Display name deleted successfully" });
 		} else {
-			return reply.code(401).send({ error: 'You dont have the right to delete this' });
+			return reply.code(400).send({ msg: "Member does not exist" })
 		}
 	} catch (err) {
 		fastify.log.error(err);
diff --git a/src/api/user/dUser.js b/src/api/user/dUser.js
index d2728af..864d8cb 100644
--- a/src/api/user/dUser.js
+++ b/src/api/user/dUser.js
@@ -1,6 +1,10 @@
 export async function dUser(request, reply, fastify, getUserInfo, deleteMatchHistory, deleteFriends, deleteUser) {
 	try {
-		if (!getUserInfo.get(request.params.userId)) {
+		const userId = request.params.userId;
+		if (request.user !== userId && request.user !== 'admin') {
+			return reply.code(401).send({ error: 'Unauthorized' });
+		}
+		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
 		deleteMatchHistory.run('pong', request.params.userId);
diff --git a/src/api/user/default.js b/src/api/user/default.js
index 79b5786..2a3ee89 100644
--- a/src/api/user/default.js
+++ b/src/api/user/default.js
@@ -173,6 +173,7 @@ export default async function(fastify, options) {
 			if (jwt.user !== 'admin') {
 				throw ('You lack administrator privileges');
 			}
+			request.user = jwt.user;
 		} catch (err) {
 			reply.code(401).send({ error: 'Unauthorized' });
 		}
diff --git a/src/api/user/gAvatar.js b/src/api/user/gAvatar.js
index 6c0d3f6..f7c386f 100644
--- a/src/api/user/gAvatar.js
+++ b/src/api/user/gAvatar.js
@@ -1,6 +1,9 @@
 export async function gAvatar(request, reply, fastify, getUserInfo, getAvatarId, getImage) {
 	try {
 		const userId = request.params.userId;
+		if (request.user !== userId && request.user !== 'admin') {
+			return reply.code(401).send({ error: 'Unauthorized' });
+		}
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
diff --git a/src/api/user/gFriends.js b/src/api/user/gFriends.js
index 5fbb941..8050e17 100644
--- a/src/api/user/gFriends.js
+++ b/src/api/user/gFriends.js
@@ -1,6 +1,9 @@
 export async function gFriends(request, reply, fastify, getUserInfo, getFriends) {
 	try {
 		const userId = request.params.userId;
+		if (request.user !== userId && request.user !== 'admin') {
+			return reply.code(401).send({ error: 'Unauthorized' });
+		}
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
diff --git a/src/api/user/gMatchHistory.js b/src/api/user/gMatchHistory.js
index 6999c9b..e8d3a55 100644
--- a/src/api/user/gMatchHistory.js
+++ b/src/api/user/gMatchHistory.js
@@ -1,6 +1,9 @@
 export async function gMatchHistory(request, reply, fastify, getUserInfo, getMatchHistory) {
 	try {
 		const userId = request.params.userId;
+		if (request.user !== userId && request.user !== 'admin') {
+			return reply.code(401).send({ error: 'Unauthorized' });
+		}
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
diff --git a/src/api/user/gNumberFriends.js b/src/api/user/gNumberFriends.js
index ca1ec24..03730bf 100644
--- a/src/api/user/gNumberFriends.js
+++ b/src/api/user/gNumberFriends.js
@@ -1,9 +1,13 @@
 export async function gNumberFriends(request, reply, fastify, getUserInfo, getNumberFriends) {
 	try {
 		const userId = request.params.userId;
+		if (request.user !== userId && request.user !== 'admin') {
+			return reply.code(401).send({ error: 'Unauthorized' });
+		}
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
+
 		const row = getNumberFriends.get(userId);
 		return reply.code(200).send({ n_friends: row.n_friends });
 	} catch (err) {
diff --git a/src/api/user/gNumberMatches.js b/src/api/user/gNumberMatches.js
index f26e628..a784fac 100644
--- a/src/api/user/gNumberMatches.js
+++ b/src/api/user/gNumberMatches.js
@@ -1,6 +1,9 @@
 export async function gNumberMatches(request, reply, fastify, getUserInfo, getNumberMatches) {
 	try {
 		const userId = request.params.userId;
+		if (request.user !== userId && request.user !== 'admin') {
+			return reply.code(401).send({ error: 'Unauthorized' });
+		}
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
diff --git a/src/api/user/gUser.js b/src/api/user/gUser.js
index 6937e6c..24648bd 100644
--- a/src/api/user/gUser.js
+++ b/src/api/user/gUser.js
@@ -1,11 +1,24 @@
 export async function gUser(request, reply, fastify, getUserInfo) {
 	try {
 		const userId = request.params.userId;
-		const userInfo = getUserInfo.get(userId);
-		if (!userInfo) {
+		if (request.user !== userId && request.user !== 'admin') {
+			return reply.code(401).send({ error: 'Unauthorized' });
+		}
+		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
-		return reply.code(200).send({ username: userInfo.username, displayName: userInfo.displayName, pong: { wins: userInfo.pongWins, losses: userInfo.pongLosses }, tetris: { wins: userInfo.tetrisWins, losses: userInfo.tetrisLosses } });
+		return reply.code(200).send({
+			username: userInfo.username,
+			displayName: userInfo.displayName,
+			pong: {
+				wins: userInfo.pongWins,
+				losses: userInfo.pongLosses
+			},
+			tetris: {
+				wins: userInfo.tetrisWins,
+				losses: userInfo.tetrisLosses
+			}
+		});
 	} catch (err) {
 		fastify.log.error(err);
 		return reply.code(500).send({ error: "Internal server error" });
diff --git a/src/api/user/pAvatar.js b/src/api/user/pAvatar.js
index a567589..f90299e 100644
--- a/src/api/user/pAvatar.js
+++ b/src/api/user/pAvatar.js
@@ -8,6 +8,9 @@ import sharp from 'sharp';
 export async function pAvatar(request, reply, fastify, getUserInfo, setAvatarId, postImage) {
 	try {
 		const userId = request.params.userId;
+		if (request.user !== userId && request.user !== 'admin') {
+			return reply.code(401).send({ error: 'Unauthorized' });
+		}
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
diff --git a/src/api/user/pFriend.js b/src/api/user/pFriend.js
index dfb5341..ae7d414 100644
--- a/src/api/user/pFriend.js
+++ b/src/api/user/pFriend.js
@@ -1,11 +1,8 @@
 export async function pFriend(request, reply, fastify, getUserInfo, getFriend, addFriend) {
 	try {
 		const userId = request.params.userId;
-		if (!request.user) {
-			return reply.code(400).send({ error: "Please specify a user" });
-		}
-		if (request.user !== 'admin' && request.user !== userId) {
-			return reply.code(401).send({ error: "Unauthorized" });
+		if (request.user !== userId && request.user !== 'admin') {
+			return reply.code(401).send({ error: 'Unauthorized' });
 		}
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
diff --git a/src/api/user/pMatchHistory.js b/src/api/user/pMatchHistory.js
index 584b53e..f722775 100644
--- a/src/api/user/pMatchHistory.js
+++ b/src/api/user/pMatchHistory.js
@@ -16,11 +16,11 @@ async function fetchSave(request, reply, userId, addMatch) {
 export async function pMatchHistory(request, reply, fastify, getUserInfo, addMatch, incWinsPong, incLossesPong, incWinsTetris, incLossesTetris) {
 	try {
 		const userId = request.params.userId;
-		if (!request.user) {
-			return reply.code(400).send({ error: "Please specify a user" });
+		if (request.user !== userId && request.user !== 'admin') {
+			return reply.code(401).send({ error: 'Unauthorized' });
 		}
-		if (request.user !== 'admin' && request.user !== userId) {
-			return reply.code(401).send({ error: "Unauthorized" });
+		if (!getUserInfo.get(userId)) {
+			return reply.code(404).send({ error: "User does not exist" });
 		}
 		if (request.body.game !== 'pong' && request.body.game !== 'tetris') {
 			return reply.code(400).send({ error: "Specified game does not exist" });
diff --git a/src/api/user/pUser.js b/src/api/user/pUser.js
index c5dd88e..31ce8bd 100644
--- a/src/api/user/pUser.js
+++ b/src/api/user/pUser.js
@@ -1,10 +1,7 @@
 export async function pUser(request, reply, fastify, getUserInfo, createUser) {
 	try {
 		const userId = request.params.userId;
-		if (!request.user || !request.user.user) {
-			return reply.code(400).send({ error: "Please specify a user" });
-		}
-		if (request.user.user !== 'admin') {
+		if (request.user !== 'admin') {
 			return reply.code(401).send({ error: "Unauthorized" });
 		}
 		if (getUserInfo.get(userId)) {
diff --git a/src/api/user/uAvatar.js b/src/api/user/uAvatar.js
index 1076e44..344307e 100644
--- a/src/api/user/uAvatar.js
+++ b/src/api/user/uAvatar.js
@@ -3,8 +3,11 @@ import sharp from 'sharp';
 export async function uAvatar(request, reply, fastify, getUserInfo, setAvatarId, getAvatarId, deleteAvatarId, postImage, deleteImage) {
 	try {
 		const userId = request.params.userId;
+		if (request.user !== userId && request.user !== 'admin') {
+			return reply.code(401).send({ error: 'Unauthorized' });
+		}
 		if (!getUserInfo.get(userId)) {
-			return reply.cose(404).send({ error: "User does not exist" });
+			return reply.code(404).send({ error: "User does not exist" });
 		}
 		deleteAvatarId.run(userId);
 		const parts = request.parts();
diff --git a/src/api/user/uMember.js b/src/api/user/uMember.js
index 01c1dc5..adf5fce 100644
--- a/src/api/user/uMember.js
+++ b/src/api/user/uMember.js
@@ -1,11 +1,8 @@
 export async function uMember(request, reply, fastify, getUserInfo, changeDisplayName, changeAvatarId) {
 	try {
 		const userId = request.params.userId;
-		if (!request.user) {
-			return reply.code(400).send({ error: "Please specify a user" });
-		}
-		if (request.user !== 'admin' && request.user !== userId) {
-			return reply.code(401).send({ error: "Unauthorized" });
+		if (request.user !== userId && request.user !== 'admin') {
+			return reply.code(401).send({ error: 'Unauthorized' });
 		}
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });

From 3c1c22a441155c84b68308cf04b098dfc39a0353 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 15:54:10 +0200
Subject: [PATCH 085/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix(co?=
 =?UTF-8?q?rs):=20fixed=20some=20things.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/default.js | 7 +++++++
 src/api/user/default.js | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/src/api/auth/default.js b/src/api/auth/default.js
index 422d794..5b80ed7 100644
--- a/src/api/auth/default.js
+++ b/src/api/auth/default.js
@@ -1,5 +1,6 @@
 import fastifyJWT from '@fastify/jwt';
 import fastifyCookie from '@fastify/cookie';
+import cors from '@fastify/cors';
 
 import { register } from './register.js';
 import { login } from './login.js';
@@ -24,6 +25,12 @@ authDB.prepareDB();
  */
 export default async function(fastify, options) {
 
+	fastify.register(cors, {
+		origin: process.env.CORS_ORIGIN || 'http://localhost:5173',
+		credentials: true,
+		methods: [ "GET", "POST", "PATCH", "DELETE", "OPTIONS" ]
+	});
+
 	fastify.register(fastifyJWT, {
 		secret: process.env.JWT_SECRET || '123456789101112131415161718192021',
 		cookie: {
diff --git a/src/api/user/default.js b/src/api/user/default.js
index 2a3ee89..8072895 100644
--- a/src/api/user/default.js
+++ b/src/api/user/default.js
@@ -1,6 +1,7 @@
 import fastifyJWT from '@fastify/jwt';
 import fastifyCookie from '@fastify/cookie';
 import Database from 'better-sqlite3';
+import cors from '@fastify/cors';
 
 import { gUsers } from './gUsers.js';
 import { gUser } from './gUser.js';
@@ -150,6 +151,11 @@ export default async function(fastify, options) {
 		},
 	});
 	fastify.register(fastifyCookie);
+	fastify.register(cors, {
+		origin: process.env.CORS_ORIGIN || 'http://localhost:5173',
+		credentials: true,
+		methods: [ "GET", "POST", "PATCH", "DELETE", "OPTIONS" ]
+	});
 
 	fastify.addContentTypeParser(
 		['image/jpeg', 'image/png', 'image/gif', 'image/webp'],

From e15cb8e776b7d51b89d6166446717087ce884615 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 16:00:24 +0200
Subject: [PATCH 086/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix(au?=
 =?UTF-8?q?th):=20remove=20working=20now?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user/dUser.js       | 12 ++++++------
 src/api/user/gUser.js       |  1 +
 src/utils/authDB.js         |  2 +-
 src/utils/authUserRemove.js |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/api/user/dUser.js b/src/api/user/dUser.js
index 864d8cb..fad5571 100644
--- a/src/api/user/dUser.js
+++ b/src/api/user/dUser.js
@@ -1,16 +1,16 @@
 export async function dUser(request, reply, fastify, getUserInfo, deleteMatchHistory, deleteFriends, deleteUser) {
 	try {
-		const userId = request.params.userId;
-		if (request.user !== userId && request.user !== 'admin') {
+		if (request.user !== 'admin') {
 			return reply.code(401).send({ error: 'Unauthorized' });
 		}
+		const userId = request.params.userId;
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
-		deleteMatchHistory.run('pong', request.params.userId);
-		deleteMatchHistory.run('tetris', request.params.userId);
-		deleteFriends.run(request.params.userId);
-		deleteUser.run(request.params.userId);
+		deleteMatchHistory.run('pong', userId);
+		deleteMatchHistory.run('tetris', userId);
+		deleteFriends.run(userId);
+		deleteUser.run(userId);
 		return reply.code(200).send({ msg: "User deleted successfully" });
 	} catch (err) {
 		fastify.log.error(err);
diff --git a/src/api/user/gUser.js b/src/api/user/gUser.js
index 24648bd..6750f75 100644
--- a/src/api/user/gUser.js
+++ b/src/api/user/gUser.js
@@ -7,6 +7,7 @@ export async function gUser(request, reply, fastify, getUserInfo) {
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
+		const userInfo = getUserInfo.get(userId);
 		return reply.code(200).send({
 			username: userInfo.username,
 			displayName: userInfo.displayName,
diff --git a/src/utils/authDB.js b/src/utils/authDB.js
index 69d1bde..a4611f3 100644
--- a/src/utils/authDB.js
+++ b/src/utils/authDB.js
@@ -83,7 +83,7 @@ function getUser(user) {
 }
 
 function rmUser(user) {
-	const stmt = database.prepare('DELETE * FROM credentials WHERE username = ?');
+	const stmt = database.prepare('DELETE FROM credentials WHERE username = ?');
 	stmt.run(user);
 }
 
diff --git a/src/utils/authUserRemove.js b/src/utils/authUserRemove.js
index 8af7503..2fc3bfc 100644
--- a/src/utils/authUserRemove.js
+++ b/src/utils/authUserRemove.js
@@ -8,7 +8,7 @@ export async function authUserRemove(username, fastify) {
 	const url = (process.env.USER_URL || "http://localhost:3002") + "/users/" + username;
 	const cookie = fastify.jwt.sign({ user: "admin" });
 
-	await axios.post(
+	await axios.delete(
 		url,
 		{
 			headers: {

From 583cf55cf81369812ed11712dab8532b8e7e53cd Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 16:01:37 +0200
Subject: [PATCH 087/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix(au?=
 =?UTF-8?q?th):=20now=20logout=20on=20removal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/remove.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/api/auth/remove.js b/src/api/auth/remove.js
index 3f653c6..ea1cbce 100644
--- a/src/api/auth/remove.js
+++ b/src/api/auth/remove.js
@@ -24,6 +24,7 @@ export async function remove(request, reply, fastify) {
 
 		return reply
 			.code(200)
+			.clearCookie("token")
 			.send({
 				msg: "User successfully deleted"
 			})

From f628b038d011a2929278a2b489b826d3df9afd75 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 16:05:31 +0200
Subject: [PATCH 088/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix(fr?=
 =?UTF-8?q?ont):=20added=20exception=20catching?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user/default.js                   |  4 +--
 src/front/static/ts/views/ProfileMenu.ts  |  6 ++---
 src/front/static/ts/views/RegisterPage.ts | 31 +++++++++++------------
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/api/user/default.js b/src/api/user/default.js
index 1c63b59..2c7902b 100644
--- a/src/api/user/default.js
+++ b/src/api/user/default.js
@@ -59,9 +59,9 @@ const deleteFriends = database.prepare('DELETE FROM friends WHERE username = ?;'
 export default async function(fastify, options) {
 
 	fastify.register(cors, {
-		origin: process.ENV.CORS_ORIGIN || 'http://localhost:5173',
+		origin: process.env.CORS_ORIGIN || 'http://localhost:5173',
 		credentials: true,
-		methods: [ "GET", "POST", "DELETE", "OPTIONS" ]
+		methods: [ "GET", "POST", "PATCH", "DELETE", "OPTIONS" ]
 	});
 
 	fastify.register(fastifyJWT, {
diff --git a/src/front/static/ts/views/ProfileMenu.ts b/src/front/static/ts/views/ProfileMenu.ts
index 40d68f6..84422ca 100644
--- a/src/front/static/ts/views/ProfileMenu.ts
+++ b/src/front/static/ts/views/ProfileMenu.ts
@@ -40,13 +40,13 @@ export default class extends Aview {
     async function getMainHTML() {
       if (!(await isLogged()))
       {
-        document.getElementById("menu-bottom-div").classList.add("hidden");
+        document.getElementById("menu-bottom-div")?.classList.add("hidden");
         return `
      			<a class="menu-default-button inline-flex items-center justify-center" href="/login" data-link>login</a>
      			<a class="menu-default-button inline-flex items-center justify-center" href="/register" data-link>register</a>
           `;
       }
-      document.getElementById("menu-bottom-div").classList.remove("hidden");
+      document.getElementById("menu-bottom-div")?.classList.remove("hidden");
 
       uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
 	  const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
@@ -71,7 +71,7 @@ export default class extends Aview {
 
     document.getElementById("profile-items").innerHTML = await getMainHTML();
 
-    document.getElementById("menu-logout").addEventListener("click", async () => {
+    document.getElementById("menu-logout")?.addEventListener("click", async () => {
       let req = await fetch("http://localhost:3001/logout", {
         method: "GET",
         credentials: "include",
diff --git a/src/front/static/ts/views/RegisterPage.ts b/src/front/static/ts/views/RegisterPage.ts
index 30618f1..7485e93 100644
--- a/src/front/static/ts/views/RegisterPage.ts
+++ b/src/front/static/ts/views/RegisterPage.ts
@@ -5,8 +5,7 @@ import { isLogged, navigationManager } from "../main.ts"
 
 export default class extends Aview {
 
-	constructor()
-	{
+	constructor() {
 		super();
 		this.setTitle("register");
 		setOnekoState("default");
@@ -53,7 +52,7 @@ export default class extends Aview {
 	}
 
 	async run() {
-    dragElement(document.getElementById("window"));
+		dragElement(document.getElementById("window"));
 		const login = async () => {
 			const username = (document.getElementById("username") as HTMLInputElement).value;
 			const password = (document.getElementById("password") as HTMLInputElement).value;
@@ -67,34 +66,34 @@ export default class extends Aview {
 				});
 				const data = await data_req.json();
 
-				if (data_req.status === 200)
-				{
+				if (data_req.status === 200) {
 					let uuid_req = await fetch("http://localhost:3001/me", {
 						method: "GET",
 						credentials: "include",
 					});
 					let uuid = await uuid_req.json();
-					document.cookie = `uuid=${uuid.user};max-ages=${60*60*24*7}`;
+					document.cookie = `uuid=${uuid.user};max-ages=${60 * 60 * 24 * 7}`;
 					console.log(document.cookie);
 					isLogged();
 					navigationManager("/");
 				}
-				else if (data_req.status === 400)
-				{
-					document.getElementById("login-error-message").innerHTML = "error: " + data.error;
-					document.getElementById("login-error-message").classList.remove("hidden");
+				else if (data_req.status === 400) {
+					if (document.getElementById("login-error-message")) {
+						document.getElementById("login-error-message").innerHTML = "error: " + data.error;
+						document.getElementById("login-error-message")?.classList.remove("hidden");
+					}
 				}
-				else
-				{
+				else {
 					throw new Error("invalid response");
 				}
 
 			}
-			catch (error)
-			{
+			catch (error) {
 				console.error(error);
-				document.getElementById("login-error-message").innerHTML = "error: server error, try again later...";
-				document.getElementById("login-error-message").classList.remove("hidden");
+				if (document.getElementById("login-error-message")) {
+					document.getElementById("login-error-message").innerHTML = "error: server error, try again later...";
+					document.getElementById("login-error-message")?.classList.remove("hidden");
+				}
 			}
 		};
 

From 9ea154492c7fea56428b67f87fccf4de50ff38d4 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 17:35:38 +0200
Subject: [PATCH 089/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20fixed=20some=20things.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user/gUser.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/api/user/gUser.js b/src/api/user/gUser.js
index 6750f75..78e9a71 100644
--- a/src/api/user/gUser.js
+++ b/src/api/user/gUser.js
@@ -1,9 +1,6 @@
 export async function gUser(request, reply, fastify, getUserInfo) {
 	try {
 		const userId = request.params.userId;
-		if (request.user !== userId && request.user !== 'admin') {
-			return reply.code(401).send({ error: 'Unauthorized' });
-		}
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}

From d0862a50985c1f172a646e9b9f9f9b28d63e02ae Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 17:56:28 +0200
Subject: [PATCH 090/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat:=20a?=
 =?UTF-8?q?dded=202fa=20checker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/default.js   |  8 ++++++--
 src/api/auth/totpCheck.js | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 src/api/auth/totpCheck.js

diff --git a/src/api/auth/default.js b/src/api/auth/default.js
index 5b80ed7..ecba601 100644
--- a/src/api/auth/default.js
+++ b/src/api/auth/default.js
@@ -2,6 +2,7 @@ import fastifyJWT from '@fastify/jwt';
 import fastifyCookie from '@fastify/cookie';
 import cors from '@fastify/cors';
 
+import { totpCheck } from './totpCheck.js';
 import { register } from './register.js';
 import { login } from './login.js';
 import { gRedir } from './gRedir.js';
@@ -28,7 +29,7 @@ export default async function(fastify, options) {
 	fastify.register(cors, {
 		origin: process.env.CORS_ORIGIN || 'http://localhost:5173',
 		credentials: true,
-		methods: [ "GET", "POST", "PATCH", "DELETE", "OPTIONS" ]
+		methods: ["GET", "POST", "PATCH", "DELETE", "OPTIONS"]
 	});
 
 	fastify.register(fastifyJWT, {
@@ -54,6 +55,9 @@ export default async function(fastify, options) {
 	fastify.get('/me', { preHandler: [fastify.authenticate] }, async (request, reply) => {
 		return { user: request.user };
 	});
+	fastify.get('/2fa', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+		return totpCheck(request, reply);
+	});
 
 	// GOOGLE sign in
 	fastify.get('/login/google', async (request, reply) => {
@@ -119,5 +123,5 @@ export default async function(fastify, options) {
 
 	fastify.get('/logout', {}, async (request, reply) => { return logout(reply, fastify); })
 
-	 fastify.delete('/', { preHandler: fastify.authenticate }, async (request, reply) => { return remove(request, reply, fastify)})
+	fastify.delete('/', { preHandler: fastify.authenticate }, async (request, reply) => { return remove(request, reply, fastify) })
 }
diff --git a/src/api/auth/totpCheck.js b/src/api/auth/totpCheck.js
new file mode 100644
index 0000000..d76a12e
--- /dev/null
+++ b/src/api/auth/totpCheck.js
@@ -0,0 +1,24 @@
+import authDB from '../../utils/authDB.js';
+
+/**
+ *	@param {import('fastify').FastifyRequest} request
+ *	@param {import('fastify').FastifyReply} reply
+ */
+export async function totpCheck(request, reply) {
+	try {
+		const user = request.user;
+
+		if (authDB.checkUser(user) === false) {
+			return reply.code(400).send({ error: "User does not exist" });
+		}
+
+		return reply
+			.code(200)
+			.send({
+				totp: authDB.isTOTPEnabled(user)
+			});
+	} catch (err) {
+		fastify.log.error(err);
+		return reply.code(500).send({ error: "Internal server error" });
+	}
+}

From 4918618aad3e430539a6801d78d7094b7ebb723c Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 19:18:09 +0200
Subject: [PATCH 091/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20fixed=20some=20things.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user/default.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/api/user/default.js b/src/api/user/default.js
index 8072895..13d81b3 100644
--- a/src/api/user/default.js
+++ b/src/api/user/default.js
@@ -143,6 +143,10 @@ const querySchemaMatchHistory = { type: 'object', required: ['game', 'iStart', '
 const bodySchemaMatchHistory = { type: 'object', required: ['game', 'date', 'myScore'], properties: { game: { type: 'string' }, date: { type: 'integer', minimum: 0 }, opponent: { type: 'string' }, myScore: { type: 'integer', minimum: 0 }, opponentScore: { type: 'integer', minimum: 0 } } };
 const querySchemaMatchHistoryGame = { type: 'object', required: ['game'], properties: { game: { type: 'string' } } };
 
+/**
+ *	@param {import('fastify').FastifyInstance} fastify
+ *	@param {import('fastify').FastifyPluginOptions} options
+ */
 export default async function(fastify, options) {
 	fastify.register(fastifyJWT, {
 		secret: process.env.JWT_SECRET || '123456789101112131415161718192021',
@@ -163,7 +167,6 @@ export default async function(fastify, options) {
 		async (request, payload) => payload
 	);
 
-
 	fastify.decorate('authenticate', async function(request, reply) {
 		try {
 			const jwt = await request.jwtVerify();
@@ -224,7 +227,7 @@ export default async function(fastify, options) {
 	fastify.post('/users/:userId/matchHistory', { preHandler: [fastify.authenticate], schema: { body: bodySchemaMatchHistory } }, async (request, reply) => {
 		return pMatchHistory(request, reply, fastify, getUserInfo, addMatch, incWinsPong, incLossesPong, incWinsTetris, incLossesTetris);
 	});
-	fastify.post('/users/:userId/avatar', { preHandler: [fastify.authenticate] }, async (request, reply) => {
+	fastify.post('/users/:userId/avatar', { bodyLimit: 5242880, preHandler: [fastify.authenticate] }, async (request, reply) => {
 		return pAvatar(request, reply, fastify, getUserInfo, setAvatarId, postImage);
 	});
 	fastify.post('/ping', { preHandler: [fastify.authenticate] }, async (request, reply) => {

From b290915249ca5257ab6103bd28baab43e70d39c6 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 19:31:55 +0200
Subject: [PATCH 092/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20fixed=20some=20things.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/views/LoginPage.ts  |  16 ++-
 src/front/static/ts/views/Settings.ts   | 145 ++++++++++++++++--------
 src/front/static/ts/views/TotpEnable.ts | 110 ++++++++++++++++++
 3 files changed, 217 insertions(+), 54 deletions(-)
 create mode 100644 src/front/static/ts/views/TotpEnable.ts

diff --git a/src/front/static/ts/views/LoginPage.ts b/src/front/static/ts/views/LoginPage.ts
index da0deec..97e6ed0 100644
--- a/src/front/static/ts/views/LoginPage.ts
+++ b/src/front/static/ts/views/LoginPage.ts
@@ -73,11 +73,17 @@ export default class extends Aview {
 				} else if (data_req.status === 401) {
 					const data = await data_req.json();
 
-					const error = document.createElement("p");
-					error.innerHTML = data.error;
-					error.classList.add("text-red-700", "dark:text-red-500");
+					if (!document.getElementById("error-totp")) {
+						const error = document.createElement("p");
+						error.innerHTML = data.error;
+						error.classList.add("text-red-700", "dark:text-red-500");
+
+						idWindow.appendChild(error);
+					} else {
+						const error = document.getElementById("error-totp") as HTMLParagraphElement;
+						error.innerHTML = data.error;
+					}
 
-					idWindow.appendChild(error);
 				} else {
 					console.log(data_req.status)
 					console.log(await data_req.json())
@@ -140,7 +146,7 @@ export default class extends Aview {
 
 					const tokenTitle = document.createElement("h1");
 					tokenTitle.innerHTML = `hey ${username}, please submit your 2fa code below :`;
-					tokenTitle.classList.add("text-gray-900", "dark_text-white", "text-lg", "pt-0", "pb-4", "justify-center");
+					tokenTitle.classList.add("text-gray-900", "dark:text-white", "text-lg", "pt-0", "pb-4", "justify-center");
 
 					const form = document.createElement("form");
 					form.method = "dialog";
diff --git a/src/front/static/ts/views/Settings.ts b/src/front/static/ts/views/Settings.ts
index 94e6500..021b215 100644
--- a/src/front/static/ts/views/Settings.ts
+++ b/src/front/static/ts/views/Settings.ts
@@ -2,12 +2,12 @@ import Aview from "./Aview.ts"
 import { dragElement } from "./drag.ts";
 import { setOnekoState } from "../oneko.ts"
 import { isLogged, navigationManager } from "../main.ts"
-
+import { totpEnablePopup } from "./TotpEnable.ts";
+import { totpVerify } from "../../../../api/auth/totpVerify.js";
 
 export default class extends Aview {
 
-	constructor()
-	{
+	constructor() {
 		super();
 		this.setTitle("profile");
 		setOnekoState("default");
@@ -29,62 +29,109 @@ export default class extends Aview {
 				<button id="displayName-button" type="submit" class="default-button w-full">change display name</button>
 				<button id="deleteAccount-button" type="submit" class="default-button w-full">delete your account</button>
 				<hr class="my-2 w-full reverse-border">
-				<button id="2fa-button" type="submit" class="default-button w-full">enable 2FA</button>
+				<button id="2fa-button" type="submit" class="default-button w-full">2fa</button>
 			</div>
 		</div>
 		`;
 	}
 
-  async run() {
-    if (!await isLogged())
-      navigationManager("/");
+	async run() {
+		if (!await isLogged())
+			navigationManager("/");
 
-    dragElement(document.getElementById("window"));
+		dragElement(document.getElementById("window"));
 
-    let uuid: String;
-    uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
-    const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
-      method: "GET",
-      credentials: "include",
-    });
-    if (userdata_req.status == 404) {
-      console.error("invalid user");
-      return;
-    }
-    let userdata = await userdata_req.json();
+		const isTOTPEnabled = async () => {
+			const totpVerify_req = await fetch('http://localhost:3001/2fa', {
+				method: "GET",
+				credentials: "include"
+			})
 
-    (document.getElementById("displayName-input") as HTMLInputElement).placeholder = userdata.displayName;
-    (document.getElementById("displayName-input") as HTMLInputElement).value = userdata.displayName;
+			if (totpVerify_req.status === 200) {
+				const totpVerify_data = await totpVerify_req.json();
+				if (totpVerify_data.totp == true) {
+					return true;
+				}
+			}
+			return false;
+		};
 
-    document.getElementById("displayName-button")?.addEventListener("click", async () => {
-      const changeDisplayName_req = await fetch(`http://localhost:3002/users/${uuid}/displayName`, {
-        method: "PATCH",
-        headers: { "Content-Type": "application/json", },
-        credentials: "include",
-        body: JSON.stringify({ displayName: (document.getElementById("displayName-input") as HTMLInputElement).value })
-      });
-      if (changeDisplayName_req.status == 200) {
-        // idk display success
-      }
-      else {
-        // display error ig, uuuh it's in await changeDisplayName.json().error
-      }
-    });
+		let uuid: String;
+		uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+		const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
+			method: "GET",
+			credentials: "include",
+		});
+		if (userdata_req.status == 404) {
+			console.error("invalid user");
+			return;
+		}
+		let userdata = await userdata_req.json();
 
-    document.getElementById("deleteAccount-button")?.addEventListener("click", async () => {
-      const delete_req = await fetch(`http://localhost:3001/`, {
-        method: "DELETE",
-        credentials: "include",
-      });
+		(document.getElementById("displayName-input") as HTMLInputElement).placeholder = userdata.displayName;
+		(document.getElementById("displayName-input") as HTMLInputElement).value = userdata.displayName;
 
-      if (delete_req.status == 200)
-        navigationManager("/");
-      else
-        console.error("xd"); // xd?????????????
-    });
+		document.getElementById("displayName-button")?.addEventListener("click", async () => {
+			const changeDisplayName_req = await fetch(`http://localhost:3002/users/${uuid}/displayName`, {
+				method: "PATCH",
+				headers: { "Content-Type": "application/json", },
+				credentials: "include",
+				body: JSON.stringify({ displayName: (document.getElementById("displayName-input") as HTMLInputElement).value })
+			});
+			if (changeDisplayName_req.status == 200) {
+				// idk display success
+			}
+			else {
+				// display error ig, uuuh it's in await changeDisplayName.json().error
+			}
+		});
 
-	document.getElementById("2fa-button")?.addEventListener("click", async () => {
-		
-	});
-  }
+		document.getElementById("deleteAccount-button")?.addEventListener("click", async () => {
+			const delete_req = await fetch(`http://localhost:3001/`, {
+				method: "DELETE",
+				credentials: "include",
+			});
+
+			if (delete_req.status == 200)
+				navigationManager("/");
+			else
+				console.error("xd"); // xd?????????????
+		});
+
+
+		const totpButton = document.getElementById("2fa-button") as HTMLButtonElement;
+
+		if ((await isTOTPEnabled()) === true) {
+			totpButton.innerHTML = "disable 2fa";
+
+			document.getElementById("2fa-button")?.addEventListener("click", async () => {
+				const totp_req = await fetch(`http://localhost:3001/2fa`, {
+					method: "DELETE",
+					credentials: "include"
+				})
+				if (totp_req.status === 200) {
+					console.log("working")
+					navigationManager("/settings")
+				} else {
+					console.log("wut")
+				}
+			});
+		} else {
+			totpButton.innerHTML = "enable 2fa";
+	
+			document.getElementById("2fa-button")?.addEventListener("click", async () => {
+				const totp_req = await fetch(`http://localhost:3001/2fa`, {
+					method: "POST",
+					credentials: "include"
+				})
+				if (totp_req.status === 200) {
+					console.log("working")
+					const totp_data = await totp_req.json();
+					totpEnablePopup(uuid, totp_data.secret, totp_data.otpauthUrl);
+				} else {
+					console.log("wut")
+				}
+			});
+		}
+	}
 }
diff --git a/src/front/static/ts/views/TotpEnable.ts b/src/front/static/ts/views/TotpEnable.ts
new file mode 100644
index 0000000..89488c1
--- /dev/null
+++ b/src/front/static/ts/views/TotpEnable.ts
@@ -0,0 +1,110 @@
+import { navigationManager } from "../main.ts";
+import { dragElement } from "./drag.ts";
+
+async function totpVerify() {
+	const code = (document.getElementById("totpPin") as HTMLInputElement).value;
+	const data_req = await fetch('http://localhost:3001/2fa/verify', {
+		method: "POST",
+		credentials: "include",
+		headers: {
+			"Content-Type": "application/json",
+		},
+		body: JSON.stringify({
+			token: code
+		})
+	})
+
+	if (data_req.status === 200) {
+		navigationManager("/settings");
+	} else if (data_req.status === 401 || data_req.status === 400) {
+		const popup_content = document.getElementById("2fa-enable-content");
+
+		if (!document.getElementById("error-totp")) {
+			const error = document.createElement("p");
+			error.id = "error-totp";
+			error.classList.add("text-red-700", "dark:text-red-500");
+			error.innerHTML = (await data_req.json()).error;
+
+			popup_content?.appendChild(error)
+		} else {
+			const error = document.getElementById("error-totp") as HTMLParagraphElement;
+			error.innerHTML = (await data_req.json()).error;
+		}
+	} else {
+		console.log("Unexpected error")
+	}
+}
+
+export async function totpEnablePopup(username: String, secret: String, url: String) {
+	const popup: HTMLDivElement = document.createElement("div");
+	popup.id = "2fa-enable-popup";
+	popup.classList.add("z-10", "absolute", "default-border");
+	const header = popup.appendChild(document.createElement("div"));;
+	header.classList.add("bg-linear-to-r", "from-orange-200", "to-orange-300", "flex", "flex-row", "min-w-35", "justify-between", "px-2");
+	header.id = "2fa-enable-popup-header";
+	header.appendChild(document.createElement("span")).innerText = "2fa_enable.ts";
+	const btn = header.appendChild(document.createElement("button"));
+	btn.innerText = " × ";
+	btn.onclick = () => { document.getElementById("2fa-enable-popup")?.remove(); };
+
+	const popup_content: HTMLSpanElement = popup.appendChild(document.createElement("div"));
+	popup_content.id = "2fa-enable-content";
+	popup_content.classList.add("flex", "flex-col", "bg-neutral-200", "dark:bg-neutral-800", "p-6", "pt-4", "text-neutral-900", "dark:text-white", "space-y-4");
+
+	const qrDivTOTP = document.createElement("div");
+	qrDivTOTP.classList.add("flex", "justify-center");
+
+	const qrCodeTOTP = document.createElement("img");
+	qrCodeTOTP.id = "qrCodeTOTP";
+	qrCodeTOTP.src = `https://api.qrserver.com/v1/create-qr-code/?margin=10&size=512x512&data=${url}`;
+	qrCodeTOTP.classList.add("w-60");
+	qrDivTOTP.appendChild(qrCodeTOTP);
+
+	const secretText = document.createElement("p");
+	secretText.innerHTML = `key: <div class="select-all">${secret}</div>`;
+	secretText.classList.add("text-center")
+
+	const tokenInput = document.createElement("input");
+	tokenInput.type = "tel";
+	tokenInput.id = "totpPin";
+	tokenInput.name = "totpPin";
+	tokenInput.placeholder = "TOTP code";
+	tokenInput.required = true;
+	tokenInput.autocomplete = "off";
+	tokenInput.pattern = "[0-9]*";
+	tokenInput.setAttribute("inputmode", "numeric");
+	tokenInput.classList.add("bg-white", "text-neutral-900", "w-full", "px-4", "py-2", "input-border");
+
+	const tokenSubmit = document.createElement("button");
+	tokenSubmit.type = "submit";
+	tokenSubmit.classList.add("default-button", "w-full");
+	tokenSubmit.id = "totp-submit";
+	tokenSubmit.innerHTML = "submit";
+
+	const hr = document.createElement("hr");
+	hr.classList.add("my-2", "w-full", "reverse-border");
+
+	const t = document.createElement("h2");
+	t.innerHTML = "hey " + username +
+		` you are trying to add 2fa</br>
+		just add the following to your app and enter the code bellow ↓
+	`;
+	t.classList.add("text-center")
+
+	document.getElementById("app")?.appendChild(popup);
+
+	const form = document.createElement("form");
+	form.method = "dialog";
+	form.classList.add("space-y-4");
+	form.appendChild(tokenInput);
+	form.appendChild(tokenSubmit);
+
+	popup_content.appendChild(t)
+	popup_content.appendChild(qrDivTOTP);
+	popup_content.appendChild(secretText);
+	popup_content.appendChild(hr)
+	popup_content.appendChild(form);
+	dragElement(document.getElementById("2fa-enable-popup"));
+
+	document.getElementById("totp-submit")?.addEventListener("click", totpVerify)
+}

From bfaed233651ca4c393b8b4c65321dbe95d89a971 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 19:41:35 +0200
Subject: [PATCH 093/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20centered=20the=20error=20text?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/views/TotpEnable.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/front/static/ts/views/TotpEnable.ts b/src/front/static/ts/views/TotpEnable.ts
index 89488c1..baf4fd9 100644
--- a/src/front/static/ts/views/TotpEnable.ts
+++ b/src/front/static/ts/views/TotpEnable.ts
@@ -22,7 +22,7 @@ async function totpVerify() {
 		if (!document.getElementById("error-totp")) {
 			const error = document.createElement("p");
 			error.id = "error-totp";
-			error.classList.add("text-red-700", "dark:text-red-500");
+			error.classList.add("text-red-700", "dark:text-red-500", "text-center");
 			error.innerHTML = (await data_req.json()).error;
 
 			popup_content?.appendChild(error)

From 774581b9f64dd69e7cbd4674fc70323c6fe55609 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 20:08:09 +0200
Subject: [PATCH 094/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20fixed=20the=20settings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/views/Settings.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/front/static/ts/views/Settings.ts b/src/front/static/ts/views/Settings.ts
index 87e3066..3019af6 100644
--- a/src/front/static/ts/views/Settings.ts
+++ b/src/front/static/ts/views/Settings.ts
@@ -24,7 +24,7 @@ export default class extends Aview {
 					<a href="/" data-link> × </a>
 				</div>
 			</div>
-			<div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-8 reverse-border">
+			<div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 space-y-4 reverse-border">
 			  <div class="flex flex-row items-center place-items-center space-x-4">
 					<input type="text" id="displayName-input" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
 					<button id="displayName-button" type="submit" class="default-button w-full">change display name</button>
@@ -37,7 +37,9 @@ export default class extends Aview {
 			    <label for="upload-file" class="default-button">select an avatar...</label><input type="file" id="upload-file" class="hidden" accept="image/*" />
 				</div>
 				<button id="deleteAccount-button" type="submit" class="default-button w-full">delete your account</button>
-				<hr class="my-2 w-full reverse-border">
+				<div class="flex justify-center">
+					<hr class="w-50 reverse-border">
+				</div>
 				<button id="2fa-button" type="submit" class="default-button w-full">2fa</button>
 			</div>
 		</div>

From b5d2244035a114c9085dbba6089de010dac7bbe5 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 20:09:33 +0200
Subject: [PATCH 095/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20fixed=20the=20profile=20page=20with=20the=20shitty=20profile?=
 =?UTF-8?q?=20picture?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/views/Profile.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/front/static/ts/views/Profile.ts b/src/front/static/ts/views/Profile.ts
index 4374d70..6dce472 100644
--- a/src/front/static/ts/views/Profile.ts
+++ b/src/front/static/ts/views/Profile.ts
@@ -188,7 +188,9 @@ export default class extends Aview {
       method: "GET",
       credentials: "include",
     });
-    picture.src = a.status === 200 ? `http://localhost:3002/users/${uuid}/avatar` : "https://api.kanel.ovh/pp";
+	picture.src = a.status === 200
+		? `http://localhost:3002/users/${uuid}/avatar?t=${Date.now()}`
+		: "https://api.kanel.ovh/pp";
     picture.classList.add("text-neutral-900", "dark:text-white", "center", "h-18", "w-18", "mx-3", "reverse-border");
 
     const nametag = profile.appendChild(document.createElement("div"));

From d4ebc2d1fe55a5547d9b0ca53127b69bad21ce38 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 22:26:13 +0200
Subject: [PATCH 096/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip:=20added=20shitty=20code=20for=20shitty=20improvement?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/index.html                |  2 +-
 src/front/static/ts/main.ts         | 27 +++++++++++++++++++++++++++
 src/front/static/ts/oneko.ts        |  7 ++++++-
 src/front/static/ts/views/Tetris.ts |  4 +++-
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/front/index.html b/src/front/index.html
index c348c97..dbd12eb 100644
--- a/src/front/index.html
+++ b/src/front/index.html
@@ -39,7 +39,7 @@
 		<div class="border-t-2 border-neutral-300 dark:border-neutral-800 sticky bottom-0">
 			<nav class="bg-neutral-200 dark:bg-neutral-900 shadow-md border-t-2 border-neutral-400 dark:border-neutral-700 flex justify-between h-12 items-center content-center space-x-6 font-[Kubasta]">
 				<div class="flex px-4 items-center content-center space-x-2">
-				    <button id="profile-button" class="taskbar-button flex flex-row justify-center items-center"><img class="object-scale-down mr-2 h-5 w-5" src="https://api.kanel.ovh/id?id=65" /> start</button>
+				    <button id="profile-button" class="taskbar-button flex flex-row justify-center items-center"><img id="start-img" class="object-scale-down mr-2 h-5 w-5" src="https://api.kanel.ovh/id?id=65" /> start</button>
 					<div class="text-neutral-700 dark:text-neutral-400">|</div>
 					<a target="_blank" class="taskbar-button" href="https://rusty.42angouleme.fr/">rusty</a>
 					<a target="_blank" class="taskbar-button" href="https://dn720004.ca.archive.org/0/items/2009-tetris-variant-concepts_202201/2009%20Tetris%20Design%20Guideline.pdf">tetris-guideline.pdf</a>
diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index 831d203..5ac2396 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -142,3 +142,30 @@ updateClock();
 setInterval(pingClock, 30000);
 
 oneko();
+
+async function startMenuPP() {
+	const profileButton = document.getElementById("start-img") as HTMLImageElement;
+	try {
+		if(document.cookie.match(new RegExp('(^| )' + "token" + '=([^;]+)'))) {
+			throw "not today, thank you";
+		}
+		let uuid: String;
+		uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+
+
+		const a = await fetch(`http://localhost:3002/users/${uuid}/avatar`, {
+			method: "GET",
+			credentials: "include"
+		});
+
+		profileButton.src = a.status === 200
+			? `http://localhost:3002/users/${uuid}/avatar?t=${Date.now()}`
+			: "https://api.kanel.ovh/pp";
+	} catch (err){
+		// console.log("not yet logged, going default for start icon...");
+		profileButton.src = "https://api.kanel.ovh/id?id=65";
+	}
+}
+
+setInterval(startMenuPP, 3000);
+startMenuPP();
diff --git a/src/front/static/ts/oneko.ts b/src/front/static/ts/oneko.ts
index a2a159b..57670eb 100644
--- a/src/front/static/ts/oneko.ts
+++ b/src/front/static/ts/oneko.ts
@@ -22,7 +22,7 @@ export function setOnekoState(state: string) {
 }
 
 export function setOnekoOffset() {
-	if (oneko_state != 0)
+	if (oneko_state === 1)
 	{
 		offsetX = document.getElementById("window").offsetLeft + 44;
 		offsetY = document.getElementById("window").offsetTop + 44 + 24;
@@ -30,6 +30,11 @@ export function setOnekoOffset() {
   return;
 }
 
+export function setSleepPos() {
+	mousePosX = document.getElementById("window")?.offsetLeft + 120;
+	mousePosY = document.getElementById("window")?.offsetTop + 400;
+}
+
 export function setBallPos(x: number, y: number)
 {
 	mousePosX = x + offsetX;
diff --git a/src/front/static/ts/views/Tetris.ts b/src/front/static/ts/views/Tetris.ts
index f5a20d3..72cfacb 100644
--- a/src/front/static/ts/views/Tetris.ts
+++ b/src/front/static/ts/views/Tetris.ts
@@ -1,7 +1,7 @@
 import Aview from "./Aview.ts";
 import { isLogged } from "../main.js";
 import { dragElement } from "./drag.js";
-import { setOnekoState, setBallPos, setOnekoOffset } from "../oneko.ts";
+import { setOnekoState, setBallPos, setOnekoOffset, setSleepPos } from "../oneko.ts";
 
 export default class extends Aview {
   running: boolean;
@@ -42,6 +42,7 @@ export default class extends Aview {
   }
 
   async run() {
+	setSleepPos();
     dragElement(document.getElementById("window"));
     const COLS = 10;
     const ROWS = 20;
@@ -874,6 +875,7 @@ export default class extends Aview {
         this.drawPiece();
         this.drawHUD();
         this.drawQueue();
+		setSleepPos();
       }
     }
 

From 254e318f8641eb9b4796f5e75d94a804d8c40744 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Thu, 23 Oct 2025 22:44:47 +0200
Subject: [PATCH 097/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20now=20less=20shitty?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/oneko.ts              | 5 ++++-
 src/front/static/ts/views/TetrisVersus.ts | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/front/static/ts/oneko.ts b/src/front/static/ts/oneko.ts
index 57670eb..01d3453 100644
--- a/src/front/static/ts/oneko.ts
+++ b/src/front/static/ts/oneko.ts
@@ -186,7 +186,10 @@ export function oneko() {
     idleTime += 1;
 
     // every ~ 20 seconds
-    if (
+	if (oneko_state === 2) {
+		idleAnimation = "sleeping";
+	}
+	else if (
       idleTime > 10 &&
       Math.floor(Math.random() * 200) == 0 &&
       idleAnimation == null
diff --git a/src/front/static/ts/views/TetrisVersus.ts b/src/front/static/ts/views/TetrisVersus.ts
index f9debac..68f40e8 100644
--- a/src/front/static/ts/views/TetrisVersus.ts
+++ b/src/front/static/ts/views/TetrisVersus.ts
@@ -1,7 +1,7 @@
 import Aview from "./Aview.ts";
 import { isLogged } from "../main.js";
 import { dragElement } from "./drag.js";
-import { setOnekoState, setBallPos, setOnekoOffset } from "../oneko.ts";
+import { setOnekoState, setBallPos, setOnekoOffset, setSleepPos } from "../oneko.ts";
 
 export default class extends Aview {
   running: boolean;
@@ -53,6 +53,7 @@ export default class extends Aview {
   }
 
   async run() {
+	  setSleepPos();
     dragElement(document.getElementById("window"));
     const COLS = 10;
     const ROWS = 20;
@@ -920,6 +921,7 @@ export default class extends Aview {
         this.drawPiece();
         this.drawHUD();
         this.drawQueue();
+		setSleepPos();
       }
     }
 

From 6ba25e04d1750f16374320a036652a1a255a690e Mon Sep 17 00:00:00 2001
From: Adam <45126464+KeyZox71@users.noreply.github.com>
Date: Thu, 23 Oct 2025 22:46:10 +0200
Subject: [PATCH 098/109] Update README to mark user stats dashboard as
 completed

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 24e7168..e9c72c0 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ Press F to pay respect
   - [ ] ~~Live chat - Major~~
 - **AI-Algo**
   - [ ] ~~AI opponent - Major~~
-  - [ ] User and game stats dashboards - Minor
+  - [ ] ~~User and game stats dashboards - Minor~~
 - **Cybersecurity**
   - [ ] ~~WAF/ModSecurity and Hashicorp Vault - Major~~
   - [ ] ~~RGPD compliance - Minor~~

From 10e4eeae55aff6dea905c0896326823ae160f195 Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Thu, 23 Oct 2025 23:05:44 +0200
Subject: [PATCH 099/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat(tour?=
 =?UTF-8?q?nament):=20logic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/views/LoginPage.ts      |   6 +-
 src/front/static/ts/views/Pong.ts           |  54 ++-
 src/front/static/ts/views/Profile.ts        |  15 +
 src/front/static/ts/views/ProfileMenu.ts    |  23 +-
 src/front/static/ts/views/RegisterPage.ts   |   7 +-
 src/front/static/ts/views/TetrisVersus.ts   |  56 ++-
 src/front/static/ts/views/TournamentMenu.ts | 377 +++++++++++++++++---
 7 files changed, 444 insertions(+), 94 deletions(-)

diff --git a/src/front/static/ts/views/LoginPage.ts b/src/front/static/ts/views/LoginPage.ts
index cffe8fb..be5b8e1 100644
--- a/src/front/static/ts/views/LoginPage.ts
+++ b/src/front/static/ts/views/LoginPage.ts
@@ -27,8 +27,10 @@ export default class extends Aview {
 		  <div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 reverse-border flex flex-col items-center">
 				<form method="dialog" class="space-y-4">
 				  <h1 class="text-gray-900 dark:text-white text-lg pt-0 pb-4">welcome back ! please login.</h1>
-					<input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
-					<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
+		      <div class="flex flex-row justify-between space-x-4">
+						<input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
+						<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
+					</div>
 					<button id="login-button" type="submit" class="default-button w-full">login</button>
 				</form>
 
diff --git a/src/front/static/ts/views/Pong.ts b/src/front/static/ts/views/Pong.ts
index 526812c..a1d7bd0 100644
--- a/src/front/static/ts/views/Pong.ts
+++ b/src/front/static/ts/views/Pong.ts
@@ -59,6 +59,9 @@ export default class extends Aview {
 		let p1_name: string;
 		let p2_name: string;
 
+		let p1_displayName: string;
+		let p2_displayName: string;
+
 		let countdown: number = 3;
 		let countdownTimer: number = 0;
 
@@ -203,8 +206,8 @@ export default class extends Aview {
 			ctx.font = "24px Kubasta";
 			let text_score = `${p1_score} - ${p2_score}`;
 			ctx.fillText(text_score, canvas.width / 2 - (ctx.measureText(text_score).width / 2), 25);
-			ctx.fillText(p1_name, canvas.width / 4 - (ctx.measureText(p1_name).width / 2), 45);
-			ctx.fillText(p2_name, (canvas.width / 4 * 3) - (ctx.measureText(p2_name).width / 2), 45);
+      ctx.fillText(p1_displayName, canvas.width / 4 - (ctx.measureText(p1_name).width / 2), 45);
+			ctx.fillText(p2_displayName, (canvas.width / 4 * 3) - (ctx.measureText(p2_name).width / 2), 45);
 
 			if (match_over)
 			{
@@ -273,23 +276,46 @@ export default class extends Aview {
 		if (await isLogged())
 		{
       uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
-      const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
-  			method: "GET",
-  			credentials: "include",
-  		});
-  		if (userdata_req.status == 404)
-  		{
-  			console.error("invalid user");
-  			return ;
-  		}
-      let userdata = await userdata_req.json();
-			p1_input.value = userdata.displayName;
+
+			p1_input.value = uuid;
 			p1_input.readOnly = true;
 		}
 		else
 			p1_input.value = "player 1";
 
-		document.getElementById("game-start")?.addEventListener("click", () => {
+		document.getElementById("game-start")?.addEventListener("click", async () => {
+      let p1_isvalid = true;
+      let p2_isvalid = true;
+      if (await isLogged()) {
+        const p1_req = await fetch(`http://localhost:3002/users/${p1_input.value}`, {
+          method: "GET",
+          credentials: "include",
+        });
+        const p2_req = await fetch(`http://localhost:3002/users/${p2_input.value}`, {
+          method: "GET",
+          credentials: "include",
+        });
+        if (p1_req.status != 200)
+          p1_isvalid = false;
+        else
+          p1_displayName = (await p1_req.json()).displayName;
+
+        if (p2_req.status != 200)
+          p2_isvalid = false;
+        else
+          p2_displayName = (await p2_req.json()).displayName;
+      }
+      else
+        p1_isvalid = p2_isvalid = false;
+      p1_name = p1_input.value;
+      p2_name = p2_input.value;
+      if (!p1_isvalid)
+        p1_displayName = p1_name;
+      if (!p2_isvalid)
+        p2_displayName = p2_name;
+
+      p1_displayName = p1_displayName.length > 16 ? p1_displayName.substring(0, 16) + "." : p1_displayName;
+      p2_displayName = p2_displayName.length > 16 ? p2_displayName.substring(0, 16) + "." : p2_displayName;
       p1_name = p1_input.value.length > 16 ? p1_input.value.substring(0, 16) + "." : p1_input.value;
 			p2_name = p2_input.value.length > 16 ? p2_input.value.substring(0, 16) + "." : p2_input.value;
 			document.getElementById("player-inputs").remove();
diff --git a/src/front/static/ts/views/Profile.ts b/src/front/static/ts/views/Profile.ts
index 24faa0a..8da9656 100644
--- a/src/front/static/ts/views/Profile.ts
+++ b/src/front/static/ts/views/Profile.ts
@@ -78,6 +78,12 @@ export default class extends Aview {
 
     if (matches.matchHistory) {
       for (let match of matches.matchHistory) {
+        const p2_req = await fetch(`http://localhost:3002/users/${match.score.p2}`, {
+          method: "GET",
+          credentials: "include",
+        });
+        match.score.p1 = userdata.displayName;
+        match.score.p2 = (await p2_req.json()).displayName;
         const newEntry = document.createElement("li");
         newEntry.classList.add("m-1", "default-button", "bg-neutral-200", "dark:bg-neutral-800", "text-neutral-900", "dark:text-white");
         newEntry.innerHTML = match.score.p1Score > match.score.p2Score ? `${match.score.p1} - winner` : `${match.score.p2} - winner`;
@@ -134,6 +140,15 @@ export default class extends Aview {
 
     if (matches.matchHistory) {
       for (let match of matches.matchHistory) {
+        if (match.score.p2 != undefined)
+        {
+          const p2_req = await fetch(`http://localhost:3002/users/${match.score.p2}`, {
+            method: "GET",
+            credentials: "include",
+          });
+          match.score.p2 = (await p2_req.json()).displayName;
+        }
+        match.score.p1 = userdata.displayName;
         const newEntry = document.createElement("li");
         newEntry.classList.add("m-1", "default-button", "bg-neutral-200", "dark:bg-neutral-800", "text-neutral-900", "dark:text-white");
         newEntry.innerHTML = match.score.p2 != undefined ?
diff --git a/src/front/static/ts/views/ProfileMenu.ts b/src/front/static/ts/views/ProfileMenu.ts
index 40d68f6..591c96a 100644
--- a/src/front/static/ts/views/ProfileMenu.ts
+++ b/src/front/static/ts/views/ProfileMenu.ts
@@ -68,19 +68,20 @@ export default class extends Aview {
       `;
     }
 
+    requestAnimationFrame(async () => {
+      document.getElementById("profile-items").innerHTML = await getMainHTML();
 
-    document.getElementById("profile-items").innerHTML = await getMainHTML();
-
-    document.getElementById("menu-logout").addEventListener("click", async () => {
-      let req = await fetch("http://localhost:3001/logout", {
-        method: "GET",
-        credentials: "include",
+      document.getElementById("menu-logout").addEventListener("click", async () => {
+        let req = await fetch("http://localhost:3001/logout", {
+          method: "GET",
+          credentials: "include",
+        });
+        isLogged();
+        if (req.status === 200)
+          this.run();
+        else
+          console.error("logout failed");
       });
-      isLogged();
-      if (req.status === 200)
-        this.run();
-      else
-        console.error("logout failed");
     });
 	}
 }
diff --git a/src/front/static/ts/views/RegisterPage.ts b/src/front/static/ts/views/RegisterPage.ts
index 30618f1..2e0493e 100644
--- a/src/front/static/ts/views/RegisterPage.ts
+++ b/src/front/static/ts/views/RegisterPage.ts
@@ -27,8 +27,10 @@ export default class extends Aview {
 			<div class="bg-neutral-200 dark:bg-neutral-800 text-center pb-10 pt-5 px-10 reverse-border flex flex-col items-center">
 		    <form method="dialog" class="space-y-4">
 				  <h1 class="text-gray-900 dark:text-white text-lg pt-0 pb-4">welcome ! please register.</h1>
-			    <input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
-					<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
+			    <div class="flex flex-row justify-between space-x-4">
+							<input type="text" id="username" placeholder="username" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
+							<input type="password" id="password" placeholder="password" class="bg-white text-neutral-900 px-4 py-2 input-border" required></input>
+					</div>
 					<button id="register-button" type="submit" class="default-button w-full">register</button>
 				</form>
 
@@ -75,7 +77,6 @@ export default class extends Aview {
 					});
 					let uuid = await uuid_req.json();
 					document.cookie = `uuid=${uuid.user};max-ages=${60*60*24*7}`;
-					console.log(document.cookie);
 					isLogged();
 					navigationManager("/");
 				}
diff --git a/src/front/static/ts/views/TetrisVersus.ts b/src/front/static/ts/views/TetrisVersus.ts
index f9debac..da1805a 100644
--- a/src/front/static/ts/views/TetrisVersus.ts
+++ b/src/front/static/ts/views/TetrisVersus.ts
@@ -65,6 +65,8 @@ export default class extends Aview {
 		let p2_score: number = 0;
 		let p1_name: string;
 		let p2_name: string;
+		let p1_displayName: string;
+		let p2_displayName: string;
 
     const view = this;
 
@@ -861,7 +863,7 @@ export default class extends Aview {
         ctx.fillRect(4, 4, 120, 60);
         ctx.fillStyle = "#fff";
         ctx.font = "12px Kubasta";
-        ctx.fillText(`${this.id == 0 ? p1_name : p2_name}: ${this.id == 0 ? p1_score : p2_score}`, 8, 20);
+        ctx.fillText(`${this.id == 0 ? p1_displayName : p2_displayName}: ${this.id == 0 ? p1_score : p2_score}`, 8, 20);
         ctx.fillText(`score: ${this.score}`, 8, 36);
         ctx.fillText(`lines: ${this.lines}`, 8, 52);
 
@@ -931,26 +933,48 @@ export default class extends Aview {
 		p2_input.value = "player 2";
 		if (await isLogged())
 		{
-          uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
-          const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
-      			method: "GET",
-      			credentials: "include",
-      		});
-      		if (userdata_req.status == 404)
-      		{
-      			console.error("invalid user");
-      			return ;
-      		}
-          let userdata = await userdata_req.json();
-			p1_input.value = userdata.displayName;
+      uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+			p1_input.value = uuid;
       p1_input.readOnly = true;
 		}
 		else
 			p1_input.value = "player 1";
 
-    document.getElementById("game-start")?.addEventListener("click", () => {
-      p1_name = p1_input.value.length > 16 ? p1_input.value.substring(0, 16) + "." : p1_input.value;
-      p2_name = p2_input.value.length > 16 ? p2_input.value.substring(0, 16) + "." : p2_input.value;
+    document.getElementById("game-start")?.addEventListener("click", async () => {
+      let p1_isvalid = true;
+      let p2_isvalid = true;
+      if (await isLogged()) {
+        const p1_req = await fetch(`http://localhost:3002/users/${p1_input.value}`, {
+          method: "GET",
+          credentials: "include",
+        });
+        const p2_req = await fetch(`http://localhost:3002/users/${p2_input.value}`, {
+          method: "GET",
+          credentials: "include",
+        });
+        if (p1_req.status != 200)
+          p1_isvalid = false;
+        else
+        p1_displayName = (await p1_req.json()).displayName;
+
+        if (p2_req.status != 200)
+          p2_isvalid = false;
+        else
+          p2_displayName = (await p2_req.json()).displayName;
+      }
+      else
+        p1_isvalid = p2_isvalid = false;
+
+      p1_name = p1_input.value;
+      p2_name = p2_input.value;
+      if (!p1_isvalid)
+        p1_displayName = p1_name;
+      if (!p2_isvalid)
+        p2_displayName = p2_name;
+
+      p1_displayName = p1_displayName.length > 16 ? p1_displayName.substring(0, 16) + "." : p1_displayName;
+      p2_displayName = p2_displayName.length > 16 ? p2_displayName.substring(0, 16) + "." : p2_displayName;
+
       document.getElementById("player-inputs").remove();
       document.getElementById("game-boards").classList.remove("hidden");
       game1 = new Game("board1", 0);
diff --git a/src/front/static/ts/views/TournamentMenu.ts b/src/front/static/ts/views/TournamentMenu.ts
index 00538a8..ddf464b 100644
--- a/src/front/static/ts/views/TournamentMenu.ts
+++ b/src/front/static/ts/views/TournamentMenu.ts
@@ -1,14 +1,17 @@
 import Aview from "./Aview.ts"
+import { isLogged } from "../main.js"
 import { dragElement } from "./drag.ts";
-import { setOnekoState, setBallPos } from "../oneko.ts"
+import { setOnekoState, setBallPos, setOnekoOffset } from "../oneko.ts"
 
 export default class extends Aview {
+  running: boolean;
 
 	constructor()
 	{
 		super();
 		this.setTitle("Tournament");
 		setOnekoState("default");
+    this.running = true;
 	}
 
 	async getHTML() {
@@ -23,7 +26,8 @@ export default class extends Aview {
 				</div>
 			</div>
 
-		<div class="bg-neutral-200 dark:bg-neutral-800 text-center p-10 pt-5 space-y-4 reverse-border">
+		<div id="main-div" class="bg-neutral-200 dark:bg-neutral-800 text-center p-10 pt-5 space-y-4 reverse-border">
+		  <div id="tournament-id">
 			<p class="text-neutral-900 dark:text-white text-lg font-bold pb-4">how many players ?</p>
 			<div class="flex flex-col space-y-4">
 			  <select id="playerNumber" class="bg-white text-shadow-neutral-900 p-2 input-border">
@@ -37,28 +41,285 @@ export default class extends Aview {
 				<button type="submit" id="bracket-generate" class="default-button">create the bracket</button>
 				<div id="bracket" class="flex flex-col space-y-6 items-center"></div>
 			</div>
+			</div>
 		</div>
 		</div>
 		`;
 	}
 
+	async runGame(p1_id: number, p2_id: number, players: string[]): Promise<number> {
+    return new Promise<number>(async (resolve) => {
+      console.log(p1_id, p2_id, players, players[p1_id], players[p2_id]);
+      let p1_name = players[p1_id];
+      let p2_name = players[p2_id];
+      let uuid: string;
+      let start: number = 0;
+      let elapsed: number;
+
+      let game_playing: boolean = false;
+      let match_over: boolean = false;
+      let p1_score: number = 0;
+      let p2_score: number = 0;
+
+      let p1_displayName: string;
+      let p2_displayName: string;
+
+      let countdown: number = 3;
+      let countdownTimer: number = 0;
+
+      let canvas: HTMLCanvasElement;
+      let ctx: CanvasRenderingContext2D;
+
+      const paddleOffset: number = 15;
+      const paddleHeight: number = 100;
+      const paddleWidth: number = 10;
+      const ballSize: number = 10;
+
+      const paddleSpeed: number = 727 * 0.69;
+      let leftPaddleY: number;
+      let rightPaddleY: number;
+      let ballX: number;
+      let ballY: number;
+      let ballSpeed: number = 200;
+      let ballSpeedX: number = 300;
+      let ballSpeedY: number = 10;
+
+      const keys: Record<string, boolean> = {};
+
+      document.addEventListener("keydown", e => { keys[e.key] = true; });
+      document.addEventListener("keyup", e => { keys[e.key] = false; });
+
+      function movePaddles() {
+        if ((keys["w"] || keys["W"]) && leftPaddleY > 0)
+          leftPaddleY -= paddleSpeed * elapsed;
+        if ((keys["s"] || keys["S"]) && leftPaddleY < canvas.height - paddleHeight)
+          leftPaddleY += paddleSpeed * elapsed;
+        if (keys["ArrowUp"] && rightPaddleY > 0)
+          rightPaddleY -= paddleSpeed * elapsed;
+        if (keys["ArrowDown"] && rightPaddleY < canvas.height - paddleHeight)
+          rightPaddleY += paddleSpeed * elapsed;
+      }
+
+      function getBounceVelocity(paddleY: number) {
+        const paddleCenterY = paddleY + paddleHeight / 2;
+
+        let n = (ballY - paddleCenterY) / (paddleHeight / 2);
+        n = Math.max(-1, Math.min(1, n));
+        let theta = n * ((75 * Math.PI) / 180);
+        ballSpeedY = ballSpeed * Math.sin(theta);
+      }
+
+      async function moveBall() {
+        let length = Math.sqrt(ballSpeedX * ballSpeedX + ballSpeedY * ballSpeedY);
+        let scale = ballSpeed / length;
+        ballX += (ballSpeedX * scale) * elapsed;
+        ballY += (ballSpeedY * scale) * elapsed;
+
+        if (ballY <= 0 || ballY >= canvas.height - ballSize)
+          ballSpeedY *= -1;
+
+        if (ballX <= paddleWidth + paddleOffset && ballX >= paddleOffset &&
+          ballY > leftPaddleY && ballY < leftPaddleY + paddleHeight) {
+          ballSpeedX *= -1;
+          ballX = paddleWidth + paddleOffset;
+          getBounceVelocity(leftPaddleY);
+          ballSpeed += 10;
+        }
+
+        if (ballX >= canvas.width - paddleWidth - ballSize - paddleOffset && ballX <= canvas.width - ballSize - paddleOffset &&
+          ballY > rightPaddleY && ballY < rightPaddleY + paddleHeight) {
+          ballSpeedX *= -1;
+          ballX = canvas.width - paddleWidth - ballSize - paddleOffset;
+          getBounceVelocity(rightPaddleY);
+          ballSpeed += 10;
+        }
+
+        // scoring
+        if (ballX < 0 || ballX > canvas.width - ballSize) {
+          setOnekoState("default");
+          game_playing = false;
+          if (ballX < 0)
+            p2_score++;
+          else
+            p1_score++;
+
+          if (p1_score === 3 || p2_score === 3) {
+            if (await isLogged()) {
+              let uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+              fetch(`http://localhost:3002/users/${uuid}/matchHistory?game=pong`, {
+                method: "POST",
+                headers: { "Content-Type": "application/json", },
+                credentials: "include",
+                body: JSON.stringify({
+                  "game": "pong",
+                  "opponent": p2_name,
+                  "myScore": p1_score,
+                  "opponentScore": p2_score,
+                  "date": Date.now(),
+                }),
+              });
+              resolve(p1_score == 3 ? p1_id : p2_id);
+            }
+            match_over = true;
+          }
+          else {
+            countdown = 3;
+            countdownTimer = performance.now();
+          }
+
+          ballX = canvas.width / 2;
+          ballY = canvas.height / 2;
+          ballSpeed = 200;
+          ballSpeedX = 300 * ((ballSpeedX > 0) ? 1 : -1);
+          ballSpeedY = 10;
+          ballSpeedX = -ballSpeedX;
+          leftPaddleY = canvas.height / 2 - paddleHeight / 2;
+          rightPaddleY = canvas.height / 2 - paddleHeight / 2;
+        }
+        setBallPos(ballX, ballY);
+      }
+
+      function draw() {
+        ctx.fillStyle = "black";
+        ctx.fillRect(0, 0, canvas.width, canvas.height);
+
+        ctx.strokeStyle = "white";
+        ctx.beginPath();
+        ctx.setLineDash([5, 10]);
+        ctx.moveTo(canvas.width / 2, 0);
+        ctx.lineTo(canvas.width / 2, canvas.height);
+        ctx.stroke();
+
+        ctx.fillStyle = "white";
+        ctx.fillRect(paddleOffset, leftPaddleY, paddleWidth, paddleHeight);
+        ctx.fillRect(canvas.width - paddleWidth - paddleOffset, rightPaddleY, paddleWidth, paddleHeight);
+
+        ctx.fillStyle = "white";
+        if (game_playing)
+          ctx.fillRect(ballX, ballY, ballSize, ballSize);
+
+        ctx.font = "24px Kubasta";
+        let text_score = `${p1_score} - ${p2_score}`;
+        ctx.fillText(text_score, canvas.width / 2 - (ctx.measureText(text_score).width / 2), 25);
+        ctx.fillText(p1_displayName, canvas.width / 4 - (ctx.measureText(p1_name).width / 2), 45);
+        ctx.fillText(p2_displayName, (canvas.width / 4 * 3) - (ctx.measureText(p2_name).width / 2), 45);
+
+        if (match_over) {
+          ctx.font = "32px Kubasta";
+          const winner = `${p1_score > p2_score ? p1_name : p2_name} won :D`;
+          ctx.fillText(winner, canvas.width / 2 - (ctx.measureText(winner).width / 2), canvas.height / 2 + 16);
+          document.getElementById("game-buttons")?.classList.remove("hidden");
+        }
+      }
+
+      function startCountdown() {
+        const now = performance.now();
+        if (countdown > 0) {
+          if (now - countdownTimer >= 500) {
+            countdown--;
+            countdownTimer = now;
+          }
+          ctx.font = "48px Kubasta";
+          ctx.fillText(countdown.toString(), canvas.width / 2 - 10, canvas.height / 2 + 24);
+        }
+        else if (countdown === 0) {
+          ctx.font = "48px Kubasta";
+          ctx.fillText("Go!", canvas.width / 2 - 30, canvas.height / 2 + 24);
+          setTimeout(() => {
+            game_playing = true;
+            countdown = -1;
+          }, 500);
+        }
+      }
+
+      const gameLoop = async (timestamp: number) => {
+        elapsed = (timestamp - start) / 1000;
+        start = timestamp;
+        if (game_playing) {
+          movePaddles();
+          await moveBall();
+        }
+        draw();
+        if (!game_playing)
+          startCountdown();
+        if (this.running)
+          requestAnimationFrame(gameLoop);
+      };
+
+
+      document.getElementById("game-retry")?.addEventListener("click", () => {
+        setOnekoState("pong");
+        document.getElementById("game-buttons")?.classList.add("hidden");
+        game_playing = false;
+        match_over = false;
+        p1_score = 0;
+        p2_score = 0;
+
+        countdown = 3;
+        countdownTimer = performance.now();
+      });
+
+      let p1_isvalid = true;
+      let p2_isvalid = true;
+      if (await isLogged()) {
+        const p1_req = await fetch(`http://localhost:3002/users/${p1_name}`, {
+          method: "GET",
+          credentials: "include",
+        });
+        const p2_req = await fetch(`http://localhost:3002/users/${p2_name}`, {
+          method: "GET",
+          credentials: "include",
+        });
+
+        if (p1_req.status != 200)
+          p1_displayName = p1_name;
+        else
+          p1_displayName = (await p1_req.json()).displayName;
+
+        if (p2_req.status != 200)
+          p2_displayName = p2_name;
+        else
+          p2_displayName = (await p2_req.json()).displayName;
+      }
+
+      p1_displayName = p1_displayName.length > 16 ? p1_displayName.substring(0, 16) + "." : p1_displayName;
+      p2_displayName = p2_displayName.length > 16 ? p2_displayName.substring(0, 16) + "." : p2_displayName;
+      p1_name = p1_name.length > 16 ? p1_name.substring(0, 16) + "." : p1_name;
+      p2_name = p2_name.length > 16 ? p2_name.substring(0, 16) + "." : p2_name;
+      document.getElementById("tournament-ui")?.classList.add("hidden");
+
+      canvas = document.createElement("canvas");
+      canvas.id = "gameCanvas";
+      canvas.classList.add("reverse-border");
+
+      document.getElementById("main-div")?.prepend(canvas);
+
+      ctx = canvas.getContext("2d", { alpha: false }) as CanvasRenderingContext2D;
+      ctx.canvas.width = 600;
+      ctx.canvas.height = 600;
+
+      leftPaddleY = canvas.height / 2 - paddleHeight / 2;
+      rightPaddleY = canvas.height / 2 - paddleHeight / 2;
+      ballX = canvas.width / 2;
+      ballY = canvas.height / 2;
+
+      setOnekoState("pong");
+      setOnekoOffset();
+      requestAnimationFrame(gameLoop);
+    });
+  }
+
 	async run() {
     dragElement(document.getElementById("window"));
 		const generateBracket = async (playerCount: number) => {
+      let initPlayerCount = playerCount;
 			document.getElementById("bracket").innerHTML = "";
 
-			const rounds = Math.ceil(Math.log2(playerCount));
-			const totalSlots = 2 ** rounds;
-			const byes = totalSlots - playerCount;
-
-			let odd = 0;
-			if (playerCount > 9 || (playerCount != 3 && playerCount % 2 != 0))
-			{
-				console.error("odd numbers are temporarily invalids");
-				return ;
-			}
-
-			let notPowPlayersCount = 0;
+			const rounds: number = Math.ceil(Math.log2(playerCount));
+			const totalSlots: number = 2 ** rounds;
+			let odd: number = 0;
+			let notPowPlayersCount: number = 0;
+      let tournament: number[][] = [];
 
 			if ((playerCount & (playerCount - 1)) != 0)
 				notPowPlayersCount = playerCount - (2 ** Math.floor(Math.log2(playerCount)));
@@ -74,20 +335,33 @@ export default class extends Aview {
 			const playerInputColumn = document.createElement("div");
 			playerInputColumn.className = `flex flex-col mt-${(notPowPlayersCount + odd) * 28} space-y-4`;
 
+      tournament.push([]);
 			initialPlayers.forEach((name, i) => {
 				const input = document.createElement("input");
 				input.type = "text";
 				input.id = `playerName${i}`;
-				input.value = "";
+				input.value = name;
 				input.placeholder = name;
+				if (i == 0)
+				{
+          isLogged().then((value) => {
+            if (value) {
+              let uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
+              input.value = uuid;
+              input.readOnly = true;
+            }
+          });
+				}
 				input.className = "w-32 h-10 p-2 text-sm bg-white disabled:bg-gray-200 input-border";
 				playerInputColumn.appendChild(input);
+        tournament[0].push(i);
 			});
 
 			bracketWrapper.appendChild(playerInputColumn);
 
 			let currentRound = initialPlayers;
 			let previousPadding = 4;
+			tournament.push([]);
 			for (let round = 1; round <= rounds; round++)
 			{
 				const roundColumn = document.createElement("div");
@@ -96,34 +370,17 @@ export default class extends Aview {
 
 				const nextRound: string[] = [];
 
-				if (!notPowPlayersCount)
-				{
-					if (odd)
-					{
-						const input = document.createElement("input");
-						input.type = "text";
-						input.id = `playerName${playerCount}`;
-            input.value = `player ${++playerCount}`;
-						input.placeholder = `player ${++playerCount}`;
-						input.className =
-							"w-32 h-10 p-2 text-sm bg-white disabled:bg-gray-200 input-border";
-						roundColumn.appendChild(input);
-						odd--;
-						nextRound.push("");
-					}
-				}
-
-				while (notPowPlayersCount)
-				{
-					const input = document.createElement("input");
-					input.type = "text";
-					input.id = `playerName${playerCount}`;
-					input.value = "";
-					input.placeholder = `player ${++playerCount}`;
-					input.className =
-						"w-32 h-10 p-2 text-sm bg-white disabled:bg-gray-200 input-border";
-					roundColumn.appendChild(input);
-					--notPowPlayersCount;
+        while (notPowPlayersCount) {
+          tournament[1].push(playerCount);
+          const input = document.createElement("input");
+          input.type = "text";
+          input.id = `playerName${playerCount}`;
+          input.value = `player ${playerCount + 1}`;
+          input.placeholder = `player ${++playerCount}`;
+          input.className =
+            "w-32 h-10 p-2 text-sm bg-white disabled:bg-gray-200 input-border";
+          roundColumn.appendChild(input);
+          --notPowPlayersCount;
 					nextRound.push("");
 				}
 
@@ -146,13 +403,37 @@ export default class extends Aview {
 				currentRound = nextRound;
 			}
 
-			document.getElementById("bracket").appendChild(document.createElement("hr")).classList.add("my-4", "mb-8", "w-64", "reverse-border");
-			document.getElementById("bracket").appendChild(bracketWrapper);
-      const btn = document.getElementById("bracket").appendChild(document.createElement("button"));
+			document.getElementById("bracket")?.appendChild(document.createElement("hr")).classList.add("my-4", "mb-8", "w-64", "reverse-border");
+			document.getElementById("bracket")?.appendChild(bracketWrapper);
+      const btn = document.getElementById("bracket")?.appendChild(document.createElement("button"));
+      if (!btn) return;
       btn.classList.add("default-button", "w-full");
       btn.id = "tournament-play";
-      btn.onclick = () => {
-        console.log("ok");
+      btn.onclick = async () => {
+
+        let players: string[] = [];
+        for (let i of Array(initPlayerCount).keys()) {
+          players.push((document.getElementById(`playerName${i}`) as HTMLInputElement).value);
+        }
+
+        while (tournament[0].length > 1)
+        {
+          while(tournament[0].length > 0)
+          {
+            console.log(tournament[0]);
+            const p1 = tournament[0].shift() as number;
+            const p2 = tournament[0].shift() as number;
+
+            document.getElementById("tournament-id")?.classList.add("hidden");
+            const result = await this.runGame(p1, p2, players);
+            document.getElementById("gameCanvas").remove();
+            document.getElementById("tournament-id")?.classList.remove("hidden");
+            tournament[1].push(result);
+          }
+          tournament[0] = tournament[1];
+          tournament[1] = [];
+        }
+        console.log(`winner: ${tournament[0][0]}`);
       };
       btn.innerText = "start tournament !!";
 

From 8d7f1748db38234a6ba3e773f2525e4ddfeb5358 Mon Sep 17 00:00:00 2001
From: Tzvetan Trave <tzvetan.trave@abadcafe.org>
Date: Thu, 23 Oct 2025 23:07:53 +0200
Subject: [PATCH 100/109] fixed PATCH avatar

---
 src/api/user/uAvatar.js | 48 +++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 31 deletions(-)

diff --git a/src/api/user/uAvatar.js b/src/api/user/uAvatar.js
index 344307e..c3df63a 100644
--- a/src/api/user/uAvatar.js
+++ b/src/api/user/uAvatar.js
@@ -9,38 +9,24 @@ export async function uAvatar(request, reply, fastify, getUserInfo, setAvatarId,
 		if (!getUserInfo.get(userId)) {
 			return reply.code(404).send({ error: "User does not exist" });
 		}
-		deleteAvatarId.run(userId);
-		const parts = request.parts();
-		for await (const part of parts) {
-			if (part.file) {
-				let size = 0;
-				const chunks = [];
-				for await (const chunk of part.file) {
-					size += chunk.length;
-					chunks.push(chunk);
-				}
-				if (size === 5 * 1024 * 1024 + 1) {
-					return reply.code(400).send({ error: "File too large" });
-				}
-				const buffer = Buffer.concat(chunks);
-				if (!part.filename || part.filename.trim() === '') {
-					return reply.code(400).send({ error: "Missing filename" });
-				}
-				if (!part.mimetype || part.mimetype.trim() === '') {
-					return reply.code(400).send({ error: "Missing mimetype" });
-				}
-				const webpBuffer = await sharp(buffer).toFormat('webp').toBuffer();
-				const imageId = postImage.run(part.filename, part.mimetype, webpBuffer);
-				const oldImageId = getAvatarId.get(userId);
-				if (oldImageId.avatarId !== -1) {
-					deleteImage.run(oldImageId.avatarId);
-					deleteAvatarId.run(userId);
-				}
-				setAvatarId.run(imageId.lastInsertRowid, userId);
-				return reply.code(200).send({ msg: "Avatar modified successfully" });
-			}
+		const buffer = request.body;
+		if (!buffer) {
+			return reply.code(400).send({ error: "No file uploaded" });
 		}
-		return reply.code(400).send({ error: "No avatar modified" });
+		if (buffer.length > 5 * 1024 * 1024) {
+			return reply.code(400).send({ error: "File too large" });
+		}
+		const webpBuffer = await sharp(buffer).toFormat('webp').toBuffer();
+		const mimeType = request.headers['content-type'];
+		const fileName = `avatar_${userId}.webp`;
+		const imageId = postImage.run(fileName, mimeType, webpBuffer);
+		const oldImageId = getAvatarId.get(userId);
+		if (oldImageId.avatarId !== -1) {
+			deleteImage.run(oldImageId.avatarId);
+			deleteAvatarId.run(userId);
+		}
+		setAvatarId.run(imageId.lastInsertRowid, userId);
+		return reply.code(200).send({ msg: "Avatar modified successfully" });
 	} catch (err) {
 		fastify.log.error(err);
 		return reply.code(500).send({ error: "Internal server error" });

From e8177cc8d9bc4f440eef7ad8a5e4844abe02d338 Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Fri, 24 Oct 2025 11:24:26 +0200
Subject: [PATCH 101/109] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat:=20t?=
 =?UTF-8?q?ournament=20done,=20added=20env=20vars?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example                                |   3 +
 src/front/static/ts/main.ts                 |   7 +-
 src/front/static/ts/views/Friends.ts        |  16 +--
 src/front/static/ts/views/LoginPage.ts      |  17 +--
 src/front/static/ts/views/Pong.ts           |   8 +-
 src/front/static/ts/views/Profile.ts        |  20 +--
 src/front/static/ts/views/ProfileMenu.ts    |  28 ++---
 src/front/static/ts/views/RegisterPage.ts   |  15 +--
 src/front/static/ts/views/Settings.ts       |  22 ++--
 src/front/static/ts/views/Tetris.ts         |   4 +-
 src/front/static/ts/views/TetrisVersus.ts   |   8 +-
 src/front/static/ts/views/TotpEnable.ts     |   4 +-
 src/front/static/ts/views/TournamentMenu.ts | 133 +++++++++++++++++---
 13 files changed, 193 insertions(+), 92 deletions(-)

diff --git a/.env.example b/.env.example
index f6d25ac..cec8a45 100644
--- a/.env.example
+++ b/.env.example
@@ -29,3 +29,6 @@ EMAIL_TO=<mail to send to>
 USER_URL=<the url to the user api>
 AUTH_URL=<the url to the auth api>
 CORS_ORIGIN=<the url of origin for cors>
+
+VITE_USER_API=<the external url of the user api>
+VITE_AUTH_API=<the external url of the auth api>
diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index 831d203..147875e 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -4,8 +4,11 @@ import FriendsMenu from "./views/Friends.ts";
 let profile_view = new ProfileMenu;
 let friends_view = new FriendsMenu;
 
+export const user_api = import.meta.env.VITE_USER_API as String;
+export const auth_api = import.meta.env.VITE_AUTH_API as String;
+
 export async function isLogged(): Promise<boolean> {
-	let uuid_req = await fetch("http://localhost:3001/me", {
+	let uuid_req = await fetch(auth_api + "/me", {
 		method: "GET",
 		credentials: "include",
 	});
@@ -129,7 +132,7 @@ function updateClock()
 
 async function pingClock() {
 	if (await isLogged()) {
-		fetch(`http://localhost:3002/ping`, {
+		fetch(user_api + "/ping", {
 			method: "POST",
 		credentials: "include"
 		});
diff --git a/src/front/static/ts/views/Friends.ts b/src/front/static/ts/views/Friends.ts
index 7e11e4e..2d6d72a 100644
--- a/src/front/static/ts/views/Friends.ts
+++ b/src/front/static/ts/views/Friends.ts
@@ -1,7 +1,7 @@
 import Aview from "./Aview.ts"
-import { setOnekoState } from "../oneko.ts"
 import { dragElement } from "./drag.ts";
-import { isLogged, navigationManager } from "../main.ts"
+import { setOnekoState } from "../oneko.ts"
+import { isLogged, navigationManager, user_api, auth_api } from "../main.ts"
 
 export default class extends Aview {
 
@@ -58,7 +58,7 @@ export default class extends Aview {
 		const add_friend_msg = (document.getElementById("add-friend-msg") as HTMLParagraphElement);
 
 		async function removeFriend(name: String) {
-			const data_req = await fetch("http://localhost:3002/users/" + uuid + "/friends/" + name, {
+			const data_req = await fetch(user_api + "/users/" + uuid + "/friends/" + name, {
 				method: "DELETE",
 				credentials: "include",
 			});
@@ -76,7 +76,7 @@ export default class extends Aview {
 		}
 
 		async function isFriendLogged(name: string): Promise<Boolean> {
-			const data_req = await fetch("http://localhost:3002/ping/" + name, {
+			const data_req = await fetch(user_api + "/ping/" + name, {
 				method: "GET",
 				credentials: "include",
 			});
@@ -88,7 +88,7 @@ export default class extends Aview {
 		}
 
 		const list_friends = async () => {
-			const data_req = await fetch("http://localhost:3002/users/" + uuid + "/friends/count", {
+			const data_req = await fetch(user_api + "/users/" + uuid + "/friends/count", {
 				method: "GET",
 				headers: {
 					"Content-Type": "application/json",
@@ -103,7 +103,7 @@ export default class extends Aview {
 			}
 
 			if (data.n_friends > 0) {
-				const list_req = await fetch("http://localhost:3002/users/" + uuid + "/friends?iStart=0&iEnd=2147483647", {
+				const list_req = await fetch(user_api + "/users/" + uuid + "/friends?iStart=0&iEnd=2147483647", {
 					method: "GET",
 					headers: {
 						"Content-Type": "application/json",
@@ -156,7 +156,7 @@ export default class extends Aview {
 		}
 
 		const add_friend = async () => {
-			const data_req = await fetch("http://localhost:3002/users/" + uuid + "/friends/" + new_friend.value, {
+			const data_req = await fetch(user_api + "/users/" + uuid + "/friends/" + new_friend.value, {
 				method: "POST",
 				credentials: "include",
 			});
@@ -179,7 +179,7 @@ export default class extends Aview {
 		}
 
 		try {
-			const data_req = await fetch("http://localhost:3002/users/" + uuid + "/friends/count", {
+			const data_req = await fetch(user_api + "/users/" + uuid + "/friends/count", {
 				method: "GET",
 				headers: {
 					"Content-Type": "application/json",
diff --git a/src/front/static/ts/views/LoginPage.ts b/src/front/static/ts/views/LoginPage.ts
index 97ee6cb..eaf49ca 100644
--- a/src/front/static/ts/views/LoginPage.ts
+++ b/src/front/static/ts/views/LoginPage.ts
@@ -1,7 +1,7 @@
 import Aview from "./Aview.ts"
 import { dragElement } from "./drag.ts"
 import { setOnekoState } from "../oneko.ts"
-import { isLogged, navigationManager } from "../main.ts"
+import { isLogged, navigationManager, user_api, auth_api } from "../main.ts"
 
 export default class extends Aview {
 
@@ -39,13 +39,13 @@ export default class extends Aview {
 				<hr class="my-4 w-64 reverse-border">
 
 				<div class="flex flex-col space-y-4 w-full">
-				  <a target="_blank" href="http://localhost:3001/login/google" class="default-button inline-flex items-center justify-center w-full">
+				  <a target="_blank" id="login-google" class="default-button inline-flex items-center justify-center w-full">
 						<img src="https://upload.wikimedia.org/wikipedia/commons/c/c1/Google_%22G%22_logo.svg" height=20 width=20 class="mr-2 justify-self-start" />
-						login with John Google
+						login with google
 					</a>
 					<a target="_blank" href="https://rusty.42angouleme.fr/issues/all" class="default-button inline-flex items-center justify-center w-full">
 					  <img src="https://rusty.42angouleme.fr/assets/favicon-bb06adc80c8495db.ico" height=20 width=20 class="mr-2 justify-self-start" />
-						login with Rusty
+						login with rusty
 					</a>
 				</div>
 			</div>
@@ -55,6 +55,7 @@ export default class extends Aview {
 	}
 
 	async run() {
+    document.getElementById("login-google").href = `${auth_api}/login/google`;
 		dragElement(document.getElementById("window"));
 
 		const totpVerify = async () => {
@@ -63,7 +64,7 @@ export default class extends Aview {
 			const totpPin = (document.getElementById('totpPin') as HTMLInputElement).value;
 			const idWindow = (document.getElementById('2fa-popup-content') as HTMLInputElement);
 			try {
-				const data_req = await fetch("http://localhost:3001/login", {
+				const data_req = await fetch(auth_api + "/login", {
 					method: "POST",
 					headers: { "Content-Type": "application/json", },
 					credentials: "include",
@@ -101,7 +102,7 @@ export default class extends Aview {
 			const password = (document.getElementById("password") as HTMLInputElement).value;
 
 			try {
-				const data_req = await fetch("http://localhost:3001/login", {
+				const data_req = await fetch(auth_api + "/login", {
 					method: "POST",
 					headers: { "Content-Type": "application/json", },
 					credentials: "include",
@@ -165,9 +166,9 @@ export default class extends Aview {
 					uu.disabled = true;
 					pass.disabled = true;
 
-					document.getElementById("app")?.appendChild(popup); 
+					document.getElementById("app")?.appendChild(popup);
 					tokenInput.focus();
-					dragElement(document.getElementById("2fa-popup")); 
+					dragElement(document.getElementById("2fa-popup"));
 
 					document.getElementById("totp-submit")?.addEventListener("click", totpVerify);
 				}
diff --git a/src/front/static/ts/views/Pong.ts b/src/front/static/ts/views/Pong.ts
index a1d7bd0..f78f74a 100644
--- a/src/front/static/ts/views/Pong.ts
+++ b/src/front/static/ts/views/Pong.ts
@@ -1,7 +1,7 @@
 import Aview from "./Aview.ts"
 import { isLogged } from "../main.js"
 import { dragElement } from "./drag.js"
-import { setOnekoState, setBallPos, setOnekoOffset } from "../oneko.ts"
+import { setOnekoState, setBallPos, setOnekoOffset , user_api, auth_api } from "../oneko.ts"
 
 export default class extends Aview {
 
@@ -151,7 +151,7 @@ export default class extends Aview {
           if (await isLogged())
           {
             let uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
-            fetch(`http://localhost:3002/users/${uuid}/matchHistory?game=pong`, {
+            fetch(user_api + "/users/" + uuid + "/matchHistory?game=pong", {
               method: "POST",
               headers: { "Content-Type": "application/json", },
               credentials: "include",
@@ -287,11 +287,11 @@ export default class extends Aview {
       let p1_isvalid = true;
       let p2_isvalid = true;
       if (await isLogged()) {
-        const p1_req = await fetch(`http://localhost:3002/users/${p1_input.value}`, {
+        const p1_req = await fetch(`${user_api}/users/${p1_input.value}`, {
           method: "GET",
           credentials: "include",
         });
-        const p2_req = await fetch(`http://localhost:3002/users/${p2_input.value}`, {
+        const p2_req = await fetch(`${user_api}/users/${p2_input.value}`, {
           method: "GET",
           credentials: "include",
         });
diff --git a/src/front/static/ts/views/Profile.ts b/src/front/static/ts/views/Profile.ts
index 81d0dc7..25258ab 100644
--- a/src/front/static/ts/views/Profile.ts
+++ b/src/front/static/ts/views/Profile.ts
@@ -1,7 +1,7 @@
 import Aview from "./Aview.ts"
 import { dragElement } from "./drag.ts";
 import { setOnekoState } from "../oneko.ts"
-import { isLogged, navigationManager } from "../main.ts"
+import { isLogged, navigationManager, user_api, auth_api } from "../main.ts"
 
 
 export default class extends Aview {
@@ -49,7 +49,7 @@ export default class extends Aview {
     let uuid: String;
     uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
 
-    const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
+    const userdata_req = await fetch(`${user_api}/users/${uuid}`, {
       method: "GET",
       credentials: "include",
     });
@@ -59,14 +59,14 @@ export default class extends Aview {
     }
     let userdata = await userdata_req.json();
 
-    let matchCount_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory/count?game=pong`, {
+    let matchCount_req = await fetch(`${user_api}/users/${uuid}/matchHistory/count?game=pong`, {
       method: "GET",
       credentials: "include",
     });
     let matchCount = await matchCount_req.json();
     pc += matchCount.n_matches;
 
-    let matches_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory?game=pong&iStart=0&iEnd=${matchCount.n_matches}`, {
+    let matches_req = await fetch(`${user_api}/users/${uuid}/matchHistory?game=pong&iStart=0&iEnd=${matchCount.n_matches}`, {
       method: "GET",
       credentials: "include",
     });
@@ -78,7 +78,7 @@ export default class extends Aview {
 
     if (matches.matchHistory) {
       for (let match of matches.matchHistory) {
-        const p2_req = await fetch(`http://localhost:3002/users/${match.score.p2}`, {
+        const p2_req = await fetch(`${user_api}/users/${match.score.p2}`, {
           method: "GET",
           credentials: "include",
         });
@@ -121,14 +121,14 @@ export default class extends Aview {
       }
     }
 
-    matchCount_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory/count?game=tetris`, {
+    matchCount_req = await fetch(`${user_api}/users/${uuid}/matchHistory/count?game=tetris`, {
       method: "GET",
       credentials: "include",
     });
     matchCount = await matchCount_req.json();
     pc += matchCount.n_matches;
 
-    matches_req = await fetch(`http://localhost:3002/users/${uuid}/matchHistory?game=tetris&iStart=0&iEnd=${matchCount.n_matches}`, {
+    matches_req = await fetch(`${user_api}/users/${uuid}/matchHistory?game=tetris&iStart=0&iEnd=${matchCount.n_matches}`, {
       method: "GET",
       credentials: "include",
     });
@@ -143,7 +143,7 @@ export default class extends Aview {
       for (let match of matches.matchHistory) {
         if (match.score.p2 != undefined)
         {
-          const p2_req = await fetch(`http://localhost:3002/users/${match.score.p2}`, {
+          const p2_req = await fetch(`${user_api}/users/${match.score.p2}`, {
             method: "GET",
             credentials: "include",
           });
@@ -199,12 +199,12 @@ export default class extends Aview {
     if (!profile) return;
 
     const picture = profile.appendChild(document.createElement("img"));
-    const a = await fetch(`http://localhost:3002/users/${uuid}/avatar`, {
+    const a = await fetch(`${user_api}/users/${uuid}/avatar`, {
       method: "GET",
       credentials: "include",
     });
 	picture.src = a.status === 200
-		? `http://localhost:3002/users/${uuid}/avatar?t=${Date.now()}`
+		? `${user_api}/users/${uuid}/avatar?t=${Date.now()}`
 		: "https://api.kanel.ovh/pp";
     picture.classList.add("text-neutral-900", "dark:text-white", "center", "h-18", "w-18", "mx-3", "reverse-border");
 
diff --git a/src/front/static/ts/views/ProfileMenu.ts b/src/front/static/ts/views/ProfileMenu.ts
index d0ebf4e..9a480e0 100644
--- a/src/front/static/ts/views/ProfileMenu.ts
+++ b/src/front/static/ts/views/ProfileMenu.ts
@@ -1,5 +1,5 @@
 import Aview from "./Aview.ts"
-import { isLogged, navigationManager } from "../main.ts"
+import { isLogged, user_api, auth_api } from "../main.ts"
 
 export default class extends Aview {
 	async getHTML() {
@@ -7,8 +7,7 @@ export default class extends Aview {
 		<div id="main-window" class="default-border shadow-2x1 bg-neutral-200 dark:bg-neutral-800">
 		  <div class="flex flex-row items-stretch">
 				<div class="inline-block bg-linear-to-b from-orange-200 to-orange-300 min-h-84 w-6 relative">
-				  <!--div class="absolute bottom-1 left-full whitespace-nowrap origin-bottom-left -rotate-90 font-bold">knl_meowscendence</div-->
-				  <div class="absolute bottom-1 left-full whitespace-nowrap origin-bottom-left -rotate-90 font-bold">girls kissing :3</div>
+				  <div class="absolute bottom-1 left-full whitespace-nowrap origin-bottom-left -rotate-90 font-bold">knl_meowscendence</div>
 				</div>
 
 				<div class="flex flex-col items-center">
@@ -49,7 +48,7 @@ export default class extends Aview {
       document.getElementById("menu-bottom-div")?.classList.remove("hidden");
 
       uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
-	  const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
+	  const userdata_req = await fetch(`${user_api}/users/${uuid}`, {
 		method: "GET",
 		credentials: "include",
 	  });
@@ -68,20 +67,21 @@ export default class extends Aview {
       `;
     }
 
-    requestAnimationFrame(async () => {
-      document.getElementById("profile-items").innerHTML = await getMainHTML();
-
+    document.getElementById("profile-items").innerHTML = await getMainHTML();
+    requestAnimationFrame(() => {
       document.getElementById("menu-logout").addEventListener("click", async () => {
-        let req = await fetch("http://localhost:3001/logout", {
+        let req = fetch(`${auth_api}/logout`, {
           method: "GET",
           credentials: "include",
         });
-        isLogged();
-        if (req.status === 200)
-          this.run();
-        else
-          console.error("logout failed");
+        req.then((res) => {
+          isLogged();
+          if (res.status === 200)
+            this.run();
+          else
+            console.error("logout failed");
+        });
       });
-    document.getElementById("profile-items").innerHTML = await getMainHTML();
+    });
 	}
 }
diff --git a/src/front/static/ts/views/RegisterPage.ts b/src/front/static/ts/views/RegisterPage.ts
index f604ddb..ce19458 100644
--- a/src/front/static/ts/views/RegisterPage.ts
+++ b/src/front/static/ts/views/RegisterPage.ts
@@ -1,7 +1,7 @@
 import Aview from "./Aview.ts"
 import { dragElement } from "./drag.ts";
 import { setOnekoState } from "../oneko.ts"
-import { isLogged, navigationManager } from "../main.ts"
+import { isLogged, navigationManager, user_api, auth_api } from "../main.ts"
 
 export default class extends Aview {
 
@@ -38,13 +38,13 @@ export default class extends Aview {
 				<hr class="my-4 w-64 reverse-border">
 
 			  <div class="flex flex-col space-y-4 w-full">
-			    <a target="_blank" href="http://localhost:3001/register/google" class="default-button inline-flex items-center justify-center w-full">
+			    <a target="_blank" id="register-google" class="default-button inline-flex items-center justify-center w-full">
 					  <img src="https://upload.wikimedia.org/wikipedia/commons/c/c1/Google_%22G%22_logo.svg" height=20 width=20 class="mr-2 justify-self-start" />
-					  register with John Google
+					  register with google
 					</a>
 				  <a target="_blank" href="https://rusty.42angouleme.fr/issues/all" class="default-button inline-flex items-center justify-center w-full">
 		        <img src="https://rusty.42angouleme.fr/assets/favicon-bb06adc80c8495db.ico" height=20 width=20 class="mr-2 justify-self-start" />
-						register with Rusty
+						register with rusty
 					</a>
 				</div>
 			</div>
@@ -54,13 +54,14 @@ export default class extends Aview {
 	}
 
 	async run() {
+	document.getElementById("register-google").href = `${auth_api}/register/google`;
 		dragElement(document.getElementById("window"));
 		const login = async () => {
 			const username = (document.getElementById("username") as HTMLInputElement).value;
 			const password = (document.getElementById("password") as HTMLInputElement).value;
 
 			try {
-				const data_req = await fetch("http://localhost:3001/register", {
+				const data_req = await fetch(auth_api + "/register", {
 					method: "POST",
 					headers: { "Content-Type": "application/json", },
 					credentials: "include",
@@ -69,12 +70,12 @@ export default class extends Aview {
 				const data = await data_req.json();
 
 				if (data_req.status === 200) {
-					let uuid_req = await fetch("http://localhost:3001/me", {
+					let uuid_req = await fetch(auth_api + "/me", {
 						method: "GET",
 						credentials: "include",
 					});
 					let uuid = await uuid_req.json();
-					document.cookie = `uuid=${uuid.user};max-ages=${60*60*24*7}`;
+					document.cookie = `uuid=${uuid.user};max-ages=${60 * 60 * 24 * 7}`;
 					isLogged();
 					navigationManager("/");
 				}
diff --git a/src/front/static/ts/views/Settings.ts b/src/front/static/ts/views/Settings.ts
index 3019af6..f2ab968 100644
--- a/src/front/static/ts/views/Settings.ts
+++ b/src/front/static/ts/views/Settings.ts
@@ -1,9 +1,9 @@
 import Aview from "./Aview.ts"
 import { dragElement } from "./drag.ts";
 import { setOnekoState } from "../oneko.ts"
-import { isLogged, navigationManager } from "../main.ts"
 import { totpEnablePopup } from "./TotpEnable.ts";
 import { totpVerify } from "../../../../api/auth/totpVerify.js";
+import { isLogged, navigationManager, user_api, auth_api } from "../main.ts"
 
 export default class extends Aview {
 
@@ -53,7 +53,7 @@ export default class extends Aview {
     dragElement(document.getElementById("window"));
 
     const isTOTPEnabled = async () => {
-			const totpVerify_req = await fetch('http://localhost:3001/2fa', {
+			const totpVerify_req = await fetch(auth_api + '/2fa', {
 				method: "GET",
 				credentials: "include"
 			})
@@ -66,10 +66,10 @@ export default class extends Aview {
 			}
 			return false;
 		};
-  
+
     let uuid: String;
     uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
-    const userdata_req = await fetch(`http://localhost:3002/users/${uuid}`, {
+    const userdata_req = await fetch(`${user_api}/users/${uuid}`, {
       method: "GET",
       credentials: "include",
     });
@@ -83,7 +83,7 @@ export default class extends Aview {
     (document.getElementById("displayName-input") as HTMLInputElement).value = userdata.displayName;
 
     document.getElementById("displayName-button")?.addEventListener("click", async () => {
-      const changeDisplayName_req = await fetch(`http://localhost:3002/users/${uuid}/displayName`, {
+      const changeDisplayName_req = await fetch(`${user_api}/users/${uuid}/displayName`, {
         method: "PATCH",
         headers: { "Content-Type": "application/json", },
         credentials: "include",
@@ -98,7 +98,7 @@ export default class extends Aview {
     });
 
     document.getElementById("deleteAccount-button")?.addEventListener("click", async () => {
-      const delete_req = await fetch(`http://localhost:3001/`, {
+      const delete_req = await fetch(auth_api + "/", {
         method: "DELETE",
         credentials: "include",
       });
@@ -134,7 +134,7 @@ export default class extends Aview {
     });
 
     (document.getElementById("upload-submit") as HTMLButtonElement).onclick = async () => {
-      const up_req = await fetch(`http://localhost:3002/users/${uuid}/avatar`, {
+      const up_req = await fetch(`${user_api}/users/${uuid}/avatar`, {
         method: "POST",
         headers: { "Content-Type": upload.files[0].type } ,
         credentials: "include",
@@ -142,14 +142,14 @@ export default class extends Aview {
       });
       console.log(up_req.status);
     };
-  
+
   	const totpButton = document.getElementById("2fa-button") as HTMLButtonElement;
 
 		if ((await isTOTPEnabled()) === true) {
 			totpButton.innerHTML = "disable 2fa";
 
 			document.getElementById("2fa-button")?.addEventListener("click", async () => {
-				const totp_req = await fetch(`http://localhost:3001/2fa`, {
+				const totp_req = await fetch(`${user_api}/2fa`, {
 					method: "DELETE",
 					credentials: "include"
 				})
@@ -162,9 +162,9 @@ export default class extends Aview {
 			});
 		} else {
 			totpButton.innerHTML = "enable 2fa";
-	
+
 			document.getElementById("2fa-button")?.addEventListener("click", async () => {
-				const totp_req = await fetch(`http://localhost:3001/2fa`, {
+				const totp_req = await fetch(`${user_api}/2fa`, {
 					method: "POST",
 					credentials: "include"
 				})
diff --git a/src/front/static/ts/views/Tetris.ts b/src/front/static/ts/views/Tetris.ts
index f5a20d3..c53c5cc 100644
--- a/src/front/static/ts/views/Tetris.ts
+++ b/src/front/static/ts/views/Tetris.ts
@@ -1,6 +1,6 @@
 import Aview from "./Aview.ts";
-import { isLogged } from "../main.js";
 import { dragElement } from "./drag.js";
+import { isLogged , user_api, auth_api } from "../main.js";
 import { setOnekoState, setBallPos, setOnekoOffset } from "../oneko.ts";
 
 export default class extends Aview {
@@ -629,7 +629,7 @@ export default class extends Aview {
           if (await isLogged())
           {
             let uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
-            fetch(`http://localhost:3002/users/${uuid}/matchHistory?game=tetris`, {
+            fetch(`${user_api}/users/${uuid}/matchHistory?game=tetris`, {
               method: "POST",
               headers: { "Content-Type": "application/json", },
               credentials: "include",
diff --git a/src/front/static/ts/views/TetrisVersus.ts b/src/front/static/ts/views/TetrisVersus.ts
index da1805a..de9acd8 100644
--- a/src/front/static/ts/views/TetrisVersus.ts
+++ b/src/front/static/ts/views/TetrisVersus.ts
@@ -1,5 +1,5 @@
 import Aview from "./Aview.ts";
-import { isLogged } from "../main.js";
+import { isLogged, user_api, auth_api } from "../main.js";
 import { dragElement } from "./drag.js";
 import { setOnekoState, setBallPos, setOnekoOffset } from "../oneko.ts";
 
@@ -668,7 +668,7 @@ export default class extends Aview {
           if (await isLogged() && this.id == 0)
           {
             let uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
-            fetch(`http://localhost:3002/users/${uuid}/matchHistory?game=tetris`, {
+            fetch(`${user_api}/users/${uuid}/matchHistory?game=tetris`, {
               method: "POST",
               headers: { "Content-Type": "application/json", },
               credentials: "include",
@@ -944,11 +944,11 @@ export default class extends Aview {
       let p1_isvalid = true;
       let p2_isvalid = true;
       if (await isLogged()) {
-        const p1_req = await fetch(`http://localhost:3002/users/${p1_input.value}`, {
+        const p1_req = await fetch(`${user_api}/users/${p1_input.value}`, {
           method: "GET",
           credentials: "include",
         });
-        const p2_req = await fetch(`http://localhost:3002/users/${p2_input.value}`, {
+        const p2_req = await fetch(`${user_api}/users/${p2_input.value}`, {
           method: "GET",
           credentials: "include",
         });
diff --git a/src/front/static/ts/views/TotpEnable.ts b/src/front/static/ts/views/TotpEnable.ts
index baf4fd9..51efed2 100644
--- a/src/front/static/ts/views/TotpEnable.ts
+++ b/src/front/static/ts/views/TotpEnable.ts
@@ -1,9 +1,9 @@
-import { navigationManager } from "../main.ts";
+import { navigationManager, user_api, auth_api } from "../main.ts";
 import { dragElement } from "./drag.ts";
 
 async function totpVerify() {
 	const code = (document.getElementById("totpPin") as HTMLInputElement).value;
-	const data_req = await fetch('http://localhost:3001/2fa/verify', {
+	const data_req = await fetch(auth_api + '/2fa/verify', {
 		method: "POST",
 		credentials: "include",
 		headers: {
diff --git a/src/front/static/ts/views/TournamentMenu.ts b/src/front/static/ts/views/TournamentMenu.ts
index ddf464b..03c246e 100644
--- a/src/front/static/ts/views/TournamentMenu.ts
+++ b/src/front/static/ts/views/TournamentMenu.ts
@@ -1,5 +1,5 @@
 import Aview from "./Aview.ts"
-import { isLogged } from "../main.js"
+import { isLogged, user_api } from "../main.js"
 import { dragElement } from "./drag.ts";
 import { setOnekoState, setBallPos, setOnekoOffset } from "../oneko.ts"
 
@@ -42,6 +42,18 @@ export default class extends Aview {
 				<div id="bracket" class="flex flex-col space-y-6 items-center"></div>
 			</div>
 			</div>
+
+			<div id="announcement" class="hidden flex flex-col space-y-8">
+			  <div id="bracket-announcement" class="flex flex-col space-y-6 items-center">
+				</div>
+			  <span id="announcement-text" class="text-lg font-bold text-neutral-900 dark:text-white"></span>
+			  <button type="submit" id="tournament-continue" class="default-button">let's go</button>
+			</div>
+
+			<div id="winner-div" class="hidden flex flex-col items-center space-y-8">
+			  <img src="https://api.kanel.ovh/pp?id=3" class="w-25 h-25 default-border" \>
+			  <span id="winner-text" class="text-2x1 text-neutral-900 dark:text-white"></span>
+			</div>
 		</div>
 		</div>
 		`;
@@ -49,9 +61,10 @@ export default class extends Aview {
 
 	async runGame(p1_id: number, p2_id: number, players: string[]): Promise<number> {
     return new Promise<number>(async (resolve) => {
-      console.log(p1_id, p2_id, players, players[p1_id], players[p2_id]);
+      //console.log(p1_id, p2_id, players, players[p1_id], players[p2_id]);
       let p1_name = players[p1_id];
       let p2_name = players[p2_id];
+
       let uuid: string;
       let start: number = 0;
       let elapsed: number;
@@ -146,7 +159,7 @@ export default class extends Aview {
           if (p1_score === 3 || p2_score === 3) {
             if (await isLogged()) {
               let uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
-              fetch(`http://localhost:3002/users/${uuid}/matchHistory?game=pong`, {
+              fetch(`${user_api}/users/${uuid}/matchHistory?game=pong`, {
                 method: "POST",
                 headers: { "Content-Type": "application/json", },
                 credentials: "include",
@@ -158,9 +171,9 @@ export default class extends Aview {
                   "date": Date.now(),
                 }),
               });
-              resolve(p1_score == 3 ? p1_id : p2_id);
             }
             match_over = true;
+            resolve(p1_score == 3 ? p1_id : p2_id);
           }
           else {
             countdown = 3;
@@ -262,24 +275,29 @@ export default class extends Aview {
       let p1_isvalid = true;
       let p2_isvalid = true;
       if (await isLogged()) {
-        const p1_req = await fetch(`http://localhost:3002/users/${p1_name}`, {
+        const p1_req = await fetch(`${user_api}/users/${p1_name}`, {
           method: "GET",
           credentials: "include",
         });
-        const p2_req = await fetch(`http://localhost:3002/users/${p2_name}`, {
+        const p2_req = await fetch(`${user_api}/users/${p2_name}`, {
           method: "GET",
           credentials: "include",
         });
 
-        if (p1_req.status != 200)
-          p1_displayName = p1_name;
-        else
+        if (p1_req.status == 200)
           p1_displayName = (await p1_req.json()).displayName;
-
-        if (p2_req.status != 200)
-          p2_displayName = p2_name;
         else
+          p1_displayName = p1_name;
+
+        if (p2_req.status == 200)
           p2_displayName = (await p2_req.json()).displayName;
+        else
+          p2_displayName = p2_name;
+      }
+      else
+      {
+        p1_displayName = p1_name;
+        p2_displayName = p2_name;
       }
 
       p1_displayName = p1_displayName.length > 16 ? p1_displayName.substring(0, 16) + "." : p1_displayName;
@@ -309,9 +327,77 @@ export default class extends Aview {
     });
   }
 
+  waitForUserClick(buttonId: string): Promise<void> {
+    return new Promise((resolve) => {
+      const button = document.getElementById(buttonId);
+      if (!button) return resolve(); // failsafe if no button
+
+      const handler = () => {
+        button.removeEventListener("click", handler);
+        resolve();
+      };
+      button.addEventListener("click", handler);
+    });
+  }
+
+  tournament_state: number[][];
+  i: number = 0;
+  space: number;
+
+  updateBracketDisplay(tournament: number[][], players: string[]) {
+    for (let i of Array(tournament[0].length).keys())
+      this.tournament_state[this.i][i] = tournament[0][i];
+    for (let i of Array(tournament[1].length).keys())
+    {
+      console.log(this.tournament_state, this.i, i);
+      this.tournament_state[this.i + 1][i] = tournament[1][i];
+    }
+    this.i++;
+    const container = document.getElementById("bracket-announcement");
+    if (!container) return;
+    container.innerHTML = ""; // clear old bracket
+
+    const bracketWrapper = document.createElement("div");
+    bracketWrapper.className = "flex space-x-8 overflow-x-auto";
+
+    // replicate generateBracket() spacing logic
+    let previousPadding = 4;
+
+    for (let round = 0; round < this.tournament_state.length; round++) {
+      const roundColumn = document.createElement("div");
+
+      if (round === 0) {
+        roundColumn.className = `flex flex-col mt-${this.space} space-y-4`;
+      } else {
+        previousPadding = previousPadding * 2 + 10;
+        roundColumn.className = `flex flex-col justify-center space-y-${previousPadding}`;
+      }
+
+      // each player slot or winner
+      for (let i = 0; i < this.tournament_state[round].length; i++) {
+        const playerIndex = this.tournament_state[round][i];
+        const name =
+          playerIndex !== undefined && playerIndex !== null
+            ? players[playerIndex]
+            : "";
+
+        const cell = document.createElement("div");
+        cell.className =
+          "w-32 h-10 flex items-center justify-center bg-white text-center text-sm input-border";
+        cell.textContent = name || "";
+        roundColumn.appendChild(cell);
+      }
+
+      bracketWrapper.appendChild(roundColumn);
+    }
+
+    container.appendChild(bracketWrapper);
+  }
+
 	async run() {
     dragElement(document.getElementById("window"));
 		const generateBracket = async (playerCount: number) => {
+      this.tournament_state = [];
       let initPlayerCount = playerCount;
 			document.getElementById("bracket").innerHTML = "";
 
@@ -333,9 +419,11 @@ export default class extends Aview {
 
 			// Round 0: Player input column
 			const playerInputColumn = document.createElement("div");
+      this.space = (notPowPlayersCount + odd) * 28;
 			playerInputColumn.className = `flex flex-col mt-${(notPowPlayersCount + odd) * 28} space-y-4`;
 
       tournament.push([]);
+      this.tournament_state.push([]);
 			initialPlayers.forEach((name, i) => {
 				const input = document.createElement("input");
 				input.type = "text";
@@ -355,6 +443,7 @@ export default class extends Aview {
 				input.className = "w-32 h-10 p-2 text-sm bg-white disabled:bg-gray-200 input-border";
 				playerInputColumn.appendChild(input);
         tournament[0].push(i);
+        this.tournament_state[0].push(-1);
 			});
 
 			bracketWrapper.appendChild(playerInputColumn);
@@ -364,6 +453,7 @@ export default class extends Aview {
 			tournament.push([]);
 			for (let round = 1; round <= rounds; round++)
 			{
+			  this.tournament_state.push([]);
 				const roundColumn = document.createElement("div");
 				previousPadding = previousPadding * 2 + 10
 				roundColumn.className = `flex flex-col justify-center space-y-${previousPadding}`;
@@ -372,6 +462,7 @@ export default class extends Aview {
 
         while (notPowPlayersCount) {
           tournament[1].push(playerCount);
+          this.tournament_state[1].push(-1);
           const input = document.createElement("input");
           input.type = "text";
           input.id = `playerName${playerCount}`;
@@ -397,6 +488,7 @@ export default class extends Aview {
 					nextRound.push("");
 
 					roundColumn.appendChild(matchDiv);
+					this.tournament_state[round].push(-1);
 				}
 
 				bracketWrapper.appendChild(roundColumn);
@@ -410,7 +502,7 @@ export default class extends Aview {
       btn.classList.add("default-button", "w-full");
       btn.id = "tournament-play";
       btn.onclick = async () => {
-
+        document.getElementById("tournament-id")?.classList.add("hidden");
         let players: string[] = [];
         for (let i of Array(initPlayerCount).keys()) {
           players.push((document.getElementById(`playerName${i}`) as HTMLInputElement).value);
@@ -418,22 +510,25 @@ export default class extends Aview {
 
         while (tournament[0].length > 1)
         {
+          this.updateBracketDisplay(tournament, players);
           while(tournament[0].length > 0)
           {
-            console.log(tournament[0]);
             const p1 = tournament[0].shift() as number;
             const p2 = tournament[0].shift() as number;
 
-            document.getElementById("tournament-id")?.classList.add("hidden");
+            document.getElementById("announcement-text").innerText = `${players[p1]} vs ${players[p2]}`;
+            document.getElementById("announcement")?.classList.remove("hidden");
+            await this.waitForUserClick("tournament-continue");
+            document.getElementById("announcement")?.classList.add("hidden");
             const result = await this.runGame(p1, p2, players);
-            document.getElementById("gameCanvas").remove();
-            document.getElementById("tournament-id")?.classList.remove("hidden");
+            document.getElementById("gameCanvas")?.remove();
             tournament[1].push(result);
           }
           tournament[0] = tournament[1];
           tournament[1] = [];
         }
-        console.log(`winner: ${tournament[0][0]}`);
+        document.getElementById("winner-div")?.classList.remove("hidden");
+        document.getElementById("winner-text").innerText = `${players[tournament[0][0]]} won the tournament !! ggs :D`;
       };
       btn.innerText = "start tournament !!";
 
@@ -445,7 +540,5 @@ export default class extends Aview {
         return;
 			generateBracket(+input.value);
 		});
-
-
 	}
 }

From 6c1a39b1c1587a1e0066cd2398202396636c9402 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Fri, 24 Oct 2025 12:25:05 +0200
Subject: [PATCH 102/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20wtf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example                      | 7 ++++---
 docker/front/compose.yml          | 4 ++--
 src/front/static/ts/views/Pong.ts | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.env.example b/.env.example
index cec8a45..6374512 100644
--- a/.env.example
+++ b/.env.example
@@ -26,9 +26,10 @@ SMTP_AUTH_USERNAME=<smtp-user>
 SMTP_AUTH_PASSWORD=<smtp pass>
 EMAIL_TO=<mail to send to>
 
-USER_URL=<the url to the user api>
-AUTH_URL=<the url to the auth api>
-CORS_ORIGIN=<the url of origin for cors>
+USER_URL=<the internal url to the user api>
+AUTH_URL=<the internal url to the auth api>
+SCORE_URL=<the internal url to the score store api>
 
+CORS_ORIGIN=<the external url of origin for cors>
 VITE_USER_API=<the external url of the user api>
 VITE_AUTH_API=<the external url of the auth api>
diff --git a/docker/front/compose.yml b/docker/front/compose.yml
index 134b29d..a85d142 100644
--- a/docker/front/compose.yml
+++ b/docker/front/compose.yml
@@ -5,8 +5,8 @@ services:
       dockerfile: docker/front/Dockerfile
       context: ../../
       args:
-        - VITE_USER_URL=${USER_URL}
-        - VITE_AUTH_URL=${AUTH_URL}
+        - VITE_USER_URL=${VITE_USER_URL}
+        - VITE_AUTH_URL=${VITE_AUTH_URL}
     environment:
       - TZ=Europe/Paris
     networks:
diff --git a/src/front/static/ts/views/Pong.ts b/src/front/static/ts/views/Pong.ts
index f78f74a..72aacf0 100644
--- a/src/front/static/ts/views/Pong.ts
+++ b/src/front/static/ts/views/Pong.ts
@@ -1,7 +1,7 @@
 import Aview from "./Aview.ts"
-import { isLogged } from "../main.js"
+import { isLogged, user_api, auth_api  } from "../main.js"
 import { dragElement } from "./drag.js"
-import { setOnekoState, setBallPos, setOnekoOffset , user_api, auth_api } from "../oneko.ts"
+import { setOnekoState, setBallPos, setOnekoOffset } from "../oneko.ts"
 
 export default class extends Aview {
 

From 71189c8dc20facb73f3d611f462f70e0ffddf868 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Fri, 24 Oct 2025 12:31:30 +0200
Subject: [PATCH 103/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix(li?=
 =?UTF-8?q?cense):=20added=20all=20names?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 6bb21cd..da81945 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Adam
+Copyright (c) 2025 adjoly, ttrave, nmoussou
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 3a7033e55453b72ef5e1514d05ea63c841f270bb Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Fri, 24 Oct 2025 15:07:33 +0200
Subject: [PATCH 104/109] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D?=
 =?UTF-8?q?=20wip:=20started=20fixing=20shit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example                              |  5 ++--
 Justfile                                  |  4 ++-
 docker/api-base/compose.yml               | 13 ++++++++--
 docker/docker-compose.yml                 |  4 +--
 docker/proxy/Dockerfile                   | 30 +++++++++++------------
 docker/proxy/config/default.conf.template | 11 ++++++++-
 src/api/user/default.js                   |  7 ------
 src/api/user/gMatchHistory.js             |  4 ++-
 src/api/user/pMatchHistory.js             |  4 ++-
 src/front/static/ts/main.ts               | 14 +++++------
 src/front/static/ts/views/Friends.ts      |  2 +-
 src/front/static/ts/views/Settings.ts     |  4 +--
 12 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/.env.example b/.env.example
index 6374512..f89d5a2 100644
--- a/.env.example
+++ b/.env.example
@@ -26,10 +26,11 @@ SMTP_AUTH_USERNAME=<smtp-user>
 SMTP_AUTH_PASSWORD=<smtp pass>
 EMAIL_TO=<mail to send to>
 
+# all of those can't have a / at the env ↓
 USER_URL=<the internal url to the user api>
 AUTH_URL=<the internal url to the auth api>
 SCORE_URL=<the internal url to the score store api>
 
 CORS_ORIGIN=<the external url of origin for cors>
-VITE_USER_API=<the external url of the user api>
-VITE_AUTH_API=<the external url of the auth api>
+VITE_USER_URL=<the external url of the user api>
+VITE_AUTH_URL=<the external url of the auth api>
diff --git a/Justfile b/Justfile
index ad2eb32..56ba865 100644
--- a/Justfile
+++ b/Justfile
@@ -42,7 +42,9 @@ set dotenv-load
 
 # To completely docker
 @clean-docker: clean-compose
-	docker system prune -af
+	docker builder prune -f
+	docker volume prune -af
+	# docker system prune -af
 
 # To clean only the container launched by the compose
 @clean-compose: stop-docker
diff --git a/docker/api-base/compose.yml b/docker/api-base/compose.yml
index bed06c8..e27bbaa 100644
--- a/docker/api-base/compose.yml
+++ b/docker/api-base/compose.yml
@@ -16,6 +16,9 @@ services:
       - LOG_FILE_PATH=/var/log/log.log
       - JWT_SECRET=${JWT_SECRET}
       - CORS_ORIGIN=${CORS_ORIGIN}
+      - USER_URL=${USER_URL}
+      - AUTH_URL=${AUTH_URL}
+      - SCORE_URL=${SCORE_URL}
     restart: unless-stopped
   auth-api:
     container_name: transcendence-api-auth
@@ -30,13 +33,17 @@ services:
       - back
     environment:
       - TZ=Europe/Paris
-      - GOOGLE_CALLBACK_URL=${AUTH_URL}
+      - GOOGLE_CALLBACK_URL=${GOOGLE_CALLBACK_URL}
       - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
       - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
+      - CALLBACK_REDIR=${CALLBACK_REDIR}
       - API_TARGET=auth
       - LOG_FILE_PATH=/var/log/log.log
       - JWT_SECRET=${JWT_SECRET}
       - CORS_ORIGIN=${CORS_ORIGIN}
+      - USER_URL=${USER_URL}
+      - AUTH_URL=${AUTH_URL}
+      - SCORE_URL=${SCORE_URL}
     restart: unless-stopped
   scorestore-api:
     container_name: transcendence-api-scoreStore
@@ -47,7 +54,6 @@ services:
       - db-scoreStore:/db
       - log-scoreStore:/var/log
     networks:
-      - front
       - back
     environment:
       - TZ=Europe/Paris
@@ -56,4 +62,7 @@ services:
       - AVAX_PRIVATE_KEY=${AVAX_PRIVATE_KEY}
       - AVAX_RPC_URL=${AVAX_RPC_URL}
       - AVAX_CONTRACT_ADDR=${AVAX_CONTRACT_ADDR}
+      - USER_URL=${USER_URL}
+      - AUTH_URL=${AUTH_URL}
+      - SCORE_URL=${SCORE_URL}
     restart: unless-stopped
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 6a9b21a..f5bf598 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -3,8 +3,8 @@ name: ft_transcendence
 include:
   - ./volumes.yml
   - ./networks.yml
-  - ./monitoring/compose.yml
+  # - ./monitoring/compose.yml
   - ./api-base/compose.yml
   - ./front/compose.yml
   - ./proxy/compose.yml
-  - ./ELK/compose.yml
+  # - ./ELK/compose.yml
diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile
index c46fb7c..dc60e69 100644
--- a/docker/proxy/Dockerfile
+++ b/docker/proxy/Dockerfile
@@ -1,17 +1,17 @@
-FROM		node:lts-alpine AS builder
-
-RUN			npm install -g pnpm
-
-WORKDIR		/app
-
-COPY		package.json pnpm-lock.yaml pnpm-workspace.yaml ./
-
-RUN			pnpm install --frozen-lockfile
-
-COPY		vite.config.js tailwind.config.js ./
-COPY		src ./src
-
-RUN			pnpm vite build
+# FROM		node:lts-alpine AS builder
+#
+# RUN			npm install -g pnpm
+#
+# WORKDIR		/app
+#
+# COPY		package.json pnpm-lock.yaml pnpm-workspace.yaml ./
+#
+# RUN			pnpm install --frozen-lockfile
+#
+# COPY		vite.config.js tailwind.config.js ./
+# COPY		src ./src
+#
+# RUN			pnpm vite build
 
 FROM		owasp/modsecurity-crs:nginx-alpine
 
@@ -23,7 +23,7 @@ COPY		docker/proxy/config/default.conf.template \
 
 COPY		--chmod=755 docker/proxy/entry/ssl-cert.sh /docker-entrypoint.d/ssl-cert.sh
 
-COPY		--from=builder /app/dist /usr/share/nginx/html
+# COPY		--from=builder /app/dist /usr/share/nginx/html
 
 USER		root
 RUN			mkdir -p /var/log/front
diff --git a/docker/proxy/config/default.conf.template b/docker/proxy/config/default.conf.template
index 0f65e5e..c8dc39b 100644
--- a/docker/proxy/config/default.conf.template
+++ b/docker/proxy/config/default.conf.template
@@ -19,11 +19,19 @@ server {
     add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
 
 	location / {
-		proxy_pass http://transcendence-webserv:80/;
+		proxy_pass http://transcendence-webserv:80;
+		proxy_http_version 1.1;
+		proxy_redirect off;
+		rewrite ^ / break;
+	}
+
+	location /assets/ {
+		proxy_pass http://transcendence-webserv:80/assets/;
 		proxy_http_version 1.1;
 	}
 
     location /api/v1/user/ {
+		modsecurity off;
         proxy_pass http://transcendence-api-user:3000/;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
@@ -35,6 +43,7 @@ server {
 	}
 
     location /api/v1/auth/ {
+		modsecurity off;
         proxy_pass http://transcendence-api-auth:3000/;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
diff --git a/src/api/user/default.js b/src/api/user/default.js
index 0057207..88c7a4e 100644
--- a/src/api/user/default.js
+++ b/src/api/user/default.js
@@ -2,7 +2,6 @@ import fastifyJWT from '@fastify/jwt';
 import fastifyCookie from '@fastify/cookie';
 import cors from '@fastify/cors'
 import Database from 'better-sqlite3';
-import cors from '@fastify/cors';
 
 import { gUsers } from './gUsers.js';
 import { gUser } from './gUser.js';
@@ -163,12 +162,6 @@ export default async function(fastify, options) {
 		},
 	});
 	fastify.register(fastifyCookie);
-	fastify.register(cors, {
-		origin: process.env.CORS_ORIGIN || 'http://localhost:5173',
-		credentials: true,
-		methods: [ "GET", "POST", "PATCH", "DELETE", "OPTIONS" ]
-	});
-
 	fastify.addContentTypeParser(
 		['image/jpeg', 'image/png', 'image/gif', 'image/webp'],
 		{ parseAs: 'buffer' },
diff --git a/src/api/user/gMatchHistory.js b/src/api/user/gMatchHistory.js
index e8d3a55..e47517a 100644
--- a/src/api/user/gMatchHistory.js
+++ b/src/api/user/gMatchHistory.js
@@ -1,3 +1,5 @@
+const score_url = process.env.SCORE_URL
+
 export async function gMatchHistory(request, reply, fastify, getUserInfo, getMatchHistory) {
 	try {
 		const userId = request.params.userId;
@@ -19,7 +21,7 @@ export async function gMatchHistory(request, reply, fastify, getUserInfo, getMat
 			return reply.code(404).send({ error: "No matches exist in the selected range" });
 		}
 		const promises = matchHistoryId.map(async (match) => {
-			const res = await fetch(`http://localhost:3003/${match.matchId}`, { method: "GET" });
+			const res = await fetch(`${score_url}/${match.matchId}`, { method: "GET" });
 			if (!res.ok) {
 				throw new Error('Failed to fetch item from blockchain API');
 			}
diff --git a/src/api/user/pMatchHistory.js b/src/api/user/pMatchHistory.js
index f722775..94dd63b 100644
--- a/src/api/user/pMatchHistory.js
+++ b/src/api/user/pMatchHistory.js
@@ -1,3 +1,5 @@
+const score_url = process.env.SCORE_URL || "http://localhost:3003";
+
 async function fetchSave(request, reply, userId, addMatch) {
 	let opponentName = '';
 	let opponentScore = 0;
@@ -5,7 +7,7 @@ async function fetchSave(request, reply, userId, addMatch) {
 		opponentName = request.body.opponent;
 		opponentScore = request.body.opponentScore;
 	}
-	const res = await fetch('http://localhost:3003/', { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ p1: userId, p2: opponentName, p1Score: request.body.myScore, p2Score: opponentScore }) });
+	const res = await fetch(score_url + "/", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ p1: userId, p2: opponentName, p1Score: request.body.myScore, p2Score: opponentScore }) });
 	if (!res.ok) {
 		throw new Error('Internal server error');
 	}
diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index 35338a5..6299759 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -4,11 +4,11 @@ import FriendsMenu from "./views/Friends.ts";
 let profile_view = new ProfileMenu;
 let friends_view = new FriendsMenu;
 
-export const user_api = import.meta.env.VITE_USER_API as String;
-export const auth_api = import.meta.env.VITE_AUTH_API as String;
+export const user_api = import.meta.env.VITE_USER_URL as String;
+export const auth_api = import.meta.env.VITE_AUTH_URL as String;
 
 export async function isLogged(): Promise<boolean> {
-	let uuid_req = await fetch(auth_api + "/me", {
+	let uuid_req = await fetch(`${auth_api}/me`, {
 		method: "GET",
 		credentials: "include",
 	});
@@ -132,9 +132,9 @@ function updateClock()
 
 async function pingClock() {
 	if (await isLogged()) {
-		fetch(user_api + "/ping", {
+		fetch(`${user_api}/ping`, {
 			method: "POST",
-		credentials: "include"
+			credentials: "include"
 		});
 	}
 }
@@ -156,13 +156,13 @@ async function startMenuPP() {
 		uuid = document.cookie.match(new RegExp('(^| )' + "uuid" + '=([^;]+)'))[2];
 
 
-		const a = await fetch(`http://localhost:3002/users/${uuid}/avatar`, {
+		const a = await fetch(`${user_api}/users/${uuid}/avatar`, {
 			method: "GET",
 			credentials: "include"
 		});
 
 		profileButton.src = a.status === 200
-			? `http://localhost:3002/users/${uuid}/avatar?t=${Date.now()}`
+			? `${user_api}/users/${uuid}/avatar?t=${Date.now()}`
 			: "https://api.kanel.ovh/pp";
 	} catch (err){
 		// console.log("not yet logged, going default for start icon...");
diff --git a/src/front/static/ts/views/Friends.ts b/src/front/static/ts/views/Friends.ts
index 2d6d72a..1819f95 100644
--- a/src/front/static/ts/views/Friends.ts
+++ b/src/front/static/ts/views/Friends.ts
@@ -103,7 +103,7 @@ export default class extends Aview {
 			}
 
 			if (data.n_friends > 0) {
-				const list_req = await fetch(user_api + "/users/" + uuid + "/friends?iStart=0&iEnd=2147483647", {
+				const list_req = await fetch(user_api + "/users/" + uuid + "/friends?iStart=0&iEnd=50", {
 					method: "GET",
 					headers: {
 						"Content-Type": "application/json",
diff --git a/src/front/static/ts/views/Settings.ts b/src/front/static/ts/views/Settings.ts
index f2ab968..3f115f6 100644
--- a/src/front/static/ts/views/Settings.ts
+++ b/src/front/static/ts/views/Settings.ts
@@ -149,7 +149,7 @@ export default class extends Aview {
 			totpButton.innerHTML = "disable 2fa";
 
 			document.getElementById("2fa-button")?.addEventListener("click", async () => {
-				const totp_req = await fetch(`${user_api}/2fa`, {
+				const totp_req = await fetch(`${auth_api}/2fa`, {
 					method: "DELETE",
 					credentials: "include"
 				})
@@ -164,7 +164,7 @@ export default class extends Aview {
 			totpButton.innerHTML = "enable 2fa";
 
 			document.getElementById("2fa-button")?.addEventListener("click", async () => {
-				const totp_req = await fetch(`${user_api}/2fa`, {
+				const totp_req = await fetch(`${auth_api}/2fa`, {
 					method: "POST",
 					credentials: "include"
 				})

From 7ab278c1afb2e0833b496a4956097542cb07b1d6 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Fri, 24 Oct 2025 15:21:33 +0200
Subject: [PATCH 105/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20fixed=20some=20things.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user/pMatchHistory.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/api/user/pMatchHistory.js b/src/api/user/pMatchHistory.js
index 94dd63b..eb60871 100644
--- a/src/api/user/pMatchHistory.js
+++ b/src/api/user/pMatchHistory.js
@@ -3,9 +3,13 @@ const score_url = process.env.SCORE_URL || "http://localhost:3003";
 async function fetchSave(request, reply, userId, addMatch) {
 	let opponentName = '';
 	let opponentScore = 0;
-	if (request.body.opponent && request.body.opponentScore) {
+	if (request.body.opponent) {
 		opponentName = request.body.opponent;
+	}
+	if (request.body.opponentScore !== undefined) {
 		opponentScore = request.body.opponentScore;
+	} else {
+		opponentScore = 0;
 	}
 	const res = await fetch(score_url + "/", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ p1: userId, p2: opponentName, p1Score: request.body.myScore, p2Score: opponentScore }) });
 	if (!res.ok) {
@@ -27,7 +31,7 @@ export async function pMatchHistory(request, reply, fastify, getUserInfo, addMat
 		if (request.body.game !== 'pong' && request.body.game !== 'tetris') {
 			return reply.code(400).send({ error: "Specified game does not exist" });
 		}
-		if (request.body.game === 'pong' && (!request.body.opponent || !request.body.opponentScore)) {
+		if (request.body.game === 'pong' && !request.body.opponent) {
 			return reply.code(400).send({ error: "Game requires two players" });
 		}
 		if (!getUserInfo.get(userId)) {
@@ -41,7 +45,7 @@ export async function pMatchHistory(request, reply, fastify, getUserInfo, addMat
 				return reply.code(400).send({ error: "Do you have dementia ? You cannot have played a match against yourself gramps" });
 			}
 		}
-		await fetchSave(request, reply, userId, addMatch);
+		fetchSave(request, reply, userId, addMatch);
 		if (request.body.game === 'pong') {
 			if (request.body.myScore > request.body.opponentScore) {
 				incWinsPong.run(userId);

From 540c94a27239076269e06c1ca81cb8a798f25ada Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Fri, 24 Oct 2025 15:38:55 +0200
Subject: [PATCH 106/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20fixed=20some=20things.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/main.ts               | 2 +-
 src/front/static/ts/views/LoginPage.ts    | 4 ++--
 src/front/static/ts/views/Profile.ts      | 6 +++---
 src/front/static/ts/views/ProfileMenu.ts  | 6 +++---
 src/front/static/ts/views/RegisterPage.ts | 2 +-
 src/front/static/ts/views/Settings.ts     | 8 ++++----
 src/front/static/ts/views/Tetris.ts       | 6 +++---
 src/front/static/ts/views/TetrisVersus.ts | 6 +++---
 src/start.js                              | 2 +-
 9 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/front/static/ts/main.ts b/src/front/static/ts/main.ts
index 6299759..5fee606 100644
--- a/src/front/static/ts/main.ts
+++ b/src/front/static/ts/main.ts
@@ -170,5 +170,5 @@ async function startMenuPP() {
 	}
 }
 
-setInterval(startMenuPP, 3000);
+setInterval(startMenuPP, 5000);
 startMenuPP();
diff --git a/src/front/static/ts/views/LoginPage.ts b/src/front/static/ts/views/LoginPage.ts
index eaf49ca..262ebf7 100644
--- a/src/front/static/ts/views/LoginPage.ts
+++ b/src/front/static/ts/views/LoginPage.ts
@@ -93,7 +93,7 @@ export default class extends Aview {
 					// throw new Error("invalid response");
 				}
 			} catch (error) {
-				console.error(error);
+				console.log(error);
 			}
 		}
 
@@ -186,7 +186,7 @@ export default class extends Aview {
 			}
 			catch (error)
 			{
-				console.error(error);
+				console.log(error);
 				document.getElementById("login-error-message").innerHTML = "error: server error, try again later...";
 				document.getElementById("login-error-message").classList.remove("hidden");
 			}
diff --git a/src/front/static/ts/views/Profile.ts b/src/front/static/ts/views/Profile.ts
index 25258ab..48f6ea8 100644
--- a/src/front/static/ts/views/Profile.ts
+++ b/src/front/static/ts/views/Profile.ts
@@ -54,7 +54,7 @@ export default class extends Aview {
       credentials: "include",
     });
     if (userdata_req.status == 404) {
-      console.error("invalid user");
+      console.log("invalid user");
       return;
     }
     let userdata = await userdata_req.json();
@@ -74,7 +74,7 @@ export default class extends Aview {
 
     let main = document.getElementById("profile-pong-scorelist");
     if (!main)
-      return console.error("what");
+      return console.log("what");
 
     if (matches.matchHistory) {
       for (let match of matches.matchHistory) {
@@ -136,7 +136,7 @@ export default class extends Aview {
 
     main = document.getElementById("profile-tetris-scorelist");
     if (!main)
-      return console.error("what");
+      return console.log("what");
 
   // don't read this shit for you mental health
     if (matches.matchHistory) {
diff --git a/src/front/static/ts/views/ProfileMenu.ts b/src/front/static/ts/views/ProfileMenu.ts
index 9a480e0..44ae8c8 100644
--- a/src/front/static/ts/views/ProfileMenu.ts
+++ b/src/front/static/ts/views/ProfileMenu.ts
@@ -54,7 +54,7 @@ export default class extends Aview {
 	  });
 	  if (userdata_req.status == 404)
 	  {
-		console.error("invalid user");
+		console.log("invalid user");
 		return ;
 	  }
 	  let userdata = await userdata_req.json();
@@ -69,7 +69,7 @@ export default class extends Aview {
 
     document.getElementById("profile-items").innerHTML = await getMainHTML();
     requestAnimationFrame(() => {
-      document.getElementById("menu-logout").addEventListener("click", async () => {
+      document.getElementById("menu-logout")?.addEventListener("click", async () => {
         let req = fetch(`${auth_api}/logout`, {
           method: "GET",
           credentials: "include",
@@ -79,7 +79,7 @@ export default class extends Aview {
           if (res.status === 200)
             this.run();
           else
-            console.error("logout failed");
+            console.log("logout failed");
         });
       });
     });
diff --git a/src/front/static/ts/views/RegisterPage.ts b/src/front/static/ts/views/RegisterPage.ts
index ce19458..b002d29 100644
--- a/src/front/static/ts/views/RegisterPage.ts
+++ b/src/front/static/ts/views/RegisterPage.ts
@@ -91,7 +91,7 @@ export default class extends Aview {
 
 			}
 			catch (error) {
-				console.error(error);
+				console.log(error);
 				if (document.getElementById("login-error-message")) {
 					document.getElementById("login-error-message").innerHTML = "error: server error, try again later...";
 					document.getElementById("login-error-message")?.classList.remove("hidden");
diff --git a/src/front/static/ts/views/Settings.ts b/src/front/static/ts/views/Settings.ts
index 3f115f6..6abdf41 100644
--- a/src/front/static/ts/views/Settings.ts
+++ b/src/front/static/ts/views/Settings.ts
@@ -74,7 +74,7 @@ export default class extends Aview {
       credentials: "include",
     });
     if (userdata_req.status == 404) {
-      console.error("invalid user");
+      console.log("invalid user");
       return;
     }
     let userdata = await userdata_req.json();
@@ -106,16 +106,16 @@ export default class extends Aview {
       if (delete_req.status == 200)
         navigationManager("/");
       else
-        console.error("xd"); // xd?????????????
+        console.log("xd"); // xd?????????????
     });
 
     const upload = document.getElementById("upload-file") as HTMLInputElement;
     upload.addEventListener("change", () => {
       const fileList: FileList | null = upload.files;
       if (!fileList)
-        return console.error("empty");
+        return console.log("empty");
       if (!fileList[0].type.startsWith("image/")) {
-        console.error("invalid file");
+        console.log("invalid file");
         return;
       }
 
diff --git a/src/front/static/ts/views/Tetris.ts b/src/front/static/ts/views/Tetris.ts
index 496bbce..360961a 100644
--- a/src/front/static/ts/views/Tetris.ts
+++ b/src/front/static/ts/views/Tetris.ts
@@ -307,18 +307,18 @@ export default class extends Aview {
         ) as HTMLCanvasElement | null;
         this.canvas = el;
         if (!this.canvas)
-          throw console.error("no canvas :c");
+          throw console.log("no canvas :c");
         this.canvas.width = COLS * BLOCK;
         this.canvas.height = ROWS * BLOCK;
         const ctx = this.canvas.getContext("2d");
         this.ctx = ctx;
         if (!this.ctx)
-          throw console.error("no ctx D:");
+          throw console.log("no ctx D:");
 
         this.holdCanvas = document.getElementById("hold") as HTMLCanvasElement;
         this.queueCanvas = document.getElementById("queue") as HTMLCanvasElement;
         if (!this.holdCanvas || !this.queueCanvas)
-          throw console.error("no canvas :c");
+          throw console.log("no canvas :c");
         this.holdCtx = this.holdCanvas.getContext("2d");
         this.queueCtx = this.queueCanvas.getContext("2d");
         if (!this.holdCtx || !this.queueCtx)
diff --git a/src/front/static/ts/views/TetrisVersus.ts b/src/front/static/ts/views/TetrisVersus.ts
index fbe83d0..38c1584 100644
--- a/src/front/static/ts/views/TetrisVersus.ts
+++ b/src/front/static/ts/views/TetrisVersus.ts
@@ -332,18 +332,18 @@ export default class extends Aview {
         ) as HTMLCanvasElement | null;
         this.canvas = el;
         if (!this.canvas)
-          throw console.error("no canvas :c");
+          throw console.log("no canvas :c");
         this.canvas.width = COLS * BLOCK;
         this.canvas.height = ROWS * BLOCK;
         const ctx = this.canvas.getContext("2d");
         this.ctx = ctx;
         if (!this.ctx)
-          throw console.error("no ctx D:");
+          throw console.log("no ctx D:");
 
         this.holdCanvas = document.getElementById(canvasId + "-hold") as HTMLCanvasElement;
         this.queueCanvas = document.getElementById(canvasId + "-queue") as HTMLCanvasElement;
         if (!this.holdCanvas || !this.queueCanvas)
-          throw console.error("no canvas :c");
+          throw console.log("no canvas :c");
         this.holdCtx = this.holdCanvas.getContext("2d");
         this.queueCtx = this.queueCanvas.getContext("2d");
         if (!this.holdCtx || !this.queueCtx)
diff --git a/src/start.js b/src/start.js
index df7bc0e..ad4cc0b 100644
--- a/src/start.js
+++ b/src/start.js
@@ -77,6 +77,6 @@ async function start() {
 }
 
 start().catch((err) => {
-	console.error(err);
+	console.log(err);
 	process.exit(1);
 });

From cc79b0e9cccac827940fe4eb5fbed5a3c2f44bf0 Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Fri, 24 Oct 2025 15:45:59 +0200
Subject: [PATCH 107/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix(fr?=
 =?UTF-8?q?ont):=20stop=20deadnaming=20people=20+=20doxxing=20in=20console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/front/static/ts/views/Pong.ts           |  4 +---
 src/front/static/ts/views/Profile.ts        |  2 --
 src/front/static/ts/views/TournamentMenu.ts | 15 ++++++++++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/front/static/ts/views/Pong.ts b/src/front/static/ts/views/Pong.ts
index 72aacf0..bf6da69 100644
--- a/src/front/static/ts/views/Pong.ts
+++ b/src/front/static/ts/views/Pong.ts
@@ -212,7 +212,7 @@ export default class extends Aview {
 			if (match_over)
 			{
 				ctx.font = "32px Kubasta";
-				const winner = `${p1_score > p2_score ? p1_name : p2_name} won :D`;
+				const winner = `${ p1_score > p2_score ? p1_displayName : p2_displayName } won :D`;
 				ctx.fillText(winner, canvas.width / 2 - (ctx.measureText(winner).width / 2), canvas.height / 2 + 16);
 				document.getElementById("game-buttons").classList.remove("hidden");
 			}
@@ -316,8 +316,6 @@ export default class extends Aview {
 
       p1_displayName = p1_displayName.length > 16 ? p1_displayName.substring(0, 16) + "." : p1_displayName;
       p2_displayName = p2_displayName.length > 16 ? p2_displayName.substring(0, 16) + "." : p2_displayName;
-      p1_name = p1_input.value.length > 16 ? p1_input.value.substring(0, 16) + "." : p1_input.value;
-			p2_name = p2_input.value.length > 16 ? p2_input.value.substring(0, 16) + "." : p2_input.value;
 			document.getElementById("player-inputs").remove();
 
 			canvas = document.createElement("canvas");
diff --git a/src/front/static/ts/views/Profile.ts b/src/front/static/ts/views/Profile.ts
index 25258ab..f60b896 100644
--- a/src/front/static/ts/views/Profile.ts
+++ b/src/front/static/ts/views/Profile.ts
@@ -117,7 +117,6 @@ export default class extends Aview {
         tx.classList.add("default-button", "items-center", "justify-center", "text-center");
 
         newEntry.onclick = () => { document.getElementById("app")?.appendChild(popup); dragElement(document.getElementById(`${id}`)); };
-        console.log(match.tx);
       }
     }
 
@@ -191,7 +190,6 @@ export default class extends Aview {
         tx.classList.add("default-button", "items-center", "justify-center", "text-center");
 
         newEntry.onclick = () => { document.getElementById("app")?.appendChild(popup); dragElement(document.getElementById(`${id}`)); };
-        console.log(match.tx);
       }
     }
 
diff --git a/src/front/static/ts/views/TournamentMenu.ts b/src/front/static/ts/views/TournamentMenu.ts
index 03c246e..e72b318 100644
--- a/src/front/static/ts/views/TournamentMenu.ts
+++ b/src/front/static/ts/views/TournamentMenu.ts
@@ -504,19 +504,28 @@ export default class extends Aview {
       btn.onclick = async () => {
         document.getElementById("tournament-id")?.classList.add("hidden");
         let players: string[] = [];
+        let players_displayName: string[] = [];
         for (let i of Array(initPlayerCount).keys()) {
           players.push((document.getElementById(`playerName${i}`) as HTMLInputElement).value);
+		  const name_req = await fetch(`${user_api}/users/${players.at(-1)}`, {
+			method: "GET",
+			credentials: "include",
+		  });
+		  if (name_req.status === 200)
+			  players_displayName.push((await name_req.json()).displayName);
+		  else
+			  players_displayName.push(players.at(-1));
         }
 
         while (tournament[0].length > 1)
         {
-          this.updateBracketDisplay(tournament, players);
+          this.updateBracketDisplay(tournament, players_displayName);
           while(tournament[0].length > 0)
           {
             const p1 = tournament[0].shift() as number;
             const p2 = tournament[0].shift() as number;
 
-            document.getElementById("announcement-text").innerText = `${players[p1]} vs ${players[p2]}`;
+            document.getElementById("announcement-text").innerText = `${players_displayName[p1]} vs ${players_displayName[p2]}`;
             document.getElementById("announcement")?.classList.remove("hidden");
             await this.waitForUserClick("tournament-continue");
             document.getElementById("announcement")?.classList.add("hidden");
@@ -528,7 +537,7 @@ export default class extends Aview {
           tournament[1] = [];
         }
         document.getElementById("winner-div")?.classList.remove("hidden");
-        document.getElementById("winner-text").innerText = `${players[tournament[0][0]]} won the tournament !! ggs :D`;
+        document.getElementById("winner-text").innerText = `${players_displayName[tournament[0][0]]} won the tournament !! ggs :D`;
       };
       btn.innerText = "start tournament !!";
 

From 8902965fe50e29c2df0b3fc4cf473d91430bcf5d Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Fri, 24 Oct 2025 16:35:18 +0200
Subject: [PATCH 108/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20fixed=20some=20things.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Justfile                     | 2 +-
 src/contract/scoreStore.json | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 src/contract/scoreStore.json

diff --git a/Justfile b/Justfile
index 56ba865..442d718 100644
--- a/Justfile
+++ b/Justfile
@@ -51,7 +51,7 @@ set dotenv-load
 	docker compose -f docker/docker-compose.yml rm
 
 @deploy-contract-scoreStore:
-	forge create scoreStore --rpc-url=${RPC_URL} --private-key=${PRIVATE_KEY}
+	forge create scoreStore --rpc-url=${AVAX_RPC_URL} --private-key=${AVAX_PRIVATE_KEY} --broadcast
 
 @verify-contract:
 	forge verify-contract --chain-id 43113 --rpc-url=${AVAX_RPC_URL} --watch ${AVAX_CONTRACT_ADDR}
diff --git a/src/contract/scoreStore.json b/src/contract/scoreStore.json
deleted file mode 100644
index 552e1bc..0000000
--- a/src/contract/scoreStore.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[{"internalType":"string","name":"p1","type":"string"},{"internalType":"string","name":"p2","type":"string"},{"internalType":"uint128","name":"p1Score","type":"uint128"},{"internalType":"uint128","name":"p2Score","type":"uint128"}],"name":"addScore","outputs":[{"internalType":"uint256","name":"id","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"id","type":"uint256"}],"name":"getScore","outputs":[{"components":[{"internalType":"string","name":"p1","type":"string"},{"internalType":"string","name":"p2","type":"string"},{"internalType":"uint128","name":"p1Score","type":"uint128"},{"internalType":"uint128","name":"p2Score","type":"uint128"}],"internalType":"struct score","name":"","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"lastId","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"scores","outputs":[{"internalType":"string","name":"p1","type":"string"},{"internalType":"string","name":"p2","type":"string"},{"internalType":"uint128","name":"p1Score","type":"uint128"},{"internalType":"uint128","name":"p2Score","type":"uint128"}],"stateMutability":"view","type":"function"}]

From 66e4fe8dd5532e67a93f13412335d09e6a18536c Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Fri, 24 Oct 2025 16:55:11 +0200
Subject: [PATCH 109/109] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:?=
 =?UTF-8?q?=20fixed=20prod?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/docker-compose.yml                     |    4 +-
 .../dashboards/11159_rev1.json.disabled       |  933 ----------
 .../graphana/dashboards/14900_rev2.json       | 1594 +----------------
 .../prometheus/config/prometheus.yml          |    5 -
 docker/proxy/Dockerfile                       |   15 -
 docker/proxy/Dockerfile.prod                  |   19 -
 6 files changed, 3 insertions(+), 2567 deletions(-)
 delete mode 100644 docker/monitoring/graphana/dashboards/11159_rev1.json.disabled

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index f5bf598..6a9b21a 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -3,8 +3,8 @@ name: ft_transcendence
 include:
   - ./volumes.yml
   - ./networks.yml
-  # - ./monitoring/compose.yml
+  - ./monitoring/compose.yml
   - ./api-base/compose.yml
   - ./front/compose.yml
   - ./proxy/compose.yml
-  # - ./ELK/compose.yml
+  - ./ELK/compose.yml
diff --git a/docker/monitoring/graphana/dashboards/11159_rev1.json.disabled b/docker/monitoring/graphana/dashboards/11159_rev1.json.disabled
deleted file mode 100644
index c7b96f6..0000000
--- a/docker/monitoring/graphana/dashboards/11159_rev1.json.disabled
+++ /dev/null
@@ -1,933 +0,0 @@
-{
-  "__inputs": [
-    {
-      "name": "DS_PROMETHEUS",
-      "label": "prometheus",
-      "description": "",
-      "type": "datasource",
-      "pluginId": "prometheus",
-      "pluginName": "Prometheus"
-    }
-  ],
-  "__requires": [
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "6.0.1"
-    },
-    {
-      "type": "panel",
-      "id": "graph",
-      "name": "Graph",
-      "version": "5.0.0"
-    },
-    {
-      "type": "datasource",
-      "id": "prometheus",
-      "name": "Prometheus",
-      "version": "5.0.0"
-    },
-    {
-      "type": "panel",
-      "id": "singlestat",
-      "name": "Singlestat",
-      "version": "5.0.0"
-    }
-  ],
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "description": "node.js prometheus client basic metrics",
-  "editable": true,
-  "gnetId": 11159,
-  "graphTooltip": 0,
-  "id": null,
-  "iteration": 1573392431370,
-  "links": [],
-  "panels": [
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
-      "fill": 1,
-      "gridPos": {
-        "h": 7,
-        "w": 10,
-        "x": 0,
-        "y": 0
-      },
-      "id": 6,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": true,
-        "min": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "paceLength": 10,
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "irate(process_cpu_user_seconds_total{instance=~\"$instance\"}[2m]) * 100",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "User CPU - {{instance}}",
-          "refId": "A"
-        },
-        {
-          "expr": "irate(process_cpu_system_seconds_total{instance=~\"$instance\"}[2m]) * 100",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "Sys CPU - {{instance}}",
-          "refId": "B"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Process CPU Usage",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "percent",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
-      "fill": 1,
-      "gridPos": {
-        "h": 7,
-        "w": 9,
-        "x": 10,
-        "y": 0
-      },
-      "id": 8,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": true,
-        "min": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "paceLength": 10,
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "nodejs_eventloop_lag_seconds{instance=~\"$instance\"}",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "{{instance}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Event Loop Lag",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "s",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": false,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "datasource": "${DS_PROMETHEUS}",
-      "format": "none",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 5,
-        "x": 19,
-        "y": 0
-      },
-      "id": 2,
-      "interval": "",
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "rgb(31, 120, 193)",
-        "show": false
-      },
-      "tableColumn": "__name__",
-      "targets": [
-        {
-          "expr": "sum(nodejs_version_info{instance=~\"$instance\"}) by (version)",
-          "format": "time_series",
-          "instant": false,
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "{{version}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": "",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Node.js Version",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "name"
-    },
-    {
-      "cacheTimeout": null,
-      "colorBackground": false,
-      "colorValue": false,
-      "colors": [
-        "#299c46",
-        "rgba(237, 129, 40, 0.89)",
-        "#d44a3a"
-      ],
-      "datasource": "${DS_PROMETHEUS}",
-      "format": "none",
-      "gauge": {
-        "maxValue": 100,
-        "minValue": 0,
-        "show": false,
-        "thresholdLabels": false,
-        "thresholdMarkers": true
-      },
-      "gridPos": {
-        "h": 4,
-        "w": 5,
-        "x": 19,
-        "y": 3
-      },
-      "id": 4,
-      "interval": null,
-      "links": [],
-      "mappingType": 1,
-      "mappingTypes": [
-        {
-          "name": "value to text",
-          "value": 1
-        },
-        {
-          "name": "range to text",
-          "value": 2
-        }
-      ],
-      "maxDataPoints": 100,
-      "nullPointMode": "connected",
-      "nullText": null,
-      "postfix": "",
-      "postfixFontSize": "50%",
-      "prefix": "",
-      "prefixFontSize": "50%",
-      "rangeMaps": [
-        {
-          "from": "null",
-          "text": "N/A",
-          "to": "null"
-        }
-      ],
-      "sparkline": {
-        "fillColor": "rgba(31, 118, 189, 0.18)",
-        "full": false,
-        "lineColor": "#F2495C",
-        "show": true
-      },
-      "tableColumn": "",
-      "targets": [
-        {
-          "expr": "sum(changes(process_start_time_seconds{instance=~\"$instance\"}[1m]))",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "{{instance}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": "",
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Process Restart Times",
-      "type": "singlestat",
-      "valueFontSize": "80%",
-      "valueMaps": [
-        {
-          "op": "=",
-          "text": "N/A",
-          "value": "null"
-        }
-      ],
-      "valueName": "current"
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
-      "fill": 1,
-      "gridPos": {
-        "h": 7,
-        "w": 16,
-        "x": 0,
-        "y": 7
-      },
-      "id": 7,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": true,
-        "min": true,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "paceLength": 10,
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "process_resident_memory_bytes{instance=~\"$instance\"}",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "Process Memory - {{instance}}",
-          "refId": "A"
-        },
-        {
-          "expr": "nodejs_heap_size_total_bytes{instance=~\"$instance\"}",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "Heap Total - {{instance}}",
-          "refId": "B"
-        },
-        {
-          "expr": "nodejs_heap_size_used_bytes{instance=~\"$instance\"}",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "Heap Used - {{instance}}",
-          "refId": "C"
-        },
-        {
-          "expr": "nodejs_external_memory_bytes{instance=~\"$instance\"}",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "External Memory - {{instance}}",
-          "refId": "D"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Process Memory Usage",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "bytes",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
-      "fill": 1,
-      "gridPos": {
-        "h": 7,
-        "w": 8,
-        "x": 16,
-        "y": 7
-      },
-      "id": 9,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": true,
-        "min": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "paceLength": 10,
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "nodejs_active_handles_total{instance=~\"$instance\"}",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "Active Handler - {{instance}}",
-          "refId": "A"
-        },
-        {
-          "expr": "nodejs_active_requests_total{instance=~\"$instance\"}",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "Active Request - {{instance}}",
-          "refId": "B"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Active Handlers/Requests Total",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
-      "fill": 1,
-      "gridPos": {
-        "h": 8,
-        "w": 8,
-        "x": 0,
-        "y": 14
-      },
-      "id": 10,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": true,
-        "min": true,
-        "rightSide": false,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "paceLength": 10,
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "nodejs_heap_space_size_total_bytes{instance=~\"$instance\"}",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "Heap Total - {{instance}} - {{space}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Heap Total Detail",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "bytes",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
-      "fill": 1,
-      "gridPos": {
-        "h": 8,
-        "w": 8,
-        "x": 8,
-        "y": 14
-      },
-      "id": 11,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": true,
-        "min": true,
-        "rightSide": false,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "paceLength": 10,
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "nodejs_heap_space_size_used_bytes{instance=~\"$instance\"}",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "Heap Used - {{instance}} - {{space}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Heap Used Detail",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "bytes",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "${DS_PROMETHEUS}",
-      "fill": 1,
-      "gridPos": {
-        "h": 8,
-        "w": 8,
-        "x": 16,
-        "y": 14
-      },
-      "id": 12,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": true,
-        "min": true,
-        "rightSide": false,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "paceLength": 10,
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "nodejs_heap_space_size_available_bytes{instance=~\"$instance\"}",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "Heap Used - {{instance}} - {{space}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Heap Available Detail",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "bytes",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "schemaVersion": 18,
-  "style": "dark",
-  "tags": [
-    "nodejs"
-  ],
-  "templating": {
-    "list": [
-      {
-        "allValue": null,
-        "current": {},
-        "datasource": "${DS_PROMETHEUS}",
-        "definition": "label_values(nodejs_version_info, instance)",
-        "hide": 0,
-        "includeAll": true,
-        "label": "instance",
-        "multi": true,
-        "name": "instance",
-        "options": [],
-        "query": "label_values(nodejs_version_info, instance)",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 1,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      }
-    ]
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ],
-    "time_options": [
-      "5m",
-      "15m",
-      "1h",
-      "6h",
-      "12h",
-      "24h",
-      "2d",
-      "7d",
-      "30d"
-    ]
-  },
-  "timezone": "",
-  "title": "NodeJS Application Dashboard",
-  "uid": "PTSqcpJWk",
-  "version": 4
-}
\ No newline at end of file
diff --git a/docker/monitoring/graphana/dashboards/14900_rev2.json b/docker/monitoring/graphana/dashboards/14900_rev2.json
index 60e47b5..2f58ee9 100644
--- a/docker/monitoring/graphana/dashboards/14900_rev2.json
+++ b/docker/monitoring/graphana/dashboards/14900_rev2.json
@@ -87,215 +87,6 @@
       "title": "General Metrics",
       "type": "row"
     },
-    {
-      "aliasColors": {
-        "172.31.0.131:9273": "dark-green"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$datasource",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 10,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 14,
-        "x": 0,
-        "y": 1
-      },
-      "hiddenSeries": false,
-      "id": 18,
-      "legend": {
-        "alignAsTable": true,
-        "avg": false,
-        "current": true,
-        "max": true,
-        "min": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "100 - (cpu_usage_idle{instance=~ \"$instance*\",cpu=\"cpu-total\"})",
-          "interval": "",
-          "legendFormat": "{{instance}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "CPU Usage",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:661",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "$$hashKey": "object:662",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "datasource": "$datasource",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "semi-dark-orange",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 5,
-        "x": 14,
-        "y": 1
-      },
-      "id": 20,
-      "options": {
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "values": false
-        },
-        "showThresholdLabels": false,
-        "showThresholdMarkers": true
-      },
-      "pluginVersion": "7.0.1",
-      "targets": [
-        {
-          "expr": "100 - (cpu_usage_idle{instance=~ \"$instance*\",cpu=\"cpu-total\"})",
-          "interval": "",
-          "legendFormat": "{{instance}}",
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Current CPU Utilization %",
-      "type": "gauge"
-    },
-    {
-      "datasource": "$datasource",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "light-red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "bytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 5,
-        "x": 19,
-        "y": 1
-      },
-      "id": 16,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "values": false
-        }
-      },
-      "pluginVersion": "7.0.1",
-      "targets": [
-        {
-          "expr": "sum(mem_used{instance=~\"$instance\"})",
-          "interval": "",
-          "legendFormat": "{{ host }}",
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Current Memory Utilization",
-      "type": "stat"
-    },
     {
       "aliasColors": {
         "mem_used": "rgb(214, 141, 89)",
@@ -556,1389 +347,6 @@
         "align": false,
         "alignLevel": null
       }
-    },
-    {
-      "collapsed": false,
-      "datasource": "${DS_PROMETHEUS.INTERNAL-ODMONT.COM}",
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 16
-      },
-      "id": 24,
-      "panels": [],
-      "title": "Nginx Requests Status Code",
-      "type": "row"
-    },
-    {
-      "aliasColors": {
-        "172.31.11.8:9273": "semi-dark-yellow"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$datasource",
-      "decimals": null,
-      "description": "Requests with 200 Status Code",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 9,
-        "w": 17,
-        "x": 0,
-        "y": 17
-      },
-      "hiddenSeries": false,
-      "id": 28,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": true,
-        "min": false,
-        "rightSide": false,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "sum_over_time(nginxlog_resp_bytes{instance=~\"$instance*\", resp_code=~\"20.\"}[5m])",
-          "interval": "",
-          "legendFormat": "{{request}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Response 2XX / 5m",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:91",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "$$hashKey": "object:92",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "datasource": "$datasource",
-      "description": "Total number of request in 24 hours for 200 response by nginx server",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "yellow",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 7,
-        "x": 17,
-        "y": 17
-      },
-      "id": 39,
-      "options": {
-        "displayMode": "gradient",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "values": false
-        },
-        "showUnfilled": true
-      },
-      "pluginVersion": "7.0.1",
-      "targets": [
-        {
-          "expr": "sum_over_time(nginxlog_resp_bytes{instance=~\"$instance*\", resp_code=~\"200\"}[24h])",
-          "interval": "",
-          "legendFormat": "{{request}}",
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Total Response 200 Req. [24h]",
-      "type": "bargauge"
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$datasource",
-      "description": "Requests with 4XX Status Code",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 9,
-        "w": 17,
-        "x": 0,
-        "y": 26
-      },
-      "hiddenSeries": false,
-      "id": 30,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": true,
-        "min": false,
-        "rightSide": false,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "sum_over_time(nginxlog_resp_bytes{instance=~\"$instance*\", resp_code=~\"40.\"}[5m])",
-          "interval": "",
-          "legendFormat": "{{request}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Response 4XX  /5m",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:167",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "$$hashKey": "object:168",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "datasource": "$datasource",
-      "description": "Total number of request in 24 hours for 404 response from nginx server",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "light-red",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 7,
-        "x": 17,
-        "y": 26
-      },
-      "id": 40,
-      "options": {
-        "displayMode": "gradient",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "values": false
-        },
-        "showUnfilled": true
-      },
-      "pluginVersion": "7.0.1",
-      "targets": [
-        {
-          "expr": "sum_over_time(nginxlog_resp_bytes{instance=~\"$instance*\", resp_code=~\"404\"}[5m])",
-          "interval": "",
-          "legendFormat": "{{request}}",
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Total Response 404 Req. [24h]",
-      "type": "bargauge"
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$datasource",
-      "description": "Requests with 3XX Status Code",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 8,
-        "w": 9,
-        "x": 0,
-        "y": 35
-      },
-      "hiddenSeries": false,
-      "id": 31,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": true,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "sum_over_time(nginxlog_resp_bytes{instance=~\"$instance*\", resp_code=~\"30.\"}[5m])",
-          "interval": "",
-          "legendFormat": "{{instance}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Response 3XX",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:929",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "$$hashKey": "object:930",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$datasource",
-      "description": "Requests with 5XX Status Code",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 8,
-        "w": 10,
-        "x": 9,
-        "y": 35
-      },
-      "hiddenSeries": false,
-      "id": 32,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": true,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "sum_over_time(nginxlog_resp_bytes{instance=~\"$instance*\", resp_code=~\"50.\"}[5m])",
-          "interval": "",
-          "legendFormat": "{{instance}}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Response 5XX",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:1003",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "$$hashKey": "object:1004",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "datasource": "$datasource",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 5,
-        "x": 19,
-        "y": 35
-      },
-      "id": 41,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "values": false
-        }
-      },
-      "pluginVersion": "7.0.1",
-      "targets": [
-        {
-          "expr": "sum_over_time(nginxlog_resp_bytes{instance=~\"$instance*\", resp_code=~\"503\"}[5m])",
-          "interval": "",
-          "legendFormat": "{{request}}",
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Total Request 503 Resonse",
-      "type": "stat"
-    },
-    {
-      "collapsed": false,
-      "datasource": "${DS_PROMETHEUS.INTERNAL-ODMONT.COM}",
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 43
-      },
-      "id": 22,
-      "panels": [],
-      "title": "Nginx Metrics",
-      "type": "row"
-    },
-    {
-      "aliasColors": {
-        "172.31.0.131:9273": "super-light-purple",
-        "{__name__=\"nginx_accepts\", env=\"prod\", exported_env=\"DEV\", instance=\"172.31.0.131:9273\", job=\"telegraf\", port=\"80\", server=\"localhost\"}": "purple"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$datasource",
-      "description": "The total number of accepted connections from clients since the nginx master process started. Note that reloading configurations or restarting worker processes will not reset this metric. If you terminate and restart the master process, you will reset the metric.\n\n",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "rgb(242, 61, 5)",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "fill": 3,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 9,
-        "x": 0,
-        "y": 44
-      },
-      "hiddenSeries": false,
-      "id": 4,
-      "legend": {
-        "alignAsTable": true,
-        "avg": false,
-        "current": true,
-        "hideEmpty": false,
-        "hideZero": false,
-        "max": true,
-        "min": true,
-        "rightSide": false,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 3,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pluginVersion": "7.0.1",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "nginx_accepts{instance=~\"$instance*\"}",
-          "interval": "",
-          "legendFormat": "{{ instance }}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Nginx Connections Accepted",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:450",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "$$hashKey": "object:451",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "datasource": "$datasource",
-      "description": "The current number of connections from clients where nginx is writing a response back to the client.\n",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "align": null
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 4,
-        "x": 9,
-        "y": 44
-      },
-      "id": 12,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "values": false
-        }
-      },
-      "pluginVersion": "7.0.1",
-      "targets": [
-        {
-          "expr": "nginx_writing{instance=~\"$instance*\"}\t",
-          "interval": "",
-          "legendFormat": "{{ host }}",
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Nginx Writing",
-      "type": "stat"
-    },
-    {
-      "datasource": "$datasource",
-      "description": "The current number of active (accepted) connections from clients. Includes all connections with the statuses Idle / Waiting, Reading, and Writing.",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "align": null
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "dark-orange",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 7,
-        "x": 13,
-        "y": 44
-      },
-      "id": 6,
-      "options": {
-        "displayMode": "lcd",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": [
-            "min"
-          ],
-          "values": false
-        },
-        "showUnfilled": true
-      },
-      "pluginVersion": "7.0.1",
-      "targets": [
-        {
-          "expr": "nginx_active{instance=~\"$instance*\"}\t",
-          "interval": "",
-          "legendFormat": "{{instance }}",
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Nginx Active Connections[accepted]",
-      "type": "bargauge"
-    },
-    {
-      "datasource": "$datasource",
-      "description": "The current number of connections from clients that are in the Idle / Waiting state.",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "semi-dark-blue",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 4,
-        "x": 20,
-        "y": 44
-      },
-      "id": 10,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "area",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "min"
-          ],
-          "values": false
-        }
-      },
-      "pluginVersion": "7.0.1",
-      "targets": [
-        {
-          "expr": "nginx_waiting{instance=~\"$instance*\"}\t",
-          "interval": "",
-          "legendFormat": "{{ instance}}",
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Nginx Waiting Connections",
-      "type": "stat"
-    },
-    {
-      "aliasColors": {
-        "172.31.0.131:9273": "rgb(219, 237, 9)",
-        "{__name__=\"nginx_handled\", env=\"prod\", exported_env=\"DEV\", instance=\"172.31.0.131:9273\", job=\"telegraf\", port=\"80\", server=\"localhost\"}": "rgb(208, 240, 17)"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$datasource",
-      "description": "The total number of handled connections from clients since the nginx master process started. This will be lower than accepted only in cases where a connection is dropped before it is handled.",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "fill": 3,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 10,
-        "x": 0,
-        "y": 51
-      },
-      "hiddenSeries": false,
-      "id": 14,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": true,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 3,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pluginVersion": "7.0.1",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "nginx_handled{instance=~\"$instance*\"}\t",
-          "interval": "",
-          "legendFormat": "{{ instance }}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Handled Request",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:1528",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "$$hashKey": "object:1529",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {
-        "172.31.0.131:9273": "rgb(250, 0, 225)",
-        "{__name__=\"nginx_requests\", env=\"prod\", exported_env=\"DEV\", instance=\"172.31.0.131:9273\", job=\"telegraf\", port=\"80\", server=\"localhost\"}": "orange"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$datasource",
-      "decimals": null,
-      "description": "The total number of client requests since the nginx master process started. A request is an application-level (HTTP, etc.) event. It occurs when a client requests a resource via the application protocol. A single connection can (and often does) make many requests. So most of the time, there are more requests than accepted/handled connections.",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "fill": 3,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 10,
-        "x": 10,
-        "y": 51
-      },
-      "hiddenSeries": false,
-      "id": 2,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "hideEmpty": false,
-        "hideZero": false,
-        "max": false,
-        "min": true,
-        "rightSide": false,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 3,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pluginVersion": "7.0.1",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "nginx_requests{instance=~\"$instance*\"}\t",
-          "interval": "",
-          "legendFormat": "{{ instance }}",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Nginx Requests",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "$$hashKey": "object:119",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "$$hashKey": "object:120",
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "datasource": "${DS_PROMETHEUS.INTERNAL-ODMONT.COM}",
-      "description": "The current number of (accepted) connections from clients where nginx is reading the request. Measured at the time the status module was queried.",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "semi-dark-green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 4,
-        "x": 20,
-        "y": 51
-      },
-      "id": 8,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "mean"
-          ],
-          "values": false
-        }
-      },
-      "pluginVersion": "7.0.1",
-      "targets": [
-        {
-          "expr": "nginx_reading{instance=~\"$instance*\"}",
-          "interval": "",
-          "legendFormat": "{{ host }}",
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "nginx_reading",
-      "type": "stat"
-    },
-    {
-      "datasource": "$datasource",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "align": "center",
-            "displayMode": "auto"
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Time"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 144
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "agent"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 173
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "auth"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 84
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "client_ip"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 143
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "env"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 20
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "exported_env"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 122
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "ident"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 74
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "job"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 53
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "path"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 151
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "referrer"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 82
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "resp_code"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 94
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "verb"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 48
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "request"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 208
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Value"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 29
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 16,
-        "w": 24,
-        "x": 0,
-        "y": 58
-      },
-      "id": 34,
-      "options": {
-        "showHeader": true,
-        "sortBy": []
-      },
-      "pluginVersion": "7.0.1",
-      "repeat": null,
-      "repeatDirection": "h",
-      "targets": [
-        {
-          "expr": "nginxlog_resp_bytes{instance=~\"$instance*\"}",
-          "interval": "",
-          "legendFormat": "",
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Each Request Detail",
-      "transformations": [
-        {
-          "id": "labelsToFields",
-          "options": {}
-        }
-      ],
-      "type": "table"
     }
   ],
   "refresh": false,
@@ -2071,4 +479,4 @@
   "uid": "4DFTt9Wnk",
   "version": 6,
   "description": "Grafana Dashboard for Nginx Web Server."
-}
\ No newline at end of file
+}
diff --git a/docker/monitoring/prometheus/config/prometheus.yml b/docker/monitoring/prometheus/config/prometheus.yml
index e3789e5..59f9fc5 100644
--- a/docker/monitoring/prometheus/config/prometheus.yml
+++ b/docker/monitoring/prometheus/config/prometheus.yml
@@ -23,8 +23,3 @@ scrape_configs:
   - job_name: 'node-exporter'
     static_configs:
       - targets: ['node-exporter:9100']
-
-  # - job_name: 'nodejs'
-  #   static_configs:
-  #     - targets: ['transcendence-api-auth:3000']
-  #     - targets: ['transcendence-api-user:3000']
diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile
index dc60e69..75e20c7 100644
--- a/docker/proxy/Dockerfile
+++ b/docker/proxy/Dockerfile
@@ -1,18 +1,3 @@
-# FROM		node:lts-alpine AS builder
-#
-# RUN			npm install -g pnpm
-#
-# WORKDIR		/app
-#
-# COPY		package.json pnpm-lock.yaml pnpm-workspace.yaml ./
-#
-# RUN			pnpm install --frozen-lockfile
-#
-# COPY		vite.config.js tailwind.config.js ./
-# COPY		src ./src
-#
-# RUN			pnpm vite build
-
 FROM		owasp/modsecurity-crs:nginx-alpine
 
 RUN			mkdir -p /etc/nginx/modsecurity.d \
diff --git a/docker/proxy/Dockerfile.prod b/docker/proxy/Dockerfile.prod
index 5c83136..dd23810 100644
--- a/docker/proxy/Dockerfile.prod
+++ b/docker/proxy/Dockerfile.prod
@@ -1,18 +1,3 @@
-FROM		node:lts-alpine AS builder
-
-RUN			npm install -g pnpm
-
-WORKDIR		/app
-
-COPY		package.json pnpm-lock.yaml pnpm-workspace.yaml ./
-
-RUN			pnpm install --frozen-lockfile
-
-COPY		vite.config.js tailwind.config.js ./
-COPY		src ./src
-
-RUN			pnpm vite build
-
 FROM		owasp/modsecurity-crs:nginx-alpine
 
 RUN			mkdir -p /etc/nginx/modsecurity.d \
@@ -21,10 +6,6 @@ RUN			mkdir -p /etc/nginx/modsecurity.d \
 COPY		docker/proxy/config/default.prod.conf.template \
 			/etc/nginx/templates/conf.d/default.conf.template
 
-COPY		--chmod=755 docker/proxy/entry/ssl-cert.sh /docker-entrypoint.d/ssl-cert.sh
-
-COPY		--from=builder /app/dist /usr/share/nginx/html
-
 USER		root
 RUN			mkdir -p /var/log/front
 RUN			touch /var/log/front/err.log /var/log/front/log.log