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 42ddaff4..d5dc5c14 100644 Binary files a/srcs/app_django/trantran and b/srcs/app_django/trantran differ