From 6729cfc421b2d3e8b109115c89babb0c56228efa Mon Sep 17 00:00:00 2001
From: Kum1ta <eddydhj@gmail.com>
Date: Mon, 23 Sep 2024 01:11:05 +0200
Subject: [PATCH] Site     - New way to manage profiles with url ->
 /profil/username Django     - modification of the user info query

---
 .../server/server/typeRequests/getUserInfo.py | 21 ++++++----
 .../djangoserver/file/server/server/urls.py   |  1 -
 .../djangoserver/file/server/server/views.py  |  4 --
 .../nginx/static/javascript/Page.js           | 39 ++++++++++-------
 .../static/javascript/profilPage/main.js      | 42 +++++++++++--------
 5 files changed, 64 insertions(+), 43 deletions(-)

diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/getUserInfo.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/getUserInfo.py
index 03c243e..bab2bba 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/getUserInfo.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/getUserInfo.py
@@ -6,7 +6,7 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/09/20 00:16:57 by edbernar          #+#    #+#              #
-#    Updated: 2024/09/20 01:08:45 by edbernar         ###   ########.fr        #
+#    Updated: 2024/09/23 00:47:12 by edbernar         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -16,9 +16,16 @@ import json
 
 @sync_to_async
 def getUserInfo(socket, content):
