From 82b3649f0c0a1dc254cb0c200a5bcf53e629032d Mon Sep 17 00:00:00 2001
From: tomoron <tomoron@student.42angouleme.fr>
Date: Thu, 14 Nov 2024 13:42:19 +0100
Subject: [PATCH 1/4] fix leave tournament

---
 .../requirements/djangoserver/file/server/server/Tournament.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker-compose/requirements/djangoserver/file/server/server/Tournament.py b/docker-compose/requirements/djangoserver/file/server/server/Tournament.py
index 0b5e8aa..99beeaa 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/Tournament.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/Tournament.py
@@ -6,7 +6,7 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/04 17:17:07 by tomoron           #+#    #+#              #
-#    Updated: 2024/10/22 16:32:35 by tomoron          ###   ########.fr        #
+#    Updated: 2024/11/14 13:42:03 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -29,6 +29,7 @@ class Tournament:
 		self.history = []
 		self.nbBot = nbBot
 		self.end = False
+		self.started = False
 		self.genCode()
 		Tournament.currentTournaments[self.code] = self
 		self.join(socket, skin, goal)

From da5d244449b6d2ca8c89213de8df67285de49346 Mon Sep 17 00:00:00 2001
From: tomoron <tomoron@student.42angouleme.fr>
Date: Thu, 14 Nov 2024 14:27:09 +0100
Subject: [PATCH 2/4] change tournament leave function

---
 .../djangoserver/file/server/server/Tournament.py         | 8 ++++----
 .../djangoserver/file/server/server/TournamentGame.py     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-compose/requirements/djangoserver/file/server/server/Tournament.py b/docker-compose/requirements/djangoserver/file/server/server/Tournament.py
index 99beeaa..7e7b2d3 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/Tournament.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/Tournament.py
@@ -6,7 +6,7 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/04 17:17:07 by tomoron           #+#    #+#              #
-#    Updated: 2024/11/14 13:42:03 by tomoron          ###   ########.fr        #
+#    Updated: 2024/11/14 13:46:45 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -69,13 +69,13 @@ class Tournament:
 		return(-1)
 
 	def leave(self, socket):
-		if(self.started):
-			return;
 		index = self.playerFromSocket(socket)
 		if(index == -1):
 			return;
-		self.players.pop(index)
 		socket.tournament = None
+		if(self.started):
+			return;
+		self.players.pop(index)
 		self.broadcast({"action":2,"id":index})
 
 	def join(self, socket, skin=0, goal=0, isBot=False):
diff --git a/docker-compose/requirements/djangoserver/file/server/server/TournamentGame.py b/docker-compose/requirements/djangoserver/file/server/server/TournamentGame.py
index 0109913..eaecc55 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/TournamentGame.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/TournamentGame.py
@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42angouleme.fr>   +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/22 01:37:00 by tomoron           #+#    #+#              #
-#    Updated: 2024/10/22 01:37:12 by tomoron          ###   ########.fr        #
+#    Updated: 2024/11/14 13:59:35 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -38,7 +38,7 @@ class TournamentGame:
 			print("waiting for player")
 			nbLoop += 1
 			await asyncio.sleep(0.1)
-		if(not l.socket.online or not r.socket.online):
+		if(not l.socket.tournament == self.tournament  or not r.socket.tournament == self.tournament):
 			print("player is not online, opponent is winner")
 			self.winner = l if l.socket.online else r
 			return;

From 1549b7134b463d37dc4ec6428f95bdaa20d9c589 Mon Sep 17 00:00:00 2001
From: tomoron <tomoron@student.42angouleme.fr>
Date: Thu, 14 Nov 2024 14:36:10 +0100
Subject: [PATCH 3/4] change tournament leave function to prevent players from
 leaving if the tournament is started

---
 .../djangoserver/file/server/server/Tournament.py           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose/requirements/djangoserver/file/server/server/Tournament.py b/docker-compose/requirements/djangoserver/file/server/server/Tournament.py
index 7e7b2d3..5ee4e0b 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/Tournament.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/Tournament.py
@@ -6,7 +6,7 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/04 17:17:07 by tomoron           #+#    #+#              #
-#    Updated: 2024/11/14 13:46:45 by tomoron          ###   ########.fr        #
+#    Updated: 2024/11/14 14:35:32 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -69,12 +69,12 @@ class Tournament:
 		return(-1)
 
 	def leave(self, socket):
+		if(self.started):
+			return;
 		index = self.playerFromSocket(socket)
 		if(index == -1):
 			return;
 		socket.tournament = None
-		if(self.started):
-			return;
 		self.players.pop(index)
 		self.broadcast({"action":2,"id":index})
 

From 0e0703032ddbb51bf6dc3a995c2d8d8694da6069 Mon Sep 17 00:00:00 2001
From: tomoron <tomoron@student.42angouleme.fr>
Date: Thu, 14 Nov 2024 15:04:14 +0100
Subject: [PATCH 4/4] add apple mobile web app

---
 .../djangoserver/file/server/server/templates/index.html        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose/requirements/djangoserver/file/server/server/templates/index.html b/docker-compose/requirements/djangoserver/file/server/server/templates/index.html
index b2489fb..750af6a 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/templates/index.html
+++ b/docker-compose/requirements/djangoserver/file/server/server/templates/index.html
@@ -3,6 +3,8 @@
 <head>
 	<meta charset='utf-8'>
 	<meta http-equiv='X-UA-Compatible' content='IE=edge'>
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
 	<title>Chat</title>
 	<meta name='viewport' content='width=device-width, initial-scale=1'>
 	<link rel='stylesheet' type='text/css' href='/static/style/homePage/home.css'>