From a6743616e39f0216f84de8b47fbf7bdc1c14a00e Mon Sep 17 00:00:00 2001
From: Kum1ta <eddydhj@gmail.com>
Date: Mon, 7 Oct 2024 00:03:32 +0200
Subject: [PATCH] Site     - fix color infinite wall on home page     - fix bug
 click tv on home page     - reworked on back arrow on profil page

---
 .../requirements/nginx/static/javascript/Page.js    |  7 ++++++-
 .../nginx/static/javascript/home3D/home3D.js        | 13 +++++++------
 .../nginx/static/javascript/profilPage/main.js      |  9 ++++-----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/docker-compose/requirements/nginx/static/javascript/Page.js b/docker-compose/requirements/nginx/static/javascript/Page.js
index a0f2407..eaad201 100644
--- a/docker-compose/requirements/nginx/static/javascript/Page.js
+++ b/docker-compose/requirements/nginx/static/javascript/Page.js
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/25 00:00:21 by edbernar          #+#    #+#             */
-/*   Updated: 2024/10/06 15:31:59 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/10/06 23:49:15 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -91,6 +91,11 @@ class Page
 				.then(data => {
 					data.text().then(text => {
 						document.body.innerHTML = text;
+						for (let i = 0; i < this.availablePages.length; i++)
+						{
+							if (this.actualPage === this.availablePages[i].class)
+								document.precedentPage = this.availablePages[i].name;
+						}
 						this.actualPage = this.availablePages[i].class;
 						document.title = this.availablePages[i].title;
 						if (!isBack && !this.wasRefresh)
diff --git a/docker-compose/requirements/nginx/static/javascript/home3D/home3D.js b/docker-compose/requirements/nginx/static/javascript/home3D/home3D.js
index 4b54879..d279349 100644
--- a/docker-compose/requirements/nginx/static/javascript/home3D/home3D.js
+++ b/docker-compose/requirements/nginx/static/javascript/home3D/home3D.js
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/22 17:19:17 by edbernar          #+#    #+#             */
-/*   Updated: 2024/10/06 16:58:43 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/10/06 23:37:28 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -47,6 +47,7 @@ class Home3D
 
 	static dispose()
 	{
+		document.addEventListener('scroll', mouseTracker);
 		window.removeEventListener('resize', windowUpdater);
 		document.removeEventListener('mousemove', mouseTracker);
 		document.removeEventListener('click', redirection);
@@ -131,7 +132,7 @@ function home3D()
 	putObject(files.lampModel, -2.5, 0, 2.5, 3, 0, Math.PI + Math.PI / 8, 0);
 	putObject(files.plantModel, 1.5, 0, 3, 0.5, 0, 0, 0);
 	putObject(files.gameboyModel, -0.5, -0.075, 0.5, 0.1, 0, 0.4, 0);
-	putObject(files.infinitPlane, -1, 0, 0, 10, 0, Math.PI / 2 + 0.5, 0, 0x252525);
+	putObject(files.infinitPlane, -1, 0, 0, 10, 0, Math.PI / 2 + 0.5, 0, 0x303030);
 	renderer.toneMapping = THREE.LinearToneMapping;
 	renderer.shadowMap.enabled = true;
 	renderer.shadowMap.type = THREE.PCFSoftShadowMap;
@@ -141,14 +142,14 @@ function home3D()
 	scene.background = new THREE.Color(0x020202)
 	scene.add(ambiantLight);
 	
-	// createPlane();
 	createCube();
 	document.body.getElementsByClassName('homeSection')[0].appendChild(renderer.domElement);
 	
 	window.addEventListener('resize', windowUpdater);
-	mouse.x = 9999; 
+	mouse.x = 9999;
 	mouse.y = 9999;
 	document.addEventListener('mousemove', mouseTracker);
+	document.addEventListener('scroll', mouseTracker);
 
 	composer		= new EffectComposer(renderer);
 	renderPass		= new RenderPass(scene, camera);
@@ -240,7 +241,7 @@ function home3D()
 		{
 			if (clickDetect)
 			{
-				document.removeEventListener('click', redirection);
+				document.getElementsByTagName('canvas')[0].removeEventListener('click', redirection);
 				clickDetect = false;
 			}
 			if (playButtonMouseOver || intersects[0].object == screen.screen)
@@ -257,7 +258,7 @@ function home3D()
 				{
 					if (!clickDetect && userMeInfo.id > 0)
 					{
-						document.addEventListener('click', redirection);
+						document.getElementsByTagName('canvas')[0].addEventListener('click', redirection);
 						clickDetect = true;
 					}
 				}
diff --git a/docker-compose/requirements/nginx/static/javascript/profilPage/main.js b/docker-compose/requirements/nginx/static/javascript/profilPage/main.js
index d1b6af0..dd36aa1 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/10/06 16:32:51 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/10/06 23:50:01 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -51,13 +51,12 @@ class ProfilPage
 		else
 			sendRequest("get_user_info", {id: user});
 		crossProfil.addEventListener('click', () => {
-			if (typeof(user) == 'string')
-				pageRenderer.changePage('homePage');
+			if (document.precedentPage)
+				pageRenderer.changePage(document.precedentPage);
 			else
-				pageRenderer.changePage('lobbyPage');
+				pageRenderer.changePage('homePage');
 		});
 		waitForUserInfo().then((userInfo) => {
-			console.log(userInfo);
 			if (userInfo == null)
 			{
 				pageRenderer.changePage('homePage');