-	user = User.objects.filter(id=content['id']).values().first()
-	if (not user):
-		socket.sync_send({"type":"user_info", "content": None})
-		return
-	socket.sync_send({"type":"user_info", "content":{'username': user['username'], 'pfp': user['pfp'], 'banner': user['banner']}})
-
+	try:
+		if (content.get('id')):
+			user = User.objects.filter(id=content['id']).values().first()
+		elif (content.get('username')):
+			user = User.objects.filter(username=content['username']).values().first()
+		else:
+			user = None
+		if (not user):
+			socket.sync_send({"type":"user_info", "content": None})
+			return
+		socket.sync_send({"type":"user_info", "content":{'username': user['username'], 'pfp': user['pfp'], 'banner': user['banner'], 'id': user['id']}})
+	except Exception as e:
+		socket.sendError("invalid request", 9005, e)
\ No newline at end of file
diff --git a/docker-compose/requirements/djangoserver/file/server/server/urls.py b/docker-compose/requirements/djangoserver/file/server/server/urls.py
index b902c80..f7c9be6 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/urls.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/urls.py
@@ -26,7 +26,6 @@ urlpatterns = [
 	path("waitingGamePage", views.waitingGamePage, name='waitingGamePage'),
 	path("profilPage", views.profilPage, name='profilPage'),
 	path("game", views.game, name='game'),
-	path("profil", views.profil, name='profil'),
 	path("wait_game", views.game, name='wait_game'),
     path("login42", views.login42, name='login42'),
     path("logout", views.logout, name='logout'),
diff --git a/docker-compose/requirements/djangoserver/file/server/server/views.py b/docker-compose/requirements/djangoserver/file/server/server/views.py
index 2041426..062683d 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/views.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/views.py
@@ -59,10 +59,6 @@ def wait_game(request):
 	# return lobbyPage(request)
 	return redirect('/lobby')
 
-def profil(request):
-	# return lobbyPage(request)
-	return redirect('/lobby')
-
 def profilPage(request):
 	if(request.method != "POST"):
 		return index(request)
diff --git a/docker-compose/requirements/nginx/static/javascript/Page.js b/docker-compose/requirements/nginx/static/javascript/Page.js
index 126e648..c3e731d 100644
--- a/docker-compose/requirements/nginx/static/javascript/Page.js
+++ b/docker-compose/requirements/nginx/static/javascript/Page.js
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Page.js                                            :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: marvin <marvin@student.42.fr>              +#+  +:+       +#+        */
+/*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/25 00:00:21 by edbernar          #+#    #+#             */
-/*   Updated: 2024/09/22 18:58:44 by marvin           ###   ########.fr       */
+/*   Updated: 2024/09/23 00:59:54 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,12 +21,12 @@ class Page
 {
 	actualPage = null;
 	availablePages = [
-		{url:'/', servUrl: '/homePage', class: HomePage, name: 'homePage', title: 'METH - Home'},
-		{url:'/lobby', servUrl: '/lobbyPage', class: LobbyPage, name: 'lobbyPage', title: 'METH - Lobby'},
-		{url:'/game', servUrl: '/multiLocalGamePage', class: multiLocalGamePage, name: 'multiLocalGamePage', title: 'METH - Game'},
-		{url:'/wait_game', servUrl: '/waitingGamePage', class: WaitingGamePage, name: 'waitingGamePage', title: 'METH - Wait for a game'},
-		{url:'/game', servUrl: '/multiOnlineGamePage', class: MultiOnlineGamePage, name: 'multiOnlineGamePage', title: 'METH - Game'},
-		{url:'/profil', servUrl: '/profilPage', class: ProfilPage, name: 'profilPage', title: 'METH - Profil'},
+		{suffix: false, url:'/', servUrl: '/homePage', class: HomePage, name: 'homePage', title: 'METH - Home'},
+		{suffix: false, url:'/lobby', servUrl: '/lobbyPage', class: LobbyPage, name: 'lobbyPage', title: 'METH - Lobby'},
+		{suffix: false, url:'/game', servUrl: '/multiLocalGamePage', class: multiLocalGamePage, name: 'multiLocalGamePage', title: 'METH - Game'},
+		{suffix: false, url:'/wait_game', servUrl: '/waitingGamePage', class: WaitingGamePage, name: 'waitingGamePage', title: 'METH - Wait for a game'},
+		{suffix: false, url:'/game', servUrl: '/multiOnlineGamePage', class: MultiOnlineGamePage, name: 'multiOnlineGamePage', title: 'METH - Game'},
+		{suffix: true, url:'/profil', servUrl: '/profilPage', class: ProfilPage, name: 'profilPage', title: 'METH - Profil'},
 	]
 
 	constructor()
@@ -35,25 +35,31 @@ class Page
 		window.onpopstate = function(event) {
 			for (let i = 0; i < thisClass.availablePages.length; i++)
 			{
-				if (window.location.pathname == thisClass.availablePages[i].url)
+				if (window.location.pathname == thisClass.availablePages[i].url || (thisClass.availablePages[i].suffix && window.location.pathname.startsWith(thisClass.availablePages[i].url)))
 				{
-					thisClass.changePage(thisClass.availablePages[i].name, true);
+					let arg = window.location.pathname.slice(thisClass.availablePages[i].url.length + 1);
+					if (arg == "" || !thisClass.availablePages[i].suffix)
+						arg = null;
+					thisClass.changePage(thisClass.availablePages[i].name, true, arg, !thisClass.availablePages[i].suffix);
 					return ;
 				}
 			}
 		};
 		for (let i = 0; i < this.availablePages.length; i++)
 		{
-			if (window.location.pathname == this.availablePages[i].url)
+			if (window.location.pathname == this.availablePages[i].url || (thisClass.availablePages[i].suffix && window.location.pathname.startsWith(thisClass.availablePages[i].url)))
 			{
-				this.changePage(this.availablePages[i].name);
+				let arg = window.location.pathname.slice(thisClass.availablePages[i].url.length + 1);
+				if (arg == "" || !thisClass.availablePages[i].suffix)
+					arg = null;
+				this.changePage(this.availablePages[i].name, false, arg, !thisClass.availablePages[i].suffix);
 				return ;
 			}
 		}
 		this.#showUnknownPage();
 	}
 	
-	changePage(name, isBack = false, arg = null)
+	changePage(name, isBack = false, arg = null, needToChangePath = true)
 	{
 		if (this.actualPage != null)
 			this.actualPage.dispose();
@@ -75,7 +81,12 @@ class Page
 						this.actualPage = this.availablePages[i].class;
 						document.title = this.availablePages[i].title;
 						if (!isBack)
-							history.pushState({}, this.availablePages[i].title, this.availablePages[i].url);
+						{
+							if (needToChangePath)
+								history.pushState({}, this.availablePages[i].title, this.availablePages[i].url);
+							else
+								history.pushState({}, this.availablePages[i].title, window.location.pathname);
+						}
 						if (arg)
 							this.actualPage.create(arg);
 						else
diff --git a/docker-compose/requirements/nginx/static/javascript/profilPage/main.js b/docker-compose/requirements/nginx/static/javascript/profilPage/main.js
index 05493c9..7598c73 100644
--- a/docker-compose/requirements/nginx/static/javascript/profilPage/main.js
+++ b/docker-compose/requirements/nginx/static/javascript/profilPage/main.js
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/09/19 23:08:31 by edbernar          #+#    #+#             */
-/*   Updated: 2024/09/22 23:47:16 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/09/23 00:59:35 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,10 +16,11 @@ import { showPrivateChat } from "/static/javascript/liveChat/showPrivateChat.js"
 import { LiveChat, showChatMenu } from "/static/javascript/liveChat/main.js";
 import { userMeInfo } from "/static/javascript/typeResponse/typeLogin.js";
 import { sendRequest } from "/static/javascript/websocket.js";
+import { pageRenderer } from '/static/javascript/main.js'
 
 class ProfilPage
 {
-	static create(userId)
+	static create(user)
 	{
 		const	username		=	document.getElementsByTagName('h2')[0];
 		const	pfp				=	document.getElementsByClassName('profile-image')[0];
@@ -27,13 +28,20 @@ class ProfilPage
 		const	githubButton	=	document.getElementById('github');
 		const	discordButton	=	document.getElementById('discord');
 		const	convButton		=	document.getElementById('newConv');
-		let		usernameText	=	null;
 
 		LiveChat.create();
-		
-		sendRequest("get_user_info", {id: userId});
+		if (typeof(user) == 'string')
+			sendRequest("get_user_info", {username: user});
+		else
+			sendRequest("get_user_info", {id: user});
 		waitForUserInfo().then((userInfo) => {
-			usernameText = userInfo.username;
+			if (userInfo == null)
+			{
+				pageRenderer.changePage('homePage');
+				return ;
+			}
+			if (typeof(user) != 'string')
+				history.replaceState({}, document.title, window.location.pathname + '/' + userInfo.username);
 			username.innerText = userInfo.username + ' (status not implemented)';
 			pfp.style.backgroundImage = `url("${userInfo.pfp}")`
 			pfp.style.backgroundSize = "cover";
@@ -41,21 +49,21 @@ class ProfilPage
 			banner.style.backgroundImage = `url("${userInfo.banner}")`
 			banner.style.backgroundSize = "cover";
 			banner.style.backgroundRepeat = "no-repeat";
-			if (userId == userMeInfo.id)
+			if (userInfo.id == userMeInfo.id)
 			{
 				pfp.innerHTML = `<div id='editPenPfpBg'><img class='editPenPfp' src='/static/img/profilPage/editPen.png'/></div>`
 				banner.innerHTML = `<img class='editPen' src='/static/img/profilPage/editPen.png'/>`
-			}	
+			}
+			if (userInfo.id != userMeInfo.id)
+			{
+				convButton.addEventListener('click', () => {
+					showChatMenu();
+					showPrivateChat({id: userInfo.id, name: userInfo.username});
+				});
+			}
+			else
+				convButton.remove();
 		});
-		if (userId != userMeInfo.id)
-		{
-			convButton.addEventListener('click', () => {
-				showChatMenu();
-				showPrivateChat({id: userId, name: usernameText});
-			});
-		}
-		else
-			convButton.remove();
 	}
 
 	static dispose()