From 2e133231dadc2c72e4c56181561dcc9e205ff382 Mon Sep 17 00:00:00 2001
From: Kum1ta <eddydhj@gmail.com>
Date: Tue, 1 Oct 2024 21:30:56 +0200
Subject: [PATCH] update

---
 .../server/server/templates/lobbyPage.html    | 30 +++++++++++++------
 .../server/typeRequests/tournamentRequest.py  | 10 +++++--
 .../nginx/static/javascript/lobbyPage/3d.js   | 14 ++++-----
 .../nginx/static/javascript/lobbyPage/main.js |  8 ++++-
 .../static/javascript/multiOnlineGame/Map.js  |  6 ++--
 .../tournamentPage/TournamentPage.js          | 16 ++++++----
 6 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html b/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html
index 3364108..dffde35 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html
+++ b/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html
@@ -28,18 +28,30 @@
 	</div>
 </div>
 
-<div class="popup-background" id="popup-background">
+<div class="popup-background" id="popup-skin-selector">
 	<div class="popup-skin">
 		<h1>Select your skin</h1>
 		<div class="color-grid">
-			<div class="color-box"></div>
-			<div class="color-box"></div>
-			<div class="color-box"></div>
-			<div class="color-box"></div>
-			<div class="color-box"></div>
-			<div class="color-box"></div>
-			<div class="color-box"></div>
-			<div class="color-box"></div>
+			<div class="color-box color-box-skin"></div>
+			<div class="color-box color-box-skin"></div>
+			<div class="color-box color-box-skin"></div>
+			<div class="color-box color-box-skin"></div>
+			<div class="color-box color-box-skin"></div>
+			<div class="color-box color-box-skin"></div>
+			<div class="color-box color-box-skin"></div>
+			<div class="color-box color-box-skin"></div>
+		</div>
+	</div>
+</div>
+
+<div class="popup-background" id="popup-goal-selector">
+	<div class="popup-skin">
+		<h1>Select your skin</h1>
+		<div class="color-grid">
+			<div class="color-box color-box-goal"></div>
+			<div class="color-box color-box-goal"></div>
+			<div class="color-box color-box-goal"></div>
+			<div class="color-box color-box-goal"></div>
 		</div>
 	</div>
 </div>
diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/tournamentRequest.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/tournamentRequest.py
index 4507d91..ee43fbd 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/tournamentRequest.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/tournamentRequest.py
@@ -6,7 +6,7 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/01 13:16:39 by edbernar          #+#    #+#              #
-#    Updated: 2024/10/01 14:00:29 by edbernar         ###   ########.fr        #
+#    Updated: 2024/10/01 17:49:33 by edbernar         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -18,16 +18,22 @@
 #		- isFull : true/false
 #		- started : true/false
 #		- code : code of the tournament
+#
 #	1 : someoneJoin : tell the client someone join the tournament (considering clients will place selon the order of the join)
 #		- id : id of the player
-#		- name : name of the player
+#		- username : name of the player
 #		- pfp : pfp of the player
+#
 #	2 : someoneLeave : tell the client someone leave the tournament (if game not started, players will be replaced in the order of the join)
 #		- id : id of the player who leave
 
+
 #client actions (actions sent by the client) :
 #	0 : start : start a tournament. if code == "", create a new tournament, else join the tournament with the code
 #		- code : code of the tournament
 #	1 : leave : leave the tournament
+#
+#   2 : message tournament : send a message to the tournament chat
+#       - message : message to send
 
 
diff --git a/docker-compose/requirements/nginx/static/javascript/lobbyPage/3d.js b/docker-compose/requirements/nginx/static/javascript/lobbyPage/3d.js
index ff21ccb..082299c 100644
--- a/docker-compose/requirements/nginx/static/javascript/lobbyPage/3d.js
+++ b/docker-compose/requirements/nginx/static/javascript/lobbyPage/3d.js
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/09/13 13:59:46 by edbernar          #+#    #+#             */
-/*   Updated: 2024/09/30 23:53:04 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/10/01 19:55:19 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -64,8 +64,8 @@ class barSelecter
 		availableSkins[6].texture = files.skinThreeTexture;
 		availableSkins[7].texture = files.skinFourTexture;
 		div.addEventListener('click', () => {
-			const	popup	=	document.getElementById('popup-background');
-			const	skins	=	document.getElementsByClassName('color-box');
+			const	popup	=	document.getElementById('popup-skin-selector');
+			const	skins	=	document.getElementsByClassName('color-box-skin');
 		
 			popup.style.display = 'flex';
 			for (let i = 0; i < skins.length; i++)
@@ -80,20 +80,20 @@ class barSelecter
 			}
 			popup.removeEventListener('click', this.hideSkinSelector);
 			popup.addEventListener('click', this.hideSkinSelector);
-		})
+		});
 	}
 
 	hideSkinSelector(event)
 	{
-		const	popup	=	document.getElementById('popup-background');
+		const	popup	=	document.getElementById('popup-skin-selector');
 
-		if (event.target.getAttribute('class') == 'popup-background')
+		if (event.target.getAttribute('class') == 'popup-skin-selector')
 			popup.style.display = 'none';
 	}
 
 	changeSkin (event)
 	{
-		const	popup	=	document.getElementById('popup-background');
+		const	popup	=	document.getElementById('popup-skin-selector');
 	
 		const id = event.target.getAttribute('skinId');
 		popup.style.display = 'none';
diff --git a/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js b/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js
index d25fd6a..baf8554 100644
--- a/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js
+++ b/docker-compose/requirements/nginx/static/javascript/lobbyPage/main.js
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/22 17:08:46 by madegryc          #+#    #+#             */
-/*   Updated: 2024/10/01 15:12:03 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/10/01 16:46:24 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -68,6 +68,12 @@ class LobbyPage
 		{
 			document.body.children[i].style.animation = 'animShowMenuDiv 0.5s';
 		}
+		setTimeout(() => {
+			for (let i = 0; i < document.body.children.length; i++)
+			{
+				document.body.children[i].style.animation = null;
+			}
+		}, 600);
 		startButton.addEventListener('click', startMode);
 		methButton.addEventListener('click', goBackHome);
 		document.getElementsByClassName('menuSelected')[gameMode].style.display = 'flex';
diff --git a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Map.js b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Map.js
index 7b9f1ab..fb991e2 100644
--- a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Map.js
+++ b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Map.js
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Map.js                                             :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: hubourge <hubourge@student.42.fr>          +#+  +:+       +#+        */
+/*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/20 14:52:55 by hubourge          #+#    #+#             */
-/*   Updated: 2024/09/30 18:13:05 by hubourge         ###   ########.fr       */
+/*   Updated: 2024/10/01 19:42:54 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -1122,4 +1122,4 @@ function createRing(colorO) {
 	return new THREE.Mesh(geometry, material);
 }
 
-export { Map };
\ No newline at end of file
+export { Map, createStar, createBox, createRectangle, createRing, colorList };
\ No newline at end of file
diff --git a/docker-compose/requirements/nginx/static/javascript/tournamentPage/TournamentPage.js b/docker-compose/requirements/nginx/static/javascript/tournamentPage/TournamentPage.js
index afb5301..d1e1532 100644
--- a/docker-compose/requirements/nginx/static/javascript/tournamentPage/TournamentPage.js
+++ b/docker-compose/requirements/nginx/static/javascript/tournamentPage/TournamentPage.js
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/10/01 13:42:29 by edbernar          #+#    #+#             */
-/*   Updated: 2024/10/01 14:15:12 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/10/01 18:36:53 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,17 +21,21 @@ const	playerList	=	{
 	player15: {id: 0, name: null, pfp: null},
 	player16: {id: 0, name: null, pfp: null},
 };
+let		divInfo	= null;	
 
 class TournamentPage
 {
 	static create(code)
 	{
-		console.log("Code game : ", code);
+		divInfo = document.getElementById('code-tournament');
+
+		document.getElementById('code-tournament').innerText = code;
+		divInfo.innerText = 'Tournament';
 	}
 
 	static dispose()
 	{
-		
+		divInfo = null;
 	}
 
 	static newOpponent(content)
@@ -50,8 +54,8 @@ class TournamentPage
 			console.warn("Tournament is full.");
 			return ;
 		}
-		console.warn('Put pfp on player' + playerNb[i]);
-		console.warn('Put username on player' + playerNb[i]);
+		document.getElementById('user-' + playerNb[i]).innerText = content.username;
+		document.getElementById('pfp-' + playerNb[i]).style.backgroundImage = `url(${content.pfp})`;
 		playerList['player' + playerNb[i]].id = content.id;
 		playerList['player' + playerNb[i]].pfp = content.pfp;
 		playerList['player' + playerNb[i]].username = content.username;
@@ -73,6 +77,8 @@ class TournamentPage
 			console.warn(`Opponent can't be remove cause he is not in this tournament`);
 			return ;
 		}
+		document.getElementById('user-' + playerNb[i]).innerText = "Nobody";
+		document.getElementById('pfp-' + playerNb[i]).style.backgroundImage = null;
 		while (i < playerNb.length - 1)
 		{
 			playerList['player' + playerNb[i]] = playerList['player' + playerNb[i + 1]];