From 5ffb33f39f1e082f00c5ff07f4cfdf3b99c17c7d Mon Sep 17 00:00:00 2001
From: victorgrt <victor.goret@laposte.net>
Date: Sat, 24 Aug 2024 18:35:46 +0200
Subject: [PATCH] fix change_profile logging out

---
 .../pages/static/pages/js/globals.js          |   1 -
 .../app_django/pages/static/pages/js/modal.js |   3 ++-
 .../app_django/pages/static/pages/js/scene.js |  18 +++++++++++++-----
 srcs/app_django/pages/static/pages/js/zoom.js |   6 +++++-
 srcs/app_django/trantran                      | Bin 278528 -> 278528 bytes
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/srcs/app_django/pages/static/pages/js/globals.js b/srcs/app_django/pages/static/pages/js/globals.js
index e01b502e..29c77541 100644
--- a/srcs/app_django/pages/static/pages/js/globals.js
+++ b/srcs/app_django/pages/static/pages/js/globals.js
@@ -1,4 +1,3 @@
-
 // ------------ DOM ELEMENTS ---------
 
 var loginForm = document.getElementsByClassName("login_form")[0];
diff --git a/srcs/app_django/pages/static/pages/js/modal.js b/srcs/app_django/pages/static/pages/js/modal.js
index b0d6592c..93854d3d 100644
--- a/srcs/app_django/pages/static/pages/js/modal.js
+++ b/srcs/app_django/pages/static/pages/js/modal.js
@@ -44,7 +44,8 @@ function hideLoggedOutModal()
 {
     const test = document.getElementById("container-modal-log");
     test.style.display = "none";
-    document.querySelector("modal-backdrop fade show").remove();
+    // const test2 = document.getElementById("modal-backdrop fade show")
+    // document.test2.remove();
 }
 
 function showPongErrorModal()
diff --git a/srcs/app_django/pages/static/pages/js/scene.js b/srcs/app_django/pages/static/pages/js/scene.js
index 39cce2b0..89e5a7d3 100644
--- a/srcs/app_django/pages/static/pages/js/scene.js
+++ b/srcs/app_django/pages/static/pages/js/scene.js
@@ -135,7 +135,6 @@ function isMouseOverElement(event, element) {
 }
 
 function onMouseMove(event) {
-    console.log("mouse move:", event);
     // Mettre à jour la position du pointeur de la souris
     mouse.x = (event.clientX / window.innerWidth) * 2 - 1;
     mouse.y = -(event.clientY / window.innerHeight) * 2 + 1;
@@ -155,6 +154,12 @@ function onMouseMove(event) {
             document.body.style.cursor = 'default';
             return;
         }
+        if (event.target.id === "change_prof" || event.target.id === "top")
+        {
+            console.log("HIDDDDDDING");
+            document.body.style.cursor = 'default';
+            return;
+        }
     }
     // Trouver les intersections avec les objets de la scène
     var intersects = raycaster.intersectObjects(scene.children, true);
@@ -273,7 +278,7 @@ function checkEvent(event)
 {
     console.log("event:", event);
     console.log("tagname: ", event.target.id);
-    if (event.target.id === "notifications" || event.target.id === "notiftitle" || event.target.id === "closeNotifs")
+    if (event.target.id === "notifications" || event.target.id === "notiftitle" || event.target.id === "closeNotifs" || event.target.id === "top" || event.target.id === "change_prof" || event.target.id === "update_profile" || event.target.id === "new_username" || event.target.id === "new_avatarg" || event.target.id === "settingsForm" || event.target.id === "messageDiv" || event.target.id === "bottom" || event.target.id === "sep" || event.target.id === "old_username")
     {
         console.log("positiv boss");
         return (true);
@@ -346,14 +351,17 @@ function onClickScene(event) {
             const pseudo = document.getElementById("user_stats");
             if (pseudo)
             {
-                if (isMouseOverElement(event, friendsDiv)) {
+                if (isMouseOverElement(event, friendsDiv) || checkEvent(event)) {
                     document.body.style.cursor = 'default';
                     return;
                 }
+                else if (checkEvent(event))
+                    return
                 else
                 {
-                    zoomToDoor();
-                    // showLoggedOutModal();
+                    showLoggedOutModal();
+                    // zoomLogout();
+                    // zoomToDoor();
                     headerLogoutFunction();
                     return;
                 }
diff --git a/srcs/app_django/pages/static/pages/js/zoom.js b/srcs/app_django/pages/static/pages/js/zoom.js
index b7246479..33bfbb13 100644
--- a/srcs/app_django/pages/static/pages/js/zoom.js
+++ b/srcs/app_django/pages/static/pages/js/zoom.js
@@ -118,6 +118,10 @@ function zoomToPCWhileLogged() {
 	friendsVisible = true;
 }
 
+function zoomLogout() {
+    showLoggedModal();    
+}
+
 function zoomToDoor() {
     console.log(isZoomed, " ", isZooming);
     if (!isZoomed && !isZooming)
@@ -134,7 +138,7 @@ function zoomToDoor() {
             targetPosition,
             targetPosition,
             () => {
-                zoomBack(); 
+                // zoomBack(); 
             }
             );
         }
diff --git a/srcs/app_django/trantran b/srcs/app_django/trantran
index 42ddaff4e37204ef8879844103d4cee10dee526a..d5dc5c1474a5ee345f66d0e38ae894725f348801 100644
GIT binary patch
delta 228
zcmV<A02}{+fDwRz5s(`J;gK9e0pYP=8ElhcZ5)%8Y_AbCATc&NGcr0cGA=kWHa0Ra
zgH>&ZRc!%>Rc!*dRc!;Tq8|aV01E(r0S?a$ZVNpM3<%l>sRnliMg$ZB;sAdEv9}-)
z1d#y*4W9uqvq2Co0k`531R@O@3k~}K4{Z)b50VZ04@eIF4v!Am4zv%q4<ol8AOr#q
z1P*EdC6hrAA(uri1SOXsE(9sJlP&~q0Ur*l01FO`01x30qYuIlgb!s8Mh_<s2oC8E
e$_|VUtG6I91d9#?0000VmvKG>D7V)>1StW&D?bGQ

delta 396
zcmZo@5Nv1=oFL6OW1@^R<BW|7k~xf=llAhYCr`~;FKDb_XlZ3+U}bEnXJ%+>YGK?Q
zn%f?l%Lv3w+e34i*DR9fozK9-P|wJBo+ppnmWzku7W+!Ja#lAM5vE6s8yV`iD+sVm
zWYlQV6Jzyl&UQ>LF3HQtwJ6CkPb^Q(E=o7c%Sp~IFSX1!HO@`UE6SbzU5;hHS4LDp
znU!ToWw3ume0pF`n2|?BYHp@crD1uBg}bYFPGY5HrfF7LWk#sGds%*Fxsid9iLQaA
zu7MendyS1ujm@?{5@J!}mEz(3&A^|_=gL2c_cvb_zX#txzJ9)&d|UXpZ<kYGVd7)q
zzr&z9*-=1ox~m?Gs;UaJFC!tBif!-LV<}>kXJBC9;p<`Gf5^X>{}6u*e=5HlzdAn$
h-%Gwze5?6-wksI0bo0r}F*`EicBR<%Q+6z7i~!ftbSMA-