From fe47a4d633417f98885afa617203c6e8517676b8 Mon Sep 17 00:00:00 2001
From: Xamora <xamora@42l.fr>
Date: Fri, 19 Jan 2024 16:48:20 +0100
Subject: [PATCH 01/77] Block fixed, looking for invite in game

---
 chat/consumersNotice.py                      | 189 +++++++++++++------
 frontend/static/css/search.css               |  16 +-
 frontend/static/js/api/chat/notice.js        | 116 ++++++++----
 frontend/static/js/api/client.js             |   2 +-
 frontend/static/js/api/profile.js            |   3 +-
 frontend/static/js/api/profiles.js           |   4 +-
 frontend/static/js/views/PageNotFoundView.js |   1 +
 frontend/static/js/views/Search.js           |  82 ++++++--
 profiles/views.py                            |   8 +-
 9 files changed, 306 insertions(+), 115 deletions(-)

diff --git a/chat/consumersNotice.py b/chat/consumersNotice.py
index 37267a2..66dea1f 100644
--- a/chat/consumersNotice.py
+++ b/chat/consumersNotice.py
@@ -1,6 +1,8 @@
 from channels.generic.websocket import WebsocketConsumer
 from asgiref.sync import async_to_sync
 
+from games.models import GameModel
+
 import time
 import json
 
@@ -31,19 +33,7 @@ class ChatNoticeConsumer(WebsocketConsumer):
 
 		self.accept()
 
-		message_time: int = int(time.time() * 1000)
-		targets = list(self.channel_layer.users_channels.keys())
-		for target in targets:
-			channel = self.channel_layer.users_channels.get(target)
-			if (channel == None or target == user.pk):
-				continue
-			async_to_sync(self.channel_layer.send)(channel, {
-				'type':"online_users",
-				'author_id':user.pk,
-				'targets': targets,
-				'time':message_time,
-				'status': 200,
-			})
+		self.sync()
 
 	def disconnect(self, code):
 
@@ -51,22 +41,15 @@ class ChatNoticeConsumer(WebsocketConsumer):
 		if (user.is_anonymous or not user.is_authenticated):
 			return	
 
-		self.channel_layer.users_channels.pop(user.pk)
+		del self.channel_layer.users_channels[user.pk]
+		del self.channel_layer.invite[user.pk]
 
-		message_time: int = int(time.time() * 1000)
+		for inviter_id, inviteds_id in self.channel_layer.invite.items():
+			if (user.pk in inviteds_id): 
+				self.channel_layer.invite[inviter_id].remove(user.pk)
+
+		self.sync()
 
-		targets = list(self.channel_layer.users_channels.keys())
-		for target in targets:
-			channel = self.channel_layer.users_channels.get(target)
-			if (channel == None or target == user.pk):
-				continue
-			async_to_sync(self.channel_layer.send)(channel, {
-				'type':"online_users",
-				'author_id':user.pk,
-				'targets': targets,
-				'time':message_time,
-				'status': 200,
-			})
 
 	def receive(self, text_data=None, bytes_data=None):
 
@@ -89,50 +72,115 @@ class ChatNoticeConsumer(WebsocketConsumer):
 		if (self.channel_layer == None):
 			return
 
-		message_time: int = int(time.time() * 1000)
-		status = 200;
+		message_time: int = int(text_data_json.get('time'))
+
+		print(message_time)
+		print(time.time())
+		print(time.time() * 1000 - message_time)
+
+		if (message_time == None):
+			message_time: int = int(time.time() * 1000)
 
 		#print("receive" + str(user.pk))
 
+		result = None
 		try:
-			status = getattr(self, "pre_" + type_notice)(user, targets)
+			status, result = getattr(self, "pre_" + type_notice)(user, targets)
 		except AttributeError:
-			print(f"La fonction pre_{type_notice} n'existe pas.")
+			status = 200
+			#print(f"La fonction pre_{type_notice} n'existe pas.")
 
-		if targets == "all":
-			targets = list(self.channel_layer.users_channels.keys())
+		if (status < 300):
+			if targets == "all":
+				targets = list(self.channel_layer.users_channels.keys())
+
+			for target in targets:
+				channel = self.channel_layer.users_channels.get(target)
+				if (channel == None or target == user.pk):
+					if (channel == None):
+						status = 404
+					continue
+				async_to_sync(self.channel_layer.send)(channel, {
+					'type':type_notice,
+					'author_id':user.pk,
+					'content':content,
+					'result':result,
+					'targets': targets,
+					'time':message_time,
+					'status': 200,
+				})
 
-		for target in targets:
-			channel = self.channel_layer.users_channels.get(target)
-			if (channel == None or target == user.pk):
-				if (channel == None):
-					status = 404
-				continue
-			async_to_sync(self.channel_layer.send)(channel, {
-				'type':type_notice,
-				'author_id':user.pk,
-				'content':content,
-				'targets': targets,
-				'time':message_time,
-				'status': 200,
-			})
 		async_to_sync(self.channel_layer.send)(self.channel_layer.users_channels.get(user.pk), {
 			'type':type_notice,
 			'author_id':user.pk,
-			'content':"notice return",
+			'result':result,
 			'targets': targets,
 			'time':message_time,
 			'status':status,
 		})
 
+	def sync(self, user = None, level = None):
+		
+		sendToUser = True
+		if (user == None):
+			user = self.scope["user"]
+			sendToUser = False
+			
+
+		if (level == None):
+			level = 0
+
+		message_time: int = int(time.time() * 1000)
+		if (sendToUser):
+			targets = [user.pk]
+		else:
+			targets = list(self.channel_layer.users_channels.keys())
+
+		for target in targets:
+			channel = self.channel_layer.users_channels.get(target)
+			if (channel == None or (not sendToUser and target == user.pk)):
+				continue
+			async_to_sync(self.channel_layer.send)(channel, {
+				'type':"online_users",
+				'author_id':user.pk,
+				'targets': targets,
+				'time':message_time,
+				'status': 200,
+			})
+			if (level >= 1): 
+				async_to_sync(self.channel_layer.send)(channel, {
+					'type':"invite",
+					'author_id':user.pk,
+					'targets': targets,
+					'time':message_time,
+					'status': 200,
+				})
+
 
 	def pre_invite(self, user, targets):
-		status = 200
 
+		status = 200
 		for target in targets:
 			if (target in self.channel_layer.invite[user.pk]):
 				status = 409
-		return status
+				continue
+
+			channel = self.channel_layer.users_channels.get(target)
+			if (channel == None):
+				status = 404
+				continue
+
+			# Add the invited in "self.channel_layer.invite"
+			if (user.pk != target):
+				self.channel_layer.invite[user.pk].append(target)
+
+		return status, None
+
+	def get_invites(self, user):
+		invites = []
+		for inviter_id, inviteds_id in self.channel_layer.invite.items():
+			if (user.pk in inviteds_id and user.pk != inviter_id): 
+				invites.append(inviter_id)
 
 	def invite(self, event):
 
@@ -140,23 +188,48 @@ class ChatNoticeConsumer(WebsocketConsumer):
 		if (user.is_anonymous or not user.is_authenticated):
 			return
 
-		if (user.pk in self.channel_layer.invite[event["author_id"]]):
-			return
-
-		if (user.pk != event["author_id"]):
-			self.channel_layer.invite[event["author_id"]].append(user.pk)
+		invites = self.get_invites(user)
 
 		self.send(text_data=json.dumps({
 			'type':event['type'],
 			'author_id':event['author_id'],
-			'content':event['content'],
+			'invites': invites,
 			'targets': event['targets'],
 			'time': event['time'],
 			'status':event['status'],
 		}))
 
-	def pre_online_users(self, user, targets):
-		pass
+	def pre_accept_invite(self, user, targets):
+
+		if (user.pk not in self.channel_layer.invite[targets[0]]):
+			return 400, None
+
+		self.channel_layer.invite[targets[0]].remove(user.pk)
+
+		if (targets[0] in self.channel_layer.invite[user.pk]):
+			self.channel_layer.invite[user.pk].remove(targets[0])
+
+		id_game = GameModel().create([user.pk, targets[0]]);
+
+		return 200, id_game
+
+	def accept_invite(self, event):
+
+		user = self.scope["user"]
+		if (user.is_anonymous or not user.is_authenticated):
+			return
+
+		invites = self.get_invites(user)
+
+		self.send(text_data=json.dumps({
+			'type':event['type'],
+			'author_id':event['author_id'],
+			'result': event['result'],
+			'invites': invites,
+			'time': event['time'],
+			'status':event['status'],
+		}))
+		
 
 	def online_users(self, event):
 
diff --git a/frontend/static/css/search.css b/frontend/static/css/search.css
index 1b70a0a..6aa1061 100644
--- a/frontend/static/css/search.css
+++ b/frontend/static/css/search.css
@@ -78,7 +78,6 @@
 	border: none;
 	outline: none;
 	border-bottom: 0.15em solid green;
-	caret-color: green;
 	color: green;
 	font-size: 0.8em;
 }
@@ -106,9 +105,8 @@
 	word-wrap: break-word;
 }
 
-#app #invite {
+#app #invite, #app #yes, #app #no {
 	position: relative;
-	background-color: green;
 	border: none;
 	color: white;
 	text-align: center;
@@ -118,3 +116,15 @@
 	width: 4em;
 	cursor: pointer;
 }
+
+#app #yes, #app #no {
+	position: relative;
+	border: none;
+	color: white;
+	text-align: center;
+	text-decoration: none;
+	font-size: 0.8em;
+	height: 2em;
+	width: 2em;
+	cursor: pointer;
+}
diff --git a/frontend/static/js/api/chat/notice.js b/frontend/static/js/api/chat/notice.js
index 1ae4d23..039ad52 100644
--- a/frontend/static/js/api/chat/notice.js
+++ b/frontend/static/js/api/chat/notice.js
@@ -1,3 +1,4 @@
+import { navigateTo } from "../../index.js";
 import {create_popup} from "../../utils/noticeUtils.js";
 
 class Notice {
@@ -7,9 +8,8 @@ class Notice {
 
 		// users online, invited by, asked friend by, 
 		let data_variable = ["online", "invited", "asked"];
-		for (let i in data_variable) {
+		for (let i in data_variable)
 			this.data[data_variable[i]] = [];
-		}
 
 		this.connect();
 
@@ -20,12 +20,14 @@ class Notice {
 
 		this.chatSocket = new WebSocket(url);
 		this.chatSocket.onmessage = (event) =>{
-			let data = JSON.parse(event.data);
-			//console.log("notice: ", data);
-			if (data.type == "invite")
-				this.receiveInvite(data);
-			else if (data.type == "online_users" || data.type == "disconnect")
-				this.receiveOnlineUser(data);
+			let send = JSON.parse(event.data);
+			console.log("notice: ", send);
+			if (send.type == "invite")
+				this.receiveInvite(send);
+			else if (send.type == "online_users" || send.type == "disconnect")
+				this.receiveOnlineUser(send);
+			else if (send.type == "accept_invite")
+				this.receiveAcceptInvite(send);
 		}
 	    this.chatSocket.onopen = (event) => {
 			this.getOnlineUser();
@@ -40,61 +42,96 @@ class Notice {
 
 	}
 
-	async sendInvite(id_inviter, id_inviteds) {
-		
-		if (this.chatSocket == undefined)
-			return;
+	async acceptInvite(invitedBy) {
 
-		this.chatSocket.send(JSON.stringify({
-			type: "invite",
-			targets: id_inviteds,
-		}));
+		this.sendRequest({
+			type: "accept_invite",
+			targets: [invitedBy],
+		});
 
 	}
 
-	async receiveInvite(data) {
+	async receiveAcceptInvite(send) {
+
+		let id_game = send["result"];
+		navigateTo("/game/" + id_game);
+
+	}
+
+	async refuseInvite(invitedBy) {
+
+		this.sendRequest({
+			type: "refuse_invite",
+			targets: [invitedBy],
+		});
+
+
+	}
+
+	async sendInvite(id_inviteds) {
+
+		this.sendRequest({
+			type: "invite",
+			targets: id_inviteds,
+			time: new Date().getTime(),
+		});
+
+	}
+
+	async receiveInvite(send) {
 		
-		if (data.content === "notice return") {
-			if (data.status == 200) {
-				for (let target in data.targets)
-					this.data["invited"].push(target);
+		if (this.client.me == undefined)
+			return ;
+
+		let content = send.content;
+
+		if (send.author_id == this.client.me.id) {
+			if (send.status == 200) {
+				for (let target in send.targets)
 				return create_popup("Invitation send");
 			}
-			else if (data.status == 404)
+			else if (send.status == 404)
 				return create_popup("User not connected");
-			else if (data.status == 409)
+			else if (send.status == 409)
 				return create_popup("Already invited");
 		}
 		else {
-			let sender = await this.client.profiles.getProfile(data.author_id);
 
-			this.inviter.push(data.author_id);
+			if (!content.includes(send.author_id) || 
+				this.data["invited"].includes(send.author_id))
+				return;
+
+			this.data["invited"] = content;
+			let sender = await this.client.profiles.getProfile(send.author_id);
+
 			create_popup("Invitation received by " + sender.username);
 
+			if (this.rewrite_invite !== undefined)
+				this.rewrite_invite();
+
 			// Géré la reception de l'invitation
 		}
 	}
 
 	async getOnlineUser() {
 		
-		if (this.chatSocket == undefined)
-			return;
-
 		this.online_users = {};
 
-		this.chatSocket.send(JSON.stringify({
+		this.sendRequest({
 			type: "online_users",
-			targets: "all",
-		}));
+			targets: [],
+			time: new Date().getTime(),
+		});
 
 	}
 
-	async receiveOnlineUser(data) {
-		if (data.content !== undefined) {
+	async receiveOnlineUser(send) {
+		let content = send.content;
+		if (content !== undefined) {
 
-			if (this.online_users.length > 0) {
+			if (this.data["online"].length > 0) {
 				// get all disconnect user
-				let disconnects = this.online_users.filter(id => !Object.keys(data.content).includes(id));
+				let disconnects = this.data["online"].filter(id => !Object.keys(content).includes(id));
 
 				// delete invite
 				this.data["invited"] = this.data["invited"].filter(id => !disconnects.includes(id));
@@ -102,12 +139,19 @@ class Notice {
 				//console.log(this.data["invited"]);
 			}
 
-			this.data["online"] = Object.keys(data.content);
+			this.data["online"] = Object.keys(content);
 
 			if (this.rewrite_usernames !== undefined)
 				this.rewrite_usernames();
 		}
 	}
+
+	async sendRequest(content) {
+		if (this.chatSocket == undefined)
+			return;
+
+		this.chatSocket.send(JSON.stringify(content));
+	}
 }
 
 export {Notice}
diff --git a/frontend/static/js/api/client.js b/frontend/static/js/api/client.js
index bc3559c..2b42a69 100644
--- a/frontend/static/js/api/client.js
+++ b/frontend/static/js/api/client.js
@@ -30,7 +30,7 @@ class Client
 
 		this.channels = new Channels(this);
 		this.channel = undefined;
-
+			
 		this.notice = new Notice(this);
 	}
 
diff --git a/frontend/static/js/api/profile.js b/frontend/static/js/api/profile.js
index b3f1b15..4ee1e92 100644
--- a/frontend/static/js/api/profile.js
+++ b/frontend/static/js/api/profile.js
@@ -34,6 +34,7 @@ class Profile
 
 		let block_response = await this.client._get("/api/profiles/block");
 
+
 		if (block_response.status != 200)
 			return
 
@@ -42,7 +43,7 @@ class Profile
 		block_list.forEach(block => {
 		 	let blocker = block.fields.blocker;
 		 	let blocked = block.fields.blocked;
-		 	if (blocker == this.client.me.user_id && blocked == user_id)
+		 	if (blocker == this.client.me.id && blocked == this.id)
 		 		return this.isBlocked = true;
 		});
 	}
diff --git a/frontend/static/js/api/profiles.js b/frontend/static/js/api/profiles.js
index 177f5a0..54c8129 100644
--- a/frontend/static/js/api/profiles.js
+++ b/frontend/static/js/api/profiles.js
@@ -37,7 +37,7 @@ class Profiles
 
 		// blocker & blocked
 		let response = await this.client._post("/api/profiles/block", { 
-			users_id:[this.client.me.user_id, user_id],
+			users_id:[this.client.me.id, user_id],
 		});
 
 		let data = await response.json();
@@ -49,7 +49,7 @@ class Profiles
 
 		// blocker & blocked
 		let response = await this.client._delete("/api/profiles/block", { 
-			users_id:[this.client.me.user_id, user_id],
+			users_id:[this.client.me.id, user_id],
 		});
 
 		let data = await response.json();
diff --git a/frontend/static/js/views/PageNotFoundView.js b/frontend/static/js/views/PageNotFoundView.js
index 5d875c3..334c1a2 100644
--- a/frontend/static/js/views/PageNotFoundView.js
+++ b/frontend/static/js/views/PageNotFoundView.js
@@ -8,6 +8,7 @@ export default class extends AbstractView {
 	async getHtml() {
 		return `
 			<h1>404 Bozo</h1>
+			<img src="https://media.giphy.com/media/pm0BKtuBFpdM4/giphy.gif">
 			<p>Git gud</p>
 		`;
 	}
diff --git a/frontend/static/js/views/Search.js b/frontend/static/js/views/Search.js
index 5f84845..13aae62 100644
--- a/frontend/static/js/views/Search.js
+++ b/frontend/static/js/views/Search.js
@@ -31,9 +31,11 @@ export default class extends AbstractView {
 		//await client.notice.getOnlineUser();
 		await this.wait_get_online_users();
 		client.notice.rewrite_usernames = this.rewrite_usernames;
+		client.notice.rewrite_invite = this.display_invite;
 
 		let search = document.getElementById("input_user");
-		search.oninput = () => this.display_users(logged, profiles);
+		if (search != undefined)
+			search.oninput = () => this.display_users(logged, profiles);
 
 		let chat_input = document.getElementById("input_chat");
 		//chat_input.addEventListener("keydown", this.display_chat_manager)
@@ -175,13 +177,15 @@ export default class extends AbstractView {
 		chat_input.maxLength=255;
 		chat.appendChild(chat_input);
 		
+		let members_id = client.channels.channel.members_id;
+
 		chat_input.onkeydown = async () => {
 			if (event.keyCode == 13 && client.channels.channel != undefined) {
 				//let chat_input = document.getElementById("input_chat");
 				let chat_text = chat_input.value;
 
 					let receivers_id = [];
-					client.channels.channel.members_id.forEach((member_id) => {
+					members_id.forEach((member_id) => {
 						if (member_id != client.me.id)
 							receivers_id.push(profiles.filter(user => user.id == member_id)[0].id);
 					});
@@ -196,7 +200,7 @@ export default class extends AbstractView {
 		// Scroll to the bottom of messages
 		messages.scrollTop = messages.scrollHeight;
 
-		this.display_invite(chat);
+		this.display_invite();
 
 	}
 
@@ -242,10 +246,13 @@ export default class extends AbstractView {
 	}
 
 	async display_members(chat, profiles) {
+
+		let members_id = client.channels.channel.members_id;
+
 		let members = document.createElement("h2");
 		members.id = "members";
 		let usernames = "";
-		client.channels.channel.members_id.forEach((member_id) => {
+		members_id.forEach((member_id) => {
 			if (member_id != client.me.id) {
 				if (usernames.length > 0)
 					usernames += ", ";
@@ -258,17 +265,66 @@ export default class extends AbstractView {
 		return members
 	}
 
-	async display_invite(chat, profiles) {
+	async display_invite() {
+
+		let chat = document.getElementById("chat");
+
+		if (chat == undefined)
+			return ;
+
+		let members_id = client.channels.channel.members_id;
+		let others = members_id.filter(id => id !== client.me.id);
 
-		// Button to send invite to play
 		let invite = document.getElementById("invite") || document.createElement("button");
-		invite.id = "invite";
-		invite.innerText = "invite";
-		invite.onclick = async () => {
-			await client.notice.sendInvite(client.me.id, 
-				client.channels.channel.members_id.filter(id => id !== client.me.id));
-		};
-		chat.appendChild(invite);
+		let yes = document.getElementById("yes") || document.createElement("button");
+		let no = document.getElementById("no") || document.createElement("button");
+
+		let invitedBy = undefined;
+		for (let x in others) {
+			if (client.notice.data["invited"].includes(others[x])) {
+				invitedBy = others[x];
+			}
+		}
+
+		if (invitedBy == undefined) {
+
+			if (yes && no) {
+				yes.remove();
+				no.remove();
+			}
+
+			// Button to send invite to play
+			invite.id = "invite";
+			invite.style.background = "orange";
+			invite.innerText = "invite";
+			invite.title = "Invite to play a game"
+			invite.onclick = async () => {
+				await client.notice.sendInvite(others);
+			};
+			chat.appendChild(invite);
+		}
+		else {
+
+			if (invite)
+				invite.remove()
+
+			yes.id = "yes";
+			yes.style.background = "green";
+			yes.title = "Accept to play a game"
+			yes.onclick = async () => {
+				await client.notice.acceptInvite(invitedBy);
+			};
+
+			no.id = "no";
+			no.style.background = "red";
+			no.title = "Refuse to play a game"
+			no.onclick = async () => {
+				await client.notice.refuseInvite(invitedBy);
+			};
+
+			chat.appendChild(yes);
+			chat.appendChild(no);
+		}
 
 	}
 
diff --git a/profiles/views.py b/profiles/views.py
index dbcbcab..7b556d3 100644
--- a/profiles/views.py
+++ b/profiles/views.py
@@ -33,7 +33,10 @@ class BlocksView(APIView):
 		users_id = request.data.get("users_id", None)
 
 		if (users_id == None):
-			return Response({"Error"}, status=status.HTTP_400_BAD_REQUEST)
+			return Response({"Error send None"}, status=status.HTTP_400_BAD_REQUEST)
+
+		if (users_id[0] == None or users_id[1] == None):
+			return Response({"Error send blocker/ed None"}, status=status.HTTP_400_BAD_REQUEST)
 
 		if (BlockModel.objects.filter(blocker=users_id[0], blocked=users_id[1])):
 			return Response({"Already Exist"}, status=status.HTTP_409_CONFLICT)
@@ -52,6 +55,9 @@ class BlocksView(APIView):
 		if (users_id == None):
 			return Response({"Error"}, status=status.HTTP_400_BAD_REQUEST)
 
+		if (users_id[0] == None or users_id[1] == None):
+			return Response({"Error send blocker/ed None"}, status=status.HTTP_400_BAD_REQUEST)
+
 		block = BlockModel.objects.filter(blocker=users_id[0], blocked=users_id[1])
 
 		print(list(block))

From 0f7953b2f3c9333a203daf63af19e035c54423ba Mon Sep 17 00:00:00 2001
From: Xamora <xamora@42l.fr>
Date: Wed, 24 Jan 2024 16:03:50 +0100
Subject: [PATCH 02/77] Chat finish; add invitation; friend; see online users
 if he is your friend

---
 chat/consumersNotice.py                     | 161 +++++++++++++++--
 frontend/static/css/profile.css             |  12 +-
 frontend/static/js/api/chat/notice.js       | 188 +++++++++++++++++---
 frontend/static/js/api/client.js            |   2 +-
 frontend/static/js/api/profile.js           |  36 +++-
 frontend/static/js/index.js                 |   1 +
 frontend/static/js/views/ProfilePageView.js |  93 ++++++++--
 frontend/static/js/views/Search.js          |  36 ++--
 profiles/admin.py                           |   4 +-
 profiles/models.py                          |  64 +++++++
 profiles/urls.py                            |   1 +
 profiles/views.py                           |  13 +-
 12 files changed, 532 insertions(+), 79 deletions(-)

diff --git a/chat/consumersNotice.py b/chat/consumersNotice.py
index 66dea1f..c0f2723 100644
--- a/chat/consumersNotice.py
+++ b/chat/consumersNotice.py
@@ -2,6 +2,7 @@ from channels.generic.websocket import WebsocketConsumer
 from asgiref.sync import async_to_sync
 
 from games.models import GameModel
+from profiles.models import FriendModel, AskFriendModel
 
 import time
 import json
@@ -72,23 +73,17 @@ class ChatNoticeConsumer(WebsocketConsumer):
 		if (self.channel_layer == None):
 			return
 
-		message_time: int = int(text_data_json.get('time'))
-
-		print(message_time)
-		print(time.time())
-		print(time.time() * 1000 - message_time)
+		message_time: int = text_data_json.get('time')
 
 		if (message_time == None):
 			message_time: int = int(time.time() * 1000)
 
-		#print("receive" + str(user.pk))
-
 		result = None
 		try:
 			status, result = getattr(self, "pre_" + type_notice)(user, targets)
-		except AttributeError:
+		except AttributeError as error:
+			print(error)
 			status = 200
-			#print(f"La fonction pre_{type_notice} n'existe pas.")
 
 		if (status < 300):
 			if targets == "all":
@@ -98,7 +93,7 @@ class ChatNoticeConsumer(WebsocketConsumer):
 				channel = self.channel_layer.users_channels.get(target)
 				if (channel == None or target == user.pk):
 					if (channel == None):
-						status = 404
+						status = 444 # target not connected
 					continue
 				async_to_sync(self.channel_layer.send)(channel, {
 					'type':type_notice,
@@ -159,6 +154,9 @@ class ChatNoticeConsumer(WebsocketConsumer):
 
 	def pre_invite(self, user, targets):
 
+		if (user.is_anonymous or not user.is_authenticated):
+			return 400, None
+
 		status = 200
 		for target in targets:
 			if (target in self.channel_layer.invite[user.pk]):
@@ -181,6 +179,7 @@ class ChatNoticeConsumer(WebsocketConsumer):
 		for inviter_id, inviteds_id in self.channel_layer.invite.items():
 			if (user.pk in inviteds_id and user.pk != inviter_id): 
 				invites.append(inviter_id)
+		return invites;
 
 	def invite(self, event):
 
@@ -201,6 +200,9 @@ class ChatNoticeConsumer(WebsocketConsumer):
 
 	def pre_accept_invite(self, user, targets):
 
+		if (user.is_anonymous or not user.is_authenticated):
+			return 400, None
+
 		if (user.pk not in self.channel_layer.invite[targets[0]]):
 			return 400, None
 
@@ -224,27 +226,148 @@ class ChatNoticeConsumer(WebsocketConsumer):
 		self.send(text_data=json.dumps({
 			'type':event['type'],
 			'author_id':event['author_id'],
-			'result': event['result'],
+			'id_game': event['result'],
 			'invites': invites,
 			'time': event['time'],
 			'status':event['status'],
 		}))
-		
 
-	def online_users(self, event):
+	def pre_refuse_invite(self, user, targets):
+
+		if (user.is_anonymous or not user.is_authenticated):
+			return 400, None
+
+		if (user.pk not in self.channel_layer.invite[targets[0]]):
+			return 400, None
+
+		self.channel_layer.invite[targets[0]].remove(user.pk)
+
+		if (targets[0] in self.channel_layer.invite[user.pk]):
+			self.channel_layer.invite[user.pk].remove(targets[0])
+
+		return 200, None
+		
+	def refuse_invite(self, event):
 
 		user = self.scope["user"]
-		#if (user.is_anonymous or not user.is_authenticated):
-			#return
+		if (user.is_anonymous or not user.is_authenticated):
+			return
 
-		#print("online_users" + str(user.pk))
-
-		event['content'] = self.channel_layer.users_channels
+		invites = self.get_invites(user)
 
 		self.send(text_data=json.dumps({
 			'type':event['type'],
 			'author_id':event['author_id'],
-			'content':event['content'],
+			'invites': invites,
+			'time': event['time'],
+			'status':event['status'],
+		}))
+
+	def pre_ask_friend(self, user, targets):
+
+		if (user.is_anonymous or not user.is_authenticated):
+			return 400, None
+
+		if (AskFriendModel.objects.filter(asker=user.pk, asked=targets[0])):
+			return 409, None
+
+		if (FriendModel().isFriend(user.pk, targets[0])):
+			return 409, None
+
+		if (targets[0] != None):
+			AskFriendModel(asker=user.pk, asked=targets[0]).save()
+
+		return 200, None
+
+	def send_ask_friend(self, event):
+
+		user = self.scope["user"]
+		if (user.is_anonymous or not user.is_authenticated):
+			return
+
+		asked = AskFriendModel().getAsked(user.pk)
+		asker = AskFriendModel().getAsker(user.pk)
+
+		self.send(text_data=json.dumps({
+			'type':event['type'],
+			'author_id':event['author_id'],
+			'targets':event['targets'],
+			'asker': asker,
+			'asked': asked,
+			'time': event['time'],
+			'status':event['status'],
+		}))
+
+	def ask_friend(self, event):
+		self.send_ask_friend(event)
+
+	def delete_ask(self, asker, user_asked):
+		if (user_asked.is_anonymous or not user_asked.is_authenticated):
+			return 400, None
+
+		asked = user_asked.pk
+
+		if (not AskFriendModel.objects.filter(asker=asker, asked=asked)):
+			return 404, None
+
+		if (FriendModel().isFriend(asker, asked)):
+			return 409, None
+
+		if (not AskFriendModel().deleteAsk(asker, asked)):
+			return 400, None
+
+		return 200, None
+
+	def pre_accept_friend(self, user, targets):
+		status, result = self.delete_ask(targets[0], user)
+		
+		if (status == 200):
+			FriendModel(user_id1=user.pk, user_id2=targets[0]).save()
+		return status, result
+
+	def accept_friend(self, event):
+		self.send_ask_friend(event)
+
+	def pre_refuse_friend(self, user, targets):
+		return self.delete_ask(targets[0], user)
+
+	def refuse_friend(self, event):
+		self.send_ask_friend(event)
+
+	def pre_remove_friend(self, user, targets):
+
+		if (user.is_anonymous or not user.is_authenticated):
+			return 400, None
+		
+		if (not FriendModel().isFriend(user.pk, targets[0])):
+			return 409, None
+
+		if (not FriendModel().deleteFriend(user.pk, targets[0])):
+			return 400, None
+
+		return 200, None
+	
+	def remove_friend(self, event):
+		self.send_ask_friend(event)
+
+
+	def online_users(self, event):
+
+		user = self.scope["user"]
+		if (user.is_anonymous or not user.is_authenticated):
+			return
+
+		online_friends = {}
+		for friend in FriendModel().getFriends(user.pk):
+			if (friend in self.channel_layer.users_channels):
+				online_friends[friend] = "green"
+			else:
+				online_friends[friend] = "red"
+
+		self.send(text_data=json.dumps({
+			'type':event['type'],
+			'author_id':event['author_id'],
+			'content':online_friends,
 			'time': event['time'],
 			'status':event['status'],
 		}))
diff --git a/frontend/static/css/profile.css b/frontend/static/css/profile.css
index b86bfb0..21fb0dc 100644
--- a/frontend/static/css/profile.css
+++ b/frontend/static/css/profile.css
@@ -3,12 +3,20 @@
 	font-size: 0.8em;
 }
 
-#app #block {
+#app #block, #app #friend {
 	cursor: pointer;
 	font-size: 0.7em;
 	text-decoration: underline;
 }
 
 #app {
-	margin-top: 20px;
+	margin-top: 1em;
+	background-color: red;
+}
+
+#app #yes, #app #no {
+	display:inline;
+	cursor: pointer;
+	font-size: 0.7em;
+	text-decoration: underline;
 }
diff --git a/frontend/static/js/api/chat/notice.js b/frontend/static/js/api/chat/notice.js
index 039ad52..4616179 100644
--- a/frontend/static/js/api/chat/notice.js
+++ b/frontend/static/js/api/chat/notice.js
@@ -6,8 +6,8 @@ class Notice {
 		this.client = client;
 		this.data = {};
 
-		// users online, invited by, asked friend by, 
-		let data_variable = ["online", "invited", "asked"];
+		// users online, invited by ..., asked by ..., asker to ...
+		let data_variable = ["online", "invited", "asked", "asker"];
 		for (let i in data_variable)
 			this.data[data_variable[i]] = [];
 
@@ -21,16 +21,19 @@ class Notice {
 		this.chatSocket = new WebSocket(url);
 		this.chatSocket.onmessage = (event) =>{
 			let send = JSON.parse(event.data);
-			console.log("notice: ", send);
-			if (send.type == "invite")
-				this.receiveInvite(send);
-			else if (send.type == "online_users" || send.type == "disconnect")
-				this.receiveOnlineUser(send);
-			else if (send.type == "accept_invite")
-				this.receiveAcceptInvite(send);
+			//console.log("notice: ", send);
+
+			try {
+				this["receive_" + send.type](send);
+			} 
+			catch (error) {
+				console.log("receive_" + send.type + ": Function not found");
+			}
+
 		}
 	    this.chatSocket.onopen = (event) => {
 			this.getOnlineUser();
+			this.ask_friend();
 		}
 	}
 
@@ -42,7 +45,7 @@ class Notice {
 
 	}
 
-	async acceptInvite(invitedBy) {
+	async accept_invite(invitedBy) {
 
 		this.sendRequest({
 			type: "accept_invite",
@@ -51,14 +54,15 @@ class Notice {
 
 	}
 
-	async receiveAcceptInvite(send) {
+	async receive_accept_invite(send) {
 
-		let id_game = send["result"];
+		this.data["invited"] = send.invites;
+		let id_game = send["id_game"];
 		navigateTo("/game/" + id_game);
 
 	}
 
-	async refuseInvite(invitedBy) {
+	async refuse_invite(invitedBy) {
 
 		this.sendRequest({
 			type: "refuse_invite",
@@ -67,8 +71,23 @@ class Notice {
 
 
 	}
+	async receive_refuse_invite(send) {
 
-	async sendInvite(id_inviteds) {
+		this.data["invited"] = send.invites;
+
+		if (send.author_id == this.client.me.id) {
+			if (this.rewrite_invite !== undefined)
+				this.rewrite_invite();
+		}
+		else {
+			let sender = await this.client.profiles.getProfile(send.author_id);
+			create_popup(sender.username + " refuse your invitation");
+		}
+
+	}
+
+
+	async send_invite(id_inviteds) {
 
 		this.sendRequest({
 			type: "invite",
@@ -78,25 +97,27 @@ class Notice {
 
 	}
 
-	async receiveInvite(send) {
+	async receive_invite(send) {
 		
 		if (this.client.me == undefined)
 			return ;
 
-		let content = send.content;
+		let content = send.invites;
 
 		if (send.author_id == this.client.me.id) {
 			if (send.status == 200) {
 				for (let target in send.targets)
 				return create_popup("Invitation send");
 			}
-			else if (send.status == 404)
+			else if (send.status == 444)
 				return create_popup("User not connected");
 			else if (send.status == 409)
 				return create_popup("Already invited");
 		}
 		else {
 
+			// Regarder qu'il est bien invité par l'auteur
+			// Et qu'il n'est pas déjà invité
 			if (!content.includes(send.author_id) || 
 				this.data["invited"].includes(send.author_id))
 				return;
@@ -108,8 +129,6 @@ class Notice {
 
 			if (this.rewrite_invite !== undefined)
 				this.rewrite_invite();
-
-			// Géré la reception de l'invitation
 		}
 	}
 
@@ -125,13 +144,20 @@ class Notice {
 
 	}
 
-	async receiveOnlineUser(send) {
+	async receive_online_users(send) {
 		let content = send.content;
 		if (content !== undefined) {
 
 			if (this.data["online"].length > 0) {
 				// get all disconnect user
-				let disconnects = this.data["online"].filter(id => !Object.keys(content).includes(id));
+				//let disconnects = this.data["online"].filter(id => !Object.keys(content).includes(id));
+				
+				let disconnects = [];
+
+				for (const [key, value] of Object.entries(this.data["online"])) {
+					if (content[key] == "red" && value == "green")
+						disconnects.push(key);
+				}
 
 				// delete invite
 				this.data["invited"] = this.data["invited"].filter(id => !disconnects.includes(id));
@@ -139,13 +165,131 @@ class Notice {
 				//console.log(this.data["invited"]);
 			}
 
-			this.data["online"] = Object.keys(content);
+			this.data["online"] = content;
 
 			if (this.rewrite_usernames !== undefined)
 				this.rewrite_usernames();
 		}
 	}
 
+	async ask_friend(user_id=undefined) {
+		this.sendRequest({
+			type: "ask_friend",
+			targets: [user_id],
+			time: new Date().getTime(),
+		});
+	}
+
+	async receive_ask_friend(send) {
+
+		let my_id = (this.client.me && this.client.me.id) || send.author_id;
+		if (send.author_id == my_id) {
+			if (send.status == 400)
+				create_popup("Friend ask error");
+			else if (send.status == 409)
+				create_popup("Already asked friend or already friend");
+		}
+
+		//if (!send.asked.includes(send.author_id) || 
+			//this.data["asked"].includes(send.author_id))
+			//return;
+
+		//if (!send.asker.includes(send.author_id) || 
+			//this.data["asker"].includes(send.author_id))
+			//return;
+
+		this.data["asked"] = send.asked;
+		this.data["asker"] = send.asker;
+
+		if (send.author_id != my_id) {
+			let sender = await this.client.profiles.getProfile(send.author_id);
+			if (this.data["asker"].includes(send.author_id))
+				create_popup(sender.username + " ask you as friend");
+			if (this.rewrite_profile !== undefined)
+				await this.rewrite_profile();
+		}
+		
+	}
+
+	async remove_friend(user_id) {
+		this.sendRequest({
+			type: "remove_friend",
+			targets: [user_id],
+			time: new Date().getTime(),
+		});
+	}
+
+	async receive_remove_friend(send) {
+		this.data["asked"] = send.asked;
+		this.data["asker"] = send.asker;
+
+		if (send.author_id == this.client.me.id) {
+			if (send.status == 400)
+				create_popup("Error remove Friend");
+			else if (send.status == 409)
+				create_popup("Not friend, wtf");
+
+		}
+
+		if (this.rewrite_profile !== undefined)
+			await this.rewrite_profile();
+	}
+
+	async accept_friend(user_id) {
+		this.sendRequest({
+			type: "accept_friend",
+			targets: [user_id],
+			time: new Date().getTime(),
+		});
+	}
+
+	async receive_accept_friend(send) {
+		this.data["asked"] = send.asked;
+		this.data["asker"] = send.asker;
+		let sender = await this.client.profiles.getProfile(send.author_id);
+
+		if (send.author_id == this.client.me.id) {
+			if (send.status == 400)
+				create_popup("Error accept Friend");
+			else if  (send.status == 404)
+				create_popup("Not found request Friend");
+			else if (send.status == 409)
+				create_popup("Already Friend, wtf");
+		}
+		else {
+			create_popup(sender.username + " accept your friend request");
+		}
+
+		if (this.rewrite_profile !== undefined)
+			await this.rewrite_profile();
+	}
+
+	async refuse_friend(user_id) {
+		this.sendRequest({
+			type: "refuse_friend",
+			targets: [user_id],
+			time: new Date().getTime(),
+		});
+	}
+
+	async receive_refuse_friend(send) {
+		this.data["asked"] = send.asked;
+		this.data["asker"] = send.asker;
+		let sender = await this.client.profiles.getProfile(send.author_id);
+
+		if (send.author_id == this.client.me.id) {
+			if (send.status == 400)
+				create_popup("Error refuse Friend");
+			else if  (send.status == 404)
+				create_popup("Not found request Friend");
+			else if (send.status == 409)
+				create_popup("Already Friend, WTF");
+
+		}
+		if (this.rewrite_profile !== undefined)
+			await this.rewrite_profile();
+	}
+
 	async sendRequest(content) {
 		if (this.chatSocket == undefined)
 			return;
diff --git a/frontend/static/js/api/client.js b/frontend/static/js/api/client.js
index 2b42a69..50c71b1 100644
--- a/frontend/static/js/api/client.js
+++ b/frontend/static/js/api/client.js
@@ -79,7 +79,7 @@ class Client
 	async _patch_json(uri, data)
     {
         let response = await fetch(this._url + uri, {
-			method: "PATCH",
+			ethod: "PATCH",
 			headers: {
 				"X-CSRFToken": getCookie("csrftoken"),
 				"Content-Type": "application/json",
diff --git a/frontend/static/js/api/profile.js b/frontend/static/js/api/profile.js
index 4ee1e92..91b5858 100644
--- a/frontend/static/js/api/profile.js
+++ b/frontend/static/js/api/profile.js
@@ -15,6 +15,7 @@ class Profile
 		this.username = username;
 		this.avatar_url = avatar_url;
 		this.isBlocked = false;
+		this.isFriend = false;
 	}
 
 	async init()
@@ -29,24 +30,47 @@ class Profile
 		this.username = response_data.username;
 		this.avatar_url = response_data.avatar_url;
 
-		if (this.client.me == undefined)
-			return;
+		await this.getBlock();
+		await this.getFriend();
 
+	}
+
+	async getBlock() {
 		let block_response = await this.client._get("/api/profiles/block");
-
-
+	
 		if (block_response.status != 200)
 			return
 
 		let block_data = await block_response.json();
-		let block_list = JSON.parse(block_data);
+		let block_list = JSON.parse(block_data["blockeds"]);
+		let client_id = block_data["user_id"];
 		block_list.forEach(block => {
 		 	let blocker = block.fields.blocker;
 		 	let blocked = block.fields.blocked;
-		 	if (blocker == this.client.me.id && blocked == this.id)
+		 	if (blocker == client_id && blocked == this.id)
 		 		return this.isBlocked = true;
 		});
 	}
+
+	async getFriend() {
+		let friend_response = await this.client._get("/api/profiles/friend");
+	
+		this.isFriend = false;
+		if (friend_response.status != 200)
+		 	return this.isFriend;
+
+		let friend_data = await friend_response.json();
+		let friends_list = friend_data["friends"];
+		let client_id = friend_data["user_id"];
+		friends_list.forEach(friend => {
+		 	if (friend == this.id) {
+		 		this.isFriend = true;
+		 		return this.isFriend;
+			}
+		});
+		return this.isFriend;
+	}
+
 }
 
 export {Profile}
diff --git a/frontend/static/js/index.js b/frontend/static/js/index.js
index 385b838..9818b9c 100644
--- a/frontend/static/js/index.js
+++ b/frontend/static/js/index.js
@@ -58,6 +58,7 @@ async function renderView(view)
 
 	let error_code = await view.postInit();
 
+
     if (error_code === 404)
         renderView(new PageNotFoundView());
     else if (error_code === 403)
diff --git a/frontend/static/js/views/ProfilePageView.js b/frontend/static/js/views/ProfilePageView.js
index bb4a6fc..b26a339 100644
--- a/frontend/static/js/views/ProfilePageView.js
+++ b/frontend/static/js/views/ProfilePageView.js
@@ -4,17 +4,16 @@ import { client } from "../index.js"
 export default class extends AbstractView {
     constructor(params) {
         super(params, "Profile ");
-        this.user_id = params.id;
+        this.id = Number(params.id);
     }
 
     async postInit()
     {
-        let profile = await client.profiles.getProfile(this.user_id);
+        this.profile = await client.profiles.getProfile(this.id);
 
-		if (profile === null)
+		if (this.profile === null)
 			return 404;
 
-        this.profile = await client.profiles.getProfile(this.user_id);
 		this.info = document.getElementById("info");
 
 		// Username
@@ -32,6 +31,14 @@ export default class extends AbstractView {
 		this.info.appendChild(avatar);
 
 		await this.blockButton();
+
+		await this.friendButton();
+
+		client.notice.rewrite_profile = async () => {
+			let result = await this.profile.getFriend();
+			await this.profile.getBlock()
+			await this.friendButton();
+		}
     }
 
 	async blockButton() {
@@ -39,23 +46,81 @@ export default class extends AbstractView {
 		if (await client.isAuthentificate() === false)
 			return;
 
-		if (client.me.id != this.user_id) {
-			let block = document.getElementById("block") || document.createElement("a");
+		if (client.me.id != this.id) {
+			let block = document.getElementById("block");
+			if (block == undefined) {
+				block = document.createElement("p");
+				this.info.appendChild(block);
+			}
+
 			block.id = "block";
-			block.innerText = "";
 			block.onclick = async () => {
-				if (!this.profile.isBlocked)
-					await client.profiles.block(this.user_id);
+				if (this.profile.isBlocked)
+					await client.profiles.deblock(this.id);
 				else
-					await client.profiles.deblock(this.user_id);
-				this.profile = await client.profiles.getProfile(this.user_id);
+					await client.profiles.block(this.id);
+				this.profile = await client.profiles.getProfile(this.id);
 				this.blockButton();
 			};
 			if (this.profile.isBlocked)
-				block.appendChild(document.createTextNode("Deblock"));
+				block.textContent = "Deblock";
 			else
-				block.appendChild(document.createTextNode("Block"));
-			this.info.appendChild(block);
+				block.textContent = "Block";
+		}
+	}
+
+	async friendButton() {
+		if (await client.isAuthentificate() === false)
+			return;
+
+		if (client.me.id != this.id) {
+			let yes = document.getElementById("yes") || document.createElement("p");
+			let no = document.getElementById("no") || document.createElement("p");
+			let friend = document.getElementById("friend") || document.createElement("p");
+			
+			if (client.notice.data["asker"].includes(this.id)) {
+
+				if (friend)
+					friend.remove();
+
+				yes.id = "yes";
+				yes.textContent = "Accept Friend";
+				yes.onclick = async () => {
+					client.notice.accept_friend(this.id);
+				}
+
+				no.id = "no";
+				no.textContent = "Refuse Friend";
+				no.onclick = async () => {
+					client.notice.refuse_friend(this.id);
+				}
+
+				this.info.appendChild(yes);
+				this.info.appendChild(document.createTextNode(" "));
+				this.info.appendChild(no);
+
+			}
+			else {
+
+				if (yes && no)
+					yes.remove(); no.remove();
+
+				friend.id = "friend"
+				friend.onclick = async () => {
+					if (this.profile.isFriend)
+						await client.notice.remove_friend(this.id);
+					else
+						await client.notice.ask_friend(this.id);
+					this.profile = await client.profiles.getProfile(this.id);
+					this.friendButton();
+				};
+				if (this.profile.isFriend)
+					friend.textContent = "Remove Friend";
+				else {
+					friend.textContent = "Ask Friend";
+				}
+				this.info.appendChild(friend);
+			}
 		}
 	}
 
diff --git a/frontend/static/js/views/Search.js b/frontend/static/js/views/Search.js
index 13aae62..812b5c4 100644
--- a/frontend/static/js/views/Search.js
+++ b/frontend/static/js/views/Search.js
@@ -10,12 +10,12 @@ export default class extends AbstractView {
 	async wait_get_online_users() {
 		return new Promise((resolve) => {
 			const checkInterval = setInterval(() => {
-				//console.log(client.notice.data["online"].length);
-				if (client.notice.data["online"].length > 0) {
+				console.log(client.notice.data["online"]);
+				if (Object.keys(client.notice.data["online"]).length > 0) {
 					clearInterval(checkInterval);
 					resolve();
 				}
-			}, 100);
+			}, 1);
 		});
 	}
 
@@ -29,7 +29,7 @@ export default class extends AbstractView {
 			return console.log("Error");
 
 		//await client.notice.getOnlineUser();
-		await this.wait_get_online_users();
+		//await this.wait_get_online_users();
 		client.notice.rewrite_usernames = this.rewrite_usernames;
 		client.notice.rewrite_invite = this.display_invite;
 
@@ -68,7 +68,14 @@ export default class extends AbstractView {
 			username.setAttribute('data-link', '');
 			username.id = `username${user.id}`
 			username.href = `/profiles/${user.id}`;
-			username.style.color = client.notice.data["online"].includes(user.id.toString()) ? "green" : "red";
+
+			if (user.id == client.me.id)
+				username.style.color = "green";
+			else {
+				let online = client.notice.data["online"][user.id];
+				username.style.color = online !== undefined ? online : "gray";
+			}
+			
 			username.appendChild(document.createTextNode(user.username));
 			new_user.appendChild(username);
 
@@ -137,8 +144,14 @@ export default class extends AbstractView {
 
 		profiles.filter(user => user.username.toLowerCase().startsWith(search) == true).forEach((user) => {
 			let username = document.getElementById(`username${user.id}`);
-			if (username !== null)
-				username.style.color = client.notice.data["online"].includes(user.id.toString()) ? "green" : "red";
+			if (username !== null) {
+				if (user.id == client.me.id)
+					username.style.color = "green";
+				else {
+					let online = client.notice.data["online"][user.id];
+					username.style.color = online !== undefined ? online : "gray";
+				}
+			}
 		});
 
 	}
@@ -259,9 +272,10 @@ export default class extends AbstractView {
 				usernames += (profiles.filter(user => user.id == member_id)[0].username);
 			}
 		});
-		members.appendChild(document.createTextNode(usernames));
+		members.textContent = usernames;
 		chat.appendChild(members);
 
+
 		return members
 	}
 
@@ -299,7 +313,7 @@ export default class extends AbstractView {
 			invite.innerText = "invite";
 			invite.title = "Invite to play a game"
 			invite.onclick = async () => {
-				await client.notice.sendInvite(others);
+				await client.notice.send_invite(others);
 			};
 			chat.appendChild(invite);
 		}
@@ -312,14 +326,14 @@ export default class extends AbstractView {
 			yes.style.background = "green";
 			yes.title = "Accept to play a game"
 			yes.onclick = async () => {
-				await client.notice.acceptInvite(invitedBy);
+				await client.notice.accept_invite(invitedBy);
 			};
 
 			no.id = "no";
 			no.style.background = "red";
 			no.title = "Refuse to play a game"
 			no.onclick = async () => {
-				await client.notice.refuseInvite(invitedBy);
+				await client.notice.refuse_invite(invitedBy);
 			};
 
 			chat.appendChild(yes);
diff --git a/profiles/admin.py b/profiles/admin.py
index d79bf0b..45df28e 100644
--- a/profiles/admin.py
+++ b/profiles/admin.py
@@ -1,7 +1,9 @@
 from django.contrib import admin
 
-from .models import ProfileModel, BlockModel
+from .models import ProfileModel, BlockModel, FriendModel, AskFriendModel
 
 # Register your models here.
 admin.site.register(ProfileModel)
 admin.site.register(BlockModel)
+admin.site.register(FriendModel)
+admin.site.register(AskFriendModel)
diff --git a/profiles/models.py b/profiles/models.py
index 1362463..10e197d 100644
--- a/profiles/models.py
+++ b/profiles/models.py
@@ -26,3 +26,67 @@ class BlockModel(models.Model):
 
 	def __str__(self):
 		return "blocker_id: " + str(self.blocker) + ", blocked_id: " + str(self.blocked)
+
+class AskFriendModel(models.Model):
+	asker = IntegerField(primary_key=False)
+	asked = IntegerField(primary_key=False)
+
+	def getAsked(self, asker):
+		askeds = []
+
+		for ask in AskFriendModel.objects.filter(asker=asker):
+			askeds.append(ask.asked)
+
+		return askeds
+
+	def getAsker(self, asked):
+		askers = []
+
+		for ask in AskFriendModel.objects.filter(asked=asked):
+			askers.append(ask.asker)
+
+		return askers
+
+	def deleteAsk(self, asker, asked):
+
+		deleted = AskFriendModel.objects.filter(asker=asker, asked=asked)
+
+		if (deleted.count() == 0 or not deleted):
+			return False
+
+		deleted.delete()
+		return True
+
+class FriendModel(models.Model):
+	user_id1 = IntegerField(primary_key=False)
+	user_id2 = IntegerField(primary_key=False)
+
+	def getFriends(self, user_id):
+		friends = []
+
+		for friend in FriendModel.objects.filter(user_id1=user_id):
+			friends.append(friend.user_id2)
+
+		for friend in FriendModel.objects.filter(user_id2=user_id):
+			friends.append(friend.user_id1)
+
+		return friends
+
+	def isFriend(self, user_id1, user_id2):
+
+		return user_id2 in self.getFriends(user_id1)
+
+	def deleteFriend(self, user_id1, user_id2):
+
+		first = FriendModel.objects.filter(user_id1=user_id1, user_id2=user_id2)
+		if (first.count() == 1):
+			first.delete()
+			return True
+
+		second = FriendModel.objects.filter(user_id1=user_id2, user_id2=user_id1)
+		if (second.count() == 1):
+			second.delete()
+			return True
+
+		return False
+
diff --git a/profiles/urls.py b/profiles/urls.py
index 8fe7c4f..ebc43c2 100644
--- a/profiles/urls.py
+++ b/profiles/urls.py
@@ -11,5 +11,6 @@ urlpatterns = [
     path("", viewsets.ProfileViewSet.as_view({'get': 'list'}), name="profiles_list"),
 	path("block", views.BlocksView.as_view(), name="block_page"),
 	path("block/<int:pk>", views.BlockView.as_view(), name="block_page"),
+	path("friend", views.FriendsView.as_view(), name="friend_page"),
 
 ] + static("/static/avatars/", document_root="./avatars")
diff --git a/profiles/views.py b/profiles/views.py
index 7b556d3..19f6635 100644
--- a/profiles/views.py
+++ b/profiles/views.py
@@ -4,7 +4,7 @@ from rest_framework import authentication, permissions, status
 from rest_framework.authentication import SessionAuthentication
 from rest_framework.renderers import JSONRenderer
 from django.core import serializers
-from .models import BlockModel
+from .models import BlockModel, FriendModel
 
 class BlockView(APIView):
 	permission_classes = (permissions.IsAuthenticated,)
@@ -25,7 +25,7 @@ class BlocksView(APIView):
 	def get(self, request):
 		blocks = BlockModel.objects.filter(blocker=request.user.pk)
 		if (blocks):
-			return Response(serializers.serialize("json", BlockModel.objects.filter(blocker=request.user.pk)), status=status.HTTP_200_OK)
+			return Response({"blockeds": serializers.serialize("json", BlockModel.objects.filter(blocker=request.user.pk)), "user_id": request.user.pk}, status=status.HTTP_200_OK)
 		return Response({}, status=status.HTTP_204_NO_CONTENT)
 
 	def post(self, request):
@@ -60,7 +60,6 @@ class BlocksView(APIView):
 
 		block = BlockModel.objects.filter(blocker=users_id[0], blocked=users_id[1])
 
-		print(list(block))
 		if (block.count() > 1):
 			return Response("Not normal >:[", status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 		
@@ -69,3 +68,11 @@ class BlocksView(APIView):
 
 		block.delete()
 		return Response("Deleted", status=status.HTTP_200_OK)
+
+class FriendsView(APIView):
+
+	def get(self, request):
+		friends = FriendModel().getFriends(request.user.pk)
+		if (friends):
+			return Response({"friends": friends, "user_id": request.user.pk}, status=status.HTTP_200_OK)
+		return Response({}, status=status.HTTP_204_NO_CONTENT)

From feaaaec128c01b9578d4813ffec0418fc9a128b0 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Mon, 29 Jan 2024 10:16:06 +0100
Subject: [PATCH 03/77] improved login redirections

---
 frontend/static/js/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/static/js/index.js b/frontend/static/js/index.js
index 2d2af71..4005051 100644
--- a/frontend/static/js/index.js
+++ b/frontend/static/js/index.js
@@ -107,14 +107,16 @@ const router = async(uri) => {
 	if (lastView !== undefined)
 		await lastView.leavePage();
 
+	if (uri !== '/login' && uri !== '/register' && uri !== '/logout')
+		lastPageUrlBeforeLogin = uri;
+	else
+		lastPageUrlBeforeLogin = undefined;
     const view = new match.route.view(getParams(match), lastPageUrlBeforeLogin);
 
     if (view instanceof AbstractRedirectView && await view.redirect())
         return 1;
 
 	lastView = view;
-	if (uri !== '/login' && uri !== '/register' && uri !== '/logout')
-		lastPageUrlBeforeLogin = uri;
 
     if (await renderView(view))
         return 1;

From f32caad343e6d974a6bf2d4a5b452e71081b67d7 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Mon, 29 Jan 2024 10:19:11 +0100
Subject: [PATCH 04/77] bozo move

---
 frontend/static/js/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/static/js/index.js b/frontend/static/js/index.js
index 4005051..e2a7cfe 100644
--- a/frontend/static/js/index.js
+++ b/frontend/static/js/index.js
@@ -19,7 +19,7 @@ import TournamentPageView from "./views/tournament/TournamentPageView.js";
 import TournamentsView from "./views/tournament/TournamentsListView.js";
 import TournamentCreateView from "./views/tournament/TournamentCreateView.js";
 
-let client = new Client(location.protocol + "//" + location.host)
+let client = new Client(location.origin)
 
 let lastView = undefined
 let lastPageUrlBeforeLogin = undefined

From b0ba327f7f7283ce74279b3fc0ebb7992d958dad Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Mon, 29 Jan 2024 10:19:55 +0100
Subject: [PATCH 05/77] ;

---
 frontend/static/js/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/static/js/index.js b/frontend/static/js/index.js
index e2a7cfe..d94db7d 100644
--- a/frontend/static/js/index.js
+++ b/frontend/static/js/index.js
@@ -19,10 +19,10 @@ import TournamentPageView from "./views/tournament/TournamentPageView.js";
 import TournamentsView from "./views/tournament/TournamentsListView.js";
 import TournamentCreateView from "./views/tournament/TournamentCreateView.js";
 
-let client = new Client(location.origin)
+let client = new Client(location.origin);
 
-let lastView = undefined
-let lastPageUrlBeforeLogin = undefined
+let lastView = undefined;
+let lastPageUrlBeforeLogin = undefined;
 
 const pathToRegex = path => new RegExp("^" + path.replace(/\//g, "\\/").replace(/:\w+/g, "(.+)") + "$");
 

From 8ee2beb432c61a09391a8e0893e7fe6e22321bfa Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Mon, 29 Jan 2024 10:50:18 +0100
Subject: [PATCH 06/77] lang: improved, Home view translation

---
 frontend/static/js/api/LanguageManager.js | 47 ++++++++++++++++-------
 frontend/static/js/index.js               | 15 ++++++--
 frontend/static/js/lang/en.json           |  7 +++-
 frontend/static/js/lang/fr.json           |  7 +++-
 frontend/static/js/views/HomeView.js      | 11 +++---
 5 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/frontend/static/js/api/LanguageManager.js b/frontend/static/js/api/LanguageManager.js
index 3e1c9b3..2c9ebb5 100644
--- a/frontend/static/js/api/LanguageManager.js
+++ b/frontend/static/js/api/LanguageManager.js
@@ -1,11 +1,17 @@
+import { reloadView } from '../index.js'
+
 export default class LanguageManager {
 	constructor() {
 		this.availableLanguages = ['en', 'fr'];
 
+		this.dict = null;
 		this.currentLang = 'en'
 		this.chosenLang = localStorage.getItem('preferedLanguage') || this.currentLang;
 		if (this.chosenLang !== this.currentLang && this.availableLanguages.includes(this.chosenLang)) {
 			this.translatePage();
+			this.currentLang = this.chosenLang;
+		} else {
+			this.loadDict(this.chosenLang);
 		}
 	}
 
@@ -13,33 +19,48 @@ export default class LanguageManager {
 		if (this.currentLang === this.chosenLang)
 			return;
 
-		let dictUrl = `${location.origin}/static/js/lang/${this.chosenLang}.json`;
-		let translation = await fetch(dictUrl).then(response => {
-			if (response.status !== 200)
-				return null;
-			return response.json();
-		});
-		if (!translation) {
-			console.log(`No translation found for language ${this.chosenLang}`);
+		await this.loadDict(this.chosenLang);
+		if (!this.dict)
 			return 1;
-		}
+
 		document.querySelectorAll('[data-i18n]').forEach(el => {
 			let key = el.getAttribute('data-i18n');
-			el.innerHTML = translation[key];
+			el.innerHTML = this.dict[key];
 		})
+		await reloadView();
 
-		this.currentLang = this.chosenLang;
 		return 0;
 	}
 
 	async changeLanguage(lang) {
 		if (lang === this.currentLang || !this.availableLanguages.includes(lang))
-			return;
+			return 1;
 
 		this.chosenLang = lang;
 		if (await this.translatePage() !== 0)
-			return;
+			return 1;
 
+		this.currentLang = this.chosenLang;
 		localStorage.setItem('preferedLanguage', lang);
+		return 0;
+	}
+
+	async loadDict(lang) {
+		let dictUrl = `${location.origin}/static/js/lang/${lang}.json`;
+		let response = await fetch(dictUrl);
+
+		if (response.status !== 200) {
+			console.log(`No translation found for language ${lang}`);
+			return;
+		}
+
+		this.dict = await response.json();
+	}
+
+	get(key, defaultTxt) {
+		if (!this.dict)
+			return defaultTxt;
+
+		return this.dict[key] || defaultTxt;
 	}
 }
diff --git a/frontend/static/js/index.js b/frontend/static/js/index.js
index d94db7d..02b1591 100644
--- a/frontend/static/js/index.js
+++ b/frontend/static/js/index.js
@@ -48,9 +48,11 @@ const navigateTo = async (uri) => {
 	}
 };
 
+const reloadView = async _ => renderView(lastView);
+
 async function renderView(view)
 {
-    let content = await view.getHtml();
+    let content = await view?.getHtml();
     if (content == null)
         return 1;
 
@@ -140,12 +142,19 @@ document.addEventListener("DOMContentLoaded", async () => {
 
 	//Languages
 	Array.from(document.getElementById('languageSelector').children).forEach(el => {
-		el.onclick = _ => client.lang.changeLanguage(el.value);
+		el.onclick = async _ => {
+			if (await client.lang.changeLanguage(el.value))
+				return;
+			document.querySelector('#languageSelector > .active')?.classList.remove('active');
+			el.classList.add('active');
+		};
 	});
+	document.querySelector(`#languageSelector > [value=${client.lang.chosenLang}]`)
+		?.classList.add('active');
 
 	await client.isAuthentificate();
     router(location.pathname);
 	document.querySelector('a[href=\'' + location.pathname + '\']')?.classList.add('active');
 });
 
-export { client, navigateTo }
+export { client, navigateTo, reloadView }
diff --git a/frontend/static/js/lang/en.json b/frontend/static/js/lang/en.json
index 3d9b14e..c558d5d 100644
--- a/frontend/static/js/lang/en.json
+++ b/frontend/static/js/lang/en.json
@@ -5,5 +5,10 @@
 	"navbarRegister": "Register",
 	"navbarProfile": "My Profile",
 	"navbarSettings": "Settings",
-	"navbarLogout": "Logout"
+	"navbarLogout": "Logout",
+	"homeTitle": "Home",
+	"homeOnline": "Play online",
+	"homeOffline": "Play offline",
+	"homeMe": "Me",
+	"homeLogout": "Logout"
 }
diff --git a/frontend/static/js/lang/fr.json b/frontend/static/js/lang/fr.json
index 3307204..76228c5 100644
--- a/frontend/static/js/lang/fr.json
+++ b/frontend/static/js/lang/fr.json
@@ -5,5 +5,10 @@
 	"navbarRegister": "S'inscrire",
 	"navbarProfile": "Mon Profil",
 	"navbarSettings": "Paramètres",
-	"navbarLogout": "Se déconnecter"
+	"navbarLogout": "Se déconnecter",
+	"homeTitle": "Maison",
+	"homeOnline": "Jouer en ligne",
+	"homeOffline": "Jouer hors ligne",
+	"homeMe": "Moi",
+	"homeLogout": "Se déconnecter"
 }
diff --git a/frontend/static/js/views/HomeView.js b/frontend/static/js/views/HomeView.js
index fb13511..1266d36 100644
--- a/frontend/static/js/views/HomeView.js
+++ b/frontend/static/js/views/HomeView.js
@@ -1,3 +1,4 @@
+import { client } from "../index.js";
 import AbstractAuthentificateView from "./abstracts/AbstractAuthentifiedView.js";
 
 export default class extends AbstractAuthentificateView {
@@ -8,11 +9,11 @@ export default class extends AbstractAuthentificateView {
 
     async getHtml() {
         return /* HTML */ `
-			<h1>HOME</h1>
-            <a href="/matchmaking" class="nav__link" data-link>Play a game</a>
-            <a href="/games/offline" class="nav__link" data-link>Play offline</a>
-            <a href="/me" class="nav__link" data-link>Me</a>
-            <a href="/logout" class="nav__link" data-link>Logout</a>
+			<h1>${client.lang.get('homeTitle', 'Home')}</h1>
+            <a href="/matchmaking" data-link>${client.lang.get('homeOnline', 'Play online')}</a>
+            <a href="/games/offline" data-link>${client.lang.get('homeOffline', 'Play offline')}</a>
+            <a href="/me" data-link>${client.lang.get('homeMe', 'Me')}</a>
+            <a href="/logout" data-link>${client.lang.get('homeLogout', 'Logout')}</a>
         `;
     }
 }

From ab5c3deec1e348431c3ba56c67d7e47dc58d038b Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Mon, 29 Jan 2024 12:59:49 +0100
Subject: [PATCH 07/77] lang: window title translation

---
 frontend/static/js/lang/en.json      | 1 +
 frontend/static/js/lang/fr.json      | 7 ++++---
 frontend/static/js/views/HomeView.js | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/static/js/lang/en.json b/frontend/static/js/lang/en.json
index c558d5d..8fc8946 100644
--- a/frontend/static/js/lang/en.json
+++ b/frontend/static/js/lang/en.json
@@ -6,6 +6,7 @@
 	"navbarProfile": "My Profile",
 	"navbarSettings": "Settings",
 	"navbarLogout": "Logout",
+	"homeWindowTitle": "Home",
 	"homeTitle": "Home",
 	"homeOnline": "Play online",
 	"homeOffline": "Play offline",
diff --git a/frontend/static/js/lang/fr.json b/frontend/static/js/lang/fr.json
index 76228c5..a879558 100644
--- a/frontend/static/js/lang/fr.json
+++ b/frontend/static/js/lang/fr.json
@@ -1,14 +1,15 @@
 {
 	"navbarSearch": "Recherche",
 	"navbarHome": "Maison",
-	"navbarLogin": "Se connecter",
+	"navbarLogin": "Connexion",
 	"navbarRegister": "S'inscrire",
 	"navbarProfile": "Mon Profil",
 	"navbarSettings": "Paramètres",
-	"navbarLogout": "Se déconnecter",
+	"navbarLogout": "Déconnexion",
+	"homeWindowTitle": "Maison",
 	"homeTitle": "Maison",
 	"homeOnline": "Jouer en ligne",
 	"homeOffline": "Jouer hors ligne",
 	"homeMe": "Moi",
-	"homeLogout": "Se déconnecter"
+	"homeLogout": "Déconnexion"
 }
diff --git a/frontend/static/js/views/HomeView.js b/frontend/static/js/views/HomeView.js
index 1266d36..a98fd9f 100644
--- a/frontend/static/js/views/HomeView.js
+++ b/frontend/static/js/views/HomeView.js
@@ -3,7 +3,7 @@ import AbstractAuthentificateView from "./abstracts/AbstractAuthentifiedView.js"
 
 export default class extends AbstractAuthentificateView {
     constructor(params) {
-        super(params, "Home");
+        super(params, client.lang.get('homeWindowTitle', 'Home'));
         this.redirect_url = "/login"
 	}
 

From 2f5cfc0e57015dd0dfe3bda50838adee424d1717 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Wed, 31 Jan 2024 12:53:19 +0100
Subject: [PATCH 08/77] accounts: 401 Response in case of invalid login

---
 accounts/views/login.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/accounts/views/login.py b/accounts/views/login.py
index fc02e4a..afcc03d 100644
--- a/accounts/views/login.py
+++ b/accounts/views/login.py
@@ -18,6 +18,6 @@ class LoginView(APIView):
 		serializer.is_valid(raise_exception=True)
 		user = serializer.get_user(data)
 		if user is None:
-			return Response({'login': ['Invalid username or password.']}, status.HTTP_400_BAD_REQUEST)
+			return Response({'login': ['Invalid username or password.']}, status.HTTP_401_UNAUTHORIZED)
 		login(request, user)
 		return Response({'id': user.pk}, status=status.HTTP_200_OK)

From d4575c92dbbae76dc8d26c2eaaa8438e4036d1f1 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Wed, 31 Jan 2024 13:54:36 +0100
Subject: [PATCH 09/77] lang: translation of django's response

---
 frontend/static/js/api/client.js | 3 ++-
 transcendence/settings.py        | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/frontend/static/js/api/client.js b/frontend/static/js/api/client.js
index 3d0a900..1e89882 100644
--- a/frontend/static/js/api/client.js
+++ b/frontend/static/js/api/client.js
@@ -114,7 +114,8 @@ class Client
 			headers: {
 				"Content-Type": "application/json",
 				"X-CSRFToken": getCookie("csrftoken"),
-			},		  
+				'Accept-Language': this.lang.currentLang,
+			},
 			body: JSON.stringify(data),
 		});
         return response;
diff --git a/transcendence/settings.py b/transcendence/settings.py
index b75cedb..f6193a8 100644
--- a/transcendence/settings.py
+++ b/transcendence/settings.py
@@ -13,6 +13,7 @@ https://docs.djangoproject.com/en/4.2/ref/settings/
 import os
 
 from pathlib import Path
+from django.utils.translation import gettext_lazy as _
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -79,6 +80,7 @@ MIDDLEWARE = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
 ]
 
 ROOT_URLCONF = 'transcendence.urls'
@@ -137,6 +139,11 @@ AUTH_PASSWORD_VALIDATORS = [
 
 LANGUAGE_CODE = 'en-us'
 
+LANGUAGES = [
+    ('en', _('English')),
+    ('fr', _('French')),
+]
+
 TIME_ZONE = 'UTC'
 
 USE_I18N = True

From 8c7c5a363791007fabc3661b0c368f67e15e140a Mon Sep 17 00:00:00 2001
From: Xamora <xamora@42l.fr>
Date: Thu, 1 Feb 2024 12:57:32 +0100
Subject: [PATCH 10/77] =?UTF-8?q?Sous=20une=20nuit=20=C3=A9toil=C3=A9,=20d?=
 =?UTF-8?q?ans=20la=20capitale=20o=C3=B9=20les=20habitants=20font=20gr?=
 =?UTF-8?q?=C3=A8ves=20en=20boucle,=20un=20jeune=20homme=20du=20nom=20d'Ad?=
 =?UTF-8?q?rien,=20plein=20d'espoir=20esp=C3=A9rant=20une=20douce=20nuit?=
 =?UTF-8?q?=20aupr=C3=A8s=20de=20sa=20belle=20et=20tendre=20'Princesse'.?=
 =?UTF-8?q?=20Acheta=20des=20capotes=20premier=20prix=20dans=20la=20pharma?=
 =?UTF-8?q?cie=20non=20loin=20de=20la=20gare.=20La=20suite=20au=20prochain?=
 =?UTF-8?q?=20commit...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 chat/consumersNotice.py               | 21 ++++++++++++++-------
 frontend/static/css/index.css         |  9 ---------
 frontend/static/css/me.css            | 12 +++---------
 frontend/static/css/profile.css       |  5 ++++-
 frontend/static/css/search.css        |  4 ++++
 frontend/static/js/api/chat/notice.js | 20 +++++++++++---------
 frontend/static/js/api/client.js      |  1 +
 frontend/static/js/api/profile.js     |  8 ++++++--
 frontend/static/js/api/profiles.js    |  8 ++++++++
 frontend/static/js/views/Search.js    |  2 +-
 frontend/templates/index.html         |  1 +
 profiles/urls.py                      |  5 +++--
 profiles/views.py                     |  2 ++
 profiles/viewsets.py                  |  9 +++++++++
 14 files changed, 67 insertions(+), 40 deletions(-)

diff --git a/chat/consumersNotice.py b/chat/consumersNotice.py
index c0f2723..f387ff0 100644
--- a/chat/consumersNotice.py
+++ b/chat/consumersNotice.py
@@ -288,12 +288,15 @@ class ChatNoticeConsumer(WebsocketConsumer):
 		asked = AskFriendModel().getAsked(user.pk)
 		asker = AskFriendModel().getAsker(user.pk)
 
+		online_friends = self.get_online_friend(user)
+
 		self.send(text_data=json.dumps({
 			'type':event['type'],
 			'author_id':event['author_id'],
 			'targets':event['targets'],
 			'asker': asker,
 			'asked': asked,
+			'online': online_friends,
 			'time': event['time'],
 			'status':event['status'],
 		}))
@@ -351,23 +354,27 @@ class ChatNoticeConsumer(WebsocketConsumer):
 		self.send_ask_friend(event)
 
 
-	def online_users(self, event):
-
-		user = self.scope["user"]
-		if (user.is_anonymous or not user.is_authenticated):
-			return
-
+	def get_online_friend(self, user):
 		online_friends = {}
 		for friend in FriendModel().getFriends(user.pk):
 			if (friend in self.channel_layer.users_channels):
 				online_friends[friend] = "green"
 			else:
 				online_friends[friend] = "red"
+		return online_friends
+
+	def online_users(self, event):
+
+		user = self.scope["user"]
+		if (user.is_anonymous or not user.is_authenticated):
+			return
+
+		online_friends = self.get_online_friend(user)
 
 		self.send(text_data=json.dumps({
 			'type':event['type'],
 			'author_id':event['author_id'],
-			'content':online_friends,
+			'online':online_friends,
 			'time': event['time'],
 			'status':event['status'],
 		}))
diff --git a/frontend/static/css/index.css b/frontend/static/css/index.css
index 7e35fb0..9b843e5 100644
--- a/frontend/static/css/index.css
+++ b/frontend/static/css/index.css
@@ -1,12 +1,3 @@
-*{
-	color: #cccccc;
-	font-size: 35px;
-	background-color: #1a1a1a;
-}
-
-body {
-}
-
 #app #avatar {
 	max-height: 10em;
 	max-width: 10em;
diff --git a/frontend/static/css/me.css b/frontend/static/css/me.css
index 1d731ee..6879d41 100644
--- a/frontend/static/css/me.css
+++ b/frontend/static/css/me.css
@@ -1,17 +1,11 @@
-#app #main .account
-{
-	color: #1a1a1a;
+#app * {
+	font-size: 30px;
 }
 
+
 #app #main
 {
 	width: 60%;
 	display: flex;
 	flex-direction: column;
-	color: #1a1a1a;
-}
-
-#app #main .profile
-{
-	color: #1a1a1a;
 }
diff --git a/frontend/static/css/profile.css b/frontend/static/css/profile.css
index 21fb0dc..a1ead7d 100644
--- a/frontend/static/css/profile.css
+++ b/frontend/static/css/profile.css
@@ -1,3 +1,7 @@
+#app * {
+	font-size: 30px;
+}
+
 #app #username
 {
 	font-size: 0.8em;
@@ -11,7 +15,6 @@
 
 #app {
 	margin-top: 1em;
-	background-color: red;
 }
 
 #app #yes, #app #no {
diff --git a/frontend/static/css/search.css b/frontend/static/css/search.css
index 6aa1061..27b9734 100644
--- a/frontend/static/css/search.css
+++ b/frontend/static/css/search.css
@@ -1,3 +1,7 @@
+#app * {
+	font-size: 40px;
+}
+
 #app img
 
 {
diff --git a/frontend/static/js/api/chat/notice.js b/frontend/static/js/api/chat/notice.js
index 4616179..f882835 100644
--- a/frontend/static/js/api/chat/notice.js
+++ b/frontend/static/js/api/chat/notice.js
@@ -80,7 +80,7 @@ class Notice {
 				this.rewrite_invite();
 		}
 		else {
-			let sender = await this.client.profiles.getProfile(send.author_id);
+			let sender = await this.client.profiles.getProfileId(send.author_id);
 			create_popup(sender.username + " refuse your invitation");
 		}
 
@@ -123,7 +123,7 @@ class Notice {
 				return;
 
 			this.data["invited"] = content;
-			let sender = await this.client.profiles.getProfile(send.author_id);
+			let sender = await this.client.profiles.getProfileId(send.author_id);
 
 			create_popup("Invitation received by " + sender.username);
 
@@ -145,7 +145,7 @@ class Notice {
 	}
 
 	async receive_online_users(send) {
-		let content = send.content;
+		let content = send.online;
 		if (content !== undefined) {
 
 			if (this.data["online"].length > 0) {
@@ -187,7 +187,7 @@ class Notice {
 			if (send.status == 400)
 				create_popup("Friend ask error");
 			else if (send.status == 409)
-				create_popup("Already asked friend or already friend");
+				create_popup("Already asked friend");
 		}
 
 		//if (!send.asked.includes(send.author_id) || 
@@ -202,7 +202,7 @@ class Notice {
 		this.data["asker"] = send.asker;
 
 		if (send.author_id != my_id) {
-			let sender = await this.client.profiles.getProfile(send.author_id);
+			let sender = await this.client.profiles.getProfileId(send.author_id);
 			if (this.data["asker"].includes(send.author_id))
 				create_popup(sender.username + " ask you as friend");
 			if (this.rewrite_profile !== undefined)
@@ -220,8 +220,6 @@ class Notice {
 	}
 
 	async receive_remove_friend(send) {
-		this.data["asked"] = send.asked;
-		this.data["asker"] = send.asker;
 
 		if (send.author_id == this.client.me.id) {
 			if (send.status == 400)
@@ -233,6 +231,8 @@ class Notice {
 
 		if (this.rewrite_profile !== undefined)
 			await this.rewrite_profile();
+
+		this.receive_online_users(send);
 	}
 
 	async accept_friend(user_id) {
@@ -246,7 +246,7 @@ class Notice {
 	async receive_accept_friend(send) {
 		this.data["asked"] = send.asked;
 		this.data["asker"] = send.asker;
-		let sender = await this.client.profiles.getProfile(send.author_id);
+		let sender = await this.client.profiles.getProfileId(send.author_id);
 
 		if (send.author_id == this.client.me.id) {
 			if (send.status == 400)
@@ -262,6 +262,8 @@ class Notice {
 
 		if (this.rewrite_profile !== undefined)
 			await this.rewrite_profile();
+
+		this.receive_online_users(send);
 	}
 
 	async refuse_friend(user_id) {
@@ -275,7 +277,7 @@ class Notice {
 	async receive_refuse_friend(send) {
 		this.data["asked"] = send.asked;
 		this.data["asker"] = send.asker;
-		let sender = await this.client.profiles.getProfile(send.author_id);
+		let sender = await this.client.profiles.getProfileId(send.author_id);
 
 		if (send.author_id == this.client.me.id) {
 			if (send.status == 400)
diff --git a/frontend/static/js/api/client.js b/frontend/static/js/api/client.js
index 7978053..57d3ce4 100644
--- a/frontend/static/js/api/client.js
+++ b/frontend/static/js/api/client.js
@@ -73,6 +73,7 @@ class Client
 		this.notice = new Notice(this);
 
 		this.lang = new LanguageManager;
+
 	}
 
 	/**
diff --git a/frontend/static/js/api/profile.js b/frontend/static/js/api/profile.js
index c2601c4..d15d0a4 100644
--- a/frontend/static/js/api/profile.js
+++ b/frontend/static/js/api/profile.js
@@ -5,7 +5,7 @@ class Profile
 	/**
 	 * @param  {Client} client
 	 */
-	constructor (client, username, id = undefined, avatar_url = undefined)
+	constructor (client, username=undefined, id=undefined, avatar_url=undefined)
 	{
 		/**
 		 * @type  {Client} client
@@ -36,7 +36,11 @@ class Profile
 
 	async init()
 	{
-		let response = await this.client._get(`/api/profiles/${this.username}`);
+		let response;
+		if (this.username !== undefined)
+			response = await this.client._get(`/api/profiles/${this.username}`);
+		else 
+			response = await this.client._get(`/api/profiles/id/${this.id}`);
 
 		if (response.status !== 200)
 			return response.status;
diff --git a/frontend/static/js/api/profiles.js b/frontend/static/js/api/profiles.js
index 4200ff5..070769c 100644
--- a/frontend/static/js/api/profiles.js
+++ b/frontend/static/js/api/profiles.js
@@ -42,6 +42,14 @@ class Profiles
 		return profile;
 	}
 
+	async getProfileId(id)
+	{
+		let profile = new Profile(this.client, undefined, id);
+		if (await profile.init())
+			return null;
+		return profile;
+	}
+
 	/**
 	 * Block a user
 	 * @param {Number} user_id 
diff --git a/frontend/static/js/views/Search.js b/frontend/static/js/views/Search.js
index f388707..76358f8 100644
--- a/frontend/static/js/views/Search.js
+++ b/frontend/static/js/views/Search.js
@@ -68,7 +68,7 @@ export default class extends AbstractView {
 			username.setAttribute('data-link', '');
 			username.id = `username${user.id}`
 			username.href = `/profiles/${user.username}`;
-			if (user.id == client.me.id)
+			if (logged && user.id == client.me.id)
 				username.style.color = "green";
 			else {
 				let online = client.notice.data["online"][user.id];
diff --git a/frontend/templates/index.html b/frontend/templates/index.html
index 499c006..585f672 100644
--- a/frontend/templates/index.html
+++ b/frontend/templates/index.html
@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Bozo Pong</title>
 	<link rel="stylesheet" href="{% static 'css/bootstrap/bootstrap.min.css' %}">
+	<link rel="stylesheet" href="{% static 'css/index.css' %}">
 </head>
 <body data-bs-theme="dark">
 	<nav class="navbar navbar-expand-lg bg-body-tertiary rounded m-2">
diff --git a/profiles/urls.py b/profiles/urls.py
index 5c29740..d0904f6 100644
--- a/profiles/urls.py
+++ b/profiles/urls.py
@@ -10,7 +10,8 @@ urlpatterns = [
     path("", viewsets.ProfileViewSet.as_view({'get': 'list'}), name="profiles_list"),
 	path("block", views.BlocksView.as_view(), name="block_page"),
 	path("block/<int:pk>", views.BlockView.as_view(), name="block_page"),
-    path("<str:username>", viewsets.ProfileViewSet.as_view({'get': 'retrieve'}), name="profile_page"),
 	path("friend", views.FriendsView.as_view(), name="friend_page"),
+    path("<str:username>", viewsets.ProfileViewSet.as_view({'get': 'retrieve'}), name="profile_page"),
+    path("id/<int:pk>", viewsets.ProfileViewSet.as_view({'get': 'retrieve_id'}), name="profile_page"),
 
-] + static("/static/avatars/", document_root="./avatars")
+] + static("/staqic/avatars/", document_root="./avatars")
diff --git a/profiles/views.py b/profiles/views.py
index 19f6635..8c27128 100644
--- a/profiles/views.py
+++ b/profiles/views.py
@@ -70,6 +70,8 @@ class BlocksView(APIView):
 		return Response("Deleted", status=status.HTTP_200_OK)
 
 class FriendsView(APIView):
+	permission_classes = (permissions.IsAuthenticated,)
+	authentication_classes = (SessionAuthentication,)
 
 	def get(self, request):
 		friends = FriendModel().getFriends(request.user.pk)
diff --git a/profiles/viewsets.py b/profiles/viewsets.py
index a0aa2c5..425cceb 100644
--- a/profiles/viewsets.py
+++ b/profiles/viewsets.py
@@ -27,6 +27,15 @@ class ProfileViewSet(viewsets.ModelViewSet):
         return Response(self.serializer_class(instance).data,
                         status=status.HTTP_200_OK)
 
+    def retrieve_id(self, request: HttpRequest, pk=None):
+        user = User.objects.filter(pk=pk)
+        if (not user):
+            return Response({"detail": "Profile not found."}, status=status.HTTP_404_NOT_FOUND)
+        instance = self.queryset().get(pk=user[0].pk)
+        instance.avatar_url.name = instance.avatar_url.name[instance.avatar_url.name.find("static") - 1:]
+        return Response(self.serializer_class(instance).data,
+                        status=status.HTTP_200_OK)
+
     def list(self, request: HttpRequest):
         serializer = ProfileSerializer(self.queryset(), many=True)
         for profile in serializer.data:

From d332ef81030a932a10e0f8158a0f9f89c356624b Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Thu, 1 Feb 2024 13:18:11 +0100
Subject: [PATCH 11/77] game: add: vector colision (Not work)

---
 frontend/static/js/api/game/Ball.js       |  75 +++++++-------
 frontend/static/js/api/game/Game.js       | 105 ++++++++++---------
 frontend/static/js/api/game/GameConfig.js |   5 +
 frontend/static/js/api/game/Time.js       |   4 +-
 frontend/static/js/views/GameView.js      |  13 +--
 games/config.py                           |   2 +-
 games/objects/Ball.py                     |  23 +++--
 games/objects/Game.py                     |   4 +-
 games/objects/Point.py                    |  19 +++-
 games/objects/Segment.py                  |  10 +-
 games/objects/Vector.py                   |  35 +++++++
 games/routine.py                          | 118 +++++++++++++---------
 12 files changed, 260 insertions(+), 153 deletions(-)
 create mode 100644 games/objects/Vector.py

diff --git a/frontend/static/js/api/game/Ball.js b/frontend/static/js/api/game/Ball.js
index bcd0ca1..24de54e 100644
--- a/frontend/static/js/api/game/Ball.js
+++ b/frontend/static/js/api/game/Ball.js
@@ -7,33 +7,37 @@ class Ball
     /**
      * 
      * @param {Game} game 
-     * @param {Number} position_x 
-     * @param {Number} position_y 
-     * @param {Number} velocity_x 
-     * @param {Number} velocity_y 
+     * @param {Point} position
+     * @param {Number} angle
+     * @param {Number} speed
+     * @param {Number} size
      */
-    constructor(game, position_x, position_y, velocity_x, velocity_y)
+    constructor(game, size, position, angle, speed)
     {
         /**
          * @type {Game}
          */
         this.game = game;
+
+        /**
+         * @type {Point}
+         */
+        this.position = position === undefined ? new Point() : position;
+
         /**
          * @type {Number}
          */
-        this.position_x = position_x;
+        this.size = size;
+
         /**
          * @type {Number}
          */
-        this.position_y = position_y;
+        this.angle = angle;
+
         /**
          * @type {Number}
          */
-        this.velocity_x = velocity_x;
-        /**
-         * @type {Number}
-         */
-        this.velocity_y = velocity_y;
+        this.speed = speed;
     }
 
     /**
@@ -42,40 +46,35 @@ class Ball
      */
     draw(ctx)
     {
-        ctx.rect(this.position_x, this.position_y, this.game.config.ball_size, this.game.config.ball_size);
+        ctx.rect(this.position.x - this.size / 2, this.position.y - this.size / 2, this.game.config.ball_size, this.game.config.ball_size);
     }
 
-    render()
+    /**
+     * 
+     * @param {CanvasRenderingContext2D} ctx 
+     */
+    render(ctx)
     {
-        /**
-         * @type {Number}
-         */
-        let new_pos_x = this.position_x + this.velocity_x * this.game.time.deltaTime();
-        /**
-         * @type {Number}
-         */
-        let new_pos_y = position_y + this.velocity_y * this.game.time.deltaTime();
+        let distance = this.speed * (this.game.time.deltaTime() / 1000)
 
-        if (this._collision(this.position_x, this.position_y, new_pos_x, new_pos_y))
-        {
-            this.velocity_x = -this.velocity_x;
-            this.velocity_y = -this.velocity_y;
-            new_pos_x = this.position_x + this.velocity_x * this.game.time.deltaTime();
-            new_pos_y = this.position_y + this.velocity_y * this.game.time.deltaTime();
-        }
-        this.position_x = new_pos_x
-        this.position_y = new_pos_y
+        let angle_radian = this.angle * Math.PI / 180
 
-        this.velocity_x = this.velocity_x + this.game.config.ball_speed_inc;
-        this.velocity_y = this.velocity_y + this.game.config.ball_speed_inc;
+        console.log(angle_radian)
+
+        this.position.x = this.position.x + distance * Math.cos(angle_radian);
+        this.position.y = this.position.y + distance * Math.sin(angle_radian);
+
+        this.draw(ctx);
     }
 
-    update (position_x, position_y, velocity_x, velocity_y)
+    from_json (data)
     {
-        this.position_x = position_x;
-        this.position_y = position_y;
-        this.velocity_x = velocity_x;
-        this.velocity_y = velocity_y; 
+        this.position = this.position.from_json(data.position);
+        this.size = data.size;
+        this.angle = data.angle;
+        this.speed = data.speed;
+
+        return this
     }
 }
 
diff --git a/frontend/static/js/api/game/Game.js b/frontend/static/js/api/game/Game.js
index 08253b0..028e547 100644
--- a/frontend/static/js/api/game/Game.js
+++ b/frontend/static/js/api/game/Game.js
@@ -4,6 +4,7 @@ import { GameConfig } from "./GameConfig.js"
 import { Player } from "./Player.js";
 import { Time } from "./Time.js";
 import { Wall } from "./Wall.js";
+import { Client } from "../client.js";
 
 class Game
 {
@@ -21,7 +22,7 @@ class Game
 
     /**
      * 
-     * @returns {Number}
+     * @returns {Promise<Number>}
      */
     async init()
     {
@@ -32,23 +33,52 @@ class Game
         
         let response_data = await response.json();
     
+        /**
+         * @type {[Number]}
+         */
         this.players_id = response_data.players_id;
+
+        /**
+         * @type {String}
+         */
         this.state = response_data.state;
+
+        /**
+         * @type {Boolean}
+         */
         this.started = response_data.started;
+
+        /**
+         * @type {Boolean}
+         */
         this.finished = response_data.finished;
+
+        /**
+         * @type {Number}
+         */
         this.winner_id = this.finished ? response_data.winner_id : undefined;
 
         if (this.finished === true)
             return 0;
 
+        /**
+         * @type {GameConfig}
+         */
         this.config = new GameConfig(this.client);
         
+
         let ret = await this.config.init();
         if (ret !== 0)
             return ret;
 
+        /**
+         * @type {Time}
+         */
         this.time = new Time();
-        this.last_pos = null
+
+        /**
+         * @type {Boolean}
+         */
         this._inited = false;
 
         return 0;
@@ -72,11 +102,11 @@ class Game
      * 
      * @param {CanvasRenderingContext2D} ctx 
      */
-    draw(ctx)
+    render(ctx)
     {
         ctx.clearRect(0, 0, this.config.size_x, this.config.size_y);
         this.draw_sides(ctx);
-        this.ball.draw(ctx);
+        this.ball.render(ctx);
     }
 
     _send(data)
@@ -90,50 +120,25 @@ class Game
 		}
     }
 
+    /**
+     * @param {Number} position 
+     * @param {Number} time 
+     */
     _send_paddle_position(position, time)
     {
-        if (this.last_pos !== null && this.last_pos.time >= time)
-            return;
-
-        this.last_pos = {"time": time, "position": position};
-
-        this._send({"detail": "update_my_paddle_pos", ...this.last_pos});
-    }
-
-    _receive_player_join(player_data)
-    {
-        console.log(player_data)
-        let index = this.players.indexOf((player) => player.id === player_data.user_id);
-
-        this.players[index].is_connected = true;
-    }
-
-    _receive_player_leave(player_data)
-    {
-        let index = this.players.indexOf((player) => player.id === player_data.user_id);
-
-        this.players[index].is_connected = false;
-    }
-
-    _receive_update_ball(data)
-    {
-        this.ball.position_x = data.position_x
-        this.ball.position_y = data.position_y
-        this.ball.position_x = data.position_x
-        this.ball.position_x = data.position_x
+        this._send({"detail": "update_my_paddle_pos", ...{"time": time, "position": position}});
     }
 
     _receive_update_paddle(data)
     {
         let player = this.players.find((player) => player.id === data.user_id);
 
-        if (player === null)
-        {
-            this._receive_player_join(data);
-            return; 
-        }
-        player.is_connected = data.is_connected;
-        player.update_pos(data.position.position, data.position.time);
+        player.from_json(data);
+    }
+
+    _receive_ball(data)
+    {
+        this.ball.from_json(data);
     }
 
     _receive(data)
@@ -141,26 +146,30 @@ class Game
         if (data.detail === "update_paddle")
             this._receive_update_paddle(data);
         else if (data.detail === "update_ball")
-            this._receive_update_ball(data);
+            this._receive_ball(data)
         else if (data.detail === "init_game")
-            this._init_game(data)
-        else if (data.detail === "player_join")
-            this._receive_player_join(data)
-        else if (data.detail === "player_leave")
-            this._receive_player_leave(data)
+            this._init_game(data);
     }
 
     _init_game(data)
     {
-        const ball_data = data.ball;
-        this.ball = new Ball(this, ball_data.position_x, ball_data.position_y, ball_data.velocity_x, ball_data.velocity_y);
+        /**
+         * @type {Ball}
+         */
+        this.ball = (new Ball(this)).from_json(data.ball)
 
+        /**
+         * @type {[Wall]}
+         */
         this.walls = [];
         const walls_data = data.walls;
         walls_data.forEach((wall_data) => {
             this.walls.push(new Wall().from_json(wall_data));
         });
 
+        /**
+         * @type {[Player]}
+         */
         this.players = []
         const players_data = data.players;
         players_data.forEach((player_data) => {
diff --git a/frontend/static/js/api/game/GameConfig.js b/frontend/static/js/api/game/GameConfig.js
index dab00ad..4b2ae61 100644
--- a/frontend/static/js/api/game/GameConfig.js
+++ b/frontend/static/js/api/game/GameConfig.js
@@ -24,14 +24,17 @@ class GameConfig
          * @type {Number}
          */
         this.size_x = response_data.MAP_SIZE_X;
+        
         /**
          * @type {Number}
          */
         this.size_y = response_data.MAP_SIZE_Y;
+
         /**
          * @type {Number}
          */
         this.center_x = this.size_x / 2;
+
         /**
          * @type {Number}
          */
@@ -63,10 +66,12 @@ class GameConfig
          * @type {Number}
          */
         this.ball_size = response_data.BALL_SIZE;
+
         /**
          * @type {Number}
          */
         this.ball_spawn_x = this.center_x;
+
         /**
          * @type {Number}
          */
diff --git a/frontend/static/js/api/game/Time.js b/frontend/static/js/api/game/Time.js
index e8885b9..7edb1d7 100644
--- a/frontend/static/js/api/game/Time.js
+++ b/frontend/static/js/api/game/Time.js
@@ -17,7 +17,9 @@ class Time
 
     deltaTime()
     {
-        return (this._current_frame - this._last_frame) !== NaN ? this._current_frame - this._last_frame : 0; 
+        if (this._last_frame === undefined)
+            return 0;
+        return (this._current_frame - this._last_frame);
     }
 
     deltaTimeSecond()
diff --git a/frontend/static/js/views/GameView.js b/frontend/static/js/views/GameView.js
index 2b8e3c7..7242add 100644
--- a/frontend/static/js/views/GameView.js
+++ b/frontend/static/js/views/GameView.js
@@ -26,7 +26,7 @@ export default class extends AbstractView
 			this.keys_pressed.push(event.key);
 	}
 
-    draw()
+    render_game()
     {
         const canva = document.getElementById('canva');
 
@@ -40,22 +40,23 @@ export default class extends AbstractView
 
         ctx.beginPath();
 
-        this.game.draw(ctx);
+        this.game.render(ctx);
 
         ctx.strokeStyle = "#000000";
-        ctx.lineWidth = 10;
+        ctx.lineWidth = 1;
         ctx.stroke();
     }
 
-    render_game()
+    render()
     {
         let loop_id = setInterval(() => {
             if (this.game === undefined)
                 clearInterval(loop_id);
             if (this.my_player)
                 this.my_player.update_paddle(this.keys_pressed);
-            this.draw();
+            this.render_game();
             this.game?.time.new_frame();
+            //clearInterval(loop_id);
         // 1 sec  fps
         }, 1000 / 60);
     }
@@ -99,7 +100,7 @@ export default class extends AbstractView
 
         this.register_key()
 
-        this.render_game();
+        this.render();
     }
 
     async update_game_state()
diff --git a/games/config.py b/games/config.py
index 40b72ef..11ccfba 100644
--- a/games/config.py
+++ b/games/config.py
@@ -12,7 +12,7 @@ MAP_CENTER_Y = MAP_SIZE_Y / 2
 WALL_RATIO = 1
 
 BALL_SPEED_INC = 1
-BALL_SPEED_START = 1
+BALL_SPEED_START = 170
 BALL_SIZE = 4
 BALL_SPAWN_POS_X = MAP_SIZE_X / 2
 BALL_SPAWN_POS_Y = MAP_SIZE_Y / 2
diff --git a/games/objects/Ball.py b/games/objects/Ball.py
index 4d2dbcb..77f4896 100644
--- a/games/objects/Ball.py
+++ b/games/objects/Ball.py
@@ -1,23 +1,28 @@
+from __future__ import annotations
+
 from .. import config
 
+from .Point import Point
+
+import math
 class Ball:
     
     def __init__(self) -> None:
-        self.postion_x: float = config.BALL_SPAWN_POS_X
-        self.postion_y: float = config.BALL_SPAWN_POS_Y
-        self.velocity_x: float = config.BALL_SPEED_START
-        self.velocity_y: float = config.BALL_SPEED_START
         self.size: float = config.BALL_SIZE
+        self.position: Point = Point(config.BALL_SPAWN_POS_X + self.size / 2, config.BALL_SPAWN_POS_Y + self.size / 2)
+        self.angle: float = math.pi * 0
+        self.speed: float = config.BALL_SPEED_START
     
     def to_dict(self):
         
         data: dict = {
             "size": self.size,
-            "position_x": self.postion_x,
-            "position_y": self.postion_y,
-            "velocity_x": self.velocity_x,
-            "velocity_y": self.velocity_y,
+            "speed": self.speed,
+            "position": self.position.to_dict(),
+            "angle": self.angle,
         }
         
         return data
-        
\ No newline at end of file
+    
+    def __str__(self) -> str:
+        return f"Ball(size: {self.size}, speed: {self.speed}, director_coefficient: {self.director_coefficient}, ordinate_at_origin: {self.ordinate_at_origin}, position: {self.position})"
\ No newline at end of file
diff --git a/games/objects/Game.py b/games/objects/Game.py
index 664dcf5..3550f48 100644
--- a/games/objects/Game.py
+++ b/games/objects/Game.py
@@ -44,8 +44,8 @@ class Game(AbstractRoom):
 
             angle: float = (i * 2 * math.pi / nb_sides) + (math.pi * 3 / nb_sides)
 
-            x: float = config.MAP_CENTER_X + radius * math.cos(angle)
-            y: float = config.MAP_CENTER_Y + radius * math.sin(angle)
+            x: float = round(config.MAP_CENTER_X + radius * math.cos(angle))
+            y: float = round(config.MAP_CENTER_Y + radius * math.sin(angle))
             
             polygon.append(Point(x, y))
         
diff --git a/games/objects/Point.py b/games/objects/Point.py
index 3d01a04..08a10da 100644
--- a/games/objects/Point.py
+++ b/games/objects/Point.py
@@ -1,11 +1,28 @@
+from __future__ import annotations
 
-
+from math import dist
 class Point:
     
     def __init__(self, x: float, y: float) -> None:
         self.x = x
         self.y = y
+    
+    def __str__(self) -> str:
+        return f"Point(x: {self.x}, y: {self.y})"
+    
+    def __repr__(self) -> str:
+        return f"Point(x: {self.x}, y: {self.x})"
+    
+    def __eq__(self, __value: object) -> bool:
+        return (self.x == __value.x and self.y == __value.y)
+    
+    def distance(self, point: Point):
+        return dist((point.x, point.y), (self.x, self.y))
+    
+    def copy(self):
         
+        return Point(self.x, self.y)
+    
     def to_dict(self):
         
         data: dict[str: float] = {
diff --git a/games/objects/Segment.py b/games/objects/Segment.py
index 8de44c5..49e3d88 100644
--- a/games/objects/Segment.py
+++ b/games/objects/Segment.py
@@ -1,12 +1,20 @@
 
 from .Point import Point
 
+import math
 class Segment:
     
     def __init__(self, start: Point, stop: Point) -> None:
         self.start: Point = start
         self.stop: Point = stop
-        
+        self.length: float = math.dist((self.start.x, self.start.y), (self.stop.x, self.stop.y))
+    
+    def __repr__(self) -> str:
+        return f"Segment(start: {self.start}, stop: {self.stop})"
+    
+    def __str__(self) -> str:
+        return f"Segment(start: {self.start}, stop: {self.stop})"
+    
     def to_dict(self):
         
         data: dict[str: dict] = {
diff --git a/games/objects/Vector.py b/games/objects/Vector.py
new file mode 100644
index 0000000..f62cbbd
--- /dev/null
+++ b/games/objects/Vector.py
@@ -0,0 +1,35 @@
+from __future__ import annotations
+
+import math
+from .Point import Point
+
+class Vector:
+
+    def __init__(self, x: float, y: float) -> None:
+        self.norm: float = math.dist((0, 0), (x, y))
+        self.x: float = x
+        self.y: float = y
+
+    def __truediv__(self, denominator: float):
+        return Vector(self.x / denominator, self.y / denominator)
+    
+    def angle(self, vector: Vector):
+        scalar_product: float = self.scalar(vector)
+        if (scalar_product is None):
+            return None
+        cos: float = scalar_product / (vector.norm * self.norm)
+        
+        angle: float = math.acos(cos)
+        
+        return angle
+
+    def scalar(self, vector: Vector):
+        return self.x * vector.x + vector.y * self.y
+    
+    def __str__(self) -> str:
+        return f"Vector(x: {self.x}, y: {self.y}, norme: {self.norm})"
+    
+    def __eq__(self, __value: Vector) -> bool:
+        return (self.x == __value.x and
+                self.x == __value.x and 
+                self.norm == __value.norm)
\ No newline at end of file
diff --git a/games/routine.py b/games/routine.py
index 6d52fe0..6dd909a 100644
--- a/games/routine.py
+++ b/games/routine.py
@@ -9,73 +9,99 @@ if TYPE_CHECKING:
     from .objects.Ball import Ball
 
 from .objects.Point import Point
+from .objects.Vector import Point
 from .objects.Segment import Segment
+from .objects.Vector import Vector
 
 from . import config
 
 import math
+import asyncio
+
+from asgiref.sync import SyncToAsync
+
 from time import sleep
 
-#see the video to understand the algorithme
-#https://www.youtube.com/watch?v=KOYoMYWUTEo
-def determine_director_coefficient(segment: Segment):
-    return ((segment.start.y - segment.stop.y) / (segment.start.x - segment.stop.x))
+def get_sign(num: float):
+    return 1 if num >= 0 else -1
 
-def determine_ordinate_at_origin(point: Point, director_cofficient: float):
-    return point.y - point.x * director_cofficient
+def get_impact_point(segments: list[Segment], ball: Ball):
 
-def determine_intersection(director_coefficient1: float, ordinate_at_origin1: float, director_coefficient2: float, ordinate_at_origin2: float):
-    if (director_coefficient1 == director_coefficient2):
-        return None
-    return (ordinate_at_origin1 + ordinate_at_origin2) / (director_coefficient1 + director_coefficient2)
+    angle_radian: float = ball.angle * math.pi / 180
 
-def determine_intersections(ball: Ball, segments: list[Segment]):
-    
-    intersections: list[Point] = []
+    direction_vector: Vector = Vector(math.cos(angle_radian), math.sin(angle_radian))
+
+    x: float = ball.position.x
+    if (direction_vector.x > 0):
+        x = x + ball.size / 2
+    elif (direction_vector.x < 0):
+        x = x - ball.size / 2
     
+    y: float = ball.position.y
+    if (direction_vector.y > 0):
+        y = y + ball.size / 2
+    elif (direction_vector.y < 0):
+        y = y - ball.size / 2
+
+    position: Point = Point(x, y)
+
     for segment in segments:
         
-        # form m * x + p
-        m: float = determine_director_coefficient(segment)
-        p: float = determine_ordinate_at_origin(segment.start, m)
+        segment_vector: Vector = Vector(segment.start.x - segment.stop.x, segment.start.y - segment.stop.y)
+        segment_vector_unit = segment_vector / segment_vector.norm
         
-        x: float = determine_intersection(m, p, ball.velocity_y, 0)
+        scalar: float = segment_vector_unit.scalar(direction_vector)
         
-        if (x is None):
-            continue      
-        
-        y: float = m * x + p
-        
-        intersections.append(Point(x, y))
+        if (scalar < 0.01):
+            continue
 
-    return intersections
+        print(segment_vector, segment_vector_unit, direction_vector)
+        
+        distance: float = scalar * segment_vector.norm / 2
+        
+        impact_x: float = position.x + distance * direction_vector.x
+        
+        impact_y: float = position.y + distance * direction_vector.y
+        
+        impact: Point = Point(impact_x, impact_y)
+        
+        print("impact", impact)
+        
+        return impact
+    
+async def update_ball(game: Game, impact: Point):
+    
+    distance: float = impact.distance(game.ball.position) - game.ball.size / 2
+    
+    time_before_impact: float = distance / game.ball.speed
+    
+    await asyncio.sleep(time_before_impact)
+    
+    game.ball.angle = game.ball.angle + 180
+    
+    game.ball.position = impact
+
+    await SyncToAsync(game.broadcast)("update_ball", game.ball.to_dict())
+
+async def render(game: Game):
+
+    while True:
+        
+        segments: list[Segment] = [player.rail for player in game.players] + [wall.rail for wall in game.walls]
+
+        impact = get_impact_point(segments, game.ball)
+
+        await update_ball(game, impact)
 
-def determine_distance_between_ball_and_wall(ball: Ball, segments: list[Segment]):
-    
-    intersections: list[Point] = determine_intersections(ball, segments)
-    
-    distances = list(map(math.dist, intersections))
-    
-    return min(distances)
-    
-def render(ball: Ball, game: Game):
-    
-    segments: list[Segment] = [player.rail for player in game.players]
-    
-    print(determine_distance_between_ball_and_wall(ball))
 
 def routine(game: Game):
-    
+
+    asyncio.run(render(game))
+
     while True:
         for player in game._updated_players:
             game.broadcast("update_paddle", player.to_dict(), [player])
-        
+
         game._updated_players.clear()
-        
-        if (game.started):
-            game.ball.postion_x = game.ball.postion_x + game.ball.velocity_x
-            game.ball.postion_y = game.ball.postion_y + game.ball.velocity_y
-            
-            game.broadcast("update_ball", game.ball.to_dict())
-        
+
         sleep(1 / config.SERVER_TPS)
\ No newline at end of file

From a82cf1377b5396d34cb31550261d8b2e469853c8 Mon Sep 17 00:00:00 2001
From: Xamora <xamora@42l.fr>
Date: Thu, 1 Feb 2024 14:39:39 +0100
Subject: [PATCH 12/77] =?UTF-8?q?Episode=202:=20Marchant=20avec=20une=20h?=
 =?UTF-8?q?=C3=A2te=20difficilement=20dissimulable,=20Adrien=20n'est=20qu'?=
 =?UTF-8?q?as=20quelque=20pas=20de=20sa=20dulcin=C3=A9e.=20Observant=20son?=
 =?UTF-8?q?=20quartier=20il=20s'imagine=20la=20vie=20qu'on=20pourrait=20av?=
 =?UTF-8?q?oir=20dans=20ses=20lieux,=20un=20kebab,=20une=20=C3=A9picerie,?=
 =?UTF-8?q?=20une=20laverie=20ouverte=2024h=20sur=2024h.=20Une=20vie=20bas?=
 =?UTF-8?q?ique=20pour=20un=20citadin=20tout=20l'inverse=20de=20notre=20pr?=
 =?UTF-8?q?otagoniste=20qui=20se=20touche=20le=20zibouiboui=20toute=20jour?=
 =?UTF-8?q?=20et=20nuit=20dans=20une=20chambre=20de=20la=20maison=20du=20g?=
 =?UTF-8?q?=C3=A9niteur,=20bien=20s=C3=BBre=20sans=20r=C3=A9veiller=20le?=
 =?UTF-8?q?=20petit=20dernier.=20Suite=20au=20prochain=20commit...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 chat/consumersNotice.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/chat/consumersNotice.py b/chat/consumersNotice.py
index f387ff0..536cdf3 100644
--- a/chat/consumersNotice.py
+++ b/chat/consumersNotice.py
@@ -82,7 +82,6 @@ class ChatNoticeConsumer(WebsocketConsumer):
 		try:
 			status, result = getattr(self, "pre_" + type_notice)(user, targets)
 		except AttributeError as error:
-			print(error)
 			status = 200
 
 		if (status < 300):

From 2786212b9c76b02ceb6da416d030808ef878bfeb Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Thu, 1 Feb 2024 14:51:20 +0100
Subject: [PATCH 13/77] lang: add locale in django and login view

---
 .gitignore                                    |  1 +
 accounts/locale/fr/LC_MESSAGES/django.po      | 22 +++++++++++++++++++
 accounts/views/login.py                       |  3 ++-
 frontend/static/js/index.js                   |  7 +++---
 frontend/static/js/lang/en.json               | 10 ++++++++-
 frontend/static/js/lang/fr.json               | 10 ++++++++-
 frontend/static/js/views/HomeView.js          | 14 ++++++------
 .../static/js/views/accounts/LoginView.js     | 18 +++++++--------
 8 files changed, 63 insertions(+), 22 deletions(-)
 create mode 100644 accounts/locale/fr/LC_MESSAGES/django.po

diff --git a/.gitignore b/.gitignore
index 17ded36..0b9eec4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ db.sqlite3
 **/migrations/**
 /profiles/static/avatars/*
 !/profiles/static/avatars/default.env
+*.mo
diff --git a/accounts/locale/fr/LC_MESSAGES/django.po b/accounts/locale/fr/LC_MESSAGES/django.po
new file mode 100644
index 0000000..eed9cf2
--- /dev/null
+++ b/accounts/locale/fr/LC_MESSAGES/django.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-02-01 13:59+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: views/login.py:22
+msgid "Invalid username or password."
+msgstr "Nom d'utilisateur ou mot de passe incorect."
diff --git a/accounts/views/login.py b/accounts/views/login.py
index afcc03d..de5181f 100644
--- a/accounts/views/login.py
+++ b/accounts/views/login.py
@@ -4,6 +4,7 @@ from rest_framework import permissions, status
 from django.http import HttpRequest
 from django.contrib.auth import login
 from rest_framework.authentication import SessionAuthentication
+from django.utils.translation import gettext as _
 
 from ..serializers.login import LoginSerializer
 
@@ -18,6 +19,6 @@ class LoginView(APIView):
 		serializer.is_valid(raise_exception=True)
 		user = serializer.get_user(data)
 		if user is None:
-			return Response({'login': ['Invalid username or password.']}, status.HTTP_401_UNAUTHORIZED)
+			return Response({'login': [_('Invalid username or password.')]}, status.HTTP_401_UNAUTHORIZED)
 		login(request, user)
 		return Response({'id': user.pk}, status=status.HTTP_200_OK)
diff --git a/frontend/static/js/index.js b/frontend/static/js/index.js
index 0c505cc..a3111d2 100644
--- a/frontend/static/js/index.js
+++ b/frontend/static/js/index.js
@@ -20,6 +20,7 @@ import TournamentsView from "./views/tournament/TournamentsListView.js";
 import TournamentCreateView from "./views/tournament/TournamentCreateView.js";
 
 let client = new Client(location.origin);
+let lang = client.lang;
 
 let lastView = undefined;
 let lastPageUrlBeforeLogin = undefined;
@@ -144,13 +145,13 @@ document.addEventListener("DOMContentLoaded", async () => {
 	//Languages
 	Array.from(document.getElementById('languageSelector').children).forEach(el => {
 		el.onclick = async _ => {
-			if (await client.lang.changeLanguage(el.value))
+			if (await lang.changeLanguage(el.value))
 				return;
 			document.querySelector('#languageSelector > .active')?.classList.remove('active');
 			el.classList.add('active');
 		};
 	});
-	document.querySelector(`#languageSelector > [value=${client.lang.chosenLang}]`)
+	document.querySelector(`#languageSelector > [value=${lang.chosenLang}]`)
 		?.classList.add('active');
 
 	await client.isAuthentificate();
@@ -158,4 +159,4 @@ document.addEventListener("DOMContentLoaded", async () => {
 	document.querySelector('a[href=\'' + location.pathname + '\']')?.classList.add('active');
 });
 
-export { client, navigateTo, reloadView }
+export { client, lang, navigateTo, reloadView }
diff --git a/frontend/static/js/lang/en.json b/frontend/static/js/lang/en.json
index 8fc8946..0ea3a84 100644
--- a/frontend/static/js/lang/en.json
+++ b/frontend/static/js/lang/en.json
@@ -11,5 +11,13 @@
 	"homeOnline": "Play online",
 	"homeOffline": "Play offline",
 	"homeMe": "Me",
-	"homeLogout": "Logout"
+	"homeLogout": "Logout",
+	"loginWindowTitle": "Login",
+	"loginFormTitle": "Login",
+	"loginFormUsername": "Username",
+	"loginFormPassword": "Password",
+	"loginFormButton": "Login",
+	"loginNoAccount": "No account yet?",
+	"loginRegister": "Register",
+	"errorEmptyField": "This field may not be blank."
 }
diff --git a/frontend/static/js/lang/fr.json b/frontend/static/js/lang/fr.json
index a879558..3fb8fa3 100644
--- a/frontend/static/js/lang/fr.json
+++ b/frontend/static/js/lang/fr.json
@@ -11,5 +11,13 @@
 	"homeOnline": "Jouer en ligne",
 	"homeOffline": "Jouer hors ligne",
 	"homeMe": "Moi",
-	"homeLogout": "Déconnexion"
+	"homeLogout": "Déconnexion",
+	"loginWindowTitle": "Connexion",
+	"loginFormTitle": "Connexion",
+	"loginFormUsername": "Nom d'utilisateur",
+	"loginFormPassword": "Mot de passe",
+	"loginFormButton": "Connexion",
+	"loginNoAccount": "Pas de compte?",
+	"loginRegister": "S'inscrire",
+	"errorEmptyField": "Ce champ ne peut être vide."
 }
diff --git a/frontend/static/js/views/HomeView.js b/frontend/static/js/views/HomeView.js
index a98fd9f..458af60 100644
--- a/frontend/static/js/views/HomeView.js
+++ b/frontend/static/js/views/HomeView.js
@@ -1,19 +1,19 @@
-import { client } from "../index.js";
+import { lang } from "../index.js";
 import AbstractAuthentificateView from "./abstracts/AbstractAuthentifiedView.js";
 
 export default class extends AbstractAuthentificateView {
     constructor(params) {
-        super(params, client.lang.get('homeWindowTitle', 'Home'));
+        super(params, lang.get('homeWindowTitle', 'Home'));
         this.redirect_url = "/login"
 	}
 
     async getHtml() {
         return /* HTML */ `
-			<h1>${client.lang.get('homeTitle', 'Home')}</h1>
-            <a href="/matchmaking" data-link>${client.lang.get('homeOnline', 'Play online')}</a>
-            <a href="/games/offline" data-link>${client.lang.get('homeOffline', 'Play offline')}</a>
-            <a href="/me" data-link>${client.lang.get('homeMe', 'Me')}</a>
-            <a href="/logout" data-link>${client.lang.get('homeLogout', 'Logout')}</a>
+			<h1>${lang.get('homeTitle', 'Home')}</h1>
+            <a href="/matchmaking" data-link>${lang.get('homeOnline', 'Play online')}</a>
+            <a href="/games/offline" data-link>${lang.get('homeOffline', 'Play offline')}</a>
+            <a href="/me" data-link>${lang.get('homeMe', 'Me')}</a>
+            <a href="/logout" data-link>${lang.get('homeLogout', 'Logout')}</a>
         `;
     }
 }
diff --git a/frontend/static/js/views/accounts/LoginView.js b/frontend/static/js/views/accounts/LoginView.js
index 6ecc3e1..19595fe 100644
--- a/frontend/static/js/views/accounts/LoginView.js
+++ b/frontend/static/js/views/accounts/LoginView.js
@@ -1,4 +1,4 @@
-import { client, navigateTo } from "../../index.js";
+import { client, lang, navigateTo } from "../../index.js";
 import { clear, fill_errors } from "../../utils/formUtils.js";
 import AbstractNonAuthentifiedView from "../abstracts/AbstractNonAuthentified.js";
 
@@ -10,10 +10,10 @@ async function login(redirectTo = '/home')
 	let password = document.getElementById('passwordInput').value;
 
 	if (username === '') {
-		document.getElementById('username').innerHTML = 'This field may not be blank.';
+		document.getElementById('username').innerHTML = lang.get('errorEmptyField', 'This field may not be blank.');
 	}
 	if (password === '') {
-		document.getElementById('password').innerHTML = 'This field may not be blank.';
+		document.getElementById('password').innerHTML = lang.get('errorEmptyField', 'This field may not be blank.');
 	}
 	if (username === '' || password === '')
 		return;
@@ -32,7 +32,7 @@ async function login(redirectTo = '/home')
 
 export default class extends AbstractNonAuthentifiedView {
     constructor(params, lastUrlBeforeLogin = '/home') {
-        super(params, "Login", lastUrlBeforeLogin);
+        super(params, lang.get('loginWindowTitle', 'Login'), lastUrlBeforeLogin);
 		this.redirectTo = lastUrlBeforeLogin;
 	}
 
@@ -56,21 +56,21 @@ export default class extends AbstractNonAuthentifiedView {
 		return `
 		<div class='container-fluid'>
 			<form class='border border-2 rounded bg-light-subtle mx-auto p-2 col-md-7 col-lg-4'>
-				<h4 class='text-center fw-semibold mb-4'>Login</h4>
+				<h4 class='text-center fw-semibold mb-4'>${lang.get('loginFormTitle', 'Login')}</h4>
 				<div class='form-floating mb-2'>
 					<input type='text' class='form-control' id='usernameInput' placeholder='Username'>
-					<label for='usernameInput'>Username</label>
+					<label for='usernameInput'>${lang.get('loginFormUsername', 'Username')}</label>
 					<span class='text-danger' id='username'></span>
 				</div>
 				<div class='form-floating'>
 					<input type='password' class='form-control' id='passwordInput' placeholder='Password'>
-					<label for='passwordInput'>Password</label>
+					<label for='passwordInput'>${lang.get('loginFormPassword', 'Password')}</label>
 					<span class='text-danger' id='password'></span>
 				</div>
 				<div class='d-flex'>
-					<button type='button' class='btn btn-primary mt-3 mb-2' id='loginButton'>Login</button>
+					<button type='button' class='btn btn-primary mt-3 mb-2' id='loginButton'>${lang.get('loginFormButton', 'Login')}</button>
 					<span class='text-danger my-auto mx-2' id='login'></span>
-					<p class='ms-auto mt-auto'>No account yet? <a href='/register' data-link>Register</a></p>
+					<p class='ms-auto mt-auto'>${lang.get('loginNoAccount', 'No account yet?')} <a href='/register' data-link>${lang.get('loginRegister', 'Register')}</a></p>
 				</div>
 			</form>
 		</div>

From 45ae11f96e07ddd46e0177d96eb9a74cfeb09125 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Thu, 1 Feb 2024 14:53:02 +0100
Subject: [PATCH 14/77] readme: added compilemessages command

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

diff --git a/README.md b/README.md
index ae970a3..4491728 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,10 @@ python manage.py makemigrations chat
 python manage.py makemigrations tournament
 python manage.py migrate
 ```
+- Compile translations
+```
+python manage.py compilemessages
+```
 - Start the developpement server
 ```
 python manage.py runserver 0.0.0.0:8000

From beb0cd4702c079535bb5f7e6d1a9e9db42d3928d Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Thu, 1 Feb 2024 16:31:25 +0100
Subject: [PATCH 15/77] lang: register view

---
 frontend/static/js/lang/en.json                | 10 +++++++++-
 frontend/static/js/lang/fr.json                | 10 +++++++++-
 .../static/js/views/accounts/LogoutView.js     |  4 ++--
 .../static/js/views/accounts/RegisterView.js   | 18 +++++++++---------
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/frontend/static/js/lang/en.json b/frontend/static/js/lang/en.json
index 0ea3a84..2126438 100644
--- a/frontend/static/js/lang/en.json
+++ b/frontend/static/js/lang/en.json
@@ -19,5 +19,13 @@
 	"loginFormButton": "Login",
 	"loginNoAccount": "No account yet?",
 	"loginRegister": "Register",
-	"errorEmptyField": "This field may not be blank."
+	"errorEmptyField": "This field may not be blank.",
+	"logoutWindowTitle": "Logout",
+	"registerWindowTitle": "Register",
+	"registerFormTitle": "Register",
+	"registerFormUsername": "Username",
+	"registerFormPassword": "Password",
+	"registerFormButton": "Register",
+	"registerAlreadyAccount": "Already have an account?",
+	"registerLogin": "Login"
 }
diff --git a/frontend/static/js/lang/fr.json b/frontend/static/js/lang/fr.json
index 3fb8fa3..0e310bc 100644
--- a/frontend/static/js/lang/fr.json
+++ b/frontend/static/js/lang/fr.json
@@ -19,5 +19,13 @@
 	"loginFormButton": "Connexion",
 	"loginNoAccount": "Pas de compte?",
 	"loginRegister": "S'inscrire",
-	"errorEmptyField": "Ce champ ne peut être vide."
+	"errorEmptyField": "Ce champ ne peut être vide.",
+	"logoutWindowTitle": "Déconnexion",
+	"registerWindowTitle": "S'inscrire",
+	"registerFormTitle": "S'inscrire",
+	"registerFormUsername": "Nom d'utilisateur",
+	"registerFormPassword": "Mot de passe",
+	"registerFormButton": "S'inscrire",
+	"registerAlreadyAccount": "Déjà un compte?",
+	"registerLogin": "Connexion"
 }
diff --git a/frontend/static/js/views/accounts/LogoutView.js b/frontend/static/js/views/accounts/LogoutView.js
index e60ffce..0007ade 100644
--- a/frontend/static/js/views/accounts/LogoutView.js
+++ b/frontend/static/js/views/accounts/LogoutView.js
@@ -1,10 +1,10 @@
-import { client, navigateTo } from "../../index.js";
+import { client, lang, navigateTo } from "../../index.js";
 import AbstractAuthentifiedView from "../abstracts/AbstractAuthentifiedView.js";
 
 export default class extends AbstractAuthentifiedView
 {
 	constructor(params, lastPageUrl = '/login') {
-		super(params, "Logout");
+		super(params, lang.get('logoutWindowTitle', 'Logout'));
 		this.lastPageUrl = lastPageUrl;
 	}
 
diff --git a/frontend/static/js/views/accounts/RegisterView.js b/frontend/static/js/views/accounts/RegisterView.js
index 9696feb..135a5d2 100644
--- a/frontend/static/js/views/accounts/RegisterView.js
+++ b/frontend/static/js/views/accounts/RegisterView.js
@@ -1,4 +1,4 @@
-import { client, navigateTo } from "../../index.js";
+import { client, lang, navigateTo } from "../../index.js";
 import { clear, fill_errors } from "../../utils/formUtils.js";
 import AbstractNonAuthentifiedView from "../abstracts/AbstractNonAuthentified.js";
 
@@ -10,9 +10,9 @@ async function register(redirectTo = '/home')
 	if (username === '' || password === '') {
 		clear("innerHTML", ["username", "password"]);
 		if (username === '')
-			document.getElementById('username').innerHTML = 'This field may not be blank.';
+			document.getElementById('username').innerHTML = lang.get('errorEmptyField', 'This field may not be blank.');
 		if (password === '')
-			document.getElementById('password').innerHTML = 'This field may not be blank.';
+			document.getElementById('password').innerHTML = lang.get('errorEmptyField', 'This field may not be blank.');
 		return;
 	}
 
@@ -30,7 +30,7 @@ async function register(redirectTo = '/home')
 
 export default class extends AbstractNonAuthentifiedView {
     constructor(params, lastUrlBeforeLogin = '/home') {
-        super(params, "Register", lastUrlBeforeLogin);
+        super(params, lang.get('registerWindowTitle', 'Register'), lastUrlBeforeLogin);
 		this.redirectTo = lastUrlBeforeLogin;
 	}
 
@@ -54,21 +54,21 @@ export default class extends AbstractNonAuthentifiedView {
         return `
 		<div class='container-fluid'>
 			<form class='border border-2 rounded bg-light-subtle mx-auto p-2 col-md-7 col-lg-4'>
-				<h4 class='text-center fw-semibold mb-4'>Register</h4>
+				<h4 class='text-center fw-semibold mb-4'>${lang.get('registerFormTitle', 'Register')}</h4>
 				<div class='form-floating mb-2'>
 					<input type='text' class='form-control' id='usernameInput' placeholder='Username'>
-					<label for='usernameInput'>Username</label>
+					<label for='usernameInput'>${lang.get('registerFormUsername', 'Username')}</label>
 					<span class='text-danger' id='username'></span>
 				</div>
 				<div class='form-floating'>
 					<input type='password' class='form-control' id='passwordInput' placeholder='Password'>
-					<label for='passwordInput'>Password</label>
+					<label for='passwordInput'>${lang.get('registerFormPassword', 'Password')}</label>
 					<span class='text-danger' id='password'></span>
 				</div>
 				<div class='d-flex'>
-					<button type='button' class='btn btn-primary mt-3 mb-2' id='registerButton'>Register</button>
+					<button type='button' class='btn btn-primary mt-3 mb-2' id='registerButton'>${lang.get('registerFormButton', 'Register')}</button>
 					<span class='text-danger my-auto mx-2' id='register'></span>
-					<p class='ms-auto mt-auto'>Already have an account? <a href='/login' data-link>Login</a></p>
+					<p class='ms-auto mt-auto'>${lang.get('registerAlreadyAccount', 'Already have an account?')} <a href='/login' data-link>${lang.get('registerLogin', 'Login')}</a></p>
 				</div>
 			</form>
 		</div>

From 5f8c42d0c3587d1c1a17e0b8341e8be97d0b13fa Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Thu, 1 Feb 2024 17:37:46 +0100
Subject: [PATCH 16/77] game: add: use straight line colision (Not finished)

---
 frontend/static/js/api/game/Ball.js |   8 +-
 games/objects/Game.py               |   2 +-
 games/routine.py                    | 120 +++++++++++++++++++---------
 3 files changed, 87 insertions(+), 43 deletions(-)

diff --git a/frontend/static/js/api/game/Ball.js b/frontend/static/js/api/game/Ball.js
index 24de54e..6836317 100644
--- a/frontend/static/js/api/game/Ball.js
+++ b/frontend/static/js/api/game/Ball.js
@@ -57,12 +57,8 @@ class Ball
     {
         let distance = this.speed * (this.game.time.deltaTime() / 1000)
 
-        let angle_radian = this.angle * Math.PI / 180
-
-        console.log(angle_radian)
-
-        this.position.x = this.position.x + distance * Math.cos(angle_radian);
-        this.position.y = this.position.y + distance * Math.sin(angle_radian);
+        this.position.x = this.position.x + distance * Math.cos(this.angle);
+        this.position.y = this.position.y + distance * Math.sin(this.angle);
 
         this.draw(ctx);
     }
diff --git a/games/objects/Game.py b/games/objects/Game.py
index 3550f48..e50a2ee 100644
--- a/games/objects/Game.py
+++ b/games/objects/Game.py
@@ -43,7 +43,7 @@ class Game(AbstractRoom):
         for i in range(nb_sides):
 
             angle: float = (i * 2 * math.pi / nb_sides) + (math.pi * 3 / nb_sides)
-
+            
             x: float = round(config.MAP_CENTER_X + radius * math.cos(angle))
             y: float = round(config.MAP_CENTER_Y + radius * math.sin(angle))
             
diff --git a/games/routine.py b/games/routine.py
index 6dd909a..3dfbcbf 100644
--- a/games/routine.py
+++ b/games/routine.py
@@ -22,52 +22,100 @@ from asgiref.sync import SyncToAsync
 
 from time import sleep
 
-def get_sign(num: float):
-    return 1 if num >= 0 else -1
+def get_sign(num: float) -> int:
+    if (num == 0):
+        return 1
+    if (num > 0):
+        return 1
+    if (num < 0):
+        return -1
 
-def get_impact_point(segments: list[Segment], ball: Ball):
-
-    angle_radian: float = ball.angle * math.pi / 180
-
-    direction_vector: Vector = Vector(math.cos(angle_radian), math.sin(angle_radian))
-
-    x: float = ball.position.x
-    if (direction_vector.x > 0):
-        x = x + ball.size / 2
-    elif (direction_vector.x < 0):
-        x = x - ball.size / 2
+def simplify_angle(angle: float):
     
-    y: float = ball.position.y
-    if (direction_vector.y > 0):
-        y = y + ball.size / 2
-    elif (direction_vector.y < 0):
-        y = y - ball.size / 2
-
-    position: Point = Point(x, y)
+    return (angle + 2 * math.pi) % (2 * math.pi)
 
+def exclude_invalid_segments(segments: list[Segment], ball: Ball):
+    
+    cos: float = math.cos(ball.angle)
+    sin: float = math.sin(ball.angle)
+    
+    valid_segments = []
+    
+    print(ball.angle)
+    angle: float = ball.angle
+    
     for segment in segments:
         
-        segment_vector: Vector = Vector(segment.start.x - segment.stop.x, segment.start.y - segment.stop.y)
-        segment_vector_unit = segment_vector / segment_vector.norm
+        diff_x: float = segment.start.x - ball.position.x
+        diff_y: float = segment.start.y - ball.position.y
         
-        scalar: float = segment_vector_unit.scalar(direction_vector)
+        start_angle: float = math.atan2(diff_y, diff_x)
         
-        if (scalar < 0.01):
+        diff_x: float = segment.stop.x - ball.position.x
+        diff_y: float = segment.stop.y - ball.position.y
+        stop_angle: float = math.atan2(diff_y, diff_x)
+        
+        min_angle: float = min(start_angle, stop_angle)
+        max_angle: float = max(start_angle, stop_angle)
+        
+        print(min_angle, max_angle)
+        
+        if not (min_angle <= angle <= max_angle):
             continue
+        
+        start_cos: float = math.cos(start_angle)
+        start_sin: float = math.sin(start_angle)
+        stop_cos: float = math.cos(stop_angle)
+        stop_sin: float = math.sin(stop_angle)
+        
+        if (get_sign(start_cos) != get_sign(cos) and get_sign(cos) != get_sign(stop_cos)):
+            continue
+        
+        if (get_sign(start_sin) != get_sign(sin) and get_sign(sin) != get_sign(stop_sin)):
+           continue
+        
+        valid_segments.append(segment)
 
-        print(segment_vector, segment_vector_unit, direction_vector)
+    return valid_segments
+
+def get_derive(segment: Segment):
+    
+    if (segment.start.x == segment.stop.x):
+        return None
+    
+    return (segment.stop.y - segment.start.y) / (segment.stop.x - segment.stop.y)
+
+def get_intercept(derive: float, point: Point):
+    
+    if (derive is None):
+        return None
+    
+    return point.y - (point.x * derive)
+
+def get_interception(segment1: Segment, segment2: Segment):
+    
+    #TODO https://chat.openai.com/c/3fd8b80f-86cc-4fb9-8ff1-44c108f5ccae
+    pass
+
+def get_impact_point(segments: list[Segment], ball: Ball):    
+    
+    valid_segments: list[Segment] = exclude_invalid_segments(segments, ball)
+    
+    point: Point = Point(ball.position.x + math.cos(ball.angle), ball.position.y + math.sin(ball.angle))
+
+    closest: Point = None
+    distance: float = None
+
+    for segment in valid_segments:
+
+        impact: Point = get_interception(Segment(ball.position, point), segment)
+        distance2: float = impact.distance(ball.position)
         
-        distance: float = scalar * segment_vector.norm / 2
-        
-        impact_x: float = position.x + distance * direction_vector.x
-        
-        impact_y: float = position.y + distance * direction_vector.y
-        
-        impact: Point = Point(impact_x, impact_y)
-        
-        print("impact", impact)
-        
-        return impact
+        if (closest is None or distance2 < distance):
+            closest = impact
+            distance = distance2
+
+    return closest
     
 async def update_ball(game: Game, impact: Point):
     

From 043a958dd0ff489580fe315645a457b91c31573d Mon Sep 17 00:00:00 2001
From: adrien-lsh <adrien-lsh@noreply.codeberg.org>
Date: Thu, 1 Feb 2024 20:48:58 +0000
Subject: [PATCH 17/77] renamed 404 page title

---
 frontend/static/js/views/PageNotFoundView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/static/js/views/PageNotFoundView.js b/frontend/static/js/views/PageNotFoundView.js
index 334c1a2..9758359 100644
--- a/frontend/static/js/views/PageNotFoundView.js
+++ b/frontend/static/js/views/PageNotFoundView.js
@@ -2,7 +2,7 @@ import AbstractView from "./abstracts/AbstractView.js";
 
 export default class extends AbstractView {
     constructor(params) {
-        super(params, "Dashboard");
+        super(params, "Not Found");
     }
 
 	async getHtml() {

From e9e370d4f548e357f21d9a75dbef8f6645303aef Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Fri, 2 Feb 2024 10:15:33 +0100
Subject: [PATCH 18/77] lang: translation of 404 window title

---
 frontend/static/js/lang/en.json              | 3 ++-
 frontend/static/js/lang/fr.json              | 3 ++-
 frontend/static/js/views/PageNotFoundView.js | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/static/js/lang/en.json b/frontend/static/js/lang/en.json
index 2126438..700fbe3 100644
--- a/frontend/static/js/lang/en.json
+++ b/frontend/static/js/lang/en.json
@@ -27,5 +27,6 @@
 	"registerFormPassword": "Password",
 	"registerFormButton": "Register",
 	"registerAlreadyAccount": "Already have an account?",
-	"registerLogin": "Login"
+	"registerLogin": "Login",
+	"404WindowTitle": "Not Found"
 }
diff --git a/frontend/static/js/lang/fr.json b/frontend/static/js/lang/fr.json
index 0e310bc..4691961 100644
--- a/frontend/static/js/lang/fr.json
+++ b/frontend/static/js/lang/fr.json
@@ -27,5 +27,6 @@
 	"registerFormPassword": "Mot de passe",
 	"registerFormButton": "S'inscrire",
 	"registerAlreadyAccount": "Déjà un compte?",
-	"registerLogin": "Connexion"
+	"registerLogin": "Connexion",
+	"404WindowTitle": "Pas trouvé"
 }
diff --git a/frontend/static/js/views/PageNotFoundView.js b/frontend/static/js/views/PageNotFoundView.js
index 9758359..2c021c0 100644
--- a/frontend/static/js/views/PageNotFoundView.js
+++ b/frontend/static/js/views/PageNotFoundView.js
@@ -1,8 +1,9 @@
 import AbstractView from "./abstracts/AbstractView.js";
+import { lang } from '../index.js'
 
 export default class extends AbstractView {
     constructor(params) {
-        super(params, "Not Found");
+        super(params, lang.get('404WindowTitle', 'Not Found'));
     }
 
 	async getHtml() {

From 44dbaf70543855b94293a7cdb00ae30e77bc63d5 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Fri, 2 Feb 2024 10:30:16 +0100
Subject: [PATCH 19/77] translations: added compilemessages cmd in run script

---
 run.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/run.sh b/run.sh
index 5bb5b76..66e42ce 100755
--- a/run.sh
+++ b/run.sh
@@ -8,4 +8,5 @@ python manage.py makemigrations profiles
 python manage.py makemigrations chat
 python manage.py makemigrations tournament
 python manage.py migrate
+python manage.py compilemessages
 python manage.py runserver 0.0.0.0:8000

From 8534f4bafb4f172ca3ccb9b4da7dd191d27635c8 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Fri, 2 Feb 2024 11:02:23 +0100
Subject: [PATCH 20/77] lang: search window title

---
 frontend/static/js/lang/en.json    | 3 ++-
 frontend/static/js/lang/fr.json    | 3 ++-
 frontend/static/js/views/Search.js | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/static/js/lang/en.json b/frontend/static/js/lang/en.json
index 700fbe3..c5e42e4 100644
--- a/frontend/static/js/lang/en.json
+++ b/frontend/static/js/lang/en.json
@@ -28,5 +28,6 @@
 	"registerFormButton": "Register",
 	"registerAlreadyAccount": "Already have an account?",
 	"registerLogin": "Login",
-	"404WindowTitle": "Not Found"
+	"404WindowTitle": "Not Found",
+	"SearchWindowTitle": "Search"
 }
diff --git a/frontend/static/js/lang/fr.json b/frontend/static/js/lang/fr.json
index 4691961..663c19c 100644
--- a/frontend/static/js/lang/fr.json
+++ b/frontend/static/js/lang/fr.json
@@ -28,5 +28,6 @@
 	"registerFormButton": "S'inscrire",
 	"registerAlreadyAccount": "Déjà un compte?",
 	"registerLogin": "Connexion",
-	"404WindowTitle": "Pas trouvé"
+	"404WindowTitle": "Pas trouvé",
+	"SearchWindowTitle": "Recherche"
 }
diff --git a/frontend/static/js/views/Search.js b/frontend/static/js/views/Search.js
index 76358f8..5cab730 100644
--- a/frontend/static/js/views/Search.js
+++ b/frontend/static/js/views/Search.js
@@ -1,10 +1,10 @@
 import AbstractView from "./abstracts/AbstractView.js";
-import {client} from "../index.js";
+import { client, lang } from "../index.js";
 import {Message} from "../api/chat/message.js"
 
 export default class extends AbstractView {
     constructor(params) {
-        super(params, "Search");
+        super(params, lang.get('SearchWindowTitle', 'Search'));
     }
 
 	async wait_get_online_users() {

From c4619b0ff7e0a8a4d0ac90a99255175bb3552b61 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Fri, 2 Feb 2024 11:14:19 +0100
Subject: [PATCH 21/77] lang: translation of profile page

---
 frontend/static/js/api/profiles.js          |  2 +-
 frontend/static/js/lang/en.json             |  8 +++++++-
 frontend/static/js/lang/fr.json             |  8 +++++++-
 frontend/static/js/views/ProfilePageView.js | 14 +++++++-------
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/frontend/static/js/api/profiles.js b/frontend/static/js/api/profiles.js
index 7c0d924..1a1eb54 100644
--- a/frontend/static/js/api/profiles.js
+++ b/frontend/static/js/api/profiles.js
@@ -32,7 +32,7 @@ class Profiles
 	/**
 	 * 
 	 * @param {String} username 
-	 * @returns {?Profile}
+	 * @returns {?Promise<Profile>}
 	 */
 	async getProfile(username)
 	{
diff --git a/frontend/static/js/lang/en.json b/frontend/static/js/lang/en.json
index c5e42e4..b6ad271 100644
--- a/frontend/static/js/lang/en.json
+++ b/frontend/static/js/lang/en.json
@@ -29,5 +29,11 @@
 	"registerAlreadyAccount": "Already have an account?",
 	"registerLogin": "Login",
 	"404WindowTitle": "Not Found",
-	"SearchWindowTitle": "Search"
+	"SearchWindowTitle": "Search",
+	"profileAddFriend": "Ask Friend",
+	"profileRemoveFriend": "Remove Friend",
+	"profileDenyRequest": "Decline Friend",
+	"profileAcceptRequest": "Accept Friend",
+	"profileUnblock": "Unblock",
+	"profileBlock": "Block"
 }
diff --git a/frontend/static/js/lang/fr.json b/frontend/static/js/lang/fr.json
index 663c19c..be38190 100644
--- a/frontend/static/js/lang/fr.json
+++ b/frontend/static/js/lang/fr.json
@@ -29,5 +29,11 @@
 	"registerAlreadyAccount": "Déjà un compte?",
 	"registerLogin": "Connexion",
 	"404WindowTitle": "Pas trouvé",
-	"SearchWindowTitle": "Recherche"
+	"SearchWindowTitle": "Recherche",
+	"profileAddFriend": "Demander en ami",
+	"profileRemoveFriend": "Retirer l'ami",
+	"profileDenyRequest": "Refuser l'ami",
+	"profileAcceptRequest": "Accepter l'ami",
+	"profileUnblock": "Débloquer",
+	"profileBlock": "Bloquer"
 }
diff --git a/frontend/static/js/views/ProfilePageView.js b/frontend/static/js/views/ProfilePageView.js
index 88ab8f7..04e90cd 100644
--- a/frontend/static/js/views/ProfilePageView.js
+++ b/frontend/static/js/views/ProfilePageView.js
@@ -1,5 +1,5 @@
 import AbstractView from "./abstracts/AbstractView.js";
-import { client } from "../index.js"
+import { client, lang } from "../index.js"
 
 export default class extends AbstractView {
     constructor(params) {
@@ -65,9 +65,9 @@ export default class extends AbstractView {
 				this.blockButton();
 			};
 			if (this.profile.isBlocked)
-				block.textContent = "Deblock";
+				block.textContent = lang.get('profileUnblock', 'Unblock');
 			else
-				block.textContent = "Block";
+				block.textContent = lang.get('profileBlock', 'Block');
 		}
 	}
 
@@ -86,13 +86,13 @@ export default class extends AbstractView {
 					friend.remove();
 
 				yes.id = "yes";
-				yes.textContent = "Accept Friend";
+				yes.textContent = lang.get('profileAcceptRequest', 'Accept Friend');
 				yes.onclick = async () => {
 					client.notice.accept_friend(this.user_id);
 				}
 
 				no.id = "no";
-				no.textContent = "Refuse Friend";
+				no.textContent = lang.get('profileDenyRequest', 'Decline Friend');
 				no.onclick = async () => {
 					client.notice.refuse_friend(this.user_id);
 				}
@@ -117,9 +117,9 @@ export default class extends AbstractView {
 					this.friendButton();
 				};
 				if (this.profile.isFriend)
-					friend.textContent = "Remove Friend";
+					friend.textContent = lang.get('profileRemoveFriend', 'Remove Friend');
 				else {
-					friend.textContent = "Ask Friend";
+					friend.textContent = lang.get('profileAddFriend', 'Ask Friend');
 				}
 				this.info.appendChild(friend);
 			}

From 091d443aceaaf8ce5cbbf83d1c7da8ee1e623f49 Mon Sep 17 00:00:00 2001
From: Xamora <xamora@42l.fr>
Date: Fri, 2 Feb 2024 11:16:25 +0100
Subject: [PATCH 22/77] =?UTF-8?q?Episode=203:=20Petit=20Homme=20=C3=A9rect?=
 =?UTF-8?q?ion=20au=20pantalon=20fa=C3=A7e=20=C3=A0=20l'entr=C3=A9e=20de?=
 =?UTF-8?q?=20ses=20d=C3=A9sirs,=20p=C3=A9netre=20non=20sans=20crainte=20u?=
 =?UTF-8?q?ne=20demeure=20avec=20le=20souvenir=20du=20num=C3=A9ro=20de=20c?=
 =?UTF-8?q?ode=20de=20la=20Belle=20Dame.=20Pas=20=C3=A0=20pas,=20marche=20?=
 =?UTF-8?q?par=20marche,=20sautant=20de=20deux=20en=20deux,=20des=20ailes?=
 =?UTF-8?q?=20lui=20pouss=C3=A9=20sur=20le=20dos=20ne=20pensant=20qu'au=20?=
 =?UTF-8?q?moment=20futur.=20En=20oposition=20=C3=A0=C2=A0la=20porte=20de?=
 =?UTF-8?q?=20sa=20tr=C3=A8s=20ch=C3=A8re,=20il=20sonne,=20puis=20rien...?=
 =?UTF-8?q?=20Il=20ressonne,=20remarque=20que=20la=20porte=20n'=C3=A9tait?=
 =?UTF-8?q?=20pas=20v=C3=A9rouiller,=20entre=20puis...;=20La=20suite=20au?=
 =?UTF-8?q?=20prochain=20Commit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/static/js/views/ProfilePageView.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/static/js/views/ProfilePageView.js b/frontend/static/js/views/ProfilePageView.js
index 88ab8f7..b289a9f 100644
--- a/frontend/static/js/views/ProfilePageView.js
+++ b/frontend/static/js/views/ProfilePageView.js
@@ -57,9 +57,9 @@ export default class extends AbstractView {
 			block.id = "block";
 			block.onclick = async () => {
 				if (!this.profile.isBlocked)
-					await client.profiles.block(this.userId);
+					await client.profiles.block(this.user_id);
 				else
-					await client.profiles.deblock(this.userId);
+					await client.profiles.deblock(this.user_id);
 				this.profile = await client.profiles.getProfile(this.username);
 
 				this.blockButton();

From d63fa260881640069f189c85aed428f61b981eef Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Fri, 2 Feb 2024 13:31:26 +0100
Subject: [PATCH 23/77] tro bo

---
 frontend/static/js/api/chat/notice.js          | 4 ++++
 frontend/static/js/api/client.js               | 2 ++
 frontend/static/js/views/ProfilePageView.js    | 2 +-
 frontend/static/js/views/accounts/LoginView.js | 2 --
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/static/js/api/chat/notice.js b/frontend/static/js/api/chat/notice.js
index f882835..f512d91 100644
--- a/frontend/static/js/api/chat/notice.js
+++ b/frontend/static/js/api/chat/notice.js
@@ -42,7 +42,11 @@ class Notice {
 			return ;
 
 		this.chatSocket.close();
+	}
 
+	async reconnect() {
+		this.disconnect();
+		this.connect();
 	}
 
 	async accept_invite(invitedBy) {
diff --git a/frontend/static/js/api/client.js b/frontend/static/js/api/client.js
index dc0a843..7e7a183 100644
--- a/frontend/static/js/api/client.js
+++ b/frontend/static/js/api/client.js
@@ -192,6 +192,7 @@ class Client
 		{
 			this.me = new MyProfile(this);
 			await this.me.init();
+			this.notice.reconnect();
 			document.getElementById('navbarLoggedOut').classList.add('d-none');
 			document.getElementById('navbarLoggedIn').classList.remove('d-none');
 			document.getElementById('navbarDropdownButton').innerHTML = this.me.username;
@@ -200,6 +201,7 @@ class Client
 		else
 		{
 			this.me = undefined;
+			this.notice.reconnect();
 			document.getElementById('navbarLoggedOut').classList.remove('d-none');
 			document.getElementById('navbarLoggedIn').classList.add('d-none');
 			document.getElementById('navbarDropdownButton').innerHTML = 'Me';
diff --git a/frontend/static/js/views/ProfilePageView.js b/frontend/static/js/views/ProfilePageView.js
index 9087332..9585423 100644
--- a/frontend/static/js/views/ProfilePageView.js
+++ b/frontend/static/js/views/ProfilePageView.js
@@ -4,7 +4,7 @@ import { client, lang } from "../index.js"
 export default class extends AbstractView {
     constructor(params) {
         super(params, params.username);
-        this.username = params.username;
+        this.username = decodeURI(params.username);
     }
 
     async postInit()
diff --git a/frontend/static/js/views/accounts/LoginView.js b/frontend/static/js/views/accounts/LoginView.js
index 19595fe..61b9b14 100644
--- a/frontend/static/js/views/accounts/LoginView.js
+++ b/frontend/static/js/views/accounts/LoginView.js
@@ -21,8 +21,6 @@ async function login(redirectTo = '/home')
 	let response = await client.login(username, password);
 
 	if (response.status == 200) {
-		await client.notice.disconnect();
-		await client.notice.connect();
 		navigateTo(redirectTo);
 	} else {
 		let error = await response.json();

From 6552b58815047b658e0a6cf97a7ee84f0150e43f Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Fri, 2 Feb 2024 13:34:53 +0100
Subject: [PATCH 24/77] i forgor

---
 frontend/static/js/views/ProfilePageView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/static/js/views/ProfilePageView.js b/frontend/static/js/views/ProfilePageView.js
index 9585423..9d21d26 100644
--- a/frontend/static/js/views/ProfilePageView.js
+++ b/frontend/static/js/views/ProfilePageView.js
@@ -3,7 +3,7 @@ import { client, lang } from "../index.js"
 
 export default class extends AbstractView {
     constructor(params) {
-        super(params, params.username);
+        super(params, decodeURI(params.username));
         this.username = decodeURI(params.username);
     }
 

From fe98a0f52fabf594f1497efaf81371364719dda3 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Fri, 2 Feb 2024 15:00:59 +0100
Subject: [PATCH 25/77] game: fix: colision: cosition work horizontally

---
 games/routine.py | 162 +++++++++++++++++++++++++++++------------------
 1 file changed, 100 insertions(+), 62 deletions(-)

diff --git a/games/routine.py b/games/routine.py
index 3dfbcbf..20861b1 100644
--- a/games/routine.py
+++ b/games/routine.py
@@ -22,9 +22,12 @@ from asgiref.sync import SyncToAsync
 
 from time import sleep
 
+VERTICALLY = 1
+NORMAL = 2
+
 def get_sign(num: float) -> int:
     if (num == 0):
-        return 1
+        return 0
     if (num > 0):
         return 1
     if (num < 0):
@@ -34,112 +37,147 @@ def simplify_angle(angle: float):
     
     return (angle + 2 * math.pi) % (2 * math.pi)
 
-def exclude_invalid_segments(segments: list[Segment], ball: Ball):
-    
-    cos: float = math.cos(ball.angle)
-    sin: float = math.sin(ball.angle)
-    
-    valid_segments = []
-    
-    print(ball.angle)
-    angle: float = ball.angle
-    
-    for segment in segments:
-        
-        diff_x: float = segment.start.x - ball.position.x
-        diff_y: float = segment.start.y - ball.position.y
-        
-        start_angle: float = math.atan2(diff_y, diff_x)
-        
-        diff_x: float = segment.stop.x - ball.position.x
-        diff_y: float = segment.stop.y - ball.position.y
-        stop_angle: float = math.atan2(diff_y, diff_x)
-        
-        min_angle: float = min(start_angle, stop_angle)
-        max_angle: float = max(start_angle, stop_angle)
-        
-        print(min_angle, max_angle)
-        
-        if not (min_angle <= angle <= max_angle):
-            continue
-        
-        start_cos: float = math.cos(start_angle)
-        start_sin: float = math.sin(start_angle)
-        stop_cos: float = math.cos(stop_angle)
-        stop_sin: float = math.sin(stop_angle)
-        
-        if (get_sign(start_cos) != get_sign(cos) and get_sign(cos) != get_sign(stop_cos)):
-            continue
-        
-        if (get_sign(start_sin) != get_sign(sin) and get_sign(sin) != get_sign(stop_sin)):
-           continue
-        
-        valid_segments.append(segment)
-
-    return valid_segments
-
-def get_derive(segment: Segment):
+def get_derive(segment: Segment) -> float:
     
     if (segment.start.x == segment.stop.x):
         return None
     
     return (segment.stop.y - segment.start.y) / (segment.stop.x - segment.stop.y)
 
-def get_intercept(derive: float, point: Point):
+def get_intercept(derive: float, point: Point) -> float:
     
     if (derive is None):
         return None
     
     return point.y - (point.x * derive)
 
-def get_interception(segment1: Segment, segment2: Segment):
+def get_constant(segment: Segment) -> float:
     
-    #TODO https://chat.openai.com/c/3fd8b80f-86cc-4fb9-8ff1-44c108f5ccae
-    pass
+    return segment.start.x
+
+def identify(segment: Segment) -> str:
+    
+    if (segment.start.x == segment.stop.x):
+        return VERTICALLY
+    return NORMAL
+
+def get_interception(segment1: Segment, segment2: Segment):
+
+    if (identify(segment1) == VERTICALLY and identify(segment2) == VERTICALLY):
+        return None
+    
+    if (identify(segment1) == NORMAL and identify(segment2) == NORMAL):
+        
+        # representation m * x + p
+                
+        m1 = get_derive(segment1)
+        m2 = get_derive(segment2)
+        
+        p1 = get_intercept(m1, segment1.start)
+        p2 = get_intercept(m2, segment2.start)
+        
+        # m1 * x + p1 = m2 * x + p2
+        # m1 * x = m2 * x + p2 -p1
+        # m1 * x - m2 * x = p1 - p2
+        # x * (m1 - m2) = p1 - p2
+        # x = (p1 - p2) / (m1 - m2)
+        if (m1 == m2):
+            return None
+        else:
+            x: float = (p1 - p2) / (m1 - m2)
+            
+        y: float = m1 * x + p1
+        
+        
+    else:
+
+        if (identify(segment1) == VERTICALLY):
+            constant: float = get_constant(segment1)
+            m: float = get_derive(segment2)
+            p: float = get_intercept(m, segment2.start)
+        else:
+            constant: float = get_constant(segment2)
+            m: float = get_derive(segment1)
+            p: float = get_intercept(m, segment1.start)
+        
+        x: float = constant
+        y: float = m * x + p
+    
+    impact: Point = Point(x,y)
+    
+    return impact
 
 def get_impact_point(segments: list[Segment], ball: Ball):    
     
-    valid_segments: list[Segment] = exclude_invalid_segments(segments, ball)
+    cos: float = round(math.cos(ball.angle), 6)
+    sin: float = round(math.sin(ball.angle), 6)
     
-    point: Point = Point(ball.position.x + math.cos(ball.angle), ball.position.y + math.sin(ball.angle))
+    print("cos:", cos)
+    print("sin:", sin)
+    
+    point: Point = Point(ball.position.x + cos, ball.position.y + sin)
+
+    ball_segment = Segment(ball.position, point)
 
     closest: Point = None
-    distance: float = None
 
-    for segment in valid_segments:
+    for segment in segments:
 
-        impact: Point = get_interception(Segment(ball.position, point), segment)
-        distance2: float = impact.distance(ball.position)
+        impact: Point = get_interception(segment, ball_segment)
         
-        if (closest is None or distance2 < distance):
+        if (impact is None):
+            continue
+
+        diff_x: float = ball.position.x - impact.x
+        print("x:", diff_x)
+        if (get_sign(diff_x) != get_sign(cos)):
+            continue
+        print("OK: X")
+        
+        diff_y: float = ball.position.y - impact.y
+        print("y:", diff_y)
+        if (get_sign(diff_y) == get_sign(sin)):
+            continue
+        print("OK: Y")
+        
+        print("OK: PARFAIT")
+        
+        impact.x += (ball.size / 2) * get_sign(cos) * (-1)
+        impact.y += (ball.size / 2) * get_sign(sin) * (-1)
+
+        if (closest is None or impact.distance(ball.position) < closest.distance(ball.position)):
             closest = impact
-            distance = distance2
 
     return closest
     
 async def update_ball(game: Game, impact: Point):
     
-    distance: float = impact.distance(game.ball.position) - game.ball.size / 2
+    distance: float = impact.distance(game.ball.position)
+    
+    print("distance:", distance)
     
     time_before_impact: float = distance / game.ball.speed
     
+    print("time:", time_before_impact)
+    
     await asyncio.sleep(time_before_impact)
     
-    game.ball.angle = game.ball.angle + 180
+    game.ball.angle = game.ball.angle + math.pi
     
     game.ball.position = impact
 
     await SyncToAsync(game.broadcast)("update_ball", game.ball.to_dict())
 
 async def render(game: Game):
-
+    
     while True:
         
         segments: list[Segment] = [player.rail for player in game.players] + [wall.rail for wall in game.walls]
 
         impact = get_impact_point(segments, game.ball)
-
+        
         await update_ball(game, impact)
+        print("bozo")
 
 
 def routine(game: Game):

From d54ef03aa4ab31c1bf39cd37c28be2a7eef81d82 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Fri, 2 Feb 2024 15:15:14 +0100
Subject: [PATCH 26/77] game: fix: collision work in 1v1

---
 games/routine.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/games/routine.py b/games/routine.py
index 20861b1..3e61d46 100644
--- a/games/routine.py
+++ b/games/routine.py
@@ -42,7 +42,7 @@ def get_derive(segment: Segment) -> float:
     if (segment.start.x == segment.stop.x):
         return None
     
-    return (segment.stop.y - segment.start.y) / (segment.stop.x - segment.stop.y)
+    return (segment.stop.y - segment.start.y) / (segment.stop.x - segment.start.x)
 
 def get_intercept(derive: float, point: Point) -> float:
     
@@ -130,13 +130,13 @@ def get_impact_point(segments: list[Segment], ball: Ball):
 
         diff_x: float = ball.position.x - impact.x
         print("x:", diff_x)
-        if (get_sign(diff_x) != get_sign(cos)):
+        if (get_sign(diff_x) == get_sign(cos) and cos != 0):
             continue
         print("OK: X")
         
         diff_y: float = ball.position.y - impact.y
         print("y:", diff_y)
-        if (get_sign(diff_y) == get_sign(sin)):
+        if (get_sign(diff_y) == get_sign(sin) and sin != 0):
             continue
         print("OK: Y")
         

From d001a60edbf87d55946f2acfb8c21a1c85c90bb6 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Fri, 2 Feb 2024 16:17:50 +0100
Subject: [PATCH 27/77] add: readme

---
 README.md | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4491728..2712729 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,23 @@
-# BACKEND
+# FT_TRANSCENDENCE
+
+# Modules
+
+| Module | Nb point | state|
+| ------ | -------- | ---- |
+| Multiplayer | 2 | 🚧
+| Remote | 2 | 🚧
+| Bootstrap | 1 | 🏁 |
+| Django | 2 | 🏁 |
+| Bdd | 1 | 🚧 |
+| Accounts | 2 | 🏁 |
+| WebGL | 2 | 🚧 |
+| Other game | 2 | 🚧 |
+| Chat | 2 | 🏁 |
+| Translation | 1 | 🚧 |
+| Other browser | 1 | 🏁 |
+| --- | --- |  ---
+| Ready | 8 | |
+| Total | 18 | | 
 
 ## Installation
 

From 5a61b41dd1690aab95a97d9a983ec342980560bc Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Fri, 2 Feb 2024 16:19:52 +0100
Subject: [PATCH 28/77] add: readme

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

diff --git a/README.md b/README.md
index 2712729..3aad622 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@
 | Chat | 2 | 🏁 |
 | Translation | 1 | 🚧 |
 | Other browser | 1 | 🏁 |
+| Smartphone support | 1 | 🚧 |
 | --- | --- |  ---
 | Ready | 8 | |
 | Total | 18 | | 

From 03f178319fd62eab2abf7418ffa7cc109583f0b3 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Fri, 2 Feb 2024 16:20:42 +0100
Subject: [PATCH 29/77] add: readme

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

diff --git a/README.md b/README.md
index 3aad622..89b0430 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
 | Smartphone support | 1 | 🚧 |
 | --- | --- |  ---
 | Ready | 8 | |
-| Total | 18 | | 
+| Total | 19 | | 
 
 ## Installation
 

From 7f78871240893af1745fa88796fa83c1d27bde5e Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Fri, 2 Feb 2024 16:37:31 +0100
Subject: [PATCH 30/77] game: fix: position is now calculate rightly

---
 games/routine.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/games/routine.py b/games/routine.py
index 3e61d46..f02ce05 100644
--- a/games/routine.py
+++ b/games/routine.py
@@ -115,7 +115,10 @@ def get_impact_point(segments: list[Segment], ball: Ball):
     print("cos:", cos)
     print("sin:", sin)
     
-    point: Point = Point(ball.position.x + cos, ball.position.y + sin)
+    point: Point = Point(ball.position.x + cos, ball.position.y - sin)
+
+    print(ball.position)
+    print(point)
 
     ball_segment = Segment(ball.position, point)
 
@@ -136,14 +139,14 @@ def get_impact_point(segments: list[Segment], ball: Ball):
         
         diff_y: float = ball.position.y - impact.y
         print("y:", diff_y)
-        if (get_sign(diff_y) == get_sign(sin) and sin != 0):
+        if (get_sign(diff_y) != get_sign(sin) and sin != 0):
             continue
         print("OK: Y")
         
-        print("OK: PARFAIT")
+        print("OK: PARFAIT", impact)
         
         impact.x += (ball.size / 2) * get_sign(cos) * (-1)
-        impact.y += (ball.size / 2) * get_sign(sin) * (-1)
+        impact.y += (ball.size / 2) * get_sign(sin)
 
         if (closest is None or impact.distance(ball.position) < closest.distance(ball.position)):
             closest = impact

From 86572965e3d61e0b4dd22ee7294400d335e28dea Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Fri, 2 Feb 2024 16:38:01 +0100
Subject: [PATCH 31/77] game: fix: sync client and server

---
 frontend/static/js/api/game/Ball.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/static/js/api/game/Ball.js b/frontend/static/js/api/game/Ball.js
index 6836317..dd8187d 100644
--- a/frontend/static/js/api/game/Ball.js
+++ b/frontend/static/js/api/game/Ball.js
@@ -46,7 +46,7 @@ class Ball
      */
     draw(ctx)
     {
-        ctx.rect(this.position.x - this.size / 2, this.position.y - this.size / 2, this.game.config.ball_size, this.game.config.ball_size);
+        ctx.rect(this.position.x - this.size / 2, this.position.y - this.size / 2, this.size, this.size);
     }
 
     /**
@@ -58,7 +58,7 @@ class Ball
         let distance = this.speed * (this.game.time.deltaTime() / 1000)
 
         this.position.x = this.position.x + distance * Math.cos(this.angle);
-        this.position.y = this.position.y + distance * Math.sin(this.angle);
+        this.position.y = this.position.y - distance * Math.sin(this.angle);
 
         this.draw(ctx);
     }

From 99f097cfaf9382194ec2cee1db37cd0cedc5dbb4 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Fri, 2 Feb 2024 17:39:39 +0100
Subject: [PATCH 32/77] game: collision work

---
 games/objects/Ball.py    |  2 +-
 games/objects/Segment.py |  3 ++
 games/routine.py         | 66 +++++++++++++++++-----------------------
 3 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/games/objects/Ball.py b/games/objects/Ball.py
index 77f4896..bb8b8ab 100644
--- a/games/objects/Ball.py
+++ b/games/objects/Ball.py
@@ -10,7 +10,7 @@ class Ball:
     def __init__(self) -> None:
         self.size: float = config.BALL_SIZE
         self.position: Point = Point(config.BALL_SPAWN_POS_X + self.size / 2, config.BALL_SPAWN_POS_Y + self.size / 2)
-        self.angle: float = math.pi * 0
+        self.angle: float = math.pi * 0.25
         self.speed: float = config.BALL_SPEED_START
     
     def to_dict(self):
diff --git a/games/objects/Segment.py b/games/objects/Segment.py
index 49e3d88..b785756 100644
--- a/games/objects/Segment.py
+++ b/games/objects/Segment.py
@@ -15,6 +15,9 @@ class Segment:
     def __str__(self) -> str:
         return f"Segment(start: {self.start}, stop: {self.stop})"
     
+    def copy(self):
+        return Segment(self.start.copy(), self.stop.copy())
+    
     def to_dict(self):
         
         data: dict[str: dict] = {
diff --git a/games/routine.py b/games/routine.py
index f02ce05..71e9521 100644
--- a/games/routine.py
+++ b/games/routine.py
@@ -15,6 +15,8 @@ from .objects.Vector import Vector
 
 from . import config
 
+from . import config
+
 import math
 import asyncio
 
@@ -65,16 +67,21 @@ def get_interception(segment1: Segment, segment2: Segment):
 
     if (identify(segment1) == VERTICALLY and identify(segment2) == VERTICALLY):
         return None
+
+    # because of in matematics world y = 10 is above y = 5 and on a display it is inverted I invert the coordonate
+    
+    tmp1 = Segment(Point(segment1.start.x, config.MAP_SIZE_Y - segment1.start.y), Point(segment1.stop.x, config.MAP_SIZE_Y - segment1.stop.y))
+    tmp2 = Segment(Point(segment2.start.x, config.MAP_SIZE_Y - segment2.start.y), Point(segment2.stop.x, config.MAP_SIZE_Y - segment2.stop.y))
     
     if (identify(segment1) == NORMAL and identify(segment2) == NORMAL):
         
         # representation m * x + p
-                
-        m1 = get_derive(segment1)
-        m2 = get_derive(segment2)
+
+        m1 = get_derive(tmp1)
+        m2 = get_derive(tmp2)
         
-        p1 = get_intercept(m1, segment1.start)
-        p2 = get_intercept(m2, segment2.start)
+        p1 = get_intercept(m1, tmp1.start)
+        p2 = get_intercept(m2, tmp2.start)
         
         # m1 * x + p1 = m2 * x + p2
         # m1 * x = m2 * x + p2 -p1
@@ -83,27 +90,27 @@ def get_interception(segment1: Segment, segment2: Segment):
         # x = (p1 - p2) / (m1 - m2)
         if (m1 == m2):
             return None
-        else:
-            x: float = (p1 - p2) / (m1 - m2)
-            
-        y: float = m1 * x + p1
         
+        #                                reinvert
+        x: float = (p1 - p2) / (m1 - m2) * (-1)
+        
+        y: float = config.MAP_SIZE_Y - (m1 * x + p1)
         
     else:
 
-        if (identify(segment1) == VERTICALLY):
-            constant: float = get_constant(segment1)
-            m: float = get_derive(segment2)
-            p: float = get_intercept(m, segment2.start)
+        if (identify(tmp1) == VERTICALLY):
+            constant: float = get_constant(tmp1)
+            m: float = get_derive(tmp2)
+            p: float = get_intercept(m, tmp2.start)
         else:
-            constant: float = get_constant(segment2)
-            m: float = get_derive(segment1)
-            p: float = get_intercept(m, segment1.start)
+            constant: float = get_constant(tmp2)
+            m: float = get_derive(tmp1)
+            p: float = get_intercept(m, tmp1.start)
         
         x: float = constant
-        y: float = m * x + p
+        y: float = config.MAP_SIZE_Y - (m * x + p)
     
-    impact: Point = Point(x,y)
+    impact: Point = Point(x, y)
     
     return impact
 
@@ -112,14 +119,8 @@ def get_impact_point(segments: list[Segment], ball: Ball):
     cos: float = round(math.cos(ball.angle), 6)
     sin: float = round(math.sin(ball.angle), 6)
     
-    print("cos:", cos)
-    print("sin:", sin)
-    
     point: Point = Point(ball.position.x + cos, ball.position.y - sin)
 
-    print(ball.position)
-    print(point)
-
     ball_segment = Segment(ball.position, point)
 
     closest: Point = None
@@ -127,23 +128,17 @@ def get_impact_point(segments: list[Segment], ball: Ball):
     for segment in segments:
 
         impact: Point = get_interception(segment, ball_segment)
-        
+
         if (impact is None):
             continue
 
         diff_x: float = ball.position.x - impact.x
-        print("x:", diff_x)
         if (get_sign(diff_x) == get_sign(cos) and cos != 0):
             continue
-        print("OK: X")
         
-        diff_y: float = ball.position.y - impact.y
-        print("y:", diff_y)
+        diff_y: float = (ball.position.y - impact.y)
         if (get_sign(diff_y) != get_sign(sin) and sin != 0):
             continue
-        print("OK: Y")
-        
-        print("OK: PARFAIT", impact)
         
         impact.x += (ball.size / 2) * get_sign(cos) * (-1)
         impact.y += (ball.size / 2) * get_sign(sin)
@@ -157,12 +152,8 @@ async def update_ball(game: Game, impact: Point):
     
     distance: float = impact.distance(game.ball.position)
     
-    print("distance:", distance)
-    
     time_before_impact: float = distance / game.ball.speed
     
-    print("time:", time_before_impact)
-    
     await asyncio.sleep(time_before_impact)
     
     game.ball.angle = game.ball.angle + math.pi
@@ -177,10 +168,9 @@ async def render(game: Game):
         
         segments: list[Segment] = [player.rail for player in game.players] + [wall.rail for wall in game.walls]
 
-        impact = get_impact_point(segments, game.ball)
+        impact = get_impact_point(segments, game.ball, )
         
         await update_ball(game, impact)
-        print("bozo")
 
 
 def routine(game: Game):

From ea50b9d072e8b5c37080a60dd3b2ff0c7a83a379 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 6 Feb 2024 14:14:21 +0100
Subject: [PATCH 33/77] game: clean: give explicite name to variables

---
 games/routine.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/games/routine.py b/games/routine.py
index 71e9521..5f91287 100644
--- a/games/routine.py
+++ b/games/routine.py
@@ -70,18 +70,18 @@ def get_interception(segment1: Segment, segment2: Segment):
 
     # because of in matematics world y = 10 is above y = 5 and on a display it is inverted I invert the coordonate
     
-    tmp1 = Segment(Point(segment1.start.x, config.MAP_SIZE_Y - segment1.start.y), Point(segment1.stop.x, config.MAP_SIZE_Y - segment1.stop.y))
-    tmp2 = Segment(Point(segment2.start.x, config.MAP_SIZE_Y - segment2.start.y), Point(segment2.stop.x, config.MAP_SIZE_Y - segment2.stop.y))
+    inverted_segment1 = Segment(Point(segment1.start.x, config.MAP_SIZE_Y - segment1.start.y), Point(segment1.stop.x, config.MAP_SIZE_Y - segment1.stop.y))
+    inverted_segment2 = Segment(Point(segment2.start.x, config.MAP_SIZE_Y - segment2.start.y), Point(segment2.stop.x, config.MAP_SIZE_Y - segment2.stop.y))
     
     if (identify(segment1) == NORMAL and identify(segment2) == NORMAL):
         
         # representation m * x + p
 
-        m1 = get_derive(tmp1)
-        m2 = get_derive(tmp2)
+        m1 = get_derive(inverted_segment1)
+        m2 = get_derive(inverted_segment2)
         
-        p1 = get_intercept(m1, tmp1.start)
-        p2 = get_intercept(m2, tmp2.start)
+        p1 = get_intercept(m1, inverted_segment1.start)
+        p2 = get_intercept(m2, inverted_segment2.start)
         
         # m1 * x + p1 = m2 * x + p2
         # m1 * x = m2 * x + p2 -p1
@@ -98,14 +98,14 @@ def get_interception(segment1: Segment, segment2: Segment):
         
     else:
 
-        if (identify(tmp1) == VERTICALLY):
-            constant: float = get_constant(tmp1)
-            m: float = get_derive(tmp2)
-            p: float = get_intercept(m, tmp2.start)
+        if (identify(inverted_segment1) == VERTICALLY):
+            constant: float = get_constant(inverted_segment1)
+            m: float = get_derive(inverted_segment2)
+            p: float = get_intercept(m, inverted_segment2.start)
         else:
-            constant: float = get_constant(tmp2)
-            m: float = get_derive(tmp1)
-            p: float = get_intercept(m, tmp1.start)
+            constant: float = get_constant(inverted_segment2)
+            m: float = get_derive(inverted_segment1)
+            p: float = get_intercept(m, inverted_segment1.start)
         
         x: float = constant
         y: float = config.MAP_SIZE_Y - (m * x + p)

From 8d19c467c75abc36822e261dbe17bbe72528de83 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 6 Feb 2024 14:16:29 +0100
Subject: [PATCH 34/77] game: clean: add coment

---
 games/objects/Game.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/games/objects/Game.py b/games/objects/Game.py
index e50a2ee..1cbc7be 100644
--- a/games/objects/Game.py
+++ b/games/objects/Game.py
@@ -107,19 +107,17 @@ class Game(AbstractRoom):
     
     def _player_join(self, user_id: int, socket: WebsocketConsumer):
         
-        # check if player is already connected
         player = self.get_player_by_user_id(user_id)
         if (player is None):
             return None
-        
+
+        # check if player is already connected
         if (player.is_connected()):
             player.disconnect(1001)
 
         player.socket = socket
         
         if (self.everbody_is_here()):
-            print("chie moi dessu")
-            print("start")
             self.start()
 
         self._update_player(player)

From 768af46c664c302e6dea960414b729ee6159d80d Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 6 Feb 2024 20:38:05 +0100
Subject: [PATCH 35/77] game: clean remove unuse functionj

---
 games/routine.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/games/routine.py b/games/routine.py
index 5f91287..b3dd8c9 100644
--- a/games/routine.py
+++ b/games/routine.py
@@ -35,10 +35,6 @@ def get_sign(num: float) -> int:
     if (num < 0):
         return -1
 
-def simplify_angle(angle: float):
-    
-    return (angle + 2 * math.pi) % (2 * math.pi)
-
 def get_derive(segment: Segment) -> float:
     
     if (segment.start.x == segment.stop.x):

From cc4c09fd0d5f818963e4d6a9cc698bb1a081d1ba Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Wed, 7 Feb 2024 14:50:03 +0100
Subject: [PATCH 36/77] game: add: wall collision

---
 games/routine.py | 44 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/games/routine.py b/games/routine.py
index b3dd8c9..00f70a9 100644
--- a/games/routine.py
+++ b/games/routine.py
@@ -110,7 +110,7 @@ def get_interception(segment1: Segment, segment2: Segment):
     
     return impact
 
-def get_impact_point(segments: list[Segment], ball: Ball):    
+def get_impact_point(segments: list[Segment], ball: Ball) -> dict:
     
     cos: float = round(math.cos(ball.angle), 6)
     sin: float = round(math.sin(ball.angle), 6)
@@ -119,7 +119,7 @@ def get_impact_point(segments: list[Segment], ball: Ball):
 
     ball_segment = Segment(ball.position, point)
 
-    closest: Point = None
+    closest: dict = None
 
     for segment in segments:
 
@@ -139,22 +139,46 @@ def get_impact_point(segments: list[Segment], ball: Ball):
         impact.x += (ball.size / 2) * get_sign(cos) * (-1)
         impact.y += (ball.size / 2) * get_sign(sin)
 
-        if (closest is None or impact.distance(ball.position) < closest.distance(ball.position)):
-            closest = impact
+        if (closest is None or impact.distance(ball.position) < closest.get("distance")):
+            closest = {
+                "impact": impact,
+                "segment": segment,
+                "distance": impact.distance(ball.position),
+            }
 
     return closest
+
+def wall_colision(ball_angle: float, wall_angle: float) -> float:
+
+    ball_cos: float = math.cos(ball_angle)
+    ball_sin: float = math.sin(ball_angle)
+
+    incident_angle: float = ball_angle - wall_angle
+
+    reflection_angle: float = wall_angle - incident_angle
+
+    new_cos: float = math.cos(reflection_angle)
+    new_sin: float = math.sin(reflection_angle)
+
+    new_angle: float = math.atan2(new_sin, new_cos)
+
+    return new_angle
+
+async def update_ball(game: Game, impact: dict):
     
-async def update_ball(game: Game, impact: Point):
-    
-    distance: float = impact.distance(game.ball.position)
+    distance: float = impact.get("distance")
     
     time_before_impact: float = distance / game.ball.speed
     
     await asyncio.sleep(time_before_impact)
     
-    game.ball.angle = game.ball.angle + math.pi
+    segment: Segment = impact.get("segment")
+
+    wall_angle: float = math.atan2(segment.stop.y - segment.start.y, segment.stop.x - segment.start.x)
+
+    game.ball.angle = wall_colision(game.ball.angle, wall_angle)
     
-    game.ball.position = impact
+    game.ball.position = impact.get("impact")
 
     await SyncToAsync(game.broadcast)("update_ball", game.ball.to_dict())
 
@@ -164,7 +188,7 @@ async def render(game: Game):
         
         segments: list[Segment] = [player.rail for player in game.players] + [wall.rail for wall in game.walls]
 
-        impact = get_impact_point(segments, game.ball, )
+        impact: dict = get_impact_point(segments, game.ball, )
         
         await update_ball(game, impact)
 

From a265c0bd19bc8896d29f493aa015541a604a9bc2 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Wed, 7 Feb 2024 21:53:36 +0100
Subject: [PATCH 37/77] fix: 2MB size limit on profile picture upload

---
 profiles/viewsets.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/profiles/viewsets.py b/profiles/viewsets.py
index 425cceb..1d902b5 100644
--- a/profiles/viewsets.py
+++ b/profiles/viewsets.py
@@ -56,11 +56,11 @@ class MyProfileViewSet(viewsets.ModelViewSet):
     def perform_update(self, serializer, pk=None):
         profile: ProfileModel = self.get_object()
         avatar = self.request.data.get("file", None)
-        if (avatar is not None):
+        if (avatar is not None and avatar.size <= 2 * 1024 * 1024):
             if (profile.avatar_url.name != "./profiles/static/avatars/default.avif"):
                 profile.avatar_url.storage.delete(profile.avatar_url.name)
             profile.avatar_url = avatar
-        profile.save()
+            profile.save()
     
     def retrieve(self, request: HttpRequest, pk=None):
         instance: ProfileModel = self.get_object()

From f2981f6309010f824deca9012f988022c0ad595c Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Wed, 7 Feb 2024 22:03:59 +0100
Subject: [PATCH 38/77] pp upload: js verification

---
 frontend/static/js/views/MeView.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frontend/static/js/views/MeView.js b/frontend/static/js/views/MeView.js
index 357c072..4362d3e 100644
--- a/frontend/static/js/views/MeView.js
+++ b/frontend/static/js/views/MeView.js
@@ -78,11 +78,17 @@ export default class extends AbstractAuthentificateView
 
         if (avatar.files[0] !== undefined)
         {
+			if (avatar.files[0].size > 2 * 1024 * 1024) {
+				document.getElementById("save-profile").classList.add('text-danger');
+				document.getElementById("save-profile").innerHTML = "Image too large :/";
+				return;
+			}
             let form_data = new FormData();
             form_data.append("file", avatar.files[0]);
             await client.me.change_avatar(form_data);
 			this.display_avatar();
         }
+		document.getElementById("save-profile").classList.remove('text-danger');
         document.getElementById("save-profile").innerHTML = "Saved";
     }
 

From 9e86af98262c34de3d0c34df33f39f826d272676 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Thu, 8 Feb 2024 08:54:13 +0100
Subject: [PATCH 39/77] pp upload: size limit in django settings

---
 profiles/models.py        | 2 +-
 profiles/viewsets.py      | 6 ++++--
 transcendence/settings.py | 4 ++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/profiles/models.py b/profiles/models.py
index aaa2daa..aaff1ad 100644
--- a/profiles/models.py
+++ b/profiles/models.py
@@ -14,7 +14,7 @@ def upload_to(instance, filename: str):
 # Create your models here.
 class ProfileModel(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
-    avatar_url = models.ImageField(upload_to=upload_to, default="./profiles/static/avatars/default.avif") #blank=True, null=True)
+    avatar_url = models.ImageField(upload_to=upload_to, default="./profiles/static/avatars/default.avif")
     
     def get_game(self) -> int:
         for game in game_manager._game_list:
diff --git a/profiles/viewsets.py b/profiles/viewsets.py
index 1d902b5..60725e1 100644
--- a/profiles/viewsets.py
+++ b/profiles/viewsets.py
@@ -8,6 +8,8 @@ from rest_framework.authentication import SessionAuthentication
 from django.http import HttpRequest
 from django.db.models import QuerySet
 from django.contrib.auth.models import User
+from django.core.files.uploadedfile import InMemoryUploadedFile
+from django.conf import settings
 
 from .serializers import ProfileSerializer
 from .models import ProfileModel
@@ -55,8 +57,8 @@ class MyProfileViewSet(viewsets.ModelViewSet):
 
     def perform_update(self, serializer, pk=None):
         profile: ProfileModel = self.get_object()
-        avatar = self.request.data.get("file", None)
-        if (avatar is not None and avatar.size <= 2 * 1024 * 1024):
+        avatar : InMemoryUploadedFile = self.request.data.get("file", None)
+        if (avatar is not None and avatar.size <= settings.PROFILE_PICTURE_MAX_SIZE):
             if (profile.avatar_url.name != "./profiles/static/avatars/default.avif"):
                 profile.avatar_url.storage.delete(profile.avatar_url.name)
             profile.avatar_url = avatar
diff --git a/transcendence/settings.py b/transcendence/settings.py
index f6193a8..7e4fe90 100644
--- a/transcendence/settings.py
+++ b/transcendence/settings.py
@@ -160,3 +160,7 @@ STATIC_URL = 'static/'
 # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+# Profile picture upload limit
+
+PROFILE_PICTURE_MAX_SIZE = 2 * 1024 * 1024 # 2MB

From e669cb21ca92dbb1724682381c3c9cda28497e43 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Thu, 8 Feb 2024 09:17:56 +0100
Subject: [PATCH 40/77] offline game: fix: reset game doesnt duplicate scores
 display

---
 frontend/static/js/views/GameOfflineView.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/static/js/views/GameOfflineView.js b/frontend/static/js/views/GameOfflineView.js
index 62c3066..a7dc96e 100644
--- a/frontend/static/js/views/GameOfflineView.js
+++ b/frontend/static/js/views/GameOfflineView.js
@@ -19,6 +19,10 @@ export default class extends AbstractView {
 		document.getElementById('stopGameButton').onclick = this.stopGame.bind(this);
 	}
 
+	async leavePage() {
+		this.game?.cleanup();
+	}
+
 	startGame() {
 		if (this.game == null) {
 			document.getElementById('startGameButton').innerHTML = 'Reset Game';
@@ -26,6 +30,7 @@ export default class extends AbstractView {
 		}
 		else {
 			document.getElementById('app').removeChild(this.game.canvas);
+			document.getElementById('app').removeChild(this.game.scoresDisplay);
 			this.game.cleanup();
 			this.game = new Game;
 		}

From 1dea678a04cf131c59a2dffdc5fae7933f70bc65 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Thu, 8 Feb 2024 09:25:32 +0100
Subject: [PATCH 41/77] game: fix: unregister_key now works

---
 frontend/static/js/views/GameView.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/static/js/views/GameView.js b/frontend/static/js/views/GameView.js
index 7242add..11f5580 100644
--- a/frontend/static/js/views/GameView.js
+++ b/frontend/static/js/views/GameView.js
@@ -13,7 +13,7 @@ export default class extends AbstractView
         this.my_player = undefined;
     }
 
-	keyStretchHandler(event)
+	keyReleaseHandler(event)
     {
 		const idx = this.keys_pressed.indexOf(event.key);
 		if (idx != -1)
@@ -63,14 +63,16 @@ export default class extends AbstractView
 
     register_key()
     {
-        document.addEventListener('keydown', this.keyPressHandler.bind(this));
-		document.addEventListener('keyup', this.keyStretchHandler.bind(this));
+		this.keyPressHandler = this.keyPressHandler.bind(this);
+		this.keyReleaseHandler = this.keyReleaseHandler.bind(this);
+        document.addEventListener('keydown', this.keyPressHandler);
+		document.addEventListener('keyup', this.keyReleaseHandler);
     }
 
     unregister_key()
     {
         document.removeEventListener('keydown', this.keyPressHandler);
-		document.removeEventListener('keyup', this.keyStretchHandler);
+		document.removeEventListener('keyup', this.keyReleaseHandler);
     }
 
     async join_game()

From 55d3ea40f62a5fda74b177d1cca43e8ed7d5a5bb Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Thu, 8 Feb 2024 10:09:36 +0100
Subject: [PATCH 42/77] ux: Me becomes Settings; backend: fix special usernames
 (me, block...)

---
 frontend/static/css/{me.css => settings.css}            | 0
 frontend/static/js/api/MyProfile.js                     | 6 +++---
 frontend/static/js/api/client.js                        | 2 +-
 frontend/static/js/api/profile.js                       | 2 +-
 frontend/static/js/index.js                             | 4 ++--
 frontend/static/js/lang/en.json                         | 2 +-
 frontend/static/js/lang/fr.json                         | 2 +-
 frontend/static/js/views/HomeView.js                    | 2 +-
 frontend/static/js/views/{MeView.js => SettingsView.js} | 4 ++--
 frontend/templates/index.html                           | 2 +-
 profiles/urls.py                                        | 9 ++++-----
 11 files changed, 17 insertions(+), 18 deletions(-)
 rename frontend/static/css/{me.css => settings.css} (100%)
 rename frontend/static/js/views/{MeView.js => SettingsView.js} (97%)

diff --git a/frontend/static/css/me.css b/frontend/static/css/settings.css
similarity index 100%
rename from frontend/static/css/me.css
rename to frontend/static/css/settings.css
diff --git a/frontend/static/js/api/MyProfile.js b/frontend/static/js/api/MyProfile.js
index de3f46e..fb4a9fd 100644
--- a/frontend/static/js/api/MyProfile.js
+++ b/frontend/static/js/api/MyProfile.js
@@ -9,7 +9,7 @@ class MyProfile extends Profile
 	 */
 	constructor (client)
 	{
-		super(client, "me")
+		super(client, "../me")
 	}
 
 	/**
@@ -19,7 +19,7 @@ class MyProfile extends Profile
 	 */
 	async change_avatar(form_data)
 	{
-		let response = await this.client._patch_file(`/api/profiles/me`, form_data);
+		let response = await this.client._patch_file(`/api/profiles/settings`, form_data);
 		let response_data = await response.json()
 
 		return response_data;
@@ -27,4 +27,4 @@ class MyProfile extends Profile
 
 }
 
-export {MyProfile}
\ No newline at end of file
+export {MyProfile}
diff --git a/frontend/static/js/api/client.js b/frontend/static/js/api/client.js
index 7e7a183..5df70bf 100644
--- a/frontend/static/js/api/client.js
+++ b/frontend/static/js/api/client.js
@@ -150,7 +150,7 @@ class Client
 	async _patch_json(uri, data)
     {
         let response = await fetch(this._url + uri, {
-			ethod: "PATCH",
+			method: "PATCH",
 			headers: {
 				"X-CSRFToken": getCookie("csrftoken"),
 				"Content-Type": "application/json",
diff --git a/frontend/static/js/api/profile.js b/frontend/static/js/api/profile.js
index 2b57a04..8fcc6bf 100644
--- a/frontend/static/js/api/profile.js
+++ b/frontend/static/js/api/profile.js
@@ -42,7 +42,7 @@ class Profile
 	{
 		let response;
 		if (this.username !== undefined)
-			response = await this.client._get(`/api/profiles/${this.username}`);
+			response = await this.client._get(`/api/profiles/user/${this.username}`);
 		else 
 			response = await this.client._get(`/api/profiles/id/${this.id}`);
 
diff --git a/frontend/static/js/index.js b/frontend/static/js/index.js
index a3111d2..911920a 100644
--- a/frontend/static/js/index.js
+++ b/frontend/static/js/index.js
@@ -12,7 +12,7 @@ import GameView from "./views/GameView.js";
 import PageNotFoundView from './views/PageNotFoundView.js' 
 
 import AbstractRedirectView from "./views/abstracts/AbstractRedirectView.js";
-import MeView from "./views/MeView.js";
+import SettingsView from "./views/SettingsView.js";
 import ProfilePageView from "./views/ProfilePageView.js";
 import MatchMakingView from "./views/MatchMakingView.js";
 import TournamentPageView from "./views/tournament/TournamentPageView.js";
@@ -82,7 +82,7 @@ const router = async(uri) => {
         { path: "/register", view: RegisterView },
         { path: "/search", view: Search },
         { path: "/home", view: HomeView },
-        { path: "/me", view: MeView },
+        { path: "/settings", view: SettingsView },
         { path: "/matchmaking", view: MatchMakingView },
         { path: "/games/offline", view: GameOfflineView },
         { path: "/games/:id", view: GameView },
diff --git a/frontend/static/js/lang/en.json b/frontend/static/js/lang/en.json
index b6ad271..8bd8b4b 100644
--- a/frontend/static/js/lang/en.json
+++ b/frontend/static/js/lang/en.json
@@ -10,7 +10,7 @@
 	"homeTitle": "Home",
 	"homeOnline": "Play online",
 	"homeOffline": "Play offline",
-	"homeMe": "Me",
+	"homeSettings": "Settings",
 	"homeLogout": "Logout",
 	"loginWindowTitle": "Login",
 	"loginFormTitle": "Login",
diff --git a/frontend/static/js/lang/fr.json b/frontend/static/js/lang/fr.json
index be38190..06d2434 100644
--- a/frontend/static/js/lang/fr.json
+++ b/frontend/static/js/lang/fr.json
@@ -10,7 +10,7 @@
 	"homeTitle": "Maison",
 	"homeOnline": "Jouer en ligne",
 	"homeOffline": "Jouer hors ligne",
-	"homeMe": "Moi",
+	"homeSettings": "Paramètres",
 	"homeLogout": "Déconnexion",
 	"loginWindowTitle": "Connexion",
 	"loginFormTitle": "Connexion",
diff --git a/frontend/static/js/views/HomeView.js b/frontend/static/js/views/HomeView.js
index 458af60..8ac3ea2 100644
--- a/frontend/static/js/views/HomeView.js
+++ b/frontend/static/js/views/HomeView.js
@@ -12,7 +12,7 @@ export default class extends AbstractAuthentificateView {
 			<h1>${lang.get('homeTitle', 'Home')}</h1>
             <a href="/matchmaking" data-link>${lang.get('homeOnline', 'Play online')}</a>
             <a href="/games/offline" data-link>${lang.get('homeOffline', 'Play offline')}</a>
-            <a href="/me" data-link>${lang.get('homeMe', 'Me')}</a>
+            <a href="/settings" data-link>${lang.get('homeSettings', 'Settings')}</a>
             <a href="/logout" data-link>${lang.get('homeLogout', 'Logout')}</a>
         `;
     }
diff --git a/frontend/static/js/views/MeView.js b/frontend/static/js/views/SettingsView.js
similarity index 97%
rename from frontend/static/js/views/MeView.js
rename to frontend/static/js/views/SettingsView.js
index 4362d3e..d22024c 100644
--- a/frontend/static/js/views/MeView.js
+++ b/frontend/static/js/views/SettingsView.js
@@ -6,7 +6,7 @@ export default class extends AbstractAuthentificateView
 {    
     constructor(params)
     {
-        super(params, "Me");
+        super(params, "Settings");
 	}
 
     async postInit()
@@ -95,7 +95,7 @@ export default class extends AbstractAuthentificateView
     async getHtml()
     {
         return /* HTML */ `
-            <link rel="stylesheet" href="/static/css/me.css">
+            <link rel="stylesheet" href="/static/css/settings.css">
 			<h1>ME</h1>
             <div id="main">
 				<div class="avatar">
diff --git a/frontend/templates/index.html b/frontend/templates/index.html
index 585f672..2d62ab7 100644
--- a/frontend/templates/index.html
+++ b/frontend/templates/index.html
@@ -36,7 +36,7 @@
 				</a>
 				<div class='dropdown-menu dropdown-menu-end position-absolute text-end px-2' style='min-width: 100px'>
 					<a data-i18n='navbarProfile' id='myProfileLink' href='' class="dropdow-item nav-link pt-1" data-link>My Profile</a>
-					<a data-i18n='navbarSettings' href="/me" class="dropdow-item nav-link pt-0" data-link>Settings</a>
+					<a data-i18n='navbarSettings' href="/settings" class="dropdow-item nav-link pt-0" data-link>Settings</a>
 					<hr class='dropdown-separator my-auto mx-1'></hr>
 					<a data-i18n='navbarLogout' href="/logout" class="dropdow-item nav-link pb-1" data-link>Logout</a>
 				</div>
diff --git a/profiles/urls.py b/profiles/urls.py
index d0904f6..d2f5bb4 100644
--- a/profiles/urls.py
+++ b/profiles/urls.py
@@ -1,17 +1,16 @@
 from django.urls import path
-from django.conf import settings
-from django.conf.urls.static import static
 
 from . import viewsets
 from . import views
 
 urlpatterns = [
-    path("me", viewsets.MyProfileViewSet.as_view({'patch': 'partial_update', 'get': 'retrieve'}), name="my_profile_page"),
+    path("settings", viewsets.MyProfileViewSet.as_view({'patch': 'partial_update'}), name="my_profile_page"),
+    path("me", viewsets.MyProfileViewSet.as_view({'get': 'retrieve'}), name="my_profile_page"),
     path("", viewsets.ProfileViewSet.as_view({'get': 'list'}), name="profiles_list"),
 	path("block", views.BlocksView.as_view(), name="block_page"),
 	path("block/<int:pk>", views.BlockView.as_view(), name="block_page"),
 	path("friend", views.FriendsView.as_view(), name="friend_page"),
-    path("<str:username>", viewsets.ProfileViewSet.as_view({'get': 'retrieve'}), name="profile_page"),
+    path("user/<str:username>", viewsets.ProfileViewSet.as_view({'get': 'retrieve'}), name="profile_page"),
     path("id/<int:pk>", viewsets.ProfileViewSet.as_view({'get': 'retrieve_id'}), name="profile_page"),
 
-] + static("/staqic/avatars/", document_root="./avatars")
+]

From e81af939c1f221d355226cbee57768eef625fa62 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Thu, 8 Feb 2024 10:15:05 +0100
Subject: [PATCH 43/77] fix: type hint

---
 tournament/serializers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tournament/serializers.py b/tournament/serializers.py
index c1aba61..bdfcfb3 100644
--- a/tournament/serializers.py
+++ b/tournament/serializers.py
@@ -15,7 +15,7 @@ class TournamentSerializer(serializers.ModelSerializer):
 		fields = ["name", "nb_players", "nb_players_by_game", "level", "started", "finished", "levels", "id"]
 
 	def get_levels(self, instance: TournamentModel):
-		levels: [[int]] = []
+		levels: list[list[int]] = []
 		for i in range(instance.level):
 			games_id: [int] = instance.get_games_id_by_level(i)
 			if (games_id == []):

From 33a8b3f148c111202846eda2a436ef73172af197 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Thu, 8 Feb 2024 10:48:31 +0100
Subject: [PATCH 44/77] lang: display current language on dropdown link

---
 frontend/static/js/api/LanguageManager.js | 4 ++++
 frontend/templates/index.html             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/static/js/api/LanguageManager.js b/frontend/static/js/api/LanguageManager.js
index 2c9ebb5..4c2a6d0 100644
--- a/frontend/static/js/api/LanguageManager.js
+++ b/frontend/static/js/api/LanguageManager.js
@@ -13,6 +13,8 @@ export default class LanguageManager {
 		} else {
 			this.loadDict(this.chosenLang);
 		}
+		document.getElementById('languageDisplay').innerHTML =
+			document.querySelector(`#languageSelector > [value=${this.currentLang}]`)?.innerHTML;
 	}
 
 	async translatePage() {
@@ -42,6 +44,8 @@ export default class LanguageManager {
 
 		this.currentLang = this.chosenLang;
 		localStorage.setItem('preferedLanguage', lang);
+		document.getElementById('languageDisplay').innerHTML =
+			document.querySelector(`#languageSelector > [value=${this.currentLang}]`)?.innerHTML;
 		return 0;
 	}
 
diff --git a/frontend/templates/index.html b/frontend/templates/index.html
index 2d62ab7..06786f0 100644
--- a/frontend/templates/index.html
+++ b/frontend/templates/index.html
@@ -18,7 +18,7 @@
 		</div>
 		<div class="navbar-nav justify-content-end d-flex flex-row gap-2">
 			<div class='nav-item dropdown-center me-2'>
-				<a class='nav-link dropdown-toggle' role='button' data-bs-toggle='dropdown'>
+				<a id='languageDisplay' class='nav-link dropdown-toggle' role='button' data-bs-toggle='dropdown'>
 					Lang.
 				</a>
 				<div id='languageSelector' class='dropdown-menu dropdown-menu-end position-absolute text-center px-2' style='min-width: 65px'>

From f965b270a05732f5251c8b19d3c0f2e9f0360d05 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Thu, 8 Feb 2024 11:23:25 +0100
Subject: [PATCH 45/77] settings: refreh avatar on change + size limit in var

---
 frontend/static/js/views/SettingsView.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/static/js/views/SettingsView.js b/frontend/static/js/views/SettingsView.js
index d22024c..ab44678 100644
--- a/frontend/static/js/views/SettingsView.js
+++ b/frontend/static/js/views/SettingsView.js
@@ -7,6 +7,7 @@ export default class extends AbstractAuthentificateView
     constructor(params)
     {
         super(params, "Settings");
+		this.PROFILE_PICTURE_MAX_SIZE = 2 * 1024 * 1024; // 2MB
 	}
 
     async postInit()
@@ -24,7 +25,7 @@ export default class extends AbstractAuthentificateView
 				document.getElementById("avatar").remove();
 			let avatar = document.createElement("img");
 			avatar.id = "avatar";
-			avatar.src = profile.avatar_url;
+			avatar.src = profile.avatar_url + '?t=' +new Date().getTime();
 			document.getElementsByClassName("avatar")[0].appendChild(avatar);
 		}
 	}
@@ -78,7 +79,7 @@ export default class extends AbstractAuthentificateView
 
         if (avatar.files[0] !== undefined)
         {
-			if (avatar.files[0].size > 2 * 1024 * 1024) {
+			if (avatar.files[0].size > this.PROFILE_PICTURE_MAX_SIZE) {
 				document.getElementById("save-profile").classList.add('text-danger');
 				document.getElementById("save-profile").innerHTML = "Image too large :/";
 				return;

From e8cc05fb3c601d42f98971a42080001bb942b439 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Thu, 8 Feb 2024 12:38:56 +0100
Subject: [PATCH 46/77] game: add: goal work

---
 frontend/static/js/api/game/Player.js  | 68 ++++++------------
 frontend/static/js/api/game/Segment.js | 24 +++++++
 games/objects/Ball.py                  | 20 ++++--
 games/objects/Segment.py               | 14 +++-
 games/routine.py                       | 95 ++++++++++++++++++++++----
 5 files changed, 150 insertions(+), 71 deletions(-)

diff --git a/frontend/static/js/api/game/Player.js b/frontend/static/js/api/game/Player.js
index 8736db1..728d0e6 100644
--- a/frontend/static/js/api/game/Player.js
+++ b/frontend/static/js/api/game/Player.js
@@ -43,26 +43,6 @@ class Player
          * @type {Segment}
          */
         this.rail = rail === undefined ? new Segment() : rail;
-
-        /**
-         * @type {Number}
-         */
-        this.rail_size = Math.abs(this.rail.stop.x - this.rail.start.x) + Math.abs(this.rail.stop.y - this.rail.start.y);
- 
-        /**
-         * @type {Number}
-         */
-        this.paddle_size = this.rail_size * this.game.config.paddle_ratio;
- 
-        /**
-         * @type {Number}
-         */
-        this.diff_x = this.rail.stop.x - this.rail.start.x;
-
-        /**
-         * @type {Number}
-         */
-        this.diff_y = this.rail.stop.y - this.rail.start.y;
     }
 
     /**
@@ -85,17 +65,29 @@ class Player
             ctx.lineTo(this.rail.stop.x, this.rail.stop.y);
             return;
         }
-        let paddle_pos = new Point(this.rail.start.x + this.diff_x * this.position,
-                                   this.rail.start.y + this.diff_y * this.position);
 
+        let diff_x = this.rail.stop.x - this.rail.start.x,
+            diff_y = this.rail.stop.y - this.rail.start.y;
+
+        let rail_length = this.rail.len(),
+            paddle_length = rail_length * this.game.config.paddle_ratio;
+
+        let paddle_center = new Point(this.rail.start.x + diff_x * this.position,
+                                      this.rail.start.y + diff_y * this.position);
+
+        let paddle_start_x = paddle_center.x - (diff_x * (paddle_length / 2 / rail_length)),
+            paddle_start_y = paddle_center.y - (diff_y * (paddle_length / 2 / rail_length)),
+            paddle_stop_x = paddle_center.x + (diff_x * (paddle_length / 2 / rail_length)),
+            paddle_stop_y = paddle_center.y + (diff_y * (paddle_length / 2 / rail_length));
         
-        let start_x = paddle_pos.x - (this.diff_x * (this.paddle_size / 2 / this.rail_size)),
-            start_y = paddle_pos.y - (this.diff_y * (this.paddle_size / 2 / this.rail_size)),
-            stop_x = paddle_pos.x + (this.diff_x * (this.paddle_size / 2 / this.rail_size)),
-            stop_y = paddle_pos.y + (this.diff_y * (this.paddle_size / 2 / this.rail_size));
+        let paddle_start = new Point(paddle_start_x, paddle_start_y),
+            paddle_stop = new Point (paddle_stop_x, paddle_stop_y);
+        
+        let paddle = new Segment(paddle_start, paddle_stop);
+        
+        console.log(paddle)
 
-        ctx.moveTo(start_x, start_y);
-        ctx.lineTo(stop_x, stop_y);
+        paddle.draw(ctx);
     }
 
     from_json(data)
@@ -125,26 +117,6 @@ class Player
          */
         this.rail = this.rail.from_json(data.rail);
 
-        /**
-         * @type {Number}
-         */
-        this.rail_size = Math.abs(this.rail.stop.x - this.rail.start.x) + Math.abs(this.rail.stop.y - this.rail.start.y);
-
-        /**
-         * @type {Number}
-         */
-        this.paddle_size = this.rail_size * this.game.config.paddle_ratio;
-
-        /**
-         * @type {Number}
-         */
-        this.diff_x = this.rail.stop.x - this.rail.start.x;
-        
-        /**
-         * @type {Number}
-         */
-        this.diff_y = this.rail.stop.y - this.rail.start.y;
-
         return this
     }
 }
diff --git a/frontend/static/js/api/game/Segment.js b/frontend/static/js/api/game/Segment.js
index 7d6fedc..5c146e8 100644
--- a/frontend/static/js/api/game/Segment.js
+++ b/frontend/static/js/api/game/Segment.js
@@ -8,8 +8,32 @@ class Segment
      */
     constructor(start, stop)
     {
+        /**
+         * @type {Point}
+         */
         this.start = start === undefined ? new Point() : start;
+
+        /**
+         * @type {Point}
+         */
         this.stop = stop === undefined ? new Point() : stop;
+
+    }
+
+    angle()
+    {
+        let x = this.start.x - this.stop.x,
+            y = this.start.y - this.stop.y;
+
+        return Math.atan2(y, x);
+    }
+
+    len()
+    {
+        let x = this.start.x - this.stop.x,
+            y = this.start.y - this.stop.y;
+
+        return (x ** 2 + y ** 2) ** (1 / 2);
     }
 
     /**
diff --git a/games/objects/Ball.py b/games/objects/Ball.py
index bb8b8ab..4c03d0d 100644
--- a/games/objects/Ball.py
+++ b/games/objects/Ball.py
@@ -8,12 +8,20 @@ import math
 class Ball:
     
     def __init__(self) -> None:
-        self.size: float = config.BALL_SIZE
-        self.position: Point = Point(config.BALL_SPAWN_POS_X + self.size / 2, config.BALL_SPAWN_POS_Y + self.size / 2)
-        self.angle: float = math.pi * 0.25
-        self.speed: float = config.BALL_SPEED_START
+        self.size: float
+        self.position: Point
+        self.angle: float
+        self.speed: float
+        
+        self.reset()
     
-    def to_dict(self):
+    def reset(self) -> None:
+        self.size = config.BALL_SIZE
+        self.position = Point(config.BALL_SPAWN_POS_X + self.size / 2, config.BALL_SPAWN_POS_Y + self.size / 2)
+        self.angle = math.pi * 1
+        self.speed = config.BALL_SPEED_START
+    
+    def to_dict(self) -> dict:
         
         data: dict = {
             "size": self.size,
@@ -25,4 +33,4 @@ class Ball:
         return data
     
     def __str__(self) -> str:
-        return f"Ball(size: {self.size}, speed: {self.speed}, director_coefficient: {self.director_coefficient}, ordinate_at_origin: {self.ordinate_at_origin}, position: {self.position})"
\ No newline at end of file
+        return f"Ball(size: {self.size}, speed: {self.speed}, angle: {self.angle}, position: {self.position})"
\ No newline at end of file
diff --git a/games/objects/Segment.py b/games/objects/Segment.py
index b785756..fc62ada 100644
--- a/games/objects/Segment.py
+++ b/games/objects/Segment.py
@@ -1,13 +1,23 @@
 
 from .Point import Point
+from .Vector import Vector
 
 import math
+
 class Segment:
     
     def __init__(self, start: Point, stop: Point) -> None:
         self.start: Point = start
         self.stop: Point = stop
-        self.length: float = math.dist((self.start.x, self.start.y), (self.stop.x, self.stop.y))
+
+    def angle(self):
+        return math.atan2((self.start.x - self.start.y), (self.stop.x - self.stop.y))
+        
+    def length(self):
+        return self.start.distance(self.stop)
+    
+    def is_on(self, C: Point):
+        return (self.start.distance(C) + self.stop.distance(C) == self.length())
     
     def __repr__(self) -> str:
         return f"Segment(start: {self.start}, stop: {self.stop})"
@@ -18,7 +28,7 @@ class Segment:
     def copy(self):
         return Segment(self.start.copy(), self.stop.copy())
     
-    def to_dict(self):
+    def to_dict(self) -> dict:
         
         data: dict[str: dict] = {
             "start": self.start.to_dict(),
diff --git a/games/routine.py b/games/routine.py
index 00f70a9..2c01d08 100644
--- a/games/routine.py
+++ b/games/routine.py
@@ -136,19 +136,22 @@ def get_impact_point(segments: list[Segment], ball: Ball) -> dict:
         if (get_sign(diff_y) != get_sign(sin) and sin != 0):
             continue
         
-        impact.x += (ball.size / 2) * get_sign(cos) * (-1)
-        impact.y += (ball.size / 2) * get_sign(sin)
+        impact_with_padding: Point = impact.copy()
 
-        if (closest is None or impact.distance(ball.position) < closest.get("distance")):
+        impact_with_padding.x += (ball.size / 2) * get_sign(cos) * (-1)
+        impact_with_padding.y += (ball.size / 2) * get_sign(sin)
+
+        if (closest is None or impact_with_padding.distance(ball.position) < closest.get("distance")):
             closest = {
+                "impact_with_padding": impact_with_padding,
                 "impact": impact,
                 "segment": segment,
-                "distance": impact.distance(ball.position),
+                "distance": impact_with_padding.distance(ball.position),
             }
 
     return closest
 
-def wall_colision(ball_angle: float, wall_angle: float) -> float:
+def wall_collision(ball_angle: float, wall_angle: float) -> float:
 
     ball_cos: float = math.cos(ball_angle)
     ball_sin: float = math.sin(ball_angle)
@@ -164,21 +167,83 @@ def wall_colision(ball_angle: float, wall_angle: float) -> float:
 
     return new_angle
 
-async def update_ball(game: Game, impact: dict):
+def paddle_collision(ball: Ball, impact: Point, player: Player):
+
+    diff_x: float = player.rail.stop.x - player.rail.start.x
+    diff_y: float = player.rail.stop.y - player.rail.start.y
     
-    distance: float = impact.get("distance")
+    paddle_center_x: float = player.rail.start.x + diff_x * player.position.position
+    paddle_center_y: float = player.rail.start.y + diff_y * player.position.position
+    
+    paddle_center: Point = Point(paddle_center_x, paddle_center_y)
+
+    rail_length: float = player.rail.length()
+    paddle_length: float =  rail_length * config.PADDLE_RATIO;
+    
+    print(paddle_length)
+    print(paddle_center)
+
+    start_x: float = paddle_center.x - (diff_x * (paddle_length / 2 / rail_length))
+    start_y: float = paddle_center.y - (diff_y * (paddle_length / 2 / rail_length))
+    stop_x: float = paddle_center.x + (diff_x * (paddle_length / 2 / rail_length))
+    stop_y: float = paddle_center.y + (diff_y * (paddle_length / 2 / rail_length))
+    
+    start: Point = Point(start_x, start_y)
+    stop: Point = Point(stop_x, stop_y)    
+    
+    paddle: Segment = Segment(start, stop)
+    
+    if (not paddle.is_on(impact)):
+        print(not paddle.is_on(impact))
+        return None
+    
+    return ball.angle + math.pi
+
+def collision(game: Game, impact_data: dict) -> bool:
+    
+    segment: Segment = impact_data.get("segment")
+    
+    player_hitted = None
+    for player in game.players:
+        if (not player.is_connected()):
+            continue
+        if (player.rail is segment):
+            player_hitted = player
+            break 
+
+    surface_angle: float = math.atan2(segment.start.y - segment.stop.y, segment.start.x - segment.stop.y)
+    
+    if (player_hitted is None):
+        
+        game.ball.angle = wall_collision(game.ball.angle, surface_angle)
+        
+        return True
+    else:
+        angle = paddle_collision(game.ball, impact_data.get("impact"), player_hitted)
+        
+        if (angle is None):
+            return False
+        
+        game.ball.angle = angle
+        
+        return True
+
+async def update_ball(game: Game, impact_data: dict) -> None:
+    
+    distance: float = impact_data.get("distance")
     
     time_before_impact: float = distance / game.ball.speed
     
     await asyncio.sleep(time_before_impact)
     
-    segment: Segment = impact.get("segment")
-
-    wall_angle: float = math.atan2(segment.stop.y - segment.start.y, segment.stop.x - segment.start.x)
-
-    game.ball.angle = wall_colision(game.ball.angle, wall_angle)
+    hit: bool = collision(game, impact_data)
     
-    game.ball.position = impact.get("impact")
+    if (hit == False):
+        await asyncio.sleep(0.1)
+        print("Goal")
+        game.ball.reset()
+    else:
+        game.ball.position = impact_data.get("impact_with_padding")
 
     await SyncToAsync(game.broadcast)("update_ball", game.ball.to_dict())
 
@@ -188,9 +253,9 @@ async def render(game: Game):
         
         segments: list[Segment] = [player.rail for player in game.players] + [wall.rail for wall in game.walls]
 
-        impact: dict = get_impact_point(segments, game.ball, )
+        impact_data: dict = get_impact_point(segments, game.ball)
         
-        await update_ball(game, impact)
+        await update_ball(game, impact_data)
 
 
 def routine(game: Game):

From 9aa885c49d450a1554863f19cb274645f2a9a3fd Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Thu, 8 Feb 2024 12:39:10 +0100
Subject: [PATCH 47/77] game: clean: type hint

---
 games/objects/Point.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games/objects/Point.py b/games/objects/Point.py
index 08a10da..d88de2a 100644
--- a/games/objects/Point.py
+++ b/games/objects/Point.py
@@ -23,7 +23,7 @@ class Point:
         
         return Point(self.x, self.y)
     
-    def to_dict(self):
+    def to_dict(self) -> dict:
         
         data: dict[str: float] = {
             "x": self.x,

From f6bb48e772ea3a18912226534519a0d3c1a9da56 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Thu, 8 Feb 2024 12:47:10 +0100
Subject: [PATCH 48/77] the tabulations must die

---
 accounts/serializers/login.py                 |  10 +-
 accounts/views/delete.py                      |  24 +-
 accounts/views/logged.py                      |   8 +-
 accounts/views/login.py                       |  22 +-
 accounts/views/logout.py                      |  10 +-
 accounts/views/register.py                    |  20 +-
 chat/consumersChat.py                         | 366 +++++-----
 chat/consumersNotice.py                       | 636 +++++++++---------
 chat/models.py                                |  36 +-
 chat/routing.py                               |   4 +-
 chat/tests.py                                 |  32 +-
 chat/views.py                                 |  50 +-
 games/models.py                               |  32 +-
 games/routing.py                              |   2 +-
 games/views.py                                |  26 +-
 matchmaking/consumers.py                      |  46 +-
 matchmaking/models.py                         |  40 +-
 matchmaking/routing.py                        |   2 +-
 profiles/models.py                            |  88 +--
 profiles/urls.py                              |   6 +-
 profiles/views.py                             | 102 +--
 tournament/consumers.py                       |  46 +-
 tournament/models.py                          | 214 +++---
 tournament/routing.py                         |   2 +-
 tournament/serializers.py                     |  58 +-
 tournament/test.py                            |  52 +-
 tournament/viewset.py                         |  70 +-
 transcendence/abstract/AbstractRoom.py        |  74 +-
 transcendence/abstract/AbstractRoomManager.py |  12 +-
 transcendence/abstract/AbstractRoomMember.py  |  24 +-
 transcendence/asgi.py                         |  16 +-
 transcendence/settings.py                     |  10 +-
 32 files changed, 1070 insertions(+), 1070 deletions(-)

diff --git a/accounts/serializers/login.py b/accounts/serializers/login.py
index 9fcbaff..b38fead 100644
--- a/accounts/serializers/login.py
+++ b/accounts/serializers/login.py
@@ -4,9 +4,9 @@ from django.core.exceptions import ValidationError
 
 class LoginSerializer(Serializer):
     
-	username = CharField()
-	password = CharField()
+    username = CharField()
+    password = CharField()
 
-	def get_user(self, data):
-		user = authenticate(username=data['username'], password=data['password'])
-		return user
\ No newline at end of file
+    def get_user(self, data):
+        user = authenticate(username=data['username'], password=data['password'])
+        return user
\ No newline at end of file
diff --git a/accounts/views/delete.py b/accounts/views/delete.py
index 9a83800..1333f7e 100644
--- a/accounts/views/delete.py
+++ b/accounts/views/delete.py
@@ -6,16 +6,16 @@ from django.http import HttpRequest
 from rest_framework.authentication import SessionAuthentication
 
 class DeleteView(APIView):
-	permission_classes = (permissions.IsAuthenticated,)
-	authentication_classes = (SessionAuthentication,)
-	def delete(self, request: HttpRequest):
-		data: dict = request.data
+    permission_classes = (permissions.IsAuthenticated,)
+    authentication_classes = (SessionAuthentication,)
+    def delete(self, request: HttpRequest):
+        data: dict = request.data
 
-		password: str = data["password"]
-		if (password is None):
-			return Response({"password": ["This field may not be blank."]})
-		if (request.user.check_password(password) == False):
-			return Response({"password": ["Password wrong."]})
-		request.user.delete()
-		logout(request)
-		return Response("user deleted", status=status.HTTP_200_OK)
\ No newline at end of file
+        password: str = data["password"]
+        if (password is None):
+            return Response({"password": ["This field may not be blank."]})
+        if (request.user.check_password(password) == False):
+            return Response({"password": ["Password wrong."]})
+        request.user.delete()
+        logout(request)
+        return Response("user deleted", status=status.HTTP_200_OK)
\ No newline at end of file
diff --git a/accounts/views/logged.py b/accounts/views/logged.py
index 1cc9cce..b67abe4 100644
--- a/accounts/views/logged.py
+++ b/accounts/views/logged.py
@@ -9,8 +9,8 @@ from ..serializers.login import LoginSerializer
 
 class LoggedView(APIView):
     
-	permission_classes = (permissions.AllowAny,)
-	authentication_classes = (SessionAuthentication,)
+    permission_classes = (permissions.AllowAny,)
+    authentication_classes = (SessionAuthentication,)
 
-	def get(self, request: HttpRequest):
-		return Response(status = (status.HTTP_200_OK if request.user.is_authenticated else status.HTTP_400_BAD_REQUEST))
+    def get(self, request: HttpRequest):
+        return Response(status = (status.HTTP_200_OK if request.user.is_authenticated else status.HTTP_400_BAD_REQUEST))
diff --git a/accounts/views/login.py b/accounts/views/login.py
index de5181f..d981f41 100644
--- a/accounts/views/login.py
+++ b/accounts/views/login.py
@@ -10,15 +10,15 @@ from ..serializers.login import LoginSerializer
 
 class LoginView(APIView):
     
-	permission_classes = (permissions.AllowAny,)
-	authentication_classes = (SessionAuthentication,)
+    permission_classes = (permissions.AllowAny,)
+    authentication_classes = (SessionAuthentication,)
 
-	def post(self, request: HttpRequest):
-		data = request.data
-		serializer = LoginSerializer(data=data)
-		serializer.is_valid(raise_exception=True)
-		user = serializer.get_user(data)
-		if user is None:
-			return Response({'login': [_('Invalid username or password.')]}, status.HTTP_401_UNAUTHORIZED)
-		login(request, user)
-		return Response({'id': user.pk}, status=status.HTTP_200_OK)
+    def post(self, request: HttpRequest):
+        data = request.data
+        serializer = LoginSerializer(data=data)
+        serializer.is_valid(raise_exception=True)
+        user = serializer.get_user(data)
+        if user is None:
+            return Response({'login': [_('Invalid username or password.')]}, status.HTTP_401_UNAUTHORIZED)
+        login(request, user)
+        return Response({'id': user.pk}, status=status.HTTP_200_OK)
diff --git a/accounts/views/logout.py b/accounts/views/logout.py
index f64e5b1..cee8868 100644
--- a/accounts/views/logout.py
+++ b/accounts/views/logout.py
@@ -6,8 +6,8 @@ from django.http import HttpRequest
 from rest_framework.authentication import SessionAuthentication
 
 class LogoutView(APIView):
-	permission_classes = (permissions.IsAuthenticated,)
-	authentication_classes = (SessionAuthentication,)
-	def get(self, request: HttpRequest):
-		logout(request)
-		return Response("user unlogged", status=status.HTTP_200_OK)
\ No newline at end of file
+    permission_classes = (permissions.IsAuthenticated,)
+    authentication_classes = (SessionAuthentication,)
+    def get(self, request: HttpRequest):
+        logout(request)
+        return Response("user unlogged", status=status.HTTP_200_OK)
\ No newline at end of file
diff --git a/accounts/views/register.py b/accounts/views/register.py
index 667ef2a..903609a 100644
--- a/accounts/views/register.py
+++ b/accounts/views/register.py
@@ -6,13 +6,13 @@ from django.http import HttpRequest
 from django.contrib.auth import login
 
 class RegisterView(APIView):
-	permission_classes = (permissions.AllowAny,)
-	def post(self, request: HttpRequest):
-		data = request.data
-		serializer = RegisterSerialiser(data=data)
-		if serializer.is_valid(raise_exception=True):
-			user = serializer.create(data)
-			if user:
-				login(request, user)
-				return Response("user created", status=status.HTTP_201_CREATED)
-		return Response(status=status.HTTP_400_BAD_REQUEST)
+    permission_classes = (permissions.AllowAny,)
+    def post(self, request: HttpRequest):
+        data = request.data
+        serializer = RegisterSerialiser(data=data)
+        if serializer.is_valid(raise_exception=True):
+            user = serializer.create(data)
+            if user:
+                login(request, user)
+                return Response("user created", status=status.HTTP_201_CREATED)
+        return Response(status=status.HTTP_400_BAD_REQUEST)
diff --git a/chat/consumersChat.py b/chat/consumersChat.py
index 2de3c68..289fe7c 100644
--- a/chat/consumersChat.py
+++ b/chat/consumersChat.py
@@ -8,244 +8,244 @@ import json
 
 class ChatConsumer(WebsocketConsumer):
 
-	def connect(self):
+    def connect(self):
 
-		user = self.scope["user"]
-		if (user.is_anonymous or not user.is_authenticated):
-			return
+        user = self.scope["user"]
+        if (user.is_anonymous or not user.is_authenticated):
+            return
 
-		channel_id : int = int(self.scope['url_route']['kwargs']['chat_id'])
+        channel_id : int = int(self.scope['url_route']['kwargs']['chat_id'])
 
-		if ChatMemberModel.objects.filter(member_id=user.pk, channel_id=int(channel_id)).count() != 1:
-			return
+        if ChatMemberModel.objects.filter(member_id=user.pk, channel_id=int(channel_id)).count() != 1:
+            return
 
-		if (self.channel_layer == None):
-			return
+        if (self.channel_layer == None):
+            return
 
-		self.room_group_name = f'chat{channel_id}'
+        self.room_group_name = f'chat{channel_id}'
 
-		async_to_sync(self.channel_layer.group_add)(
-			self.room_group_name,
-			self.channel_name
-		)
+        async_to_sync(self.channel_layer.group_add)(
+            self.room_group_name,
+            self.channel_name
+        )
 
-		self.accept()
+        self.accept()
 
 
-	def receive(self, text_data=None, bytes_data=None):
+    def receive(self, text_data=None, bytes_data=None):
 
-		if text_data == None:
-			return
+        if text_data == None:
+            return
 
-		user = self.scope["user"]
-		if (user.is_anonymous or not user.is_authenticated):
-			return
+        user = self.scope["user"]
+        if (user.is_anonymous or not user.is_authenticated):
+            return
 
-		text_data_json: dict = json.loads(text_data)
-		
-		message = text_data_json.get('message')
-		if (message is None):
-			return
-		
-		receivers_id = text_data_json.get('receivers_id')
-		if (receivers_id is None):
-			return
+        text_data_json: dict = json.loads(text_data)
+        
+        message = text_data_json.get('message')
+        if (message is None):
+            return
+        
+        receivers_id = text_data_json.get('receivers_id')
+        if (receivers_id is None):
+            return
 
-		channel_id : int = int(self.scope['url_route']['kwargs']['chat_id'])
+        channel_id : int = int(self.scope['url_route']['kwargs']['chat_id'])
 
-		if ChatMemberModel.objects.filter(member_id = user.pk, channel_id = channel_id).count() != 1:
-			return
+        if ChatMemberModel.objects.filter(member_id = user.pk, channel_id = channel_id).count() != 1:
+            return
 
-		if (self.channel_layer == None):
-			return
+        if (self.channel_layer == None):
+            return
 
-		message_time: int = int(time.time() * 1000)
-		
-		if (len(receivers_id) == 1 and 
-			BlockModel.objects.filter(blocker=user.pk, blocked=receivers_id[0]) or
-			BlockModel.objects.filter(blocker=receivers_id[0], blocked=user.pk)
-			):
-			return
+        message_time: int = int(time.time() * 1000)
+        
+        if (len(receivers_id) == 1 and 
+            BlockModel.objects.filter(blocker=user.pk, blocked=receivers_id[0]) or
+            BlockModel.objects.filter(blocker=receivers_id[0], blocked=user.pk)
+            ):
+            return
 
-		async_to_sync(self.channel_layer.group_send)(
-			self.room_group_name,
-			{
-				'type':'chat_message',
-				'author_id':user.pk,
-				'content':message,
-				'time':message_time,
-			}
-		)
-		
-		new_message = ChatMessageModel(
-				channel_id = channel_id, 
-				author_id = user.pk, 
-				content = message, 
-				time = message_time
-		).save()
+        async_to_sync(self.channel_layer.group_send)(
+            self.room_group_name,
+            {
+                'type':'chat_message',
+                'author_id':user.pk,
+                'content':message,
+                'time':message_time,
+            }
+        )
+        
+        new_message = ChatMessageModel(
+                channel_id = channel_id, 
+                author_id = user.pk, 
+                content = message, 
+                time = message_time
+        ).save()
 
-	def chat_message(self, event):
+    def chat_message(self, event):
 
-		user = self.scope["user"]
-		if (user.is_anonymous or not user.is_authenticated):
-			return
+        user = self.scope["user"]
+        if (user.is_anonymous or not user.is_authenticated):
+            return
 
-		channel_id: int = int(self.scope['url_route']['kwargs']['chat_id'])
+        channel_id: int = int(self.scope['url_route']['kwargs']['chat_id'])
 
-		if ChatMemberModel.objects.filter(member_id=user.pk, channel_id=channel_id).count() != 1:
-			return
+        if ChatMemberModel.objects.filter(member_id=user.pk, channel_id=channel_id).count() != 1:
+            return
 
-		self.send(text_data=json.dumps({
-			'type':'chat',
-			'author_id':event['author_id'],
-			'content':event['content'],
-			'time': event['time'],
-		}))
+        self.send(text_data=json.dumps({
+            'type':'chat',
+            'author_id':event['author_id'],
+            'content':event['content'],
+            'time': event['time'],
+        }))
 
 class ChatNoticeConsumer(WebsocketConsumer):
 
-	def connect(self):
+    def connect(self):
 
-		user = self.scope["user"]
-		#if (user.is_anonymous or not user.is_authenticated):
-			#return
+        user = self.scope["user"]
+        #if (user.is_anonymous or not user.is_authenticated):
+            #return
 
-		if (self.channel_layer == None):
-			return
+        if (self.channel_layer == None):
+            return
 
-		self.room_group_name = f'chatNotice{user.pk}'
-		if (not hasattr(self.channel_layer, "users_channels")):
-			self.channel_layer.users_channels = {}
-		self.channel_layer.users_channels[user.pk] = self.channel_name
+        self.room_group_name = f'chatNotice{user.pk}'
+        if (not hasattr(self.channel_layer, "users_channels")):
+            self.channel_layer.users_channels = {}
+        self.channel_layer.users_channels[user.pk] = self.channel_name
 
-		if (not hasattr(self.channel_layer, "invite")):
-			self.channel_layer.invite = {}
-		self.channel_layer.invite[user.pk] = [];
+        if (not hasattr(self.channel_layer, "invite")):
+            self.channel_layer.invite = {}
+        self.channel_layer.invite[user.pk] = [];
 
-		async_to_sync(self.channel_layer.group_add)(
-			self.room_group_name,
-			self.channel_name
-		)
+        async_to_sync(self.channel_layer.group_add)(
+            self.room_group_name,
+            self.channel_name
+        )
 
-		self.accept()
+        self.accept()
 
-		message_time: int = int(time.time() * 1000)
-		targets = list(self.channel_layer.users_channels.keys())
-		for target in targets:
-			channel = self.channel_layer.users_channels.get(target)
-			if (channel == None or target == user.pk):
-				continue
-			async_to_sync(self.channel_layer.send)(channel, {
-				'type':"online_users",
-				'author_id':user.pk,
-				'time':message_time,
-			})
+        message_time: int = int(time.time() * 1000)
+        targets = list(self.channel_layer.users_channels.keys())
+        for target in targets:
+            channel = self.channel_layer.users_channels.get(target)
+            if (channel == None or target == user.pk):
+                continue
+            async_to_sync(self.channel_layer.send)(channel, {
+                'type':"online_users",
+                'author_id':user.pk,
+                'time':message_time,
+            })
 
-	def disconnect(self, code):
+    def disconnect(self, code):
 
-		user = self.scope["user"]
-		if (user.is_anonymous or not user.is_authenticated):
-			return	
+        user = self.scope["user"]
+        if (user.is_anonymous or not user.is_authenticated):
+            return    
 
-		self.channel_layer.users_channels.pop(user.pk)
+        self.channel_layer.users_channels.pop(user.pk)
 
-		message_time: int = int(time.time() * 1000)
+        message_time: int = int(time.time() * 1000)
 
-		targets = list(self.channel_layer.users_channels.keys())
-		for target in targets:
-			channel = self.channel_layer.users_channels.get(target)
-			if (channel == None or target == user.pk):
-				continue
-			async_to_sync(self.channel_layer.send)(channel, {
-				'type':"online_users",
-				'author_id':user.pk,
-				'time':message_time,
-			})
+        targets = list(self.channel_layer.users_channels.keys())
+        for target in targets:
+            channel = self.channel_layer.users_channels.get(target)
+            if (channel == None or target == user.pk):
+                continue
+            async_to_sync(self.channel_layer.send)(channel, {
+                'type':"online_users",
+                'author_id':user.pk,
+                'time':message_time,
+            })
 
-	def receive(self, text_data=None, bytes_data=None):
+    def receive(self, text_data=None, bytes_data=None):
 
-		if text_data == None:
-			return
+        if text_data == None:
+            return
 
-		user = self.scope["user"]
-		#if (user.is_anonymous or not user.is_authenticated):
-			#return
+        user = self.scope["user"]
+        #if (user.is_anonymous or not user.is_authenticated):
+            #return
 
-		text_data_json = json.loads(text_data)
-		
-		type_notice = text_data_json.get('type')
-		targets : list = text_data_json.get('targets')
-		content : dict = text_data_json.get('content')
+        text_data_json = json.loads(text_data)
+        
+        type_notice = text_data_json.get('type')
+        targets : list = text_data_json.get('targets')
+        content : dict = text_data_json.get('content')
 
-		if (type_notice == None or targets == None):
-			return
+        if (type_notice == None or targets == None):
+            return
 
-		if (self.channel_layer == None):
-			return
+        if (self.channel_layer == None):
+            return
 
-		message_time: int = int(time.time() * 1000)
-		status = 200;
+        message_time: int = int(time.time() * 1000)
+        status = 200;
 
-		#print("receive" + str(user.pk))
+        #print("receive" + str(user.pk))
 
-		if targets == "all":
-			targets = list(self.channel_layer.users_channels.keys())
+        if targets == "all":
+            targets = list(self.channel_layer.users_channels.keys())
 
-		for target in targets:
-			channel = self.channel_layer.users_channels.get(target)
-			if (channel == None or target == user.pk):
-				if (channel == None):
-					status = 404
-				continue
-			async_to_sync(self.channel_layer.send)(channel, {
-				'type':type_notice,
-				'author_id':user.pk,
-				'content':content,
-				'time':message_time,
-				'status': 200,
-			})
-		async_to_sync(self.channel_layer.send)(self.channel_layer.users_channels.get(user.pk), {
-			'type':type_notice,
-			'author_id':user.pk,
-			'content':"notice return",
-			'time':message_time,
-			'status':status,
-		})
+        for target in targets:
+            channel = self.channel_layer.users_channels.get(target)
+            if (channel == None or target == user.pk):
+                if (channel == None):
+                    status = 404
+                continue
+            async_to_sync(self.channel_layer.send)(channel, {
+                'type':type_notice,
+                'author_id':user.pk,
+                'content':content,
+                'time':message_time,
+                'status': 200,
+            })
+        async_to_sync(self.channel_layer.send)(self.channel_layer.users_channels.get(user.pk), {
+            'type':type_notice,
+            'author_id':user.pk,
+            'content':"notice return",
+            'time':message_time,
+            'status':status,
+        })
 
 
 
-	def invite(self, event):
+    def invite(self, event):
 
-		user = self.scope["user"]
-		if (user.is_anonymous or not user.is_authenticated):
-			return
+        user = self.scope["user"]
+        if (user.is_anonymous or not user.is_authenticated):
+            return
 
-		if (self.channel_layer.invite[event["author_id"]].get(user.pk)):
-			return
-		self.channel_layer.invite[event["author_id"]].append(user.pl)
+        if (self.channel_layer.invite[event["author_id"]].get(user.pk)):
+            return
+        self.channel_layer.invite[event["author_id"]].append(user.pl)
 
-		self.send(text_data=json.dumps({
-			'type':event['type'],
-			'author_id':event['author_id'],
-			'content':event['content'],
-			'time': event['time'],
-			'status':event['status'],
-		}))
+        self.send(text_data=json.dumps({
+            'type':event['type'],
+            'author_id':event['author_id'],
+            'content':event['content'],
+            'time': event['time'],
+            'status':event['status'],
+        }))
 
-	def online_users(self, event):
+    def online_users(self, event):
 
-		user = self.scope["user"]
-		#if (user.is_anonymous or not user.is_authenticated):
-			#return
+        user = self.scope["user"]
+        #if (user.is_anonymous or not user.is_authenticated):
+            #return
 
-		#print("online_users" + str(user.pk))
+        #print("online_users" + str(user.pk))
 
-		event['content'] = self.channel_layer.users_channels
+        event['content'] = self.channel_layer.users_channels
 
-		self.send(text_data=json.dumps({
-			'type':event['type'],
-			'author_id':event['author_id'],
-			'content':event['content'],
-			'time': event['time'],
-			'status':event['status'],
-		}))
+        self.send(text_data=json.dumps({
+            'type':event['type'],
+            'author_id':event['author_id'],
+            'content':event['content'],
+            'time': event['time'],
+            'status':event['status'],
+        }))
diff --git a/chat/consumersNotice.py b/chat/consumersNotice.py
index 536cdf3..1070c8e 100644
--- a/chat/consumersNotice.py
+++ b/chat/consumersNotice.py
@@ -9,371 +9,371 @@ import json
 
 class ChatNoticeConsumer(WebsocketConsumer):
 
-	def connect(self):
+    def connect(self):
 
-		user = self.scope["user"]
-		#if (user.is_anonymous or not user.is_authenticated):
-			#return
+        user = self.scope["user"]
+        #if (user.is_anonymous or not user.is_authenticated):
+            #return
 
-		if (self.channel_layer == None):
-			return
-
-		self.room_group_name = f'chatNotice{user.pk}'
-		if (not hasattr(self.channel_layer, "users_channels")):
-			self.channel_layer.users_channels = {}
-		self.channel_layer.users_channels[user.pk] = self.channel_name
-
-		if (not hasattr(self.channel_layer, "invite")):
-			self.channel_layer.invite = {}
-		self.channel_layer.invite[user.pk] = [];
-
-		async_to_sync(self.channel_layer.group_add)(
-			self.room_group_name,
-			self.channel_name
-		)
-
-		self.accept()
-
-		self.sync()
-
-	def disconnect(self, code):
-
-		user = self.scope["user"]
-		if (user.is_anonymous or not user.is_authenticated):
-			return	
-
-		del self.channel_layer.users_channels[user.pk]
-		del self.channel_layer.invite[user.pk]
-
-		for inviter_id, inviteds_id in self.channel_layer.invite.items():
-			if (user.pk in inviteds_id): 
-				self.channel_layer.invite[inviter_id].remove(user.pk)
-
-		self.sync()
-
-
-	def receive(self, text_data=None, bytes_data=None):
-
-		if text_data == None:
-			return
-
-		user = self.scope["user"]
-		#if (user.is_anonymous or not user.is_authenticated):
-			#return
-
-		text_data_json = json.loads(text_data)
-		
-		type_notice = text_data_json.get('type')
-		targets : list = text_data_json.get('targets')
-		content : dict = text_data_json.get('content')
-
-		if (type_notice == None or targets == None):
-			return
-
-		if (self.channel_layer == None):
-			return
-
-		message_time: int = text_data_json.get('time')
-
-		if (message_time == None):
-			message_time: int = int(time.time() * 1000)
-
-		result = None
-		try:
-			status, result = getattr(self, "pre_" + type_notice)(user, targets)
-		except AttributeError as error:
-			status = 200
-
-		if (status < 300):
-			if targets == "all":
-				targets = list(self.channel_layer.users_channels.keys())
-
-			for target in targets:
-				channel = self.channel_layer.users_channels.get(target)
-				if (channel == None or target == user.pk):
-					if (channel == None):
-						status = 444 # target not connected
-					continue
-				async_to_sync(self.channel_layer.send)(channel, {
-					'type':type_notice,
-					'author_id':user.pk,
-					'content':content,
-					'result':result,
-					'targets': targets,
-					'time':message_time,
-					'status': 200,
-				})
-
-		async_to_sync(self.channel_layer.send)(self.channel_layer.users_channels.get(user.pk), {
-			'type':type_notice,
-			'author_id':user.pk,
-			'result':result,
-			'targets': targets,
-			'time':message_time,
-			'status':status,
-		})
-
-	def sync(self, user = None, level = None):
-		
-		sendToUser = True
-		if (user == None):
-			user = self.scope["user"]
-			sendToUser = False
-			
-
-		if (level == None):
-			level = 0
-
-		message_time: int = int(time.time() * 1000)
-		if (sendToUser):
-			targets = [user.pk]
-		else:
-			targets = list(self.channel_layer.users_channels.keys())
-
-		for target in targets:
-			channel = self.channel_layer.users_channels.get(target)
-			if (channel == None or (not sendToUser and target == user.pk)):
-				continue
-			async_to_sync(self.channel_layer.send)(channel, {
-				'type':"online_users",
-				'author_id':user.pk,
-				'targets': targets,
-				'time':message_time,
-				'status': 200,
-			})
-			if (level >= 1): 
-				async_to_sync(self.channel_layer.send)(channel, {
-					'type':"invite",
-					'author_id':user.pk,
-					'targets': targets,
-					'time':message_time,
-					'status': 200,
-				})
-
-
-	def pre_invite(self, user, targets):
-
-		if (user.is_anonymous or not user.is_authenticated):
-			return 400, None
-
-		status = 200
-		for target in targets:
-			if (target in self.channel_layer.invite[user.pk]):
-				status = 409
-				continue
-
-			channel = self.channel_layer.users_channels.get(target)
-			if (channel == None):
-				status = 404
-				continue
-
-			# Add the invited in "self.channel_layer.invite"
-			if (user.pk != target):
-				self.channel_layer.invite[user.pk].append(target)
-
-		return status, None
-
-	def get_invites(self, user):
-		invites = []
-		for inviter_id, inviteds_id in self.channel_layer.invite.items():
-			if (user.pk in inviteds_id and user.pk != inviter_id): 
-				invites.append(inviter_id)
-		return invites;
-
-	def invite(self, event):
-
-		user = self.scope["user"]
-		if (user.is_anonymous or not user.is_authenticated):
-			return
-
-		invites = self.get_invites(user)
-
-		self.send(text_data=json.dumps({
-			'type':event['type'],
-			'author_id':event['author_id'],
-			'invites': invites,
-			'targets': event['targets'],
-			'time': event['time'],
-			'status':event['status'],
-		}))
-
-	def pre_accept_invite(self, user, targets):
-
-		if (user.is_anonymous or not user.is_authenticated):
-			return 400, None
-
-		if (user.pk not in self.channel_layer.invite[targets[0]]):
-			return 400, None
-
-		self.channel_layer.invite[targets[0]].remove(user.pk)
+        if (self.channel_layer == None):
+            return
+
+        self.room_group_name = f'chatNotice{user.pk}'
+        if (not hasattr(self.channel_layer, "users_channels")):
+            self.channel_layer.users_channels = {}
+        self.channel_layer.users_channels[user.pk] = self.channel_name
+
+        if (not hasattr(self.channel_layer, "invite")):
+            self.channel_layer.invite = {}
+        self.channel_layer.invite[user.pk] = [];
+
+        async_to_sync(self.channel_layer.group_add)(
+            self.room_group_name,
+            self.channel_name
+        )
+
+        self.accept()
+
+        self.sync()
+
+    def disconnect(self, code):
+
+        user = self.scope["user"]
+        if (user.is_anonymous or not user.is_authenticated):
+            return    
+
+        del self.channel_layer.users_channels[user.pk]
+        del self.channel_layer.invite[user.pk]
+
+        for inviter_id, inviteds_id in self.channel_layer.invite.items():
+            if (user.pk in inviteds_id): 
+                self.channel_layer.invite[inviter_id].remove(user.pk)
+
+        self.sync()
+
+
+    def receive(self, text_data=None, bytes_data=None):
+
+        if text_data == None:
+            return
+
+        user = self.scope["user"]
+        #if (user.is_anonymous or not user.is_authenticated):
+            #return
+
+        text_data_json = json.loads(text_data)
+        
+        type_notice = text_data_json.get('type')
+        targets : list = text_data_json.get('targets')
+        content : dict = text_data_json.get('content')
+
+        if (type_notice == None or targets == None):
+            return
+
+        if (self.channel_layer == None):
+            return
+
+        message_time: int = text_data_json.get('time')
+
+        if (message_time == None):
+            message_time: int = int(time.time() * 1000)
+
+        result = None
+        try:
+            status, result = getattr(self, "pre_" + type_notice)(user, targets)
+        except AttributeError as error:
+            status = 200
+
+        if (status < 300):
+            if targets == "all":
+                targets = list(self.channel_layer.users_channels.keys())
+
+            for target in targets:
+                channel = self.channel_layer.users_channels.get(target)
+                if (channel == None or target == user.pk):
+                    if (channel == None):
+                        status = 444 # target not connected
+                    continue
+                async_to_sync(self.channel_layer.send)(channel, {
+                    'type':type_notice,
+                    'author_id':user.pk,
+                    'content':content,
+                    'result':result,
+                    'targets': targets,
+                    'time':message_time,
+                    'status': 200,
+                })
+
+        async_to_sync(self.channel_layer.send)(self.channel_layer.users_channels.get(user.pk), {
+            'type':type_notice,
+            'author_id':user.pk,
+            'result':result,
+            'targets': targets,
+            'time':message_time,
+            'status':status,
+        })
+
+    def sync(self, user = None, level = None):
+        
+        sendToUser = True
+        if (user == None):
+            user = self.scope["user"]
+            sendToUser = False
+            
+
+        if (level == None):
+            level = 0
+
+        message_time: int = int(time.time() * 1000)
+        if (sendToUser):
+            targets = [user.pk]
+        else:
+            targets = list(self.channel_layer.users_channels.keys())
+
+        for target in targets:
+            channel = self.channel_layer.users_channels.get(target)
+            if (channel == None or (not sendToUser and target == user.pk)):
+                continue
+            async_to_sync(self.channel_layer.send)(channel, {
+                'type':"online_users",
+                'author_id':user.pk,
+                'targets': targets,
+                'time':message_time,
+                'status': 200,
+            })
+            if (level >= 1): 
+                async_to_sync(self.channel_layer.send)(channel, {
+                    'type':"invite",
+                    'author_id':user.pk,
+                    'targets': targets,
+                    'time':message_time,
+                    'status': 200,
+                })
+
+
+    def pre_invite(self, user, targets):
+
+        if (user.is_anonymous or not user.is_authenticated):
+            return 400, None
+
+        status = 200
+        for target in targets:
+            if (target in self.channel_layer.invite[user.pk]):
+                status = 409
+                continue
+
+            channel = self.channel_layer.users_channels.get(target)
+            if (channel == None):
+                status = 404
+                continue
+
+            # Add the invited in "self.channel_layer.invite"
+            if (user.pk != target):
+                self.channel_layer.invite[user.pk].append(target)
+
+        return status, None
+
+    def get_invites(self, user):
+        invites = []
+        for inviter_id, inviteds_id in self.channel_layer.invite.items():
+            if (user.pk in inviteds_id and user.pk != inviter_id): 
+                invites.append(inviter_id)
+        return invites;
+
+    def invite(self, event):
+
+        user = self.scope["user"]
+        if (user.is_anonymous or not user.is_authenticated):
+            return
+
+        invites = self.get_invites(user)
+
+        self.send(text_data=json.dumps({
+            'type':event['type'],
+            'author_id':event['author_id'],
+            'invites': invites,
+            'targets': event['targets'],
+            'time': event['time'],
+            'status':event['status'],
+        }))
+
+    def pre_accept_invite(self, user, targets):
+
+        if (user.is_anonymous or not user.is_authenticated):
+            return 400, None
+
+        if (user.pk not in self.channel_layer.invite[targets[0]]):
+            return 400, None
+
+        self.channel_layer.invite[targets[0]].remove(user.pk)
 
-		if (targets[0] in self.channel_layer.invite[user.pk]):
-			self.channel_layer.invite[user.pk].remove(targets[0])
+        if (targets[0] in self.channel_layer.invite[user.pk]):
+            self.channel_layer.invite[user.pk].remove(targets[0])
 
-		id_game = GameModel().create([user.pk, targets[0]]);
+        id_game = GameModel().create([user.pk, targets[0]]);
 
-		return 200, id_game
+        return 200, id_game
 
-	def accept_invite(self, event):
+    def accept_invite(self, event):
 
-		user = self.scope["user"]
-		if (user.is_anonymous or not user.is_authenticated):
-			return
+        user = self.scope["user"]
+        if (user.is_anonymous or not user.is_authenticated):
+            return
 
-		invites = self.get_invites(user)
+        invites = self.get_invites(user)
 
-		self.send(text_data=json.dumps({
-			'type':event['type'],
-			'author_id':event['author_id'],
-			'id_game': event['result'],
-			'invites': invites,
-			'time': event['time'],
-			'status':event['status'],
-		}))
+        self.send(text_data=json.dumps({
+            'type':event['type'],
+            'author_id':event['author_id'],
+            'id_game': event['result'],
+            'invites': invites,
+            'time': event['time'],
+            'status':event['status'],
+        }))
 
-	def pre_refuse_invite(self, user, targets):
+    def pre_refuse_invite(self, user, targets):
 
-		if (user.is_anonymous or not user.is_authenticated):
-			return 400, None
+        if (user.is_anonymous or not user.is_authenticated):
+            return 400, None
 
-		if (user.pk not in self.channel_layer.invite[targets[0]]):
-			return 400, None
+        if (user.pk not in self.channel_layer.invite[targets[0]]):
+            return 400, None
 
-		self.channel_layer.invite[targets[0]].remove(user.pk)
+        self.channel_layer.invite[targets[0]].remove(user.pk)
 
-		if (targets[0] in self.channel_layer.invite[user.pk]):
-			self.channel_layer.invite[user.pk].remove(targets[0])
+        if (targets[0] in self.channel_layer.invite[user.pk]):
+            self.channel_layer.invite[user.pk].remove(targets[0])
 
-		return 200, None
-		
-	def refuse_invite(self, event):
+        return 200, None
+        
+    def refuse_invite(self, event):
 
-		user = self.scope["user"]
-		if (user.is_anonymous or not user.is_authenticated):
-			return
+        user = self.scope["user"]
+        if (user.is_anonymous or not user.is_authenticated):
+            return
 
-		invites = self.get_invites(user)
+        invites = self.get_invites(user)
 
-		self.send(text_data=json.dumps({
-			'type':event['type'],
-			'author_id':event['author_id'],
-			'invites': invites,
-			'time': event['time'],
-			'status':event['status'],
-		}))
+        self.send(text_data=json.dumps({
+            'type':event['type'],
+            'author_id':event['author_id'],
+            'invites': invites,
+            'time': event['time'],
+            'status':event['status'],
+        }))
 
-	def pre_ask_friend(self, user, targets):
+    def pre_ask_friend(self, user, targets):
 
-		if (user.is_anonymous or not user.is_authenticated):
-			return 400, None
+        if (user.is_anonymous or not user.is_authenticated):
+            return 400, None
 
-		if (AskFriendModel.objects.filter(asker=user.pk, asked=targets[0])):
-			return 409, None
+        if (AskFriendModel.objects.filter(asker=user.pk, asked=targets[0])):
+            return 409, None
 
-		if (FriendModel().isFriend(user.pk, targets[0])):
-			return 409, None
+        if (FriendModel().isFriend(user.pk, targets[0])):
+            return 409, None
 
-		if (targets[0] != None):
-			AskFriendModel(asker=user.pk, asked=targets[0]).save()
+        if (targets[0] != None):
+            AskFriendModel(asker=user.pk, asked=targets[0]).save()
 
-		return 200, None
+        return 200, None
 
-	def send_ask_friend(self, event):
+    def send_ask_friend(self, event):
 
-		user = self.scope["user"]
-		if (user.is_anonymous or not user.is_authenticated):
-			return
+        user = self.scope["user"]
+        if (user.is_anonymous or not user.is_authenticated):
+            return
 
-		asked = AskFriendModel().getAsked(user.pk)
-		asker = AskFriendModel().getAsker(user.pk)
+        asked = AskFriendModel().getAsked(user.pk)
+        asker = AskFriendModel().getAsker(user.pk)
 
-		online_friends = self.get_online_friend(user)
+        online_friends = self.get_online_friend(user)
 
-		self.send(text_data=json.dumps({
-			'type':event['type'],
-			'author_id':event['author_id'],
-			'targets':event['targets'],
-			'asker': asker,
-			'asked': asked,
-			'online': online_friends,
-			'time': event['time'],
-			'status':event['status'],
-		}))
+        self.send(text_data=json.dumps({
+            'type':event['type'],
+            'author_id':event['author_id'],
+            'targets':event['targets'],
+            'asker': asker,
+            'asked': asked,
+            'online': online_friends,
+            'time': event['time'],
+            'status':event['status'],
+        }))
 
-	def ask_friend(self, event):
-		self.send_ask_friend(event)
+    def ask_friend(self, event):
+        self.send_ask_friend(event)
 
-	def delete_ask(self, asker, user_asked):
-		if (user_asked.is_anonymous or not user_asked.is_authenticated):
-			return 400, None
+    def delete_ask(self, asker, user_asked):
+        if (user_asked.is_anonymous or not user_asked.is_authenticated):
+            return 400, None
 
-		asked = user_asked.pk
+        asked = user_asked.pk
 
-		if (not AskFriendModel.objects.filter(asker=asker, asked=asked)):
-			return 404, None
+        if (not AskFriendModel.objects.filter(asker=asker, asked=asked)):
+            return 404, None
 
-		if (FriendModel().isFriend(asker, asked)):
-			return 409, None
+        if (FriendModel().isFriend(asker, asked)):
+            return 409, None
 
-		if (not AskFriendModel().deleteAsk(asker, asked)):
-			return 400, None
+        if (not AskFriendModel().deleteAsk(asker, asked)):
+            return 400, None
 
-		return 200, None
+        return 200, None
 
-	def pre_accept_friend(self, user, targets):
-		status, result = self.delete_ask(targets[0], user)
-		
-		if (status == 200):
-			FriendModel(user_id1=user.pk, user_id2=targets[0]).save()
-		return status, result
+    def pre_accept_friend(self, user, targets):
+        status, result = self.delete_ask(targets[0], user)
+        
+        if (status == 200):
+            FriendModel(user_id1=user.pk, user_id2=targets[0]).save()
+        return status, result
 
-	def accept_friend(self, event):
-		self.send_ask_friend(event)
+    def accept_friend(self, event):
+        self.send_ask_friend(event)
 
-	def pre_refuse_friend(self, user, targets):
-		return self.delete_ask(targets[0], user)
+    def pre_refuse_friend(self, user, targets):
+        return self.delete_ask(targets[0], user)
 
-	def refuse_friend(self, event):
-		self.send_ask_friend(event)
+    def refuse_friend(self, event):
+        self.send_ask_friend(event)
 
-	def pre_remove_friend(self, user, targets):
+    def pre_remove_friend(self, user, targets):
 
-		if (user.is_anonymous or not user.is_authenticated):
-			return 400, None
-		
-		if (not FriendModel().isFriend(user.pk, targets[0])):
-			return 409, None
+        if (user.is_anonymous or not user.is_authenticated):
+            return 400, None
+        
+        if (not FriendModel().isFriend(user.pk, targets[0])):
+            return 409, None
 
-		if (not FriendModel().deleteFriend(user.pk, targets[0])):
-			return 400, None
+        if (not FriendModel().deleteFriend(user.pk, targets[0])):
+            return 400, None
 
-		return 200, None
-	
-	def remove_friend(self, event):
-		self.send_ask_friend(event)
+        return 200, None
+    
+    def remove_friend(self, event):
+        self.send_ask_friend(event)
 
 
-	def get_online_friend(self, user):
-		online_friends = {}
-		for friend in FriendModel().getFriends(user.pk):
-			if (friend in self.channel_layer.users_channels):
-				online_friends[friend] = "green"
-			else:
-				online_friends[friend] = "red"
-		return online_friends
+    def get_online_friend(self, user):
+        online_friends = {}
+        for friend in FriendModel().getFriends(user.pk):
+            if (friend in self.channel_layer.users_channels):
+                online_friends[friend] = "green"
+            else:
+                online_friends[friend] = "red"
+        return online_friends
 
-	def online_users(self, event):
+    def online_users(self, event):
 
-		user = self.scope["user"]
-		if (user.is_anonymous or not user.is_authenticated):
-			return
+        user = self.scope["user"]
+        if (user.is_anonymous or not user.is_authenticated):
+            return
 
-		online_friends = self.get_online_friend(user)
+        online_friends = self.get_online_friend(user)
 
-		self.send(text_data=json.dumps({
-			'type':event['type'],
-			'author_id':event['author_id'],
-			'online':online_friends,
-			'time': event['time'],
-			'status':event['status'],
-		}))
+        self.send(text_data=json.dumps({
+            'type':event['type'],
+            'author_id':event['author_id'],
+            'online':online_friends,
+            'time': event['time'],
+            'status':event['status'],
+        }))
diff --git a/chat/models.py b/chat/models.py
index d8eb491..a53d15c 100644
--- a/chat/models.py
+++ b/chat/models.py
@@ -5,28 +5,28 @@ from django.contrib import admin
 
 # Create your models here.
 class ChatChannelModel(models.Model):
-	
-	def create(self, users_id: [int]):
-		self.save()
-		for user_id in users_id:
-			ChatMemberModel(channel_id = self.pk, member_id = user_id).save()
-		return self.pk
+    
+    def create(self, users_id: [int]):
+        self.save()
+        for user_id in users_id:
+            ChatMemberModel(channel_id = self.pk, member_id = user_id).save()
+        return self.pk
 
-	def get_members_id(self):
-		return [member_channel.member_id for member_channel in ChatMemberModel.objects.filter(channel_id = self.pk)]
+    def get_members_id(self):
+        return [member_channel.member_id for member_channel in ChatMemberModel.objects.filter(channel_id = self.pk)]
 
 class ChatMemberModel(models.Model):
-	member_id = IntegerField(primary_key=False)
-	channel_id = IntegerField(primary_key=False)
+    member_id = IntegerField(primary_key=False)
+    channel_id = IntegerField(primary_key=False)
 
-	def __str__(self):
-		return "member_id: " + str(self.member_id) + ", channel_id: " + str(self.channel_id)
+    def __str__(self):
+        return "member_id: " + str(self.member_id) + ", channel_id: " + str(self.channel_id)
 
 class ChatMessageModel(models.Model):
-	channel_id = IntegerField(primary_key=False)
-	author_id = IntegerField(primary_key=False)
-	content = models.CharField(max_length=255)
-	time = IntegerField(primary_key=False)
+    channel_id = IntegerField(primary_key=False)
+    author_id = IntegerField(primary_key=False)
+    content = models.CharField(max_length=255)
+    time = IntegerField(primary_key=False)
 
-	def __str__(self): 
-		return "author_id: " + str(self.author_id) + ", channel_id: " + str(self.channel_id) + ", content: " + self.content
+    def __str__(self): 
+        return "author_id: " + str(self.author_id) + ", channel_id: " + str(self.channel_id) + ", content: " + self.content
diff --git a/chat/routing.py b/chat/routing.py
index 6b8fc6f..642f6c0 100644
--- a/chat/routing.py
+++ b/chat/routing.py
@@ -4,6 +4,6 @@ from . import consumersChat
 from . import consumersNotice
 
 websocket_urlpatterns = [
-	re_path(r'ws/chat/(?P<chat_id>\d+)$', consumersChat.ChatConsumer.as_asgi()),
-	re_path(r'ws/chat/notice$', consumersNotice.ChatNoticeConsumer.as_asgi()),
+    re_path(r'ws/chat/(?P<chat_id>\d+)$', consumersChat.ChatConsumer.as_asgi()),
+    re_path(r'ws/chat/notice$', consumersNotice.ChatNoticeConsumer.as_asgi()),
 ]
diff --git a/chat/tests.py b/chat/tests.py
index cf0ee9f..6be487e 100644
--- a/chat/tests.py
+++ b/chat/tests.py
@@ -6,25 +6,25 @@ from django.contrib.auth.models import User
 
 # Create your tests here.
 class ChatTest(TestCase):
-	def setUp(self):
-		self.client = Client()
+    def setUp(self):
+        self.client = Client()
 
-		self.username='bozo1'
-		self.password='password'
+        self.username='bozo1'
+        self.password='password'
 
-		self.user: User = User.objects.create_user(username=self.username, password=self.password)
+        self.user: User = User.objects.create_user(username=self.username, password=self.password)
 
-		self.dest: User = User.objects.create_user(username="bozo2", password=self.password)
+        self.dest: User = User.objects.create_user(username="bozo2", password=self.password)
 
-		self.url = "/api/chat/"
+        self.url = "/api/chat/"
 
-	def test_create_chat(self):
-		self.client.login(username=self.username, password=self.password)
-		response: HttpResponse = self.client.post(self.url + str(self.user.pk), {"members_id": [self.user.pk, self.dest.pk]})
-		response_dict: dict = eval(response.content)
-		self.assertDictEqual(response_dict, {})
+    def test_create_chat(self):
+        self.client.login(username=self.username, password=self.password)
+        response: HttpResponse = self.client.post(self.url + str(self.user.pk), {"members_id": [self.user.pk, self.dest.pk]})
+        response_dict: dict = eval(response.content)
+        self.assertDictEqual(response_dict, {})
 
-	def test_create_chat_unlogged(self):
-		response: HttpResponse = self.client.post(self.url + str(self.user.pk), {"members_id": [self.user.pk, self.dest.pk]})
-		response_dict: dict = eval(response.content)
-		self.assertDictEqual(response_dict,  {'detail': 'Authentication credentials were not provided.'})
+    def test_create_chat_unlogged(self):
+        response: HttpResponse = self.client.post(self.url + str(self.user.pk), {"members_id": [self.user.pk, self.dest.pk]})
+        response_dict: dict = eval(response.content)
+        self.assertDictEqual(response_dict,  {'detail': 'Authentication credentials were not provided.'})
diff --git a/chat/views.py b/chat/views.py
index 125d728..4b73cbf 100644
--- a/chat/views.py
+++ b/chat/views.py
@@ -14,35 +14,35 @@ from .serializers import ChatChannelSerializer, ChatMessageSerializer
 
 class ChannelView(APIView):
     
-	queryset = ChatChannelModel.objects
-	serializer_class = ChatChannelSerializer
-	permission_classes = (permissions.IsAuthenticated,)
-	authentication_classes = (SessionAuthentication,)	
+    queryset = ChatChannelModel.objects
+    serializer_class = ChatChannelSerializer
+    permission_classes = (permissions.IsAuthenticated,)
+    authentication_classes = (SessionAuthentication,)    
 
-	def post(self, request):
+    def post(self, request):
 
-		serializer = self.serializer_class(data = request.data)
-		
-		serializer.is_valid(raise_exception=True)
+        serializer = self.serializer_class(data = request.data)
+        
+        serializer.is_valid(raise_exception=True)
 
-		data: dict = serializer.validated_data
+        data: dict = serializer.validated_data
 
-		members_id = data.get("members_id")
-		if members_id == None:
-			return Response({"detail": "members_id is None."}, status = status.HTTP_400_BAD_REQUEST)
+        members_id = data.get("members_id")
+        if members_id == None:
+            return Response({"detail": "members_id is None."}, status = status.HTTP_400_BAD_REQUEST)
 
-		if self.request.user.pk not in members_id:
-			return Response({"detail": "You are trying to create a chat group without you."}, status = status.HTTP_400_BAD_REQUEST)
+        if self.request.user.pk not in members_id:
+            return Response({"detail": "You are trying to create a chat group without you."}, status = status.HTTP_400_BAD_REQUEST)
 
-		for member_channel in ChatMemberModel.objects.filter(member_id = members_id[0]):
-			channel_id: int = member_channel.channel_id
-			if not ChatChannelModel.objects.filter(pk = channel_id).exists():
-				continue
-			channel: ChatChannelModel = ChatChannelModel.objects.get(pk = channel_id)
-			if set(channel.get_members_id()) == set(members_id):
-				messages = ChatMessageModel.objects.filter(channel_id = channel_id).order_by("time")
-				messages = serializers.serialize("json", messages)
-				return Response({'channel_id': channel_id, 'messages': messages}, status=status.HTTP_200_OK)				
+        for member_channel in ChatMemberModel.objects.filter(member_id = members_id[0]):
+            channel_id: int = member_channel.channel_id
+            if not ChatChannelModel.objects.filter(pk = channel_id).exists():
+                continue
+            channel: ChatChannelModel = ChatChannelModel.objects.get(pk = channel_id)
+            if set(channel.get_members_id()) == set(members_id):
+                messages = ChatMessageModel.objects.filter(channel_id = channel_id).order_by("time")
+                messages = serializers.serialize("json", messages)
+                return Response({'channel_id': channel_id, 'messages': messages}, status=status.HTTP_200_OK)                
 
-		new_channel_id = ChatChannelModel().create(members_id)
-		return Response({'channel_id': new_channel_id}, status=status.HTTP_201_CREATED)
+        new_channel_id = ChatChannelModel().create(members_id)
+        return Response({'channel_id': new_channel_id}, status=status.HTTP_201_CREATED)
diff --git a/games/models.py b/games/models.py
index 9641af5..a470478 100644
--- a/games/models.py
+++ b/games/models.py
@@ -3,22 +3,22 @@ from django.db import models
 # Create your models here.
 class GameModel(models.Model):
 
-	finished = models.BooleanField(default = False)
-	started = models.BooleanField(default = False)
-	winner_id = models.IntegerField(default = -1)
-	
-	def create(self, players_id: [int]):
-		self.save()
-		for player_id in players_id:
-			GameMembersModel(game_id = self.pk, player_id = player_id).save()
-		return self.pk
+    finished = models.BooleanField(default = False)
+    started = models.BooleanField(default = False)
+    winner_id = models.IntegerField(default = -1)
+    
+    def create(self, players_id: [int]):
+        self.save()
+        for player_id in players_id:
+            GameMembersModel(game_id = self.pk, player_id = player_id).save()
+        return self.pk
 
-	def start(self):
-		self.started = True
-	
-	def get_players_id(self):
-		return [game_player.player_id for game_player in GameMembersModel.objects.filter(game_id = self.pk)]
+    def start(self):
+        self.started = True
+    
+    def get_players_id(self):
+        return [game_player.player_id for game_player in GameMembersModel.objects.filter(game_id = self.pk)]
 
 class GameMembersModel(models.Model):
-	game_id = models.IntegerField()
-	player_id = models.IntegerField()
\ No newline at end of file
+    game_id = models.IntegerField()
+    player_id = models.IntegerField()
\ No newline at end of file
diff --git a/games/routing.py b/games/routing.py
index eed3b1c..34f4c4d 100644
--- a/games/routing.py
+++ b/games/routing.py
@@ -2,5 +2,5 @@ from django.urls import re_path
 from . import consumers
 
 websocket_urlpatterns = [
-	re_path(r'ws/games/(?P<game_id>\d+)$', consumers.GameWebSocket.as_asgi())
+    re_path(r'ws/games/(?P<game_id>\d+)$', consumers.GameWebSocket.as_asgi())
 ]
diff --git a/games/views.py b/games/views.py
index 21bdb50..2559264 100644
--- a/games/views.py
+++ b/games/views.py
@@ -8,20 +8,20 @@ from . import config
 
 class GameConfigView(APIView):
     
-	permission_classes = (permissions.AllowAny,)
+    permission_classes = (permissions.AllowAny,)
 
-	def get(self, request: HttpRequest):
-		config_data = {
-			"MAP_SIZE_X": config.MAP_SIZE_X,
-			"MAP_SIZE_Y": config.MAP_SIZE_Y,
+    def get(self, request: HttpRequest):
+        config_data = {
+            "MAP_SIZE_X": config.MAP_SIZE_X,
+            "MAP_SIZE_Y": config.MAP_SIZE_Y,
    
-			"WALL_RATIO": config.WALL_RATIO,
+            "WALL_RATIO": config.WALL_RATIO,
    
-			"PADDLE_SPEED_PER_SECOND_MAX": config.PADDLE_SPEED_PER_SECOND_MAX,
-			"PADDLE_RATIO": config.PADDLE_RATIO,	
+            "PADDLE_SPEED_PER_SECOND_MAX": config.PADDLE_SPEED_PER_SECOND_MAX,
+            "PADDLE_RATIO": config.PADDLE_RATIO,    
  
- 			"BALL_SIZE": config.BALL_SIZE,
-			"BALL_SPEED_INC": config.BALL_SPEED_INC,
-			"BALL_SPEED_START": config.BALL_SPEED_START
-		}
-		return Response(config_data, status = status.HTTP_200_OK)
\ No newline at end of file
+             "BALL_SIZE": config.BALL_SIZE,
+            "BALL_SPEED_INC": config.BALL_SPEED_INC,
+            "BALL_SPEED_START": config.BALL_SPEED_START
+        }
+        return Response(config_data, status = status.HTTP_200_OK)
\ No newline at end of file
diff --git a/matchmaking/consumers.py b/matchmaking/consumers.py
index 819ca40..cb2041d 100644
--- a/matchmaking/consumers.py
+++ b/matchmaking/consumers.py
@@ -10,32 +10,32 @@ from .models import Waiter, WaitingRoom, WaitingRoomManager, normal
 
 class MatchMaking(WebsocketConsumer):
 
-	def __init__(self, *args, **kwargs):
-		super().__init__(*args, **kwargs)
-		self.channel_name = "matchmaking"
-		self.group_name = "matchmaking"
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.channel_name = "matchmaking"
+        self.group_name = "matchmaking"
 
-	def connect(self):
+    def connect(self):
 
-		user: User = self.scope["user"]
-		if (user.is_anonymous or not user.is_authenticated):
-			return
+        user: User = self.scope["user"]
+        if (user.is_anonymous or not user.is_authenticated):
+            return
 
-		self.channel_layer.group_add(self.group_name, self.channel_name)
+        self.channel_layer.group_add(self.group_name, self.channel_name)
 
-		self.mode = int(self.scope['url_route']['kwargs']['mode'])
-		self.group_name = self.mode
+        self.mode = int(self.scope['url_route']['kwargs']['mode'])
+        self.group_name = self.mode
 
-		waiting_room: WaitingRoom = normal.get(self.mode)
-		waiting_room.append(Waiter(user.pk, self))
-		waiting_room.broadcast(f"{len(waiting_room)} / {waiting_room.mode}")
-		if (len(waiting_room) == waiting_room.mode):
-			game_id: int = GameModel().create(waiting_room.get_users_id())
-			waiting_room.broadcast("game_found", {"game_id": game_id})
-			waiting_room.clear()
+        waiting_room: WaitingRoom = normal.get(self.mode)
+        waiting_room.append(Waiter(user.pk, self))
+        waiting_room.broadcast(f"{len(waiting_room)} / {waiting_room.mode}")
+        if (len(waiting_room) == waiting_room.mode):
+            game_id: int = GameModel().create(waiting_room.get_users_id())
+            waiting_room.broadcast("game_found", {"game_id": game_id})
+            waiting_room.clear()
 
-	def disconnect(self, close_code):
-		waiting_room: WaitingRoom = normal.get(self.mode)
-		waiter: Waiter = waiting_room.get_member_by_socket(self)
-		if (waiter is not None):
-			waiting_room.remove(waiter, 1016)
\ No newline at end of file
+    def disconnect(self, close_code):
+        waiting_room: WaitingRoom = normal.get(self.mode)
+        waiter: Waiter = waiting_room.get_member_by_socket(self)
+        if (waiter is not None):
+            waiting_room.remove(waiter, 1016)
\ No newline at end of file
diff --git a/matchmaking/models.py b/matchmaking/models.py
index 8ce235d..2c6b3d6 100644
--- a/matchmaking/models.py
+++ b/matchmaking/models.py
@@ -9,31 +9,31 @@ from transcendence.abstract.AbstractRoomMember import AbstractRoomMember
 
 # Create your models here.
 class Waiter(AbstractRoomMember):
-	pass
+    pass
 
 class WaitingRoom(AbstractRoom):
-	
-	def __init__(self, room_manager,mode):
-		super().__init__(room_manager)
-		self.mode = mode
+    
+    def __init__(self, room_manager,mode):
+        super().__init__(room_manager)
+        self.mode = mode
 
-	def append(self, waiter: Waiter):
-		tmp: Waiter = self.get_member_by_user_id(waiter.user_id)
-		if (tmp is not None):
-			tmp.send("Connection close: Another connection open with the same user id.")
-			self.remove(tmp)
-		waiter.accept()
-		self._member_list.append(waiter)
+    def append(self, waiter: Waiter):
+        tmp: Waiter = self.get_member_by_user_id(waiter.user_id)
+        if (tmp is not None):
+            tmp.send("Connection close: Another connection open with the same user id.")
+            self.remove(tmp)
+        waiter.accept()
+        self._member_list.append(waiter)
 
 class WaitingRoomManager(AbstractRoomManager):
 
-	def get(self, mode: int):
-		for waiting_room in self._room_list:
-			waiting_room: WaitingRoom
-			if (waiting_room.mode == mode):
-				return waiting_room
-		tmp: WaitingRoom = WaitingRoom(self, mode)
-		super().append(tmp)
-		return tmp
+    def get(self, mode: int):
+        for waiting_room in self._room_list:
+            waiting_room: WaitingRoom
+            if (waiting_room.mode == mode):
+                return waiting_room
+        tmp: WaitingRoom = WaitingRoom(self, mode)
+        super().append(tmp)
+        return tmp
 
 normal: WaitingRoomManager = WaitingRoomManager()
\ No newline at end of file
diff --git a/matchmaking/routing.py b/matchmaking/routing.py
index 417779b..22af33e 100644
--- a/matchmaking/routing.py
+++ b/matchmaking/routing.py
@@ -2,5 +2,5 @@ from django.urls import re_path
 from . import consumers
 
 websocket_urlpatterns = [
-	re_path(r'ws/matchmaking/(?P<mode>\d+)$', consumers.MatchMaking.as_asgi())
+    re_path(r'ws/matchmaking/(?P<mode>\d+)$', consumers.MatchMaking.as_asgi())
 ]
diff --git a/profiles/models.py b/profiles/models.py
index aaff1ad..581ab0b 100644
--- a/profiles/models.py
+++ b/profiles/models.py
@@ -28,74 +28,74 @@ def on_user_created(sender, instance, created, **kwargs):
     if created:
         profile: ProfileModel = ProfileModel.objects.create(pk = instance.pk, user = instance)
         profile.save()
-		
+        
 class BlockModel(models.Model):
-	blocker = IntegerField(primary_key=False)
-	blocked = IntegerField(primary_key=False)
+    blocker = IntegerField(primary_key=False)
+    blocked = IntegerField(primary_key=False)
 
-	def __str__(self):
-		return "blocker_id: " + str(self.blocker) + ", blocked_id: " + str(self.blocked)
+    def __str__(self):
+        return "blocker_id: " + str(self.blocker) + ", blocked_id: " + str(self.blocked)
 
 class AskFriendModel(models.Model):
-	asker = IntegerField(primary_key=False)
-	asked = IntegerField(primary_key=False)
+    asker = IntegerField(primary_key=False)
+    asked = IntegerField(primary_key=False)
 
-	def getAsked(self, asker):
-		askeds = []
+    def getAsked(self, asker):
+        askeds = []
 
-		for ask in AskFriendModel.objects.filter(asker=asker):
-			askeds.append(ask.asked)
+        for ask in AskFriendModel.objects.filter(asker=asker):
+            askeds.append(ask.asked)
 
-		return askeds
+        return askeds
 
-	def getAsker(self, asked):
-		askers = []
+    def getAsker(self, asked):
+        askers = []
 
-		for ask in AskFriendModel.objects.filter(asked=asked):
-			askers.append(ask.asker)
+        for ask in AskFriendModel.objects.filter(asked=asked):
+            askers.append(ask.asker)
 
-		return askers
+        return askers
 
-	def deleteAsk(self, asker, asked):
+    def deleteAsk(self, asker, asked):
 
-		deleted = AskFriendModel.objects.filter(asker=asker, asked=asked)
+        deleted = AskFriendModel.objects.filter(asker=asker, asked=asked)
 
-		if (deleted.count() == 0 or not deleted):
-			return False
+        if (deleted.count() == 0 or not deleted):
+            return False
 
-		deleted.delete()
-		return True
+        deleted.delete()
+        return True
 
 class FriendModel(models.Model):
-	user_id1 = IntegerField(primary_key=False)
-	user_id2 = IntegerField(primary_key=False)
+    user_id1 = IntegerField(primary_key=False)
+    user_id2 = IntegerField(primary_key=False)
 
-	def getFriends(self, user_id):
-		friends = []
+    def getFriends(self, user_id):
+        friends = []
 
-		for friend in FriendModel.objects.filter(user_id1=user_id):
-			friends.append(friend.user_id2)
+        for friend in FriendModel.objects.filter(user_id1=user_id):
+            friends.append(friend.user_id2)
 
-		for friend in FriendModel.objects.filter(user_id2=user_id):
-			friends.append(friend.user_id1)
+        for friend in FriendModel.objects.filter(user_id2=user_id):
+            friends.append(friend.user_id1)
 
-		return friends
+        return friends
 
-	def isFriend(self, user_id1, user_id2):
+    def isFriend(self, user_id1, user_id2):
 
-		return user_id2 in self.getFriends(user_id1)
+        return user_id2 in self.getFriends(user_id1)
 
-	def deleteFriend(self, user_id1, user_id2):
+    def deleteFriend(self, user_id1, user_id2):
 
-		first = FriendModel.objects.filter(user_id1=user_id1, user_id2=user_id2)
-		if (first.count() == 1):
-			first.delete()
-			return True
+        first = FriendModel.objects.filter(user_id1=user_id1, user_id2=user_id2)
+        if (first.count() == 1):
+            first.delete()
+            return True
 
-		second = FriendModel.objects.filter(user_id1=user_id2, user_id2=user_id1)
-		if (second.count() == 1):
-			second.delete()
-			return True
+        second = FriendModel.objects.filter(user_id1=user_id2, user_id2=user_id1)
+        if (second.count() == 1):
+            second.delete()
+            return True
 
-		return False
+        return False
 
diff --git a/profiles/urls.py b/profiles/urls.py
index d2f5bb4..c7e9236 100644
--- a/profiles/urls.py
+++ b/profiles/urls.py
@@ -7,9 +7,9 @@ urlpatterns = [
     path("settings", viewsets.MyProfileViewSet.as_view({'patch': 'partial_update'}), name="my_profile_page"),
     path("me", viewsets.MyProfileViewSet.as_view({'get': 'retrieve'}), name="my_profile_page"),
     path("", viewsets.ProfileViewSet.as_view({'get': 'list'}), name="profiles_list"),
-	path("block", views.BlocksView.as_view(), name="block_page"),
-	path("block/<int:pk>", views.BlockView.as_view(), name="block_page"),
-	path("friend", views.FriendsView.as_view(), name="friend_page"),
+    path("block", views.BlocksView.as_view(), name="block_page"),
+    path("block/<int:pk>", views.BlockView.as_view(), name="block_page"),
+    path("friend", views.FriendsView.as_view(), name="friend_page"),
     path("user/<str:username>", viewsets.ProfileViewSet.as_view({'get': 'retrieve'}), name="profile_page"),
     path("id/<int:pk>", viewsets.ProfileViewSet.as_view({'get': 'retrieve_id'}), name="profile_page"),
 
diff --git a/profiles/views.py b/profiles/views.py
index 8c27128..406264c 100644
--- a/profiles/views.py
+++ b/profiles/views.py
@@ -7,74 +7,74 @@ from django.core import serializers
 from .models import BlockModel, FriendModel
 
 class BlockView(APIView):
-	permission_classes = (permissions.IsAuthenticated,)
-	authentication_classes = (SessionAuthentication,)
+    permission_classes = (permissions.IsAuthenticated,)
+    authentication_classes = (SessionAuthentication,)
 
-	def get(self, request, pk):
-		block = BlockModel.objects.filter(pk=pk)
-		if (block.exists()):
-			return Response(serializers.serialize("json", block), status=status.HTTP_200_OK)
-		else:
-			return Response("Not Found", status=status.HTTP_404_NOT_FOUND)
+    def get(self, request, pk):
+        block = BlockModel.objects.filter(pk=pk)
+        if (block.exists()):
+            return Response(serializers.serialize("json", block), status=status.HTTP_200_OK)
+        else:
+            return Response("Not Found", status=status.HTTP_404_NOT_FOUND)
 
 
 class BlocksView(APIView):
-	permission_classes = (permissions.IsAuthenticated,)
-	authentication_classes = (SessionAuthentication,)
+    permission_classes = (permissions.IsAuthenticated,)
+    authentication_classes = (SessionAuthentication,)
 
-	def get(self, request):
-		blocks = BlockModel.objects.filter(blocker=request.user.pk)
-		if (blocks):
-			return Response({"blockeds": serializers.serialize("json", BlockModel.objects.filter(blocker=request.user.pk)), "user_id": request.user.pk}, status=status.HTTP_200_OK)
-		return Response({}, status=status.HTTP_204_NO_CONTENT)
+    def get(self, request):
+        blocks = BlockModel.objects.filter(blocker=request.user.pk)
+        if (blocks):
+            return Response({"blockeds": serializers.serialize("json", BlockModel.objects.filter(blocker=request.user.pk)), "user_id": request.user.pk}, status=status.HTTP_200_OK)
+        return Response({}, status=status.HTTP_204_NO_CONTENT)
 
-	def post(self, request):
-		data: dict = request.data
-		users_id = request.data.get("users_id", None)
+    def post(self, request):
+        data: dict = request.data
+        users_id = request.data.get("users_id", None)
 
-		if (users_id == None):
-			return Response({"Error send None"}, status=status.HTTP_400_BAD_REQUEST)
+        if (users_id == None):
+            return Response({"Error send None"}, status=status.HTTP_400_BAD_REQUEST)
 
-		if (users_id[0] == None or users_id[1] == None):
-			return Response({"Error send blocker/ed None"}, status=status.HTTP_400_BAD_REQUEST)
+        if (users_id[0] == None or users_id[1] == None):
+            return Response({"Error send blocker/ed None"}, status=status.HTTP_400_BAD_REQUEST)
 
-		if (BlockModel.objects.filter(blocker=users_id[0], blocked=users_id[1])):
-			return Response({"Already Exist"}, status=status.HTTP_409_CONFLICT)
+        if (BlockModel.objects.filter(blocker=users_id[0], blocked=users_id[1])):
+            return Response({"Already Exist"}, status=status.HTTP_409_CONFLICT)
 
-		new_block = BlockModel()
-		new_block.blocker = users_id[0]
-		new_block.blocked = users_id[1]
-		new_block.save()
+        new_block = BlockModel()
+        new_block.blocker = users_id[0]
+        new_block.blocked = users_id[1]
+        new_block.save()
 
-		return Response({"block_id": new_block.pk}, status=status.HTTP_201_CREATED)
+        return Response({"block_id": new_block.pk}, status=status.HTTP_201_CREATED)
 
-	def delete(self, request):
-		data: dict = request.data
-		users_id = request.data.get("users_id", None)
+    def delete(self, request):
+        data: dict = request.data
+        users_id = request.data.get("users_id", None)
 
-		if (users_id == None):
-			return Response({"Error"}, status=status.HTTP_400_BAD_REQUEST)
+        if (users_id == None):
+            return Response({"Error"}, status=status.HTTP_400_BAD_REQUEST)
 
-		if (users_id[0] == None or users_id[1] == None):
-			return Response({"Error send blocker/ed None"}, status=status.HTTP_400_BAD_REQUEST)
+        if (users_id[0] == None or users_id[1] == None):
+            return Response({"Error send blocker/ed None"}, status=status.HTTP_400_BAD_REQUEST)
 
-		block = BlockModel.objects.filter(blocker=users_id[0], blocked=users_id[1])
+        block = BlockModel.objects.filter(blocker=users_id[0], blocked=users_id[1])
 
-		if (block.count() > 1):
-			return Response("Not normal >:[", status=status.HTTP_500_INTERNAL_SERVER_ERROR)
-		
-		if (not block):
-			return Response("Don't exist", status=status.HTTP_404_NOT_FOUND)
+        if (block.count() > 1):
+            return Response("Not normal >:[", status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        
+        if (not block):
+            return Response("Don't exist", status=status.HTTP_404_NOT_FOUND)
 
-		block.delete()
-		return Response("Deleted", status=status.HTTP_200_OK)
+        block.delete()
+        return Response("Deleted", status=status.HTTP_200_OK)
 
 class FriendsView(APIView):
-	permission_classes = (permissions.IsAuthenticated,)
-	authentication_classes = (SessionAuthentication,)
+    permission_classes = (permissions.IsAuthenticated,)
+    authentication_classes = (SessionAuthentication,)
 
-	def get(self, request):
-		friends = FriendModel().getFriends(request.user.pk)
-		if (friends):
-			return Response({"friends": friends, "user_id": request.user.pk}, status=status.HTTP_200_OK)
-		return Response({}, status=status.HTTP_204_NO_CONTENT)
+    def get(self, request):
+        friends = FriendModel().getFriends(request.user.pk)
+        if (friends):
+            return Response({"friends": friends, "user_id": request.user.pk}, status=status.HTTP_200_OK)
+        return Response({}, status=status.HTTP_204_NO_CONTENT)
diff --git a/tournament/consumers.py b/tournament/consumers.py
index ea2bb46..4198470 100644
--- a/tournament/consumers.py
+++ b/tournament/consumers.py
@@ -10,34 +10,34 @@ from .models import tournament_manager, TournamentMember, TournamentRoom, Tourna
 
 class TournamentWebConsumer(WebsocketConsumer):
 
-	def __init__(self, *args, **kwargs):
-		super().__init__(*args, **kwargs)
-		self.channel_name = "tournament"
-		self.group_name = "tournament"
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.channel_name = "tournament"
+        self.group_name = "tournament"
 
-	def connect(self):
+    def connect(self):
 
-		self.user: User = self.scope["user"]
-		if (self.user.is_anonymous or not self.user.is_authenticated):
-			return
+        self.user: User = self.scope["user"]
+        if (self.user.is_anonymous or not self.user.is_authenticated):
+            return
 
-		self.channel_layer.group_add(self.group_name, self.channel_name)
+        self.channel_layer.group_add(self.group_name, self.channel_name)
 
-		self.tournament_id = int(self.scope['url_route']['kwargs']['tournament_id'])
+        self.tournament_id = int(self.scope['url_route']['kwargs']['tournament_id'])
 
-		self.room = tournament_manager.get(self.tournament_id)
-		self.member = TournamentMember(self.user.pk, self, self.room)
+        self.room = tournament_manager.get(self.tournament_id)
+        self.member = TournamentMember(self.user.pk, self, self.room)
 
-		if (self.room is None):
-			self.member.send("Tournament not found")
-			self.disconnect(1017)
-	
-		self.room.append(self.member)
+        if (self.room is None):
+            self.member.send("Tournament not found")
+            self.disconnect(1017)
+    
+        self.room.append(self.member)
 
-	def receive(self, text_data: str = None, bytes_data: bytes = None):
-		self.member.receive(text_data, bytes_data)
+    def receive(self, text_data: str = None, bytes_data: bytes = None):
+        self.member.receive(text_data, bytes_data)
 
-	def disconnect(self, close_code):
-		member = self.room.get_member_by_socket(self)
-		if (member is not None):
-			self.room.remove(self.member, close_code)
\ No newline at end of file
+    def disconnect(self, close_code):
+        member = self.room.get_member_by_socket(self)
+        if (member is not None):
+            self.room.remove(self.member, close_code)
\ No newline at end of file
diff --git a/tournament/models.py b/tournament/models.py
index 912ec62..f664e1e 100644
--- a/tournament/models.py
+++ b/tournament/models.py
@@ -13,142 +13,142 @@ from transcendence.abstract.AbstractRoomManager import AbstractRoomManager
 # Create your models here.tu
 class TournamentModel(models.Model):
 
-	name = models.CharField(max_length = 100)
-	nb_players = models.IntegerField()
-	nb_players_by_game = models.IntegerField()
-	level = models.IntegerField()
-	started = models.BooleanField(default = False)
-	finished = models.BooleanField(default = False)
+    name = models.CharField(max_length = 100)
+    nb_players = models.IntegerField()
+    nb_players_by_game = models.IntegerField()
+    level = models.IntegerField()
+    started = models.BooleanField(default = False)
+    finished = models.BooleanField(default = False)
 
-	def create_game(self, level, players_id):
-		game_id = GameModel().create(players_id = players_id)
-		TournamentGamesModel(game_id = game_id, tournament_id = self.pk, tournament_level = level).save()
-		return game_id
-	
-	def get_games_id_by_level(self, level):
-		tmp = TournamentGamesModel.objects.filter(tournament_id = self.pk, tournament_level = level)
-		return [instance.game_id for instance in tmp]
+    def create_game(self, level, players_id):
+        game_id = GameModel().create(players_id = players_id)
+        TournamentGamesModel(game_id = game_id, tournament_id = self.pk, tournament_level = level).save()
+        return game_id
+    
+    def get_games_id_by_level(self, level):
+        tmp = TournamentGamesModel.objects.filter(tournament_id = self.pk, tournament_level = level)
+        return [instance.game_id for instance in tmp]
 
-	def get_games_id(self):
-		return [tournament_game.game_id for tournament_game in TournamentGamesModel.objects.filter(tournament_id = self.pk)]
-	
-	def get_players_id(self):
-		return [model.participant_id for model in TournamentParticipantsModel.objects.filter(tournament_id=self.pk)]
-	
-	def is_a_participant(self, participant_id: int):
-		return TournamentParticipantsModel.objects.filter(participant_id = participant_id, tournament_id = self.pk).exists()
+    def get_games_id(self):
+        return [tournament_game.game_id for tournament_game in TournamentGamesModel.objects.filter(tournament_id = self.pk)]
+    
+    def get_players_id(self):
+        return [model.participant_id for model in TournamentParticipantsModel.objects.filter(tournament_id=self.pk)]
+    
+    def is_a_participant(self, participant_id: int):
+        return TournamentParticipantsModel.objects.filter(participant_id = participant_id, tournament_id = self.pk).exists()
 
-	def add_participants(self, participants_id: [int]):
-		for participant_id in participants_id:
-			TournamentParticipantsModel(tournament_id = self.pk, participant_id = participant_id).save()
+    def add_participants(self, participants_id: [int]):
+        for participant_id in participants_id:
+            TournamentParticipantsModel(tournament_id = self.pk, participant_id = participant_id).save()
 
-	def start(self, participants_id: [int]):
-		self.started = True
-		self.add_participants(participants_id)
-		games_id = [int]
-		for i in range(0, len(participants_id), self.nb_players_by_game):
-			game_id = self.create_game(0, participants_id[i : i + self.nb_players_by_game])
-			games_id.append(game_id)
-		self.save()
-		return games_id
+    def start(self, participants_id: [int]):
+        self.started = True
+        self.add_participants(participants_id)
+        games_id = [int]
+        for i in range(0, len(participants_id), self.nb_players_by_game):
+            game_id = self.create_game(0, participants_id[i : i + self.nb_players_by_game])
+            games_id.append(game_id)
+        self.save()
+        return games_id
 
 class TournamentParticipantsModel(models.Model):
-	tournament_id = models.IntegerField()
-	participant_id = models.IntegerField()
+    tournament_id = models.IntegerField()
+    participant_id = models.IntegerField()
 
 class TournamentGamesModel(models.Model):
 
-	tournament_id = models.IntegerField()
-	tournament_level = models.IntegerField()
-	game_id = models.IntegerField()
+    tournament_id = models.IntegerField()
+    tournament_level = models.IntegerField()
+    game_id = models.IntegerField()
 
 class TournamentMember(AbstractRoomMember):
 
-	def __init__(self, user_id: int, socket: WebsocketConsumer, room):
-		super().__init__(user_id, socket)
-		self.participate = False
-		self.room = room
+    def __init__(self, user_id: int, socket: WebsocketConsumer, room):
+        super().__init__(user_id, socket)
+        self.participate = False
+        self.room = room
 
-	def receive(self, text_data: str = None, byte_dates: bytes = None):
-		
-		if (text_data is None):
-			return
+    def receive(self, text_data: str = None, byte_dates: bytes = None):
+        
+        if (text_data is None):
+            return
 
-		data: dict = json.loads(text_data)
+        data: dict = json.loads(text_data)
 
-		if (data.get("participate") is not None):
-			self.room.update_participants(self)
+        if (data.get("participate") is not None):
+            self.room.update_participants(self)
 
-	def send_error_message(self, message: str):
-		self.send("error", {"error_message": message})
+    def send_error_message(self, message: str):
+        self.send("error", {"error_message": message})
 
-	def go_to(self, url: str):
-		self.send("go_to", {"url": url})
-	
-	def send_participating(self):
-		self.send("is_participant", {"is_participant": self.participate})
+    def go_to(self, url: str):
+        self.send("go_to", {"url": url})
+    
+    def send_participating(self):
+        self.send("is_participant", {"is_participant": self.participate})
 
 class TournamentRoom(AbstractRoom):
 
-	def __init__(self, room_manager, tournament_id: int):
-		super().__init__(room_manager)
-		self.tournament_id = tournament_id
-		self.tournament = TournamentModel.objects.get(pk = tournament_id)
+    def __init__(self, room_manager, tournament_id: int):
+        super().__init__(room_manager)
+        self.tournament_id = tournament_id
+        self.tournament = TournamentModel.objects.get(pk = tournament_id)
 
-	def start(self):
-		self.broadcast("tournament_start")
-		games_id = self.tournament.start(self.get_participants_id())
-		for i, participant in enumerate(self.get_participants()):
-			participant: TournamentMember
-			participant.go_to(f"games/{games_id[i // self.tournament.nb_players_by_game]}")
+    def start(self):
+        self.broadcast("tournament_start")
+        games_id = self.tournament.start(self.get_participants_id())
+        for i, participant in enumerate(self.get_participants()):
+            participant: TournamentMember
+            participant.go_to(f"games/{games_id[i // self.tournament.nb_players_by_game]}")
 
-	def update_participants(self, member: TournamentMember):
-		if (self.tournament.started):
-			member.send_error_message("Tournament already started")
-			return
-		member.participate = not member.participate
-		nb_participants = self.get_nb_participants()
-		self.broadcast("update_participants", {"nb_participants": nb_participants})
-		member.send_participating()
-		if (nb_participants == self.tournament.nb_players):
-			self.start()
+    def update_participants(self, member: TournamentMember):
+        if (self.tournament.started):
+            member.send_error_message("Tournament already started")
+            return
+        member.participate = not member.participate
+        nb_participants = self.get_nb_participants()
+        self.broadcast("update_participants", {"nb_participants": nb_participants})
+        member.send_participating()
+        if (nb_participants == self.tournament.nb_players):
+            self.start()
 
-	def get_nb_participants(self):
-		if (self.tournament.started):
-			return self.tournament.nb_players
-		nb_participants = 0
-		for member in self._member_list:
-			member: TournamentMember
-			if (member.participate):
-				nb_participants += 1
-		return nb_participants 
+    def get_nb_participants(self):
+        if (self.tournament.started):
+            return self.tournament.nb_players
+        nb_participants = 0
+        for member in self._member_list:
+            member: TournamentMember
+            if (member.participate):
+                nb_participants += 1
+        return nb_participants 
 
-	def get_participants(self):
-		return [member for member in self._member_list if member.participate]
+    def get_participants(self):
+        return [member for member in self._member_list if member.participate]
 
-	def get_participants_id(self):
-		return [member.user_id for member in self._member_list if member.participate]
+    def get_participants_id(self):
+        return [member.user_id for member in self._member_list if member.participate]
 
-	def append(self, member: TournamentMember):
-		super().append(member)
-		if self.tournament.started:
-			member.participate = self.tournament.is_a_participant(member.user_id)
-		member.send_participating()
-		member.send("nb_participants", {"nb_participants": self.get_nb_participants()})
+    def append(self, member: TournamentMember):
+        super().append(member)
+        if self.tournament.started:
+            member.participate = self.tournament.is_a_participant(member.user_id)
+        member.send_participating()
+        member.send("nb_participants", {"nb_participants": self.get_nb_participants()})
 
 class TournamentRoomManager(AbstractRoomManager):
 
-	def get(self, tournament_id: int):
+    def get(self, tournament_id: int):
 
-		for room in self._room_list:
-			if (room.tournament_id == tournament_id):
-				return room
-		
-		if (TournamentModel.objects.filter(pk = tournament_id).exists()):
-			room = TournamentRoom(self, tournament_id)
-			self.append(room)
-			return room
-		
-		return None
+        for room in self._room_list:
+            if (room.tournament_id == tournament_id):
+                return room
+        
+        if (TournamentModel.objects.filter(pk = tournament_id).exists()):
+            room = TournamentRoom(self, tournament_id)
+            self.append(room)
+            return room
+        
+        return None
 
 tournament_manager: TournamentRoomManager = TournamentRoomManager()
\ No newline at end of file
diff --git a/tournament/routing.py b/tournament/routing.py
index 7271972..805d8a2 100644
--- a/tournament/routing.py
+++ b/tournament/routing.py
@@ -2,5 +2,5 @@ from django.urls import re_path
 from . import consumers
 
 websocket_urlpatterns = [
-	re_path(r'ws/tournaments/(?P<tournament_id>\d+)$', consumers.TournamentWebConsumer.as_asgi())
+    re_path(r'ws/tournaments/(?P<tournament_id>\d+)$', consumers.TournamentWebConsumer.as_asgi())
 ]
diff --git a/tournament/serializers.py b/tournament/serializers.py
index bdfcfb3..6f29235 100644
--- a/tournament/serializers.py
+++ b/tournament/serializers.py
@@ -4,35 +4,35 @@ from games.serializers import GameSerializer
 
 class TournamentSerializer(serializers.ModelSerializer):
 
-	levels = serializers.SerializerMethodField(read_only=True, required=False)
-	level = serializers.ReadOnlyField()
-	started = serializers.ReadOnlyField()
-	finished = serializers.ReadOnlyField()
-	name = serializers.CharField(default="")
+    levels = serializers.SerializerMethodField(read_only=True, required=False)
+    level = serializers.ReadOnlyField()
+    started = serializers.ReadOnlyField()
+    finished = serializers.ReadOnlyField()
+    name = serializers.CharField(default="")
 
-	class Meta:
-		model = TournamentModel
-		fields = ["name", "nb_players", "nb_players_by_game", "level", "started", "finished", "levels", "id"]
+    class Meta:
+        model = TournamentModel
+        fields = ["name", "nb_players", "nb_players_by_game", "level", "started", "finished", "levels", "id"]
 
-	def get_levels(self, instance: TournamentModel):
-		levels: list[list[int]] = []
-		for i in range(instance.level):
-			games_id: [int] = instance.get_games_id_by_level(i)
-			if (games_id == []):
-				break
-			levels.append(games_id)
-		return levels
+    def get_levels(self, instance: TournamentModel):
+        levels: list[list[int]] = []
+        for i in range(instance.level):
+            games_id: [int] = instance.get_games_id_by_level(i)
+            if (games_id == []):
+                break
+            levels.append(games_id)
+        return levels
 
-	def validate_nb_players(self, value: int):
-		if (value < 2):
-			raise serializers.ValidationError("The numbers of players must be greather than 2.")
-		return value
-	def validate_nb_players_by_game(self, value: int):
-		if (value < 2):
-			raise serializers.ValidationError("The numbers of players by game must be greather than 2.")
-		nb_players: str = self.initial_data.get("nb_players")
-		if (nb_players is not None and nb_players.isnumeric()):
-			nb_players: int = int(nb_players)
-			if (value > nb_players):
-				raise serializers.ValidationError("The numbers of players by game must be smaller than the numbers of players.")
-		return value
\ No newline at end of file
+    def validate_nb_players(self, value: int):
+        if (value < 2):
+            raise serializers.ValidationError("The numbers of players must be greather than 2.")
+        return value
+    def validate_nb_players_by_game(self, value: int):
+        if (value < 2):
+            raise serializers.ValidationError("The numbers of players by game must be greather than 2.")
+        nb_players: str = self.initial_data.get("nb_players")
+        if (nb_players is not None and nb_players.isnumeric()):
+            nb_players: int = int(nb_players)
+            if (value > nb_players):
+                raise serializers.ValidationError("The numbers of players by game must be smaller than the numbers of players.")
+        return value
\ No newline at end of file
diff --git a/tournament/test.py b/tournament/test.py
index 3da31cb..077f4e4 100644
--- a/tournament/test.py
+++ b/tournament/test.py
@@ -9,36 +9,36 @@ import json
 import uuid
 
 class CreateTest(TestCase):
-	def setUp(self):
-		self.client = Client()
+    def setUp(self):
+        self.client = Client()
 
-		self.url = "/api/tournaments/"
+        self.url = "/api/tournaments/"
 
-		self.username = str(uuid.uuid4())
-		self.password = str(uuid.uuid4())
+        self.username = str(uuid.uuid4())
+        self.password = str(uuid.uuid4())
 
-		self.nb_players_by_game = 2
-		self.nb_players = 8
+        self.nb_players_by_game = 2
+        self.nb_players = 8
 
-		user: User = User.objects.create_user(username=self.username, password=self.password)
-		self.client.login(username=self.username, password=self.password)
+        user: User = User.objects.create_user(username=self.username, password=self.password)
+        self.client.login(username=self.username, password=self.password)
 
-	def test_normal(self):
-		response: HttpResponse = self.client.post(self.url, {"nb_players_by_game": self.nb_players_by_game, "nb_players": self.nb_players})
-		response_data: dict = json.loads(response.content)
-		self.assertDictContainsSubset({"name": ""}, response_data)
+    def test_normal(self):
+        response: HttpResponse = self.client.post(self.url, {"nb_players_by_game": self.nb_players_by_game, "nb_players": self.nb_players})
+        response_data: dict = json.loads(response.content)
+        self.assertDictContainsSubset({"name": ""}, response_data)
 
-	def test_too_small_nb_players_by_game(self):
-		response: HttpResponse = self.client.post(self.url, {"nb_players_by_game": 1, "nb_players": self.nb_players})
-		response_data = json.loads(response.content)
-		self.assertDictEqual(response_data, {'nb_players_by_game': ['The numbers of players by game must be greather than 2.']})
-	
-	def test_too_small_nb_players(self):
-		response: HttpResponse = self.client.post(self.url, {"nb_players_by_game": self.nb_players_by_game, "nb_players": 1})
-		response_data = json.loads(response.content)
-		self.assertDictEqual(response_data, {'nb_players': ['The numbers of players must be greather than 2.'], 'nb_players_by_game': ['The numbers of players by game must be smaller than the numbers of players.']})
+    def test_too_small_nb_players_by_game(self):
+        response: HttpResponse = self.client.post(self.url, {"nb_players_by_game": 1, "nb_players": self.nb_players})
+        response_data = json.loads(response.content)
+        self.assertDictEqual(response_data, {'nb_players_by_game': ['The numbers of players by game must be greather than 2.']})
+    
+    def test_too_small_nb_players(self):
+        response: HttpResponse = self.client.post(self.url, {"nb_players_by_game": self.nb_players_by_game, "nb_players": 1})
+        response_data = json.loads(response.content)
+        self.assertDictEqual(response_data, {'nb_players': ['The numbers of players must be greather than 2.'], 'nb_players_by_game': ['The numbers of players by game must be smaller than the numbers of players.']})
 
-	def test_nb_players_smaller_nb_players_by_game(self):
-		response: HttpResponse = self.client.post(self.url, {"nb_players_by_game": 5, "nb_players": 3})
-		response_data = json.loads(response.content)
-		self.assertDictEqual(response_data, {'nb_players_by_game': ['The numbers of players by game must be smaller than the numbers of players.']})
\ No newline at end of file
+    def test_nb_players_smaller_nb_players_by_game(self):
+        response: HttpResponse = self.client.post(self.url, {"nb_players_by_game": 5, "nb_players": 3})
+        response_data = json.loads(response.content)
+        self.assertDictEqual(response_data, {'nb_players_by_game': ['The numbers of players by game must be smaller than the numbers of players.']})
\ No newline at end of file
diff --git a/tournament/viewset.py b/tournament/viewset.py
index bc27f11..0ffd2cd 100644
--- a/tournament/viewset.py
+++ b/tournament/viewset.py
@@ -13,44 +13,44 @@ from .serializers import TournamentSerializer
 # Create your views here.
 class TournamentViewSet(viewsets.ModelViewSet):
     
-	queryset = TournamentModel.objects.all
-	serializer_class = TournamentSerializer
-	permission_classes = (permissions.IsAuthenticated,)
-	authentication_classes = (SessionAuthentication,)
+    queryset = TournamentModel.objects.all
+    serializer_class = TournamentSerializer
+    permission_classes = (permissions.IsAuthenticated,)
+    authentication_classes = (SessionAuthentication,)
 
-	def perform_create(self, serializer: TournamentSerializer):
+    def perform_create(self, serializer: TournamentSerializer):
 
-		nb_players = serializer.validated_data["nb_players"]
-		nb_players_by_game = serializer.validated_data["nb_players_by_game"]
-		level = 1
-		number: int = nb_players
-		while (number != nb_players_by_game):
-			number = number // 2 + (number % 2)
-			level += 1
+        nb_players = serializer.validated_data["nb_players"]
+        nb_players_by_game = serializer.validated_data["nb_players_by_game"]
+        level = 1
+        number: int = nb_players
+        while (number != nb_players_by_game):
+            number = number // 2 + (number % 2)
+            level += 1
 
-		tournament = serializer.save(level = level)
-		
-		return Response(self.serializer_class(tournament).data, status=status.HTTP_201_CREATED)
-	
-	def list(self, request: HttpRequest, state: str = ""):
-		query: QuerySet
-		match state:
-			case "started":
-				query = TournamentModel.objects.filter(started=True, finished=False)
-			case "finished":
-				query = TournamentModel.objects.filter(finished=True)
-			case "waiting":
-				query = TournamentModel.objects.filter(started=False, finished=False)
-			case _:
-				query = TournamentModel.objects.all()
-		serializer = TournamentSerializer(query, many=True)	
-		return Response(serializer.data)
+        tournament = serializer.save(level = level)
+        
+        return Response(self.serializer_class(tournament).data, status=status.HTTP_201_CREATED)
+    
+    def list(self, request: HttpRequest, state: str = ""):
+        query: QuerySet
+        match state:
+            case "started":
+                query = TournamentModel.objects.filter(started=True, finished=False)
+            case "finished":
+                query = TournamentModel.objects.filter(finished=True)
+            case "waiting":
+                query = TournamentModel.objects.filter(started=False, finished=False)
+            case _:
+                query = TournamentModel.objects.all()
+        serializer = TournamentSerializer(query, many=True)    
+        return Response(serializer.data)
 
-	def retrieve(self, request: HttpRequest, pk):
+    def retrieve(self, request: HttpRequest, pk):
 
-		if (not TournamentModel.objects.filter(pk=pk).exists()):
-			return Response({"detail": "Tournament not found."}, status=status.HTTP_404_NOT_FOUND)
-		
-		tournament = TournamentModel.objects.get(pk=pk)
+        if (not TournamentModel.objects.filter(pk=pk).exists()):
+            return Response({"detail": "Tournament not found."}, status=status.HTTP_404_NOT_FOUND)
+        
+        tournament = TournamentModel.objects.get(pk=pk)
 
-		return Response(self.serializer_class(tournament).data, status=status.HTTP_200_OK)
\ No newline at end of file
+        return Response(self.serializer_class(tournament).data, status=status.HTTP_200_OK)
\ No newline at end of file
diff --git a/transcendence/abstract/AbstractRoom.py b/transcendence/abstract/AbstractRoom.py
index 7c1c87f..ba0e414 100644
--- a/transcendence/abstract/AbstractRoom.py
+++ b/transcendence/abstract/AbstractRoom.py
@@ -3,49 +3,49 @@ from channels.generic.websocket import WebsocketConsumer
 from .AbstractRoomMember import AbstractRoomMember
 
 class AbstractRoom:
-	
-	def __init__(self, room_manager):
-		self._member_list: [AbstractRoomMember] = [] 
-		self.room_manager = room_manager
+    
+    def __init__(self, room_manager):
+        self._member_list: [AbstractRoomMember] = [] 
+        self.room_manager = room_manager
 
-	def broadcast(self, detail: str, data: dict = {}):
-		for member in self._member_list:
-			member: AbstractRoomMember
-			member.send(detail, data)
-	
-	def clear(self):
-		self._member_list.clear()
+    def broadcast(self, detail: str, data: dict = {}):
+        for member in self._member_list:
+            member: AbstractRoomMember
+            member.send(detail, data)
+    
+    def clear(self):
+        self._member_list.clear()
 
-	def get_member_by_socket(self, socket: WebsocketConsumer):
-		for member in self._member_list:
-			member: AbstractRoomMember
-			if (member.socket is socket):
-				return member
-		return None
+    def get_member_by_socket(self, socket: WebsocketConsumer):
+        for member in self._member_list:
+            member: AbstractRoomMember
+            if (member.socket is socket):
+                return member
+        return None
 
-	def get_member_by_user_id(self, user_id: int):
-		for member in self._member_list:
-			member: AbstractRoomMember
-			if (member.user_id == user_id):
-				return member
-		return None
+    def get_member_by_user_id(self, user_id: int):
+        for member in self._member_list:
+            member: AbstractRoomMember
+            if (member.user_id == user_id):
+                return member
+        return None
 
 
-	def append(self, member: AbstractRoomMember):
-		self._member_list.append(member)
-		member.accept()
+    def append(self, member: AbstractRoomMember):
+        self._member_list.append(member)
+        member.accept()
 
-	def remove(self, member: AbstractRoomMember, code: int = 1000):
-		self._member_list.remove(member)
-		member.disconnect(code)
+    def remove(self, member: AbstractRoomMember, code: int = 1000):
+        self._member_list.remove(member)
+        member.disconnect(code)
 
-	def empty(self):
-		for _ in self._member_list:
-			return False
-		return True
+    def empty(self):
+        for _ in self._member_list:
+            return False
+        return True
 
-	def get_users_id(self):
-		return [member.user_id for member in self._member_list]
+    def get_users_id(self):
+        return [member.user_id for member in self._member_list]
 
-	def __len__(self):
-		return len(self._member_list)
+    def __len__(self):
+        return len(self._member_list)
diff --git a/transcendence/abstract/AbstractRoomManager.py b/transcendence/abstract/AbstractRoomManager.py
index a4bf09a..88468f3 100644
--- a/transcendence/abstract/AbstractRoomManager.py
+++ b/transcendence/abstract/AbstractRoomManager.py
@@ -2,11 +2,11 @@ from .AbstractRoom import AbstractRoom
 
 class AbstractRoomManager:
 
-	def __init__(self):
-		self._room_list: [AbstractRoom] = []
+    def __init__(self):
+        self._room_list: [AbstractRoom] = []
 
-	def remove(self, room: AbstractRoom):
-		self._room_list.remove(room)
+    def remove(self, room: AbstractRoom):
+        self._room_list.remove(room)
 
-	def append(self, room: AbstractRoom):
-		self._room_list.append(room)
+    def append(self, room: AbstractRoom):
+        self._room_list.append(room)
diff --git a/transcendence/abstract/AbstractRoomMember.py b/transcendence/abstract/AbstractRoomMember.py
index 0a89b98..2dd161b 100644
--- a/transcendence/abstract/AbstractRoomMember.py
+++ b/transcendence/abstract/AbstractRoomMember.py
@@ -4,17 +4,17 @@ import json
 
 class AbstractRoomMember:
 
-	def __init__(self, user_id: int, socket: WebsocketConsumer):
-		self.user_id: int = user_id
-		self.socket: WebsocketConsumer = socket
-	
-	def send(self, detail: str, data: dict = {}):
-		raw_data: dict = {"detail": detail}
-		raw_data.update(data)
-		self.socket.send(text_data=json.dumps(raw_data))
+    def __init__(self, user_id: int, socket: WebsocketConsumer):
+        self.user_id: int = user_id
+        self.socket: WebsocketConsumer = socket
+    
+    def send(self, detail: str, data: dict = {}):
+        raw_data: dict = {"detail": detail}
+        raw_data.update(data)
+        self.socket.send(text_data=json.dumps(raw_data))
 
-	def accept(self):
-		self.socket.accept()
+    def accept(self):
+        self.socket.accept()
 
-	def disconnect(self, code: int = 1000):
-		self.socket.disconnect(code)
\ No newline at end of file
+    def disconnect(self, code: int = 1000):
+        self.socket.disconnect(code)
\ No newline at end of file
diff --git a/transcendence/asgi.py b/transcendence/asgi.py
index cb8ac86..8d907a4 100644
--- a/transcendence/asgi.py
+++ b/transcendence/asgi.py
@@ -22,13 +22,13 @@ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'trancendence.settings')
 
 application = ProtocolTypeRouter({
     'http':get_asgi_application(),
-	'websocket':AuthMiddlewareStack(
-		URLRouter(
-			chat.routing.websocket_urlpatterns +
-			matchmaking.routing.websocket_urlpatterns +
-			tournament.routing.websocket_urlpatterns +
-			games.routing.websocket_urlpatterns
-		)
-	)
+    'websocket':AuthMiddlewareStack(
+        URLRouter(
+            chat.routing.websocket_urlpatterns +
+            matchmaking.routing.websocket_urlpatterns +
+            tournament.routing.websocket_urlpatterns +
+            games.routing.websocket_urlpatterns
+        )
+    )
 })
 
diff --git a/transcendence/settings.py b/transcendence/settings.py
index 7e4fe90..44bdff8 100644
--- a/transcendence/settings.py
+++ b/transcendence/settings.py
@@ -41,8 +41,8 @@ CORS_ORIGIN_WHITELIST = (
 # Application definition
 
 INSTALLED_APPS = [
-	'channels',
-	'daphne',
+    'channels',
+    'daphne',
 
     'tournament.apps.TournamentConfig',
     'matchmaking.apps.MatchmakingConfig',
@@ -65,9 +65,9 @@ INSTALLED_APPS = [
 ASGI_APPLICATION = 'transcendence.asgi.application'
 
 CHANNEL_LAYERS = {
-	'default' :{
-		'BACKEND':'channels.layers.InMemoryChannelLayer'
-	}
+    'default' :{
+        'BACKEND':'channels.layers.InMemoryChannelLayer'
+    }
 }
 
 MIDDLEWARE = [

From dcbecf14cf07bdd5c0f7fe856cd349181e282404 Mon Sep 17 00:00:00 2001
From: Xamora <xamora@42l.fr>
Date: Thu, 8 Feb 2024 15:29:06 +0100
Subject: [PATCH 49/77] =?UTF-8?q?Episode=204:=20Ouvrant=20la=20porte=20ave?=
 =?UTF-8?q?c=20le=20coeur=20battant=20=C3=A0=20toute=20vitesse;=20Les=20?=
 =?UTF-8?q?=C3=A9tranges=20sons=20venant=20de=20l'int=C3=A9rieur=20de=20ce?=
 =?UTF-8?q?t=20appartment=20appartement=20par=20Madame=20sont=20de=20plus?=
 =?UTF-8?q?=20en=20plus=20intriguant.=20Pas=20=C3=A0=20pas=20les=20sons=20?=
 =?UTF-8?q?sont=20se=20rapproches=20plus=20d'un=20g=C3=A9missement=20que?=
 =?UTF-8?q?=20de=20simple=20par=C3=B4les.=20=C3=80=20ce=20moment=20Adrien?=
 =?UTF-8?q?=20fig=C3=A9,=20immobilis=C3=A9,=20les=20pieds=20se=20sont=20tr?=
 =?UTF-8?q?ansform=C3=A9=20plomb,=20incapable=20de=20faire=20un=20bruit,?=
 =?UTF-8?q?=20un=20mouvement,...=20Prenant=20son=20courage=20=C3=A0=20deux?=
 =?UTF-8?q?=20mains,=20se=20disant=20qu'il=20fallait=20connaitre=20la=20v?=
 =?UTF-8?q?=C3=A9rit=C3=A9=C2=A0ici=20et=20maintenant.=20Une=20main=20suan?=
 =?UTF-8?q?te=20sur=20la=20poign=C3=A9e=20de=20porte,=20il=20l'a=20tourne?=
 =?UTF-8?q?=20lentement...=20;La=20suite=20au=20prochain=20commit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/static/js/api/LanguageManager.js |  2 +-
 frontend/static/js/lang/cr.json           | 39 ++++++++++++++++++++++
 frontend/static/js/lang/tp.json           | 40 +++++++++++++++++++++++
 frontend/templates/index.html             |  7 ++--
 4 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 frontend/static/js/lang/cr.json
 create mode 100644 frontend/static/js/lang/tp.json

diff --git a/frontend/static/js/api/LanguageManager.js b/frontend/static/js/api/LanguageManager.js
index 4c2a6d0..06325f2 100644
--- a/frontend/static/js/api/LanguageManager.js
+++ b/frontend/static/js/api/LanguageManager.js
@@ -2,7 +2,7 @@ import { reloadView } from '../index.js'
 
 export default class LanguageManager {
 	constructor() {
-		this.availableLanguages = ['en', 'fr'];
+		this.availableLanguages = ['en', 'fr', 'tp', 'cr'];
 
 		this.dict = null;
 		this.currentLang = 'en'
diff --git a/frontend/static/js/lang/cr.json b/frontend/static/js/lang/cr.json
new file mode 100644
index 0000000..82bf7c1
--- /dev/null
+++ b/frontend/static/js/lang/cr.json
@@ -0,0 +1,39 @@
+{
+	"navbarSearch": "cherchbeh",
+	"navbarHome": "Quoicoubouse",
+	"navbarLogin": "Quoicouconnec",
+	"navbarRegister": "Quoicougistré",
+	"navbarProfile": "Mon crampté Profile",
+	"navbarSettings": "Roue Crampté",
+	"navbarLogout": "Déconnexion crampté",
+	"homeWindowTitle": "Quoicoubouse",
+	"homeTitle": "Quoicoubouse",
+	"homeOnline": "Jouer en crampté",
+	"homeOffline": "Jouer hors crampté",
+	"homeSettings": "Roue Crampté",
+	"homeLogout": "Déconnexion crampté",
+	"loginWindowTitle": "Quoicouconnec",
+	"loginFormTitle": "Quoicouconnec",
+	"loginFormUsername": "Nom d'crampté",
+	"loginFormPassword": "Mot de crampté",
+	"loginFormButton": "Quoicouconnec",
+	"loginNoAccount": "Pas de compte encore crampté?",
+	"loginRegister": "Quoicougistré",
+	"errorEmptyField": "Ce champ ne peut pas être vide crampté.",
+	"logoutWindowTitle": "Déconnexion crampté",
+	"registerWindowTitle": "Quoicougistré",
+	"registerFormTitle": "Quoicougistré",
+	"registerFormUsername": "Nom d'crampté",
+	"registerFormPassword": "Mot de crampté",
+	"registerFormButton": "Quoicougistré",
+	"registerAlreadyAccount": "Déjà un compte crampté?",
+	"registerLogin": "Quoicouconnec",
+	"404WindowTitle": "Pas crampté",
+	"SearchWindowTitle": "cherchbeh",
+	"profileAddFriend": "Demander le cramptéman",
+	"profileRemoveFriend": "Supprimer le cramptéman",
+	"profileDenyRequest": "Refuser le cramptéman",
+	"profileAcceptRequest": "Accepter le cramptéman",
+	"profileUnblock": "Quoicoudebloquer",
+	"profileBlock": "Quoicoubloquer"
+}
diff --git a/frontend/static/js/lang/tp.json b/frontend/static/js/lang/tp.json
new file mode 100644
index 0000000..7874462
--- /dev/null
+++ b/frontend/static/js/lang/tp.json
@@ -0,0 +1,40 @@
+{
+	"navbarSearch": "Lukin",
+	"navbarHome": "Tomo",
+	"navbarLogin": "Open",
+	"navbarRegister": "Sitelen",
+	"navbarProfile": "Sitelen mi",
+	"navbarSettings": "Nasin",
+	"navbarLogout": "Tawa ala",
+	"homeWindowTitle": "Tomo",
+	"homeTitle": "Tomo",
+	"homeOnline": "Mute tawa",
+	"homeOffline": "Mute lon",
+	"homeSettings": "Nasin",
+	"homeLogout": "Tawa ala",
+	"loginWindowTitle": "Open",
+	"loginFormTitle": "Open",
+	"loginFormUsername": "nimi pi jan Open",
+	"loginFormPassword": "nimi nasa",
+	"loginFormButton": "Open",
+	"loginNoAccount": "sina wile ala wile jo e nimi pi jan Open?",
+	"loginRegister": "Sitelen",
+	"errorEmptyField": "nimi ni li wile sitelen.",
+	"logoutWindowTitle": "Tawa ala",
+	"registerWindowTitle": "Sitelen",
+	"registerFormTitle": "Sitelen",
+	"registerFormUsername": "nimi pi jan sin",
+	"registerFormPassword": "nimi nasa",
+	"registerFormButton": "Sitelen",
+	"registerAlreadyAccount": "sina jo ala jo e nimi pi jan sin?",
+	"registerLogin": "Open",
+	"404WindowTitle": "Ala o lukin e ni",
+	"SearchWindowTitle": "Lukin",
+	"profileAddFriend": "kama jo e jan",
+	"profileRemoveFriend": "tawa ala e jan",
+	"profileDenyRequest": "ante e ijo ni",
+	"profileAcceptRequest": "kama jo e ijo ni",
+	"profileUnblock": "Tawa ala e nimi pi jan ni",
+	"profileBlock": "Tawa e nimi pi jan ni"
+}
+
diff --git a/frontend/templates/index.html b/frontend/templates/index.html
index 06786f0..8e79ce3 100644
--- a/frontend/templates/index.html
+++ b/frontend/templates/index.html
@@ -22,8 +22,11 @@
 					Lang.
 				</a>
 				<div id='languageSelector' class='dropdown-menu dropdown-menu-end position-absolute text-center px-2' style='min-width: 65px'>
-					<button value='en' type='button' class="dropdow-item nav-link text-center py-1">&#127468;&#127463; EN</a>
-					<button value='fr' type='button' class="dropdow-item nav-link text-center py-1">&#127467;&#127479; FR</a>
+					<button value='en' type='button' class="dropdow-item nav-link text-center py-1">&#127468;&#127463; EN</button>
+					<button value='fr' type='button' class="dropdow-item nav-link text-center py-1">&#127467;&#127479; FR</button>
+					<button value='tp' type='button' class="dropdow-item nav-link text-center py-1">🗣️👍🖼️❤️  toki pona</button>
+						<button value='cr' type='button' class="dropdown-item nav-link text-center py-1" style="background-image: url(https://image.noelshack.com/fichiers/2023/06/1/1675686620-full.png); background-size: cover; background-position: center; background-repeat: no-repeat; background-color: transparent;">Crampté</button>
+
 				</div>
 			</div>
 			<div id='navbarLoggedOut' class='d-flex flex-row gap-2'>

From f0615a53e4682a227b54b408f54b7af55d562f71 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Thu, 8 Feb 2024 15:41:53 +0100
Subject: [PATCH 50/77] lang: replaced html code with emojis in html file

---
 frontend/templates/index.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/frontend/templates/index.html b/frontend/templates/index.html
index 8e79ce3..1d948f1 100644
--- a/frontend/templates/index.html
+++ b/frontend/templates/index.html
@@ -22,11 +22,10 @@
 					Lang.
 				</a>
 				<div id='languageSelector' class='dropdown-menu dropdown-menu-end position-absolute text-center px-2' style='min-width: 65px'>
-					<button value='en' type='button' class="dropdow-item nav-link text-center py-1">&#127468;&#127463; EN</button>
-					<button value='fr' type='button' class="dropdow-item nav-link text-center py-1">&#127467;&#127479; FR</button>
+					<button value='en' type='button' class="dropdow-item nav-link text-center py-1">🇬🇧 EN</button>
+					<button value='fr' type='button' class="dropdow-item nav-link text-center py-1">🇫🇷 FR</button>
 					<button value='tp' type='button' class="dropdow-item nav-link text-center py-1">🗣️👍🖼️❤️  toki pona</button>
-						<button value='cr' type='button' class="dropdown-item nav-link text-center py-1" style="background-image: url(https://image.noelshack.com/fichiers/2023/06/1/1675686620-full.png); background-size: cover; background-position: center; background-repeat: no-repeat; background-color: transparent;">Crampté</button>
-
+					<button value='cr' type='button' class="dropdown-item nav-link text-center py-1" style="background-image: url(https://image.noelshack.com/fichiers/2023/06/1/1675686620-full.png); background-size: cover; background-position: center; background-repeat: no-repeat; background-color: transparent;">Crampté</button>
 				</div>
 			</div>
 			<div id='navbarLoggedOut' class='d-flex flex-row gap-2'>

From 68df50cbeb263f1045a3c36b1dbc5e3d818ccf01 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Thu, 8 Feb 2024 15:58:13 +0100
Subject: [PATCH 51/77] profiles: avatar_url becomes avatar

---
 frontend/static/js/api/profile.js |  2 +-
 profiles/models.py                |  2 +-
 profiles/serializers.py           |  4 ++--
 profiles/tests.py                 |  4 ++--
 profiles/viewsets.py              | 14 +++++++-------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/frontend/static/js/api/profile.js b/frontend/static/js/api/profile.js
index 8fcc6bf..65390e0 100644
--- a/frontend/static/js/api/profile.js
+++ b/frontend/static/js/api/profile.js
@@ -52,7 +52,7 @@ class Profile
 		let response_data = await response.json();
 		this.id = response_data.user_id;
 		this.username = response_data.username;
-		this.avatar_url = response_data.avatar_url;
+		this.avatar_url = response_data.avatar;
 
 		await this.getBlock();
 		await this.getFriend();
diff --git a/profiles/models.py b/profiles/models.py
index 581ab0b..8b310eb 100644
--- a/profiles/models.py
+++ b/profiles/models.py
@@ -14,7 +14,7 @@ def upload_to(instance, filename: str):
 # Create your models here.
 class ProfileModel(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
-    avatar_url = models.ImageField(upload_to=upload_to, default="./profiles/static/avatars/default.avif")
+    avatar = models.ImageField(upload_to=upload_to, default="./profiles/static/avatars/default.avif")
     
     def get_game(self) -> int:
         for game in game_manager._game_list:
diff --git a/profiles/serializers.py b/profiles/serializers.py
index 1fea89f..b53bb03 100644
--- a/profiles/serializers.py
+++ b/profiles/serializers.py
@@ -4,8 +4,8 @@ from .models import ProfileModel
 class ProfileSerializer(serializers.ModelSerializer):
 
     username = serializers.ReadOnlyField(source='user.username')
-    avatar_url = serializers.ImageField(required=False)
+    avatar = serializers.ImageField(required=False)
 
     class Meta:
         model = ProfileModel
-        fields = ["username", "avatar_url", "user_id"]
\ No newline at end of file
+        fields = ["username", "avatar", "user_id"]
diff --git a/profiles/tests.py b/profiles/tests.py
index 087957c..a963a69 100644
--- a/profiles/tests.py
+++ b/profiles/tests.py
@@ -7,7 +7,7 @@ class ProfileTest(TestCase):
     def setUp(self):
         self.user: User = User.objects.create(username='bozo', password='password')
         self.user.save()
-        self.expected_response = {'avatar_url': '/static/avatars/default.avif', 'user_id': 1, 'username': 'bozo'}
+        self.expected_response = {'avatar': '/static/avatars/default.avif', 'user_id': 1, 'username': 'bozo'}
         
         self.url = "/api/profiles/"
     
@@ -15,4 +15,4 @@ class ProfileTest(TestCase):
         response: HttpResponse = self.client.get(self.url + str(self.user.pk))
         response_dict: dict = eval(response.content)
         self.assertDictEqual(self.expected_response, response_dict)
-        
\ No newline at end of file
+        
diff --git a/profiles/viewsets.py b/profiles/viewsets.py
index 60725e1..7272bf7 100644
--- a/profiles/viewsets.py
+++ b/profiles/viewsets.py
@@ -25,7 +25,7 @@ class ProfileViewSet(viewsets.ModelViewSet):
         if (not user):
             return Response({"detail": "Profile not found."}, status=status.HTTP_404_NOT_FOUND)
         instance = self.queryset().get(pk=user[0].pk)
-        instance.avatar_url.name = instance.avatar_url.name[instance.avatar_url.name.find("static") - 1:]
+        instance.avatar.name = instance.avatar.name[instance.avatar.name.find("static") - 1:]
         return Response(self.serializer_class(instance).data,
                         status=status.HTTP_200_OK)
 
@@ -34,14 +34,14 @@ class ProfileViewSet(viewsets.ModelViewSet):
         if (not user):
             return Response({"detail": "Profile not found."}, status=status.HTTP_404_NOT_FOUND)
         instance = self.queryset().get(pk=user[0].pk)
-        instance.avatar_url.name = instance.avatar_url.name[instance.avatar_url.name.find("static") - 1:]
+        instance.avatar.name = instance.avatar.name[instance.avatar.name.find("static") - 1:]
         return Response(self.serializer_class(instance).data,
                         status=status.HTTP_200_OK)
 
     def list(self, request: HttpRequest):
         serializer = ProfileSerializer(self.queryset(), many=True)
         for profile in serializer.data:
-            profile["avatar_url"] = profile["avatar_url"][profile["avatar_url"].find("static") - 1:]
+            profile["avatar"] = profile["avatar"][profile["avatar"].find("static") - 1:]
         return Response(serializer.data)
 
 class MyProfileViewSet(viewsets.ModelViewSet):
@@ -59,13 +59,13 @@ class MyProfileViewSet(viewsets.ModelViewSet):
         profile: ProfileModel = self.get_object()
         avatar : InMemoryUploadedFile = self.request.data.get("file", None)
         if (avatar is not None and avatar.size <= settings.PROFILE_PICTURE_MAX_SIZE):
-            if (profile.avatar_url.name != "./profiles/static/avatars/default.avif"):
-                profile.avatar_url.storage.delete(profile.avatar_url.name)
-            profile.avatar_url = avatar
+            if (profile.avatar.name != "./profiles/static/avatars/default.avif"):
+                profile.avatar.storage.delete(profile.avatar.name)
+            profile.avatar = avatar
             profile.save()
     
     def retrieve(self, request: HttpRequest, pk=None):
         instance: ProfileModel = self.get_object()
-        instance.avatar_url.name = instance.avatar_url.name[instance.avatar_url.name.find("static") - 1:]
+        instance.avatar.name = instance.avatar.name[instance.avatar.name.find("static") - 1:]
         return Response(self.serializer_class(instance).data,
                         status=status.HTTP_200_OK)

From b66088fe69036597b95c57ef970332d1c09d2999 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Thu, 8 Feb 2024 17:21:26 +0100
Subject: [PATCH 52/77] pp upload: image verification using serializers

---
 frontend/static/js/views/SettingsView.js |  2 +-
 profiles/serializers.py                  |  9 +++++++++
 profiles/viewsets.py                     | 10 +++++-----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/frontend/static/js/views/SettingsView.js b/frontend/static/js/views/SettingsView.js
index ab44678..82f691a 100644
--- a/frontend/static/js/views/SettingsView.js
+++ b/frontend/static/js/views/SettingsView.js
@@ -85,7 +85,7 @@ export default class extends AbstractAuthentificateView
 				return;
 			}
             let form_data = new FormData();
-            form_data.append("file", avatar.files[0]);
+            form_data.append("avatar", avatar.files[0]);
             await client.me.change_avatar(form_data);
 			this.display_avatar();
         }
diff --git a/profiles/serializers.py b/profiles/serializers.py
index b53bb03..893093b 100644
--- a/profiles/serializers.py
+++ b/profiles/serializers.py
@@ -1,5 +1,6 @@
 from rest_framework import serializers
 from .models import ProfileModel
+from django.conf import settings
 
 class ProfileSerializer(serializers.ModelSerializer):
 
@@ -9,3 +10,11 @@ class ProfileSerializer(serializers.ModelSerializer):
     class Meta:
         model = ProfileModel
         fields = ["username", "avatar", "user_id"]
+
+    def validate_avatar(self, value):
+        '''
+        Check that the image is not too large
+        '''
+        if value.size > settings.PROFILE_PICTURE_MAX_SIZE:
+            raise serializers.ValidationError('Image is too large.');
+        return value;
diff --git a/profiles/viewsets.py b/profiles/viewsets.py
index 7272bf7..38e9755 100644
--- a/profiles/viewsets.py
+++ b/profiles/viewsets.py
@@ -8,8 +8,6 @@ from rest_framework.authentication import SessionAuthentication
 from django.http import HttpRequest
 from django.db.models import QuerySet
 from django.contrib.auth.models import User
-from django.core.files.uploadedfile import InMemoryUploadedFile
-from django.conf import settings
 
 from .serializers import ProfileSerializer
 from .models import ProfileModel
@@ -56,9 +54,11 @@ class MyProfileViewSet(viewsets.ModelViewSet):
         return obj
 
     def perform_update(self, serializer, pk=None):
-        profile: ProfileModel = self.get_object()
-        avatar : InMemoryUploadedFile = self.request.data.get("file", None)
-        if (avatar is not None and avatar.size <= settings.PROFILE_PICTURE_MAX_SIZE):
+        serializer.is_valid(raise_exception=True);
+        profile: ProfileModel = self.get_object();
+        avatar = serializer.validated_data.get('avatar');
+
+        if (avatar is not None):
             if (profile.avatar.name != "./profiles/static/avatars/default.avif"):
                 profile.avatar.storage.delete(profile.avatar.name)
             profile.avatar = avatar

From 5a0356040d6ace3b414416fdf02c82f57043b8c7 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Fri, 9 Feb 2024 17:13:28 +0100
Subject: [PATCH 53/77] fixed .gitignore

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

diff --git a/.gitignore b/.gitignore
index 0b9eec4..aee563f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,5 @@
 db.sqlite3
 **/migrations/**
 /profiles/static/avatars/*
-!/profiles/static/avatars/default.env
+!/profiles/static/avatars/default.avif
 *.mo

From b66a584a9bd9184aa1b916beb18858f2c5439f22 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Tue, 13 Feb 2024 09:53:40 +0100
Subject: [PATCH 54/77] fix(avatar)

---
 frontend/static/js/api/profiles.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/static/js/api/profiles.js b/frontend/static/js/api/profiles.js
index 1a1eb54..8a00d8a 100644
--- a/frontend/static/js/api/profiles.js
+++ b/frontend/static/js/api/profiles.js
@@ -24,7 +24,7 @@ class Profiles
 
 		let profiles = []
 		response_data.forEach((profile) => {
-			profiles.push(new Profile(this.client, profile.username, profile.user_id, profile.avatar_url))
+			profiles.push(new Profile(this.client, profile.username, profile.user_id, profile.avatar))
 		});
 		return profiles;
 	}

From 5da7602dbb40d999acf0be1bb6101baef1349a28 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 10:07:45 +0100
Subject: [PATCH 55/77] clean: rename view

---
 ...{AbstractNonAuthentified.js => AbstractNonAuthentifiedView.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename frontend/static/js/views/abstracts/{AbstractNonAuthentified.js => AbstractNonAuthentifiedView.js} (100%)

diff --git a/frontend/static/js/views/abstracts/AbstractNonAuthentified.js b/frontend/static/js/views/abstracts/AbstractNonAuthentifiedView.js
similarity index 100%
rename from frontend/static/js/views/abstracts/AbstractNonAuthentified.js
rename to frontend/static/js/views/abstracts/AbstractNonAuthentifiedView.js

From 6765e1bb306b8f96afc47afab3081070ed18c6e9 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 10:09:16 +0100
Subject: [PATCH 56/77] accounts: merge register and login #1

---
 frontend/static/js/index.js                   |   8 +-
 .../js/views/accounts/AuthentifyView.js       | 162 ++++++++++++++++++
 .../static/js/views/accounts/LoginView.js     |  77 ---------
 .../static/js/views/accounts/RegisterView.js  |  77 ---------
 4 files changed, 165 insertions(+), 159 deletions(-)
 create mode 100644 frontend/static/js/views/accounts/AuthentifyView.js
 delete mode 100644 frontend/static/js/views/accounts/LoginView.js
 delete mode 100644 frontend/static/js/views/accounts/RegisterView.js

diff --git a/frontend/static/js/index.js b/frontend/static/js/index.js
index 911920a..90c789e 100644
--- a/frontend/static/js/index.js
+++ b/frontend/static/js/index.js
@@ -1,10 +1,8 @@
 import { Client } from "./api/client.js";
 
-import LoginView from "./views/accounts/LoginView.js";
 import Dashboard from "./views/Dashboard.js";
 import Search from "./views/Search.js";
 import HomeView from "./views/HomeView.js";
-import RegisterView from "./views/accounts/RegisterView.js";
 import LogoutView from "./views/accounts/LogoutView.js";
 import GameOfflineView from "./views/GameOfflineView.js";
 import GameView from "./views/GameView.js";
@@ -18,6 +16,7 @@ import MatchMakingView from "./views/MatchMakingView.js";
 import TournamentPageView from "./views/tournament/TournamentPageView.js";
 import TournamentsView from "./views/tournament/TournamentsListView.js";
 import TournamentCreateView from "./views/tournament/TournamentCreateView.js";
+import AuthentificateView from "./views/accounts/AuthentifyView.js";
 
 let client = new Client(location.origin);
 let lang = client.lang;
@@ -62,7 +61,6 @@ async function renderView(view)
 
 	let error_code = await view.postInit();
 
-
     if (error_code === 404)
         renderView(new PageNotFoundView());
     else if (error_code === 403)
@@ -77,9 +75,9 @@ const router = async(uri) => {
         { path: "/tournaments/create", view: TournamentCreateView },
         { path: "/tournaments/:id", view: TournamentPageView },
         { path: "/tournaments/", view: TournamentsView },
-        { path: "/login", view: LoginView },
+        { path: "/login", view: AuthentificateView },
+        { path: "/register", view: AuthentificateView },
         { path: "/logout", view: LogoutView },
-        { path: "/register", view: RegisterView },
         { path: "/search", view: Search },
         { path: "/home", view: HomeView },
         { path: "/settings", view: SettingsView },
diff --git a/frontend/static/js/views/accounts/AuthentifyView.js b/frontend/static/js/views/accounts/AuthentifyView.js
new file mode 100644
index 0000000..0c675c3
--- /dev/null
+++ b/frontend/static/js/views/accounts/AuthentifyView.js
@@ -0,0 +1,162 @@
+
+import { client, lang, navigateTo } from "../../index.js";
+import { clear, fill_errors } from "../../utils/formUtils.js";
+import AbstractNonAuthentifiedView from "../abstracts/AbstractNonAuthentifiedView.js";
+
+export default class extends AbstractNonAuthentifiedView
+{
+	constructor(params, lastUrlBeforeLogin = '/home')
+	{
+        super(params, lang.get('loginWindowTitle', 'Login'), lastUrlBeforeLogin);
+		this.redirectTo = lastUrlBeforeLogin;
+		this.current_mode = undefined
+	}
+
+	/**
+	 * @returns {Promise}
+	 */
+	async postInit()
+	{
+		let element = document.getElementById("toogle-register-login");
+
+		element.onclick = this.toogle_register_login.bind(this);
+	
+		let new_mode = location.pathname.slice(1);
+		this.update_mode(new_mode);
+
+		document.getElementById("button").onclick = this.authentificate.bind(this);
+	}
+
+	/**
+	 * Check if field is normal
+	 * @returns {null | Object<String>}
+	 */
+	basic_verif()
+	{
+		let username = document.getElementById('username-input').value;
+		let password = document.getElementById('password-input').value;
+
+		if (username === '')
+			document.getElementById('username').innerHTML = lang.get('errorEmptyField', 'This field may not be blank.');
+
+		if (password === '')
+			document.getElementById('password').innerHTML = lang.get('errorEmptyField', 'This field may not be blank.');
+		
+		if (username === '' || password === '')
+			return null;
+
+		return { username, password };
+	}
+
+	/**
+	 * @returns { undefined }
+	 */
+	toogle_register_login(event)
+	{
+		event.preventDefault();
+
+		let new_mode = this.current_mode === "register" ? "login" : "register";
+
+		this.update_mode(new_mode);
+	}
+
+	/**
+	 * @param {String} new_mode 
+	 */
+	update_mode(new_mode)
+	{
+		if (new_mode === this.current_mode)
+			return;
+
+		this.current_mode = new_mode;
+
+		let title = document.getElementById("title"),
+			username_label = document.getElementById("username-label"),
+			password_label = document.getElementById("password-label"),
+			toogle_register_login = document.getElementById("toogle-register-login"),
+			toogle_register_login_label = document.getElementById("toogle-register-login-label"),
+			button = document.getElementById("button")
+			;
+
+		let title_text = this.current_mode === "register" ? "registerFormTitle" : "loginFormTitle"; 
+		title.innerText = lang.get(title_text, "ERROR LANG");
+
+		let username_label_text = this.current_mode === "register" ? "registerFormUsername" : "loginFormUsername"; 
+		username_label.innerText = lang.get(username_label_text, "ERROR LANG");
+
+		let password_label_text = this.current_mode === "register" ? "registerFormPassword" : "loginFormPassword"; 
+		password_label.innerText = lang.get(password_label_text, "ERROR LANG");
+
+		let toogle_register_login_label_text = this.current_mode === "register" ? "registerAlreadyAccount" : "loginNoAccount";
+		toogle_register_login_label.innerText = lang.get(toogle_register_login_label_text, "ERROR LANG");;
+
+		let toogle_register_login_text = this.current_mode === "register" ? "registerLogin" : "loginRegister";
+		toogle_register_login.innerText = lang.get(toogle_register_login_text, "ERROR LANG");
+
+		let button_text = this.current_mode === "login" ? "loginFormButton" : "registerFormButton";
+		button.innerText = lang.get(button_text, "ERROR LANG");
+
+		history.pushState(null, null, `/${this.current_mode}`);
+	}
+
+	/**
+	 * @returns {Promise}
+	 */
+	async authentificate()
+	{
+		let ret = this.basic_verif();
+
+		if (ret === null)
+			return
+
+		let {username, password} = ret;
+
+		let response_data;
+
+		if (this.current_mode === "register")
+			response_data = await client.account.create(username, password) 
+		else
+			response_data = await client.login(username, password);
+
+		if (response_data !== null)
+		{
+			navigateTo(this.redirectTo);
+			return;
+		}
+	
+		clear("innerHTML", ["username", "password", 'register']);
+		fill_errors(response_data, "innerHTML");
+
+	}
+
+	async getHtml()
+	{
+        return /* HTML */ `
+			<link rel="stylesheet" href="/static/css/authentify.css">
+
+			<div class='container-fluid'>
+				<form class='border border-2 rounded bg-light-subtle mx-auto p-2 col-md-7 col-lg-4'>
+					<h4 class='text-center fw-semibold mb-4' id="title">Loading...</h4>
+					<div class='form-floating mb-2'>
+						<input type='text' class='form-control' id='username-input' placeholder='Username'>
+						<label for='usernameInput' id='username-label'>Loading...</label>
+						<span class='text-danger' id='username'></span>
+					</div>
+					<div class='form-floating'>
+						<input type='password' class='form-control' id='password-input' placeholder='Password'>
+						<label for='password-input' id='password-label'>Loading...</label>
+						<span class='text-danger' id='password'></span>
+					</div>
+					<div class='d-flex'>
+						<button type='button' class='btn btn-primary mt-3 mb-2' id='button'>Loading...</button>
+						<span class='text-danger my-auto mx-2' id='register'></span>
+						<div class='ms-auto mt-auto flex-row d-flex gap-2' id="toogle">
+							<p id='toogle-register-login-label'>Loading...</p>
+							<a id="toogle-register-login" href='#'>Loading...</a>
+						</div>
+					</div>
+				</form>
+			</div>
+        `;
+	}
+}
\ No newline at end of file
diff --git a/frontend/static/js/views/accounts/LoginView.js b/frontend/static/js/views/accounts/LoginView.js
deleted file mode 100644
index 61b9b14..0000000
--- a/frontend/static/js/views/accounts/LoginView.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import { client, lang, navigateTo } from "../../index.js";
-import { clear, fill_errors } from "../../utils/formUtils.js";
-import AbstractNonAuthentifiedView from "../abstracts/AbstractNonAuthentified.js";
-
-async function login(redirectTo = '/home')
-{
-	clear('innerHTML', ['username', 'password', 'login']);
-
-	let username = document.getElementById('usernameInput').value;
-	let password = document.getElementById('passwordInput').value;
-
-	if (username === '') {
-		document.getElementById('username').innerHTML = lang.get('errorEmptyField', 'This field may not be blank.');
-	}
-	if (password === '') {
-		document.getElementById('password').innerHTML = lang.get('errorEmptyField', 'This field may not be blank.');
-	}
-	if (username === '' || password === '')
-		return;
-
-	let response = await client.login(username, password);
-
-	if (response.status == 200) {
-		navigateTo(redirectTo);
-	} else {
-		let error = await response.json();
-		fill_errors(error, "innerHTML");
-	}
-}
-
-export default class extends AbstractNonAuthentifiedView {
-    constructor(params, lastUrlBeforeLogin = '/home') {
-        super(params, lang.get('loginWindowTitle', 'Login'), lastUrlBeforeLogin);
-		this.redirectTo = lastUrlBeforeLogin;
-	}
-
-	async postInit()
-	{
-		let usernameField = document.getElementById('usernameInput');
-		usernameField.addEventListener('keydown', ev => {
-			if (ev.key === 'Enter')
-				login(this.redirectTo);
-		});
-		usernameField.focus();
-		let passwordField = document.getElementById('passwordInput');
-		passwordField.addEventListener('keydown', ev => {
-			if (ev.key === 'Enter')
-				login(this.redirectTo);
-		});
-		document.getElementById('loginButton').onclick = _ => login(this.redirectTo);
-	}
-
-    async getHtml() {
-		return `
-		<div class='container-fluid'>
-			<form class='border border-2 rounded bg-light-subtle mx-auto p-2 col-md-7 col-lg-4'>
-				<h4 class='text-center fw-semibold mb-4'>${lang.get('loginFormTitle', 'Login')}</h4>
-				<div class='form-floating mb-2'>
-					<input type='text' class='form-control' id='usernameInput' placeholder='Username'>
-					<label for='usernameInput'>${lang.get('loginFormUsername', 'Username')}</label>
-					<span class='text-danger' id='username'></span>
-				</div>
-				<div class='form-floating'>
-					<input type='password' class='form-control' id='passwordInput' placeholder='Password'>
-					<label for='passwordInput'>${lang.get('loginFormPassword', 'Password')}</label>
-					<span class='text-danger' id='password'></span>
-				</div>
-				<div class='d-flex'>
-					<button type='button' class='btn btn-primary mt-3 mb-2' id='loginButton'>${lang.get('loginFormButton', 'Login')}</button>
-					<span class='text-danger my-auto mx-2' id='login'></span>
-					<p class='ms-auto mt-auto'>${lang.get('loginNoAccount', 'No account yet?')} <a href='/register' data-link>${lang.get('loginRegister', 'Register')}</a></p>
-				</div>
-			</form>
-		</div>
-		`;
-    }
-}
diff --git a/frontend/static/js/views/accounts/RegisterView.js b/frontend/static/js/views/accounts/RegisterView.js
deleted file mode 100644
index 135a5d2..0000000
--- a/frontend/static/js/views/accounts/RegisterView.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import { client, lang, navigateTo } from "../../index.js";
-import { clear, fill_errors } from "../../utils/formUtils.js";
-import AbstractNonAuthentifiedView from "../abstracts/AbstractNonAuthentified.js";
-
-async function register(redirectTo = '/home')
-{
-	let username = document.getElementById("usernameInput").value;
-	let password = document.getElementById("passwordInput").value;
-
-	if (username === '' || password === '') {
-		clear("innerHTML", ["username", "password"]);
-		if (username === '')
-			document.getElementById('username').innerHTML = lang.get('errorEmptyField', 'This field may not be blank.');
-		if (password === '')
-			document.getElementById('password').innerHTML = lang.get('errorEmptyField', 'This field may not be blank.');
-		return;
-	}
-
-	let response_data = await client.account.create(username, password);
-
-	if (response_data == null)
-	{
-		navigateTo(redirectTo);
-		return;
-	}
-
-	clear("innerHTML", ["username", "password", 'register']);
-	fill_errors(response_data, "innerHTML");
-}
-
-export default class extends AbstractNonAuthentifiedView {
-    constructor(params, lastUrlBeforeLogin = '/home') {
-        super(params, lang.get('registerWindowTitle', 'Register'), lastUrlBeforeLogin);
-		this.redirectTo = lastUrlBeforeLogin;
-	}
-
-	async postInit()
-	{
-		let usernameField = document.getElementById('usernameInput');
-		usernameField.addEventListener('keydown', ev => {
-			if (ev.key === 'Enter')
-				register(this.redirectTo);
-		});
-		usernameField.focus();
-		let passwordField = document.getElementById('passwordInput');
-		passwordField.addEventListener('keydown', ev => {
-			if (ev.key === 'Enter')
-				register(this.redirectTo);
-		});
-		document.getElementById("registerButton").onclick = _ => register(this.redirectTo);
-	}
-
-    async getHtml() {
-        return `
-		<div class='container-fluid'>
-			<form class='border border-2 rounded bg-light-subtle mx-auto p-2 col-md-7 col-lg-4'>
-				<h4 class='text-center fw-semibold mb-4'>${lang.get('registerFormTitle', 'Register')}</h4>
-				<div class='form-floating mb-2'>
-					<input type='text' class='form-control' id='usernameInput' placeholder='Username'>
-					<label for='usernameInput'>${lang.get('registerFormUsername', 'Username')}</label>
-					<span class='text-danger' id='username'></span>
-				</div>
-				<div class='form-floating'>
-					<input type='password' class='form-control' id='passwordInput' placeholder='Password'>
-					<label for='passwordInput'>${lang.get('registerFormPassword', 'Password')}</label>
-					<span class='text-danger' id='password'></span>
-				</div>
-				<div class='d-flex'>
-					<button type='button' class='btn btn-primary mt-3 mb-2' id='registerButton'>${lang.get('registerFormButton', 'Register')}</button>
-					<span class='text-danger my-auto mx-2' id='register'></span>
-					<p class='ms-auto mt-auto'>${lang.get('registerAlreadyAccount', 'Already have an account?')} <a href='/login' data-link>${lang.get('registerLogin', 'Login')}</a></p>
-				</div>
-			</form>
-		</div>
-        `;
-    }
-}

From 8cdf7d7f342dd91f349812836c4b4f8180f1f96b Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 10:34:03 +0100
Subject: [PATCH 57/77] clean: simplify

---
 games/routine.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/games/routine.py b/games/routine.py
index 2c01d08..145ca81 100644
--- a/games/routine.py
+++ b/games/routine.py
@@ -213,20 +213,19 @@ def collision(game: Game, impact_data: dict) -> bool:
 
     surface_angle: float = math.atan2(segment.start.y - segment.stop.y, segment.start.x - segment.stop.y)
     
+    angle: float
+    
     if (player_hitted is None):
+        angle = wall_collision(game.ball.angle, surface_angle)
         
-        game.ball.angle = wall_collision(game.ball.angle, surface_angle)
-        
-        return True
     else:
         angle = paddle_collision(game.ball, impact_data.get("impact"), player_hitted)
-        
-        if (angle is None):
-            return False
-        
-        game.ball.angle = angle
-        
-        return True
+
+    if (angle is None):
+        return None
+    
+    game.ball.angle = angle
+    return True        
 
 async def update_ball(game: Game, impact_data: dict) -> None:
     

From f4fca1f9106938db4d2c24289c078111b4610bf7 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 10:35:42 +0100
Subject: [PATCH 58/77] games: fix

---
 games/routine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games/routine.py b/games/routine.py
index 145ca81..851cb4f 100644
--- a/games/routine.py
+++ b/games/routine.py
@@ -222,7 +222,7 @@ def collision(game: Game, impact_data: dict) -> bool:
         angle = paddle_collision(game.ball, impact_data.get("impact"), player_hitted)
 
     if (angle is None):
-        return None
+        return False
     
     game.ball.angle = angle
     return True        

From 6a2857f6233e75df9ff103144212cc4f892d380d Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Tue, 13 Feb 2024 11:01:48 +0100
Subject: [PATCH 59/77] css: improved lang dropdown menu

---
 frontend/static/css/index.css | 4 ++++
 frontend/templates/index.html | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/static/css/index.css b/frontend/static/css/index.css
index 9b843e5..6c04bb5 100644
--- a/frontend/static/css/index.css
+++ b/frontend/static/css/index.css
@@ -25,3 +25,7 @@
 	opacity: 0;
 	transition: opacity 0.25s; 
 }
+
+#languageSelector > .dropdown-item.active {
+	background-color: transparent;
+}
diff --git a/frontend/templates/index.html b/frontend/templates/index.html
index 1d948f1..3d27444 100644
--- a/frontend/templates/index.html
+++ b/frontend/templates/index.html
@@ -22,9 +22,9 @@
 					Lang.
 				</a>
 				<div id='languageSelector' class='dropdown-menu dropdown-menu-end position-absolute text-center px-2' style='min-width: 65px'>
-					<button value='en' type='button' class="dropdow-item nav-link text-center py-1">🇬🇧 EN</button>
-					<button value='fr' type='button' class="dropdow-item nav-link text-center py-1">🇫🇷 FR</button>
-					<button value='tp' type='button' class="dropdow-item nav-link text-center py-1">🗣️👍🖼️❤️  toki pona</button>
+					<button value='en' type='button' class="dropdown-item nav-link text-center py-1">🇬🇧 EN</button>
+					<button value='fr' type='button' class="dropdown-item nav-link text-center py-1">🇫🇷 FR</button>
+					<button value='tp' type='button' class="dropdown-item nav-link text-center py-1">🗣️👍🖼️❤️  toki pona</button>
 					<button value='cr' type='button' class="dropdown-item nav-link text-center py-1" style="background-image: url(https://image.noelshack.com/fichiers/2023/06/1/1675686620-full.png); background-size: cover; background-position: center; background-repeat: no-repeat; background-color: transparent;">Crampté</button>
 				</div>
 			</div>

From da0b8e4edb13cbee3c268bc2651ca098cdc7aa4d Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 11:00:10 +0100
Subject: [PATCH 60/77] fix: authentifyView do not use pushstate

---
 frontend/static/js/views/accounts/AuthentifyView.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/static/js/views/accounts/AuthentifyView.js b/frontend/static/js/views/accounts/AuthentifyView.js
index 0c675c3..5dfd569 100644
--- a/frontend/static/js/views/accounts/AuthentifyView.js
+++ b/frontend/static/js/views/accounts/AuthentifyView.js
@@ -95,8 +95,6 @@ export default class extends AbstractNonAuthentifiedView
 
 		let button_text = this.current_mode === "login" ? "loginFormButton" : "registerFormButton";
 		button.innerText = lang.get(button_text, "ERROR LANG");
-
-		history.pushState(null, null, `/${this.current_mode}`);
 	}
 
 	/**

From 0e9bfb1fed089a254384d1225807489e677cc59f Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 12:53:38 +0100
Subject: [PATCH 61/77] accounts: anthentifyView: add: enter button

---
 frontend/static/js/api/account.js             |  9 ++--
 .../js/views/accounts/AuthentifyView.js       | 51 +++++++++++--------
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/frontend/static/js/api/account.js b/frontend/static/js/api/account.js
index b8b7e83..f6a02ce 100644
--- a/frontend/static/js/api/account.js
+++ b/frontend/static/js/api/account.js
@@ -16,18 +16,15 @@ class Account
 	/**
 	 * @param {String} username 
 	 * @param {String} password 
-	 * @returns {?Promise<Object>}
+	 * @returns {Response}
 	 */
 	async create(username, password)
 	{
 		let response = await this.client._post("/api/accounts/register", {username: username, password: password});
-		let response_data = await response.json()
 
-		if (response_data == "user created")
-		{
+		if (response.status === 201)
 			await this.client._update_logged(true);
-			return null;
-		}
+
 		return response_data
 	}
 
diff --git a/frontend/static/js/views/accounts/AuthentifyView.js b/frontend/static/js/views/accounts/AuthentifyView.js
index 5dfd569..27733f8 100644
--- a/frontend/static/js/views/accounts/AuthentifyView.js
+++ b/frontend/static/js/views/accounts/AuthentifyView.js
@@ -25,17 +25,26 @@ export default class extends AbstractNonAuthentifiedView
 		this.update_mode(new_mode);
 
 		document.getElementById("button").onclick = this.authentificate.bind(this);
+
+		let username_input = document.getElementById('username-input'),
+			password_input = document.getElementById('password-input');
+		
+		[username_input, password_input].forEach(input => {
+			input.addEventListener('keydown', async ev => {
+				if (ev.key === 'Enter')
+					await this.authentificate.bind(this)()
+			});
+		});
 	}
 
 	/**
 	 * Check if field is normal
-	 * @returns {null | Object<String>}
+	 * @param username {String}
+	 * @param password {String}
+	 * @returns {Boolean}
 	 */
-	basic_verif()
+	basic_verif(username, password)
 	{
-		let username = document.getElementById('username-input').value;
-		let password = document.getElementById('password-input').value;
-
 		if (username === '')
 			document.getElementById('username').innerHTML = lang.get('errorEmptyField', 'This field may not be blank.');
 
@@ -43,9 +52,9 @@ export default class extends AbstractNonAuthentifiedView
 			document.getElementById('password').innerHTML = lang.get('errorEmptyField', 'This field may not be blank.');
 		
 		if (username === '' || password === '')
-			return null;
+			return false;
 
-		return { username, password };
+		return true
 	}
 
 	/**
@@ -102,29 +111,31 @@ export default class extends AbstractNonAuthentifiedView
 	 */
 	async authentificate()
 	{
-		let ret = this.basic_verif();
+		let username = document.getElementById("username-input").value,
+			password = document.getElementById("password-input").value;
 
-		if (ret === null)
-			return
+		if (!this.basic_verif())
+			return;
 
-		let {username, password} = ret;
-
-		let response_data;
+		let response;
 
 		if (this.current_mode === "register")
-			response_data = await client.account.create(username, password) 
+			response = await client.account.create(username, password) 
 		else
-			response_data = await client.login(username, password);
+			response = await client.login(username, password);
 
-		if (response_data !== null)
+		if (response.status === 200 || response.status === 201)
 		{
 			navigateTo(this.redirectTo);
 			return;
 		}
-	
-		clear("innerHTML", ["username", "password", 'register']);
-		fill_errors(response_data, "innerHTML");
 
+		let response_data = await response.json()
+
+		console.log(response_data);
+	
+		clear("innerHTML", ["username", "password", 'login']);
+		fill_errors(response_data, "innerHTML");
 	}
 
 	async getHtml()
@@ -147,7 +158,7 @@ export default class extends AbstractNonAuthentifiedView
 					</div>
 					<div class='d-flex'>
 						<button type='button' class='btn btn-primary mt-3 mb-2' id='button'>Loading...</button>
-						<span class='text-danger my-auto mx-2' id='register'></span>
+						<span class='text-danger my-auto mx-2' id='login'></span>
 						<div class='ms-auto mt-auto flex-row d-flex gap-2' id="toogle">
 							<p id='toogle-register-login-label'>Loading...</p>
 							<a id="toogle-register-login" href='#'>Loading...</a>

From a1b4c8867aa8351397c67bb461c0d578602080f1 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 13:06:55 +0100
Subject: [PATCH 62/77] authentify: clear current_mode on leave

---
 frontend/static/js/views/accounts/AuthentifyView.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/static/js/views/accounts/AuthentifyView.js b/frontend/static/js/views/accounts/AuthentifyView.js
index 27733f8..9804757 100644
--- a/frontend/static/js/views/accounts/AuthentifyView.js
+++ b/frontend/static/js/views/accounts/AuthentifyView.js
@@ -12,6 +12,11 @@ export default class extends AbstractNonAuthentifiedView
 		this.current_mode = undefined
 	}
 
+	async leavePage()
+	{
+		this.current_mode = undefined;
+	}
+
 	/**
 	 * @returns {Promise}
 	 */

From 6b34235d835db9555fef7d71244d0fe1da7e145f Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 13:08:31 +0100
Subject: [PATCH 63/77] clean: I speak english very well

---
 .../js/views/accounts/AuthentifyView.js       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/frontend/static/js/views/accounts/AuthentifyView.js b/frontend/static/js/views/accounts/AuthentifyView.js
index 9804757..1c33478 100644
--- a/frontend/static/js/views/accounts/AuthentifyView.js
+++ b/frontend/static/js/views/accounts/AuthentifyView.js
@@ -22,9 +22,9 @@ export default class extends AbstractNonAuthentifiedView
 	 */
 	async postInit()
 	{
-		let element = document.getElementById("toogle-register-login");
+		let element = document.getElementById("toggle-register-login");
 
-		element.onclick = this.toogle_register_login.bind(this);
+		element.onclick = this.toggle_register_login.bind(this);
 	
 		let new_mode = location.pathname.slice(1);
 		this.update_mode(new_mode);
@@ -65,7 +65,7 @@ export default class extends AbstractNonAuthentifiedView
 	/**
 	 * @returns { undefined }
 	 */
-	toogle_register_login(event)
+	toggle_register_login(event)
 	{
 		event.preventDefault();
 
@@ -87,8 +87,8 @@ export default class extends AbstractNonAuthentifiedView
 		let title = document.getElementById("title"),
 			username_label = document.getElementById("username-label"),
 			password_label = document.getElementById("password-label"),
-			toogle_register_login = document.getElementById("toogle-register-login"),
-			toogle_register_login_label = document.getElementById("toogle-register-login-label"),
+			toggle_register_login = document.getElementById("toggle-register-login"),
+			toggle_register_login_label = document.getElementById("toggle-register-login-label"),
 			button = document.getElementById("button")
 			;
 
@@ -101,11 +101,11 @@ export default class extends AbstractNonAuthentifiedView
 		let password_label_text = this.current_mode === "register" ? "registerFormPassword" : "loginFormPassword"; 
 		password_label.innerText = lang.get(password_label_text, "ERROR LANG");
 
-		let toogle_register_login_label_text = this.current_mode === "register" ? "registerAlreadyAccount" : "loginNoAccount";
-		toogle_register_login_label.innerText = lang.get(toogle_register_login_label_text, "ERROR LANG");;
+		let toggle_register_login_label_text = this.current_mode === "register" ? "registerAlreadyAccount" : "loginNoAccount";
+		toggle_register_login_label.innerText = lang.get(toggle_register_login_label_text, "ERROR LANG");;
 
-		let toogle_register_login_text = this.current_mode === "register" ? "registerLogin" : "loginRegister";
-		toogle_register_login.innerText = lang.get(toogle_register_login_text, "ERROR LANG");
+		let toggle_register_login_text = this.current_mode === "register" ? "registerLogin" : "loginRegister";
+		toggle_register_login.innerText = lang.get(toggle_register_login_text, "ERROR LANG");
 
 		let button_text = this.current_mode === "login" ? "loginFormButton" : "registerFormButton";
 		button.innerText = lang.get(button_text, "ERROR LANG");
@@ -114,7 +114,7 @@ export default class extends AbstractNonAuthentifiedView
 	/**
 	 * @returns {Promise}
 	 */
-	async authentificate()
+	async authenticate()
 	{
 		let username = document.getElementById("username-input").value,
 			password = document.getElementById("password-input").value;
@@ -164,9 +164,9 @@ export default class extends AbstractNonAuthentifiedView
 					<div class='d-flex'>
 						<button type='button' class='btn btn-primary mt-3 mb-2' id='button'>Loading...</button>
 						<span class='text-danger my-auto mx-2' id='login'></span>
-						<div class='ms-auto mt-auto flex-row d-flex gap-2' id="toogle">
-							<p id='toogle-register-login-label'>Loading...</p>
-							<a id="toogle-register-login" href='#'>Loading...</a>
+						<div class='ms-auto mt-auto flex-row d-flex gap-2' id="toggle">
+							<p id='toggle-register-login-label'>Loading...</p>
+							<a id="toggle-register-login" href='#'>Loading...</a>
 						</div>
 					</div>
 				</form>

From 0244ec0e51f99f039963922110287785818edc88 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 13:11:36 +0100
Subject: [PATCH 64/77] accounts: fix: rename func

---
 frontend/static/js/views/accounts/AuthentifyView.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/static/js/views/accounts/AuthentifyView.js b/frontend/static/js/views/accounts/AuthentifyView.js
index 1c33478..cca1015 100644
--- a/frontend/static/js/views/accounts/AuthentifyView.js
+++ b/frontend/static/js/views/accounts/AuthentifyView.js
@@ -29,7 +29,7 @@ export default class extends AbstractNonAuthentifiedView
 		let new_mode = location.pathname.slice(1);
 		this.update_mode(new_mode);
 
-		document.getElementById("button").onclick = this.authentificate.bind(this);
+		document.getElementById("button").onclick = this.authenticate.bind(this);
 
 		let username_input = document.getElementById('username-input'),
 			password_input = document.getElementById('password-input');
@@ -37,7 +37,7 @@ export default class extends AbstractNonAuthentifiedView
 		[username_input, password_input].forEach(input => {
 			input.addEventListener('keydown', async ev => {
 				if (ev.key === 'Enter')
-					await this.authentificate.bind(this)()
+					await this.authenticate.bind(this)()
 			});
 		});
 	}

From 6df27eeadf0dda6bdf63777da4fd8e1f5dc18ca4 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 13:59:16 +0100
Subject: [PATCH 65/77] clean: rename: authentification to authenticate

---
 frontend/static/js/api/client.js                       |  6 +++---
 frontend/static/js/api/matchmaking.js                  |  2 +-
 frontend/static/js/api/tournament/tournament.js        |  2 +-
 frontend/static/js/index.js                            |  8 ++++----
 frontend/static/js/views/HomeView.js                   |  4 ++--
 frontend/static/js/views/MatchMakingView.js            |  4 ++--
 frontend/static/js/views/ProfilePageView.js            |  4 ++--
 frontend/static/js/views/Search.js                     |  2 +-
 frontend/static/js/views/SettingsView.js               |  6 +++---
 ...uthentifiedView.js => AbstractAuthenticatedView.js} |  2 +-
 ...entifiedView.js => AbstractNonAuthenticatedView.js} |  2 +-
 .../{AuthentifyView.js => AuthenficationView.js}       | 10 +++++-----
 frontend/static/js/views/accounts/LogoutView.js        |  4 ++--
 .../static/js/views/tournament/TournamentCreateView.js |  4 ++--
 .../static/js/views/tournament/TournamentPageView.js   |  4 ++--
 .../static/js/views/tournament/TournamentsListView.js  |  4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)
 rename frontend/static/js/views/abstracts/{AbstractAuthentifiedView.js => AbstractAuthenticatedView.js} (87%)
 rename frontend/static/js/views/abstracts/{AbstractNonAuthentifiedView.js => AbstractNonAuthenticatedView.js} (87%)
 rename frontend/static/js/views/accounts/{AuthentifyView.js => AuthenficationView.js} (95%)

diff --git a/frontend/static/js/api/client.js b/frontend/static/js/api/client.js
index 5df70bf..f414a15 100644
--- a/frontend/static/js/api/client.js
+++ b/frontend/static/js/api/client.js
@@ -53,7 +53,7 @@ class Client
 		this.tournaments = new Tourmanents(this);
 
 		/**
-		 * @type {Boolean} A private var represent if the is is log NEVER USE IT use await isAuthentificated()
+		 * @type {Boolean} A private var represent if the is is log NEVER USE IT use await isAuthenticated()
 		 */
 		this._logged = undefined;
 
@@ -80,7 +80,7 @@ class Client
 	 * The only right way to determine is the user is logged
 	 * @returns {Promise<Boolean>}
 	 */
-	async isAuthentificate()
+	async isAuthenticate()
 	{
 		if (this._logged == undefined)
 			this._logged = await this._test_logged();
@@ -236,7 +236,7 @@ class Client
 	}
 
 	/**
-	 * Determine if the user is logged. NEVER USE IT, USE isAuthentificated()
+	 * Determine if the user is logged. NEVER USE IT, USE isAuthenticated()
 	 * @returns {Promise<Boolean>}
 	 */
 	async _test_logged()
diff --git a/frontend/static/js/api/matchmaking.js b/frontend/static/js/api/matchmaking.js
index c63dd4d..5a6a651 100644
--- a/frontend/static/js/api/matchmaking.js
+++ b/frontend/static/js/api/matchmaking.js
@@ -23,7 +23,7 @@ class MatchMaking
 	 */
 	async start(receive_func, disconnect_func, mode)
 	{
-		if (!await this.client.isAuthentificate())
+		if (!await this.client.isAuthenticate())
 			return null;
 		
 		let url = `${window.location.protocol[4] === 's' ? 'wss' : 'ws'}://${window.location.host}/ws/matchmaking/${mode}`;
diff --git a/frontend/static/js/api/tournament/tournament.js b/frontend/static/js/api/tournament/tournament.js
index 46a9502..e8782ea 100644
--- a/frontend/static/js/api/tournament/tournament.js
+++ b/frontend/static/js/api/tournament/tournament.js
@@ -120,7 +120,7 @@ class Tourmanent
 	 */
 	async join(receive_func, disconnect_func)
 	{
-		if (!await this.client.isAuthentificate())
+		if (!await this.client.isAuthenticate())
 			return null;
 		
 		let url = `${window.location.protocol[4] === 's' ? 'wss' : 'ws'}://${window.location.host}/ws/tournaments/${this.id}`;
diff --git a/frontend/static/js/index.js b/frontend/static/js/index.js
index 90c789e..1eec401 100644
--- a/frontend/static/js/index.js
+++ b/frontend/static/js/index.js
@@ -16,7 +16,7 @@ import MatchMakingView from "./views/MatchMakingView.js";
 import TournamentPageView from "./views/tournament/TournamentPageView.js";
 import TournamentsView from "./views/tournament/TournamentsListView.js";
 import TournamentCreateView from "./views/tournament/TournamentCreateView.js";
-import AuthentificateView from "./views/accounts/AuthentifyView.js";
+import AuthentifyView from "./views/accounts/AuthenficationView.js";
 
 let client = new Client(location.origin);
 let lang = client.lang;
@@ -75,8 +75,8 @@ const router = async(uri) => {
         { path: "/tournaments/create", view: TournamentCreateView },
         { path: "/tournaments/:id", view: TournamentPageView },
         { path: "/tournaments/", view: TournamentsView },
-        { path: "/login", view: AuthentificateView },
-        { path: "/register", view: AuthentificateView },
+        { path: "/login", view: AuthentifyView },
+        { path: "/register", view: AuthentifyView },
         { path: "/logout", view: LogoutView },
         { path: "/search", view: Search },
         { path: "/home", view: HomeView },
@@ -152,7 +152,7 @@ document.addEventListener("DOMContentLoaded", async () => {
 	document.querySelector(`#languageSelector > [value=${lang.chosenLang}]`)
 		?.classList.add('active');
 
-	await client.isAuthentificate();
+	await client.isAuthenticate();
     router(location.pathname);
 	document.querySelector('a[href=\'' + location.pathname + '\']')?.classList.add('active');
 });
diff --git a/frontend/static/js/views/HomeView.js b/frontend/static/js/views/HomeView.js
index 8ac3ea2..9f38a9a 100644
--- a/frontend/static/js/views/HomeView.js
+++ b/frontend/static/js/views/HomeView.js
@@ -1,7 +1,7 @@
 import { lang } from "../index.js";
-import AbstractAuthentificateView from "./abstracts/AbstractAuthentifiedView.js";
+import AbstractAuthenticatedView from "./abstracts/AbstractAuthenticatedView.js";
 
-export default class extends AbstractAuthentificateView {
+export default class extends AbstractAuthenticatedView {
     constructor(params) {
         super(params, lang.get('homeWindowTitle', 'Home'));
         this.redirect_url = "/login"
diff --git a/frontend/static/js/views/MatchMakingView.js b/frontend/static/js/views/MatchMakingView.js
index eb084d3..0414fa2 100644
--- a/frontend/static/js/views/MatchMakingView.js
+++ b/frontend/static/js/views/MatchMakingView.js
@@ -1,8 +1,8 @@
 import { client, navigateTo } from "../index.js";
 import { clear, fill_errors } from "../utils/formUtils.js";
-import AbstractAuthentifiedView from "./abstracts/AbstractAuthentifiedView.js";
+import AbstractAuthenticatedView from "./abstracts/AbstractAuthenticatedView.js";
 
-export default class extends AbstractAuthentifiedView {
+export default class extends AbstractAuthenticatedView {
     constructor(params)
     {
         super(params, "Matchmaking");
diff --git a/frontend/static/js/views/ProfilePageView.js b/frontend/static/js/views/ProfilePageView.js
index 9d21d26..9a3f2bf 100644
--- a/frontend/static/js/views/ProfilePageView.js
+++ b/frontend/static/js/views/ProfilePageView.js
@@ -44,7 +44,7 @@ export default class extends AbstractView {
 
 	async blockButton() {
 		// Block option
-		if (await client.isAuthentificate() === false)
+		if (await client.isAuthenticate() === false)
 			return;
 
 		if (client.me.id != this.user_id) {
@@ -72,7 +72,7 @@ export default class extends AbstractView {
 	}
 
 	async friendButton() {
-		if (await client.isAuthentificate() === false)
+		if (await client.isAuthenticate() === false)
 			return;
 
 		if (client.me.id != this.user_id) {
diff --git a/frontend/static/js/views/Search.js b/frontend/static/js/views/Search.js
index 5cab730..61d1c93 100644
--- a/frontend/static/js/views/Search.js
+++ b/frontend/static/js/views/Search.js
@@ -21,7 +21,7 @@ export default class extends AbstractView {
 
 	async postInit() {
 
-		let logged = await client.isAuthentificate();
+		let logged = await client.isAuthenticate();
 		let profiles = await client.profiles.all();
 
 		//console.log(client.notice.data);
diff --git a/frontend/static/js/views/SettingsView.js b/frontend/static/js/views/SettingsView.js
index 82f691a..c2b4410 100644
--- a/frontend/static/js/views/SettingsView.js
+++ b/frontend/static/js/views/SettingsView.js
@@ -1,8 +1,8 @@
 import { client, navigateTo } from "../index.js";
 import { clear, fill_errors } from "../utils/formUtils.js";
-import AbstractAuthentificateView from "./abstracts/AbstractAuthentifiedView.js";
+import AbstractAuthenticatedView from "./abstracts/AbstractAuthenticatedView.js";
 
-export default class extends AbstractAuthentificateView
+export default class extends AbstractAuthenticatedView
 {    
     constructor(params)
     {
@@ -36,7 +36,7 @@ export default class extends AbstractAuthentificateView
         
         let response_data = await client.account.delete(current_password);
 
-        console.log(await client.isAuthentificate())
+        console.log(await client.isAuthenticate())
         if (response_data === null || response_data === "user deleted")
         {
             navigateTo("/login");
diff --git a/frontend/static/js/views/abstracts/AbstractAuthentifiedView.js b/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
similarity index 87%
rename from frontend/static/js/views/abstracts/AbstractAuthentifiedView.js
rename to frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
index eff0e36..a051f4f 100644
--- a/frontend/static/js/views/abstracts/AbstractAuthentifiedView.js
+++ b/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
@@ -8,7 +8,7 @@ export default class extends AbstractRedirectView{
 
     async redirect()
     {
-		if (await client.isAuthentificate() === false)
+		if (await client.isAuthenticate() === false)
 		{
 			navigateTo(this.redirect_url);
 			return 1;
diff --git a/frontend/static/js/views/abstracts/AbstractNonAuthentifiedView.js b/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
similarity index 87%
rename from frontend/static/js/views/abstracts/AbstractNonAuthentifiedView.js
rename to frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
index cf28f45..b0d43da 100644
--- a/frontend/static/js/views/abstracts/AbstractNonAuthentifiedView.js
+++ b/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
@@ -8,7 +8,7 @@ export default class extends AbstractRedirectView{
 
     async redirect()
     {
-		if (await client.isAuthentificate() === false)
+		if (await client.isAuthenticate() === false)
 			return 0;
 		navigateTo(this.redirect_url);
 		return 1;
diff --git a/frontend/static/js/views/accounts/AuthentifyView.js b/frontend/static/js/views/accounts/AuthenficationView.js
similarity index 95%
rename from frontend/static/js/views/accounts/AuthentifyView.js
rename to frontend/static/js/views/accounts/AuthenficationView.js
index cca1015..fffd54c 100644
--- a/frontend/static/js/views/accounts/AuthentifyView.js
+++ b/frontend/static/js/views/accounts/AuthenficationView.js
@@ -1,9 +1,9 @@
 
 import { client, lang, navigateTo } from "../../index.js";
 import { clear, fill_errors } from "../../utils/formUtils.js";
-import AbstractNonAuthentifiedView from "../abstracts/AbstractNonAuthentifiedView.js";
+import AbstractNonAuthenticatedView from "../abstracts/AbstractNonAuthenticatedView.js";
 
-export default class extends AbstractNonAuthentifiedView
+export default class extends AbstractNonAuthenticatedView
 {
 	constructor(params, lastUrlBeforeLogin = '/home')
 	{
@@ -29,7 +29,7 @@ export default class extends AbstractNonAuthentifiedView
 		let new_mode = location.pathname.slice(1);
 		this.update_mode(new_mode);
 
-		document.getElementById("button").onclick = this.authenticate.bind(this);
+		document.getElementById("button").onclick = this.authencation.bind(this);
 
 		let username_input = document.getElementById('username-input'),
 			password_input = document.getElementById('password-input');
@@ -37,7 +37,7 @@ export default class extends AbstractNonAuthentifiedView
 		[username_input, password_input].forEach(input => {
 			input.addEventListener('keydown', async ev => {
 				if (ev.key === 'Enter')
-					await this.authenticate.bind(this)()
+					await this.authencation.bind(this)()
 			});
 		});
 	}
@@ -114,7 +114,7 @@ export default class extends AbstractNonAuthentifiedView
 	/**
 	 * @returns {Promise}
 	 */
-	async authenticate()
+	async authencation()
 	{
 		let username = document.getElementById("username-input").value,
 			password = document.getElementById("password-input").value;
diff --git a/frontend/static/js/views/accounts/LogoutView.js b/frontend/static/js/views/accounts/LogoutView.js
index 0007ade..d5307f1 100644
--- a/frontend/static/js/views/accounts/LogoutView.js
+++ b/frontend/static/js/views/accounts/LogoutView.js
@@ -1,7 +1,7 @@
 import { client, lang, navigateTo } from "../../index.js";
-import AbstractAuthentifiedView from "../abstracts/AbstractAuthentifiedView.js";
+import AbstractAuthenticatedView from "../abstracts/AbstractAuthenticatedView.js";
 
-export default class extends AbstractAuthentifiedView
+export default class extends AbstractAuthenticatedView
 {
 	constructor(params, lastPageUrl = '/login') {
 		super(params, lang.get('logoutWindowTitle', 'Logout'));
diff --git a/frontend/static/js/views/tournament/TournamentCreateView.js b/frontend/static/js/views/tournament/TournamentCreateView.js
index 9cfc1a4..8983071 100644
--- a/frontend/static/js/views/tournament/TournamentCreateView.js
+++ b/frontend/static/js/views/tournament/TournamentCreateView.js
@@ -1,8 +1,8 @@
 import {client, navigateTo} from "../../index.js";
 import { clear, fill_errors } from "../../utils/formUtils.js";
-import AbstractAuthentifiedView from "../abstracts/AbstractAuthentifiedView.js";
+import AbstractAuthenticatedView from "../abstracts/AbstractAuthenticatedView.js";
 
-export default class extends AbstractAuthentifiedView
+export default class extends AbstractAuthenticatedView
 {
     constructor(params)
 	{
diff --git a/frontend/static/js/views/tournament/TournamentPageView.js b/frontend/static/js/views/tournament/TournamentPageView.js
index 034d27b..2d66bfa 100644
--- a/frontend/static/js/views/tournament/TournamentPageView.js
+++ b/frontend/static/js/views/tournament/TournamentPageView.js
@@ -1,7 +1,7 @@
 import {client, navigateTo} from "../../index.js";
-import AbstractAuthentifiedView from "../abstracts/AbstractAuthentifiedView.js";
+import AbstractAuthenticatedView from "../abstracts/AbstractAuthenticatedView.js";
 
-export default class extends AbstractAuthentifiedView
+export default class extends AbstractAuthenticatedView
 {
     constructor(params)
 	{
diff --git a/frontend/static/js/views/tournament/TournamentsListView.js b/frontend/static/js/views/tournament/TournamentsListView.js
index d232698..eae0451 100644
--- a/frontend/static/js/views/tournament/TournamentsListView.js
+++ b/frontend/static/js/views/tournament/TournamentsListView.js
@@ -1,7 +1,7 @@
 import {client} from "../../index.js";
-import AbstractAuthentifiedView from "../abstracts/AbstractAuthentifiedView.js";
+import AbstractAuthenticatedView from "../abstracts/AbstractAuthenticatedView.js";
 
-export default class extends AbstractAuthentifiedView
+export default class extends AbstractAuthenticatedView
 {
     constructor(params)
 	{

From d8439484147e28e2175a450bc42532f120631644 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 14:00:10 +0100
Subject: [PATCH 66/77] fix: remove unused sylelink

---
 frontend/static/js/views/accounts/AuthenficationView.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/static/js/views/accounts/AuthenficationView.js b/frontend/static/js/views/accounts/AuthenficationView.js
index fffd54c..2053eb4 100644
--- a/frontend/static/js/views/accounts/AuthenficationView.js
+++ b/frontend/static/js/views/accounts/AuthenficationView.js
@@ -146,8 +146,6 @@ export default class extends AbstractNonAuthenticatedView
 	async getHtml()
 	{
         return /* HTML */ `
-			<link rel="stylesheet" href="/static/css/authentify.css">
-
 			<div class='container-fluid'>
 				<form class='border border-2 rounded bg-light-subtle mx-auto p-2 col-md-7 col-lg-4'>
 					<h4 class='text-center fw-semibold mb-4' id="title">Loading...</h4>

From d773859e043f33ec3e015b7ddbc781ecb143ec96 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 14:02:06 +0100
Subject: [PATCH 67/77] clean: fix typo

---
 frontend/static/js/index.js                                 | 6 +++---
 .../{AuthenficationView.js => AuthenticationView.js}        | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename frontend/static/js/views/accounts/{AuthenficationView.js => AuthenticationView.js} (100%)

diff --git a/frontend/static/js/index.js b/frontend/static/js/index.js
index 1eec401..2094fea 100644
--- a/frontend/static/js/index.js
+++ b/frontend/static/js/index.js
@@ -16,7 +16,7 @@ import MatchMakingView from "./views/MatchMakingView.js";
 import TournamentPageView from "./views/tournament/TournamentPageView.js";
 import TournamentsView from "./views/tournament/TournamentsListView.js";
 import TournamentCreateView from "./views/tournament/TournamentCreateView.js";
-import AuthentifyView from "./views/accounts/AuthenficationView.js";
+import AuthenticationView from "./views/accounts/AuthenticationView.js";
 
 let client = new Client(location.origin);
 let lang = client.lang;
@@ -75,8 +75,8 @@ const router = async(uri) => {
         { path: "/tournaments/create", view: TournamentCreateView },
         { path: "/tournaments/:id", view: TournamentPageView },
         { path: "/tournaments/", view: TournamentsView },
-        { path: "/login", view: AuthentifyView },
-        { path: "/register", view: AuthentifyView },
+        { path: "/login", view: AuthenticationView },
+        { path: "/register", view: AuthenticationView },
         { path: "/logout", view: LogoutView },
         { path: "/search", view: Search },
         { path: "/home", view: HomeView },
diff --git a/frontend/static/js/views/accounts/AuthenficationView.js b/frontend/static/js/views/accounts/AuthenticationView.js
similarity index 100%
rename from frontend/static/js/views/accounts/AuthenficationView.js
rename to frontend/static/js/views/accounts/AuthenticationView.js

From 94a4c4cdf8ba12c41cc5ae5bee272ff22886027b Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 14:07:53 +0100
Subject: [PATCH 68/77] fix: typo isAuthenticate -> isAuthenticated

---
 frontend/static/js/api/client.js                              | 2 +-
 frontend/static/js/api/matchmaking.js                         | 2 +-
 frontend/static/js/api/tournament/tournament.js               | 2 +-
 frontend/static/js/index.js                                   | 2 +-
 frontend/static/js/views/ProfilePageView.js                   | 4 ++--
 frontend/static/js/views/Search.js                            | 2 +-
 frontend/static/js/views/SettingsView.js                      | 2 +-
 .../static/js/views/abstracts/AbstractAuthenticatedView.js    | 2 +-
 .../static/js/views/abstracts/AbstractNonAuthenticatedView.js | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/static/js/api/client.js b/frontend/static/js/api/client.js
index f414a15..df0a7b1 100644
--- a/frontend/static/js/api/client.js
+++ b/frontend/static/js/api/client.js
@@ -80,7 +80,7 @@ class Client
 	 * The only right way to determine is the user is logged
 	 * @returns {Promise<Boolean>}
 	 */
-	async isAuthenticate()
+	async isAuthenticated()
 	{
 		if (this._logged == undefined)
 			this._logged = await this._test_logged();
diff --git a/frontend/static/js/api/matchmaking.js b/frontend/static/js/api/matchmaking.js
index 5a6a651..03063ca 100644
--- a/frontend/static/js/api/matchmaking.js
+++ b/frontend/static/js/api/matchmaking.js
@@ -23,7 +23,7 @@ class MatchMaking
 	 */
 	async start(receive_func, disconnect_func, mode)
 	{
-		if (!await this.client.isAuthenticate())
+		if (!await this.client.isAuthenticated())
 			return null;
 		
 		let url = `${window.location.protocol[4] === 's' ? 'wss' : 'ws'}://${window.location.host}/ws/matchmaking/${mode}`;
diff --git a/frontend/static/js/api/tournament/tournament.js b/frontend/static/js/api/tournament/tournament.js
index e8782ea..bbba2d8 100644
--- a/frontend/static/js/api/tournament/tournament.js
+++ b/frontend/static/js/api/tournament/tournament.js
@@ -120,7 +120,7 @@ class Tourmanent
 	 */
 	async join(receive_func, disconnect_func)
 	{
-		if (!await this.client.isAuthenticate())
+		if (!await this.client.isAuthenticated())
 			return null;
 		
 		let url = `${window.location.protocol[4] === 's' ? 'wss' : 'ws'}://${window.location.host}/ws/tournaments/${this.id}`;
diff --git a/frontend/static/js/index.js b/frontend/static/js/index.js
index 2094fea..fc4d560 100644
--- a/frontend/static/js/index.js
+++ b/frontend/static/js/index.js
@@ -152,7 +152,7 @@ document.addEventListener("DOMContentLoaded", async () => {
 	document.querySelector(`#languageSelector > [value=${lang.chosenLang}]`)
 		?.classList.add('active');
 
-	await client.isAuthenticate();
+	await client.isAuthenticated();
     router(location.pathname);
 	document.querySelector('a[href=\'' + location.pathname + '\']')?.classList.add('active');
 });
diff --git a/frontend/static/js/views/ProfilePageView.js b/frontend/static/js/views/ProfilePageView.js
index 9a3f2bf..7f69a64 100644
--- a/frontend/static/js/views/ProfilePageView.js
+++ b/frontend/static/js/views/ProfilePageView.js
@@ -44,7 +44,7 @@ export default class extends AbstractView {
 
 	async blockButton() {
 		// Block option
-		if (await client.isAuthenticate() === false)
+		if (await client.isAuthenticated() === false)
 			return;
 
 		if (client.me.id != this.user_id) {
@@ -72,7 +72,7 @@ export default class extends AbstractView {
 	}
 
 	async friendButton() {
-		if (await client.isAuthenticate() === false)
+		if (await client.isAuthenticated() === false)
 			return;
 
 		if (client.me.id != this.user_id) {
diff --git a/frontend/static/js/views/Search.js b/frontend/static/js/views/Search.js
index 61d1c93..487c906 100644
--- a/frontend/static/js/views/Search.js
+++ b/frontend/static/js/views/Search.js
@@ -21,7 +21,7 @@ export default class extends AbstractView {
 
 	async postInit() {
 
-		let logged = await client.isAuthenticate();
+		let logged = await client.isAuthenticated();
 		let profiles = await client.profiles.all();
 
 		//console.log(client.notice.data);
diff --git a/frontend/static/js/views/SettingsView.js b/frontend/static/js/views/SettingsView.js
index c2b4410..5f2ceff 100644
--- a/frontend/static/js/views/SettingsView.js
+++ b/frontend/static/js/views/SettingsView.js
@@ -36,7 +36,7 @@ export default class extends AbstractAuthenticatedView
         
         let response_data = await client.account.delete(current_password);
 
-        console.log(await client.isAuthenticate())
+        console.log(await client.isAuthenticated())
         if (response_data === null || response_data === "user deleted")
         {
             navigateTo("/login");
diff --git a/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js b/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
index a051f4f..cf5341f 100644
--- a/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
+++ b/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
@@ -8,7 +8,7 @@ export default class extends AbstractRedirectView{
 
     async redirect()
     {
-		if (await client.isAuthenticate() === false)
+		if (await client.isAuthenticated() === false)
 		{
 			navigateTo(this.redirect_url);
 			return 1;
diff --git a/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js b/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
index b0d43da..d70df04 100644
--- a/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
+++ b/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
@@ -8,7 +8,7 @@ export default class extends AbstractRedirectView{
 
     async redirect()
     {
-		if (await client.isAuthenticate() === false)
+		if (await client.isAuthenticated() === false)
 			return 0;
 		navigateTo(this.redirect_url);
 		return 1;

From c8cb25b0fc6d4f60bf944b184c725fb6b0aa000c Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 14:08:55 +0100
Subject: [PATCH 69/77] clean: remove debug print

---
 games/routine.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/games/routine.py b/games/routine.py
index 851cb4f..abbfbe1 100644
--- a/games/routine.py
+++ b/games/routine.py
@@ -180,9 +180,6 @@ def paddle_collision(ball: Ball, impact: Point, player: Player):
     rail_length: float = player.rail.length()
     paddle_length: float =  rail_length * config.PADDLE_RATIO;
     
-    print(paddle_length)
-    print(paddle_center)
-
     start_x: float = paddle_center.x - (diff_x * (paddle_length / 2 / rail_length))
     start_y: float = paddle_center.y - (diff_y * (paddle_length / 2 / rail_length))
     stop_x: float = paddle_center.x + (diff_x * (paddle_length / 2 / rail_length))

From b398134101830779e74e1b05a3f99b7fb7784560 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 14:19:12 +0100
Subject: [PATCH 70/77] fix: history.pushState before router

---
 frontend/static/js/index.js                             | 5 +++--
 frontend/static/js/views/accounts/AuthenticationView.js | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/static/js/index.js b/frontend/static/js/index.js
index fc4d560..537d1e7 100644
--- a/frontend/static/js/index.js
+++ b/frontend/static/js/index.js
@@ -36,11 +36,12 @@ const getParams = match => {
 };
 
 const navigateTo = async (uri) => {
-    if (await router(uri) !== 0)
-		return;
 
 	history.pushState(null, null, uri);
 
+    if (await router(uri) !== 0)
+		return;
+
 	let link = document.querySelector('a[href=\'' + location.pathname + '\']');
 	if (link) {
 		document.querySelector('[data-link].active')?.classList.remove('active');
diff --git a/frontend/static/js/views/accounts/AuthenticationView.js b/frontend/static/js/views/accounts/AuthenticationView.js
index 2053eb4..d91ded5 100644
--- a/frontend/static/js/views/accounts/AuthenticationView.js
+++ b/frontend/static/js/views/accounts/AuthenticationView.js
@@ -107,7 +107,7 @@ export default class extends AbstractNonAuthenticatedView
 		let toggle_register_login_text = this.current_mode === "register" ? "registerLogin" : "loginRegister";
 		toggle_register_login.innerText = lang.get(toggle_register_login_text, "ERROR LANG");
 
-		let button_text = this.current_mode === "login" ? "loginFormButton" : "registerFormButton";
+		let button_text = this.current_mode === "register" ? "registerFormButton" : "loginFormButton";
 		button.innerText = lang.get(button_text, "ERROR LANG");
 	}
 

From 157383748f19c40f524e72b07af02d19529af4d4 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Tue, 13 Feb 2024 14:49:38 +0100
Subject: [PATCH 71/77] lang: unit tests in django/await first loading of dict

---
 frontend/static/js/api/LanguageManager.js |  8 ++++++--
 frontend/static/js/index.js               |  7 ++++++-
 frontend/tests.py                         | 23 ++++++++++++++++++++++-
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/frontend/static/js/api/LanguageManager.js b/frontend/static/js/api/LanguageManager.js
index 06325f2..e74724b 100644
--- a/frontend/static/js/api/LanguageManager.js
+++ b/frontend/static/js/api/LanguageManager.js
@@ -8,10 +8,10 @@ export default class LanguageManager {
 		this.currentLang = 'en'
 		this.chosenLang = localStorage.getItem('preferedLanguage') || this.currentLang;
 		if (this.chosenLang !== this.currentLang && this.availableLanguages.includes(this.chosenLang)) {
-			this.translatePage();
+			this.loading = this.translatePage();
 			this.currentLang = this.chosenLang;
 		} else {
-			this.loadDict(this.chosenLang);
+			this.loading = this.loadDict(this.chosenLang);
 		}
 		document.getElementById('languageDisplay').innerHTML =
 			document.querySelector(`#languageSelector > [value=${this.currentLang}]`)?.innerHTML;
@@ -61,6 +61,10 @@ export default class LanguageManager {
 		this.dict = await response.json();
 	}
 
+	async waitLoading() {
+		await this.loading;
+	}
+
 	get(key, defaultTxt) {
 		if (!this.dict)
 			return defaultTxt;
diff --git a/frontend/static/js/index.js b/frontend/static/js/index.js
index 537d1e7..c12354a 100644
--- a/frontend/static/js/index.js
+++ b/frontend/static/js/index.js
@@ -49,7 +49,10 @@ const navigateTo = async (uri) => {
 	}
 };
 
-const reloadView = async _ => renderView(lastView);
+const reloadView = async _ => {
+	await lastView?.leavePage();
+	await renderView(lastView);
+}
 
 async function renderView(view)
 {
@@ -142,10 +145,12 @@ document.addEventListener("DOMContentLoaded", async () => {
     });
 
 	//Languages
+	await lang.waitLoading();
 	Array.from(document.getElementById('languageSelector').children).forEach(el => {
 		el.onclick = async _ => {
 			if (await lang.changeLanguage(el.value))
 				return;
+			console.log(lang);
 			document.querySelector('#languageSelector > .active')?.classList.remove('active');
 			el.classList.add('active');
 		};
diff --git a/frontend/tests.py b/frontend/tests.py
index 7ce503c..5ea3c31 100644
--- a/frontend/tests.py
+++ b/frontend/tests.py
@@ -1,3 +1,24 @@
-from django.test import TestCase
+import json
+from os import listdir
+
+from django.test import Client, TestCase
+from django.contrib.staticfiles import finders
 
 # Create your tests here.
+
+class DictionnariesTest(TestCase):
+    def setUp(self) -> None:
+        self.client = Client();
+        self.directory = finders.find('js/lang/');
+
+    def test_lang(self):
+        keys = None
+
+        json_files = listdir(self.directory);
+        for file in json_files:
+            with open(f'{self.directory}/{file}') as f:
+                data: dict = json.load(f);
+                if (keys is None):
+                    keys = set(data.keys());
+                else:
+                    self.assertEqual(set(data.keys()), keys);

From 0735c028f85296092e13c785705f6d0d529e0a90 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Tue, 13 Feb 2024 14:58:07 +0100
Subject: [PATCH 72/77] authentication: add focus + renamed function

---
 frontend/static/js/views/accounts/AuthenticationView.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/static/js/views/accounts/AuthenticationView.js b/frontend/static/js/views/accounts/AuthenticationView.js
index d91ded5..61b0fce 100644
--- a/frontend/static/js/views/accounts/AuthenticationView.js
+++ b/frontend/static/js/views/accounts/AuthenticationView.js
@@ -29,7 +29,7 @@ export default class extends AbstractNonAuthenticatedView
 		let new_mode = location.pathname.slice(1);
 		this.update_mode(new_mode);
 
-		document.getElementById("button").onclick = this.authencation.bind(this);
+		document.getElementById("button").onclick = this.authentication.bind(this);
 
 		let username_input = document.getElementById('username-input'),
 			password_input = document.getElementById('password-input');
@@ -37,9 +37,10 @@ export default class extends AbstractNonAuthenticatedView
 		[username_input, password_input].forEach(input => {
 			input.addEventListener('keydown', async ev => {
 				if (ev.key === 'Enter')
-					await this.authencation.bind(this)()
+					await this.authentication.bind(this)()
 			});
 		});
+		username_input.focus();
 	}
 
 	/**
@@ -114,7 +115,7 @@ export default class extends AbstractNonAuthenticatedView
 	/**
 	 * @returns {Promise}
 	 */
-	async authencation()
+	async authentication()
 	{
 		let username = document.getElementById("username-input").value,
 			password = document.getElementById("password-input").value;
@@ -171,4 +172,4 @@ export default class extends AbstractNonAuthenticatedView
 			</div>
         `;
 	}
-}
\ No newline at end of file
+}

From d69cd5bc7b950fa32937be09aa38cd6ff37ae8f0 Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Tue, 13 Feb 2024 15:36:09 +0100
Subject: [PATCH 73/77] fix(register): bozo

---
 frontend/static/js/api/account.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/static/js/api/account.js b/frontend/static/js/api/account.js
index f6a02ce..61f96bd 100644
--- a/frontend/static/js/api/account.js
+++ b/frontend/static/js/api/account.js
@@ -25,7 +25,7 @@ class Account
 		if (response.status === 201)
 			await this.client._update_logged(true);
 
-		return response_data
+		return response;
 	}
 
 	/**

From d59a3dc64692638b56980ff964a6a9ee6b2a08a1 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 15:38:57 +0100
Subject: [PATCH 74/77] accounts: fix: redirect to last page before login work
 again

---
 frontend/static/js/index.js                             | 9 +++++----
 frontend/static/js/views/accounts/AuthenticationView.js | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/frontend/static/js/index.js b/frontend/static/js/index.js
index c12354a..b09b445 100644
--- a/frontend/static/js/index.js
+++ b/frontend/static/js/index.js
@@ -113,12 +113,13 @@ const router = async(uri) => {
 	if (lastView !== undefined)
 		await lastView.leavePage();
 
-	if (uri !== '/login' && uri !== '/register' && uri !== '/logout')
-		lastPageUrlBeforeLogin = uri;
-	else
-		lastPageUrlBeforeLogin = undefined;
     const view = new match.route.view(getParams(match), lastPageUrlBeforeLogin);
 
+	if (await client.isAuthenticated() === false && !(view instanceof AuthenticationView))
+		lastPageUrlBeforeLogin = uri;
+
+    console.log(lastPageUrlBeforeLogin)
+
     if (view instanceof AbstractRedirectView && await view.redirect())
         return 1;
 
diff --git a/frontend/static/js/views/accounts/AuthenticationView.js b/frontend/static/js/views/accounts/AuthenticationView.js
index 61b0fce..8b4737f 100644
--- a/frontend/static/js/views/accounts/AuthenticationView.js
+++ b/frontend/static/js/views/accounts/AuthenticationView.js
@@ -7,8 +7,9 @@ export default class extends AbstractNonAuthenticatedView
 {
 	constructor(params, lastUrlBeforeLogin = '/home')
 	{
+		
         super(params, lang.get('loginWindowTitle', 'Login'), lastUrlBeforeLogin);
-		this.redirectTo = lastUrlBeforeLogin;
+		this.redirect_url = lastUrlBeforeLogin;
 		this.current_mode = undefined
 	}
 
@@ -132,7 +133,7 @@ export default class extends AbstractNonAuthenticatedView
 
 		if (response.status === 200 || response.status === 201)
 		{
-			navigateTo(this.redirectTo);
+			navigateTo(this.redirect_url);
 			return;
 		}
 

From 9128c0bf38143634ed40521d4aa19ad19c8a8fe6 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 15:52:46 +0100
Subject: [PATCH 75/77] fix: accounts: when logout go back to last page

---
 frontend/static/js/index.js                                 | 4 +---
 .../static/js/views/abstracts/AbstractAuthenticatedView.js  | 4 ++--
 .../js/views/abstracts/AbstractNonAuthenticatedView.js      | 4 ++--
 frontend/static/js/views/abstracts/AbstractRedirectView.js  | 6 +++---
 frontend/static/js/views/accounts/AuthenticationView.js     | 2 --
 frontend/static/js/views/accounts/LogoutView.js             | 2 +-
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/frontend/static/js/index.js b/frontend/static/js/index.js
index b09b445..585ae8c 100644
--- a/frontend/static/js/index.js
+++ b/frontend/static/js/index.js
@@ -115,11 +115,9 @@ const router = async(uri) => {
 
     const view = new match.route.view(getParams(match), lastPageUrlBeforeLogin);
 
-	if (await client.isAuthenticated() === false && !(view instanceof AuthenticationView))
+	if (!(view instanceof AuthenticationView) && ! (view instanceof LogoutView))
 		lastPageUrlBeforeLogin = uri;
 
-    console.log(lastPageUrlBeforeLogin)
-
     if (view instanceof AbstractRedirectView && await view.redirect())
         return 1;
 
diff --git a/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js b/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
index cf5341f..edd59fc 100644
--- a/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
+++ b/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
@@ -2,8 +2,8 @@ import { client, navigateTo } from "../../index.js";
 import AbstractRedirectView from "./AbstractRedirectView.js";
 
 export default class extends AbstractRedirectView{
-    constructor(params, title) {
-		super(params, title, "/login");
+    constructor(params, title, uri = "/home") {
+		super(params, title, uri);
     }
 
     async redirect()
diff --git a/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js b/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
index d70df04..c4936d2 100644
--- a/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
+++ b/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
@@ -2,8 +2,8 @@ import { client, navigateTo } from "../../index.js";
 import AbstractRedirectView from "./AbstractRedirectView.js";
 
 export default class extends AbstractRedirectView{
-    constructor(params, title, url) {
-		super(params, title, url);
+    constructor(params, title, uri = "/home") {
+		super(params, title, uri);
     }
 
     async redirect()
diff --git a/frontend/static/js/views/abstracts/AbstractRedirectView.js b/frontend/static/js/views/abstracts/AbstractRedirectView.js
index 81f1936..713f3f3 100644
--- a/frontend/static/js/views/abstracts/AbstractRedirectView.js
+++ b/frontend/static/js/views/abstracts/AbstractRedirectView.js
@@ -2,14 +2,14 @@ import { navigateTo } from "../../index.js";
 import AbstractView from "./AbstractView.js";
 
 export default class extends AbstractView{
-    constructor(params, title, url)
+    constructor(params, title, uri)
     {
         super(params, title);
-        this.redirect_url = url;
+        this.redirect_url = uri;
     }
 
     async redirect()
     {
-        navigateTo(url);
+        navigateTo(this.redirect_url);
     }
 }
diff --git a/frontend/static/js/views/accounts/AuthenticationView.js b/frontend/static/js/views/accounts/AuthenticationView.js
index 8b4737f..595934e 100644
--- a/frontend/static/js/views/accounts/AuthenticationView.js
+++ b/frontend/static/js/views/accounts/AuthenticationView.js
@@ -7,9 +7,7 @@ export default class extends AbstractNonAuthenticatedView
 {
 	constructor(params, lastUrlBeforeLogin = '/home')
 	{
-		
         super(params, lang.get('loginWindowTitle', 'Login'), lastUrlBeforeLogin);
-		this.redirect_url = lastUrlBeforeLogin;
 		this.current_mode = undefined
 	}
 
diff --git a/frontend/static/js/views/accounts/LogoutView.js b/frontend/static/js/views/accounts/LogoutView.js
index d5307f1..0f8b85e 100644
--- a/frontend/static/js/views/accounts/LogoutView.js
+++ b/frontend/static/js/views/accounts/LogoutView.js
@@ -4,7 +4,7 @@ import AbstractAuthenticatedView from "../abstracts/AbstractAuthenticatedView.js
 export default class extends AbstractAuthenticatedView
 {
 	constructor(params, lastPageUrl = '/login') {
-		super(params, lang.get('logoutWindowTitle', 'Logout'));
+		super(params, lang.get('logoutWindowTitle', 'Logout'), lastPageUrl);
 		this.lastPageUrl = lastPageUrl;
 	}
 

From 8a69664c74c7da1506f9e8f337fed9be49ee6de0 Mon Sep 17 00:00:00 2001
From: starnakin <camille@chauvet.pro>
Date: Tue, 13 Feb 2024 16:02:56 +0100
Subject: [PATCH 76/77] fix: url redirection authenticated view

---
 frontend/static/js/views/abstracts/AbstractAuthenticatedView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js b/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
index edd59fc..b519f3a 100644
--- a/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
+++ b/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
@@ -2,7 +2,7 @@ import { client, navigateTo } from "../../index.js";
 import AbstractRedirectView from "./AbstractRedirectView.js";
 
 export default class extends AbstractRedirectView{
-    constructor(params, title, uri = "/home") {
+    constructor(params, title, uri = "/login") {
 		super(params, title, uri);
     }
 

From 3433740d80e54b62e296a84b2c1dbfd17a8b8cbb Mon Sep 17 00:00:00 2001
From: AdrienLSH <git.adrienlsh@42l.fr>
Date: Tue, 13 Feb 2024 16:14:53 +0100
Subject: [PATCH 77/77] lang: window title updated

---
 frontend/static/js/views/HomeView.js                      | 2 +-
 frontend/static/js/views/PageNotFoundView.js              | 2 +-
 frontend/static/js/views/Search.js                        | 2 +-
 .../js/views/abstracts/AbstractAuthenticatedView.js       | 4 ++--
 .../js/views/abstracts/AbstractNonAuthenticatedView.js    | 4 ++--
 .../static/js/views/abstracts/AbstractRedirectView.js     | 4 ++--
 frontend/static/js/views/abstracts/AbstractView.js        | 8 +++++---
 frontend/static/js/views/accounts/AuthenticationView.js   | 7 +++++--
 frontend/static/js/views/accounts/LogoutView.js           | 4 ++--
 9 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/frontend/static/js/views/HomeView.js b/frontend/static/js/views/HomeView.js
index 9f38a9a..6ff6b0e 100644
--- a/frontend/static/js/views/HomeView.js
+++ b/frontend/static/js/views/HomeView.js
@@ -3,7 +3,7 @@ import AbstractAuthenticatedView from "./abstracts/AbstractAuthenticatedView.js"
 
 export default class extends AbstractAuthenticatedView {
     constructor(params) {
-        super(params, lang.get('homeWindowTitle', 'Home'));
+        super(params, 'homeWindowTitle');
         this.redirect_url = "/login"
 	}
 
diff --git a/frontend/static/js/views/PageNotFoundView.js b/frontend/static/js/views/PageNotFoundView.js
index 2c021c0..01a8ef3 100644
--- a/frontend/static/js/views/PageNotFoundView.js
+++ b/frontend/static/js/views/PageNotFoundView.js
@@ -3,7 +3,7 @@ import { lang } from '../index.js'
 
 export default class extends AbstractView {
     constructor(params) {
-        super(params, lang.get('404WindowTitle', 'Not Found'));
+        super(params, '404WindowTitle');
     }
 
 	async getHtml() {
diff --git a/frontend/static/js/views/Search.js b/frontend/static/js/views/Search.js
index 487c906..9911f1a 100644
--- a/frontend/static/js/views/Search.js
+++ b/frontend/static/js/views/Search.js
@@ -4,7 +4,7 @@ import {Message} from "../api/chat/message.js"
 
 export default class extends AbstractView {
     constructor(params) {
-        super(params, lang.get('SearchWindowTitle', 'Search'));
+        super(params, 'SearchWindowTitle');
     }
 
 	async wait_get_online_users() {
diff --git a/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js b/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
index b519f3a..d5b52df 100644
--- a/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
+++ b/frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
@@ -2,8 +2,8 @@ import { client, navigateTo } from "../../index.js";
 import AbstractRedirectView from "./AbstractRedirectView.js";
 
 export default class extends AbstractRedirectView{
-    constructor(params, title, uri = "/login") {
-		super(params, title, uri);
+    constructor(params, titleKey, uri = "/login") {
+		super(params, titleKey, uri);
     }
 
     async redirect()
diff --git a/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js b/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
index c4936d2..07185ae 100644
--- a/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
+++ b/frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
@@ -2,8 +2,8 @@ import { client, navigateTo } from "../../index.js";
 import AbstractRedirectView from "./AbstractRedirectView.js";
 
 export default class extends AbstractRedirectView{
-    constructor(params, title, uri = "/home") {
-		super(params, title, uri);
+    constructor(params, titleKey, uri = "/home") {
+		super(params, titleKey, uri);
     }
 
     async redirect()
diff --git a/frontend/static/js/views/abstracts/AbstractRedirectView.js b/frontend/static/js/views/abstracts/AbstractRedirectView.js
index 713f3f3..4d84134 100644
--- a/frontend/static/js/views/abstracts/AbstractRedirectView.js
+++ b/frontend/static/js/views/abstracts/AbstractRedirectView.js
@@ -2,9 +2,9 @@ import { navigateTo } from "../../index.js";
 import AbstractView from "./AbstractView.js";
 
 export default class extends AbstractView{
-    constructor(params, title, uri)
+    constructor(params, titleKey, uri)
     {
-        super(params, title);
+        super(params, titleKey);
         this.redirect_url = uri;
     }
 
diff --git a/frontend/static/js/views/abstracts/AbstractView.js b/frontend/static/js/views/abstracts/AbstractView.js
index a488d80..4868d62 100644
--- a/frontend/static/js/views/abstracts/AbstractView.js
+++ b/frontend/static/js/views/abstracts/AbstractView.js
@@ -1,7 +1,9 @@
+import {lang} from '../../index.js'
+
 export default class {
-    constructor(params, title) {
+    constructor(params, titleKey) {
         this.params = params;
-        this.title = title;
+        this.titleKey = titleKey;
     }
 
 	async postInit() {
@@ -11,7 +13,7 @@ export default class {
 	}
 
     setTitle() {
-        document.title = this.title;
+        document.title = lang.get(this.titleKey, 'Bozo Pong');
     }
 
     async getHtml() {
diff --git a/frontend/static/js/views/accounts/AuthenticationView.js b/frontend/static/js/views/accounts/AuthenticationView.js
index 595934e..5e457b4 100644
--- a/frontend/static/js/views/accounts/AuthenticationView.js
+++ b/frontend/static/js/views/accounts/AuthenticationView.js
@@ -1,4 +1,3 @@
-
 import { client, lang, navigateTo } from "../../index.js";
 import { clear, fill_errors } from "../../utils/formUtils.js";
 import AbstractNonAuthenticatedView from "../abstracts/AbstractNonAuthenticatedView.js";
@@ -7,7 +6,8 @@ export default class extends AbstractNonAuthenticatedView
 {
 	constructor(params, lastUrlBeforeLogin = '/home')
 	{
-        super(params, lang.get('loginWindowTitle', 'Login'), lastUrlBeforeLogin);
+		super(params, 'loginWindowTitle', lastUrlBeforeLogin);
+		this.redirect_url = lastUrlBeforeLogin;
 		this.current_mode = undefined
 	}
 
@@ -109,6 +109,9 @@ export default class extends AbstractNonAuthenticatedView
 
 		let button_text = this.current_mode === "register" ? "registerFormButton" : "loginFormButton";
 		button.innerText = lang.get(button_text, "ERROR LANG");
+
+		this.titleKey = this.current_mode === 'register' ? 'registerWindowTitle' : 'loginWindowTitle';
+		this.setTitle();
 	}
 
 	/**
diff --git a/frontend/static/js/views/accounts/LogoutView.js b/frontend/static/js/views/accounts/LogoutView.js
index 0f8b85e..18360a3 100644
--- a/frontend/static/js/views/accounts/LogoutView.js
+++ b/frontend/static/js/views/accounts/LogoutView.js
@@ -1,10 +1,10 @@
-import { client, lang, navigateTo } from "../../index.js";
+import { client, navigateTo } from "../../index.js";
 import AbstractAuthenticatedView from "../abstracts/AbstractAuthenticatedView.js";
 
 export default class extends AbstractAuthenticatedView
 {
 	constructor(params, lastPageUrl = '/login') {
-		super(params, lang.get('logoutWindowTitle', 'Logout'), lastPageUrl);
+		super(params, 'logoutWindowTitle', lastPageUrl);
 		this.lastPageUrl = lastPageUrl;
 	}