tom/METH_Transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Site

Browse Source 
- fix color infinite wall on home page
    - fix bug click tv on home page
    - reworked on back arrow on profil page
This commit is contained in:
Kum1ta
2024-10-07 00:03:32 +02:00
parent 8cc46036e4
commit a6743616e3
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docker-compose/requirements/nginx/static/javascript/Page.js
View File

@ -6,7 +6,7 @@
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */ /* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/25 00:00:21 by edbernar #+# #+# */ /* 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 => { .then(data => {
data.text().then(text => { data.text().then(text => {
document.body.innerHTML = 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; this.actualPage = this.availablePages[i].class;
document.title = this.availablePages[i].title; document.title = this.availablePages[i].title;
if (!isBack && !this.wasRefresh) if (!isBack && !this.wasRefresh)

11
docker-compose/requirements/nginx/static/javascript/home3D/home3D.js
View File

@ -6,7 +6,7 @@
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */ /* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/22 17:19:17 by edbernar #+# #+# */ /* 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() static dispose()
{ {
document.addEventListener('scroll', mouseTracker);
window.removeEventListener('resize', windowUpdater); window.removeEventListener('resize', windowUpdater);
document.removeEventListener('mousemove', mouseTracker); document.removeEventListener('mousemove', mouseTracker);
document.removeEventListener('click', redirection); 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.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.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.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.toneMapping = THREE.LinearToneMapping;
renderer.shadowMap.enabled = true; renderer.shadowMap.enabled = true;
renderer.shadowMap.type = THREE.PCFSoftShadowMap; renderer.shadowMap.type = THREE.PCFSoftShadowMap;
@ -141,7 +142,6 @@ function home3D()
scene.background = new THREE.Color(0x020202) scene.background = new THREE.Color(0x020202)
scene.add(ambiantLight); scene.add(ambiantLight);
// createPlane();
createCube(); createCube();
document.body.getElementsByClassName('homeSection')[0].appendChild(renderer.domElement); document.body.getElementsByClassName('homeSection')[0].appendChild(renderer.domElement);
@ -149,6 +149,7 @@ function home3D()
mouse.x = 9999; mouse.x = 9999;
mouse.y = 9999; mouse.y = 9999;
document.addEventListener('mousemove', mouseTracker); document.addEventListener('mousemove', mouseTracker);
document.addEventListener('scroll', mouseTracker);
composer = new EffectComposer(renderer); composer = new EffectComposer(renderer);
renderPass = new RenderPass(scene, camera); renderPass = new RenderPass(scene, camera);
@ -240,7 +241,7 @@ function home3D()
{ {
if (clickDetect) if (clickDetect)
{ {
document.removeEventListener('click', redirection); document.getElementsByTagName('canvas')[0].removeEventListener('click', redirection);
clickDetect = false; clickDetect = false;
} }
if (playButtonMouseOver || intersects[0].object == screen.screen) if (playButtonMouseOver || intersects[0].object == screen.screen)
@ -257,7 +258,7 @@ function home3D()
{ {
if (!clickDetect && userMeInfo.id > 0) if (!clickDetect && userMeInfo.id > 0)
{ {
document.addEventListener('click', redirection); document.getElementsByTagName('canvas')[0].addEventListener('click', redirection);
clickDetect = true; clickDetect = true;
} }
} }

9
docker-compose/requirements/nginx/static/javascript/profilPage/main.js
View File

@ -6,7 +6,7 @@
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */ /* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/19 23:08:31 by edbernar #+# #+# */ /* 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 else
sendRequest("get_user_info", {id: user}); sendRequest("get_user_info", {id: user});
crossProfil.addEventListener('click', () => { crossProfil.addEventListener('click', () => {
if (typeof(user) == 'string') if (document.precedentPage)
pageRenderer.changePage('homePage'); pageRenderer.changePage(document.precedentPage);
else else
pageRenderer.changePage('lobbyPage'); pageRenderer.changePage('homePage');
}); });
waitForUserInfo().then((userInfo) => { waitForUserInfo().then((userInfo) => {
console.log(userInfo);
if (userInfo == null) if (userInfo == null)
{ {
pageRenderer.changePage('homePage'); pageRenderer.changePage('homePage');