Docker

- Updated all path import

docker-compose/requirements/djangoserver/file/server/server/templates/index.html

@@ -5,11 +5,11 @@
 	<meta http-equiv='X-UA-Compatible' content='IE=edge'>
 	<title>Chat</title>
 	<meta name='viewport' content='width=device-width, initial-scale=1'>
-	<link rel='stylesheet' type='text/css' href='/static/style/home.css'>
-	<link rel='stylesheet' type='text/css' href='/static/style/liveChat.css'>
-	<link rel='stylesheet' type='text/css' href='/static/style/notification.css'>
-	<link rel='stylesheet' type='text/css' href='/static/style/loginPage.css'>
-	<script type="module" src='/static/main.js'></script>
+	<link rel='stylesheet' type='text/css' href='/static/style/homePage/home.css'>
+	<link rel='stylesheet' type='text/css' href='/static/style/homePage/liveChat.css'>
+	<link rel='stylesheet' type='text/css' href='/static/style/homePage/loginPage.css'>
+	<link rel='stylesheet' type='text/css' href='/static/style/global/notification.css'>
+	<script type="module" src='/static/javascript/main.js'></script>
 	<link rel="preconnect" href="https://fonts.googleapis.com">
 	<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 	<link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet">
@@ -70,8 +70,8 @@
 	<section class="homeSection">
 	</section>
 	<section class="homeSection relative">
-		<img id="firstBall" src="static/style/ball3D2.png">
-		<img id="secondBall" src="static/style/ball3D3.png">
+		<img id="firstBall" src="/static/img/homePage/ball3D2.png">
+		<img id="secondBall" src="/static/img/homePage/ball3D3.png">
 		<div class="relative">
 			<p id="firstText">Lorem ipsum dolor sit amet consectetur adipisicing elit. Officia totam cupiditate magni unde expedita molestiae eum aliquam fugit voluptatibus omnis! Dolores, ipsa inventore necessitatibus numquam aspernatur in perferendis id voluptas?</p>
 			<p id="secondText">Lorem ipsum dolor sit amet consectetur adipisicing elit. Officia totam cupiditate magni unde expedita molestiae eum aliquam fugit voluptatibus omnis! Dolores, ipsa inventore necessitatibus numquam aspernatur in perferendis id voluptas?</p>
@@ -80,7 +80,7 @@
 	<section class="homeSection">
 		<div class="team">
 			<div class="team-member">
-				<img src="/static/style/tomoron.png" alt="Tom" class="team-photo">
+				<img src="/static/img/homePage/tomoron.png" alt="Tom" class="team-photo">
 				<h2>Tom, tomoron</h2>
 				<p>Partie Backend</p>
 				<div class="info">
@@ -88,7 +88,7 @@
 				</div>
 			</div>
 			<div class="team-member">
-				<img src="/static/style/madegryc.png" alt="Mathis" class="team-photo">
+				<img src="/static/img/homePage/madegryc.png" alt="Mathis" class="team-photo">
 				<h2>Mathis, madegryc</h2>
 				<p>Partie Frontend / Design</p>
 				<div class="info">
@@ -96,7 +96,7 @@
 				</div>
 			</div>
 			<div class="team-member">
-				<img src="/static/style/edbernard.png" alt="Eddy" class="team-photo">
+				<img src="/static/img/homePage/edbernard.png" alt="Eddy" class="team-photo">
 				<h2>Eddy, edbernar</h2>
 				<p>Partie Midend</p>
 				<div class="info">
@@ -104,7 +104,7 @@
 				</div>
 			</div>
 			<div class="team-member">
-				<img src="/static/style/hubourge.png" alt="Hugo" class="team-photo">
+				<img src="/static/img/homePage/hubourge.png" alt="Hugo" class="team-photo">
 				<h2>Hugo, hubourge</h2>
 				<p>Partie jeu</p>
 				<div class="info">

docker-compose/requirements/nginx/static/home3D/Screen.js

@@ -1,143 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   Screen.js                                          :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2024/08/22 23:13:53 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/24 20:44:14 by edbernar         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-import * as THREE from '/static/three/build/three.module.js'
-import { GLTFLoader } from '/static/three/examples/jsm/loaders/GLTFLoader.js';
-
-const loader = new GLTFLoader();
-
-class Screen
-{
-	screen = null;
-	tv = null;
-	pointLightIntensity = 1;
-	screenMaterial = null;
-
-	constructor(scene)
-	{
-
-		this.screen = this.#createScreen(scene);
-		loader.load( '/static/modeles/tv.glb', (gltf) => {
-			const tv = gltf.scene.children[0];
-			const boundingBox = new THREE.Box3().setFromObject(tv);
-			const center = boundingBox.getCenter(new THREE.Vector3());
-			tv.geometry.center();
-			this.tv = tv;
-			tv.position.set(0, 0.99, 2);
-			tv.material = new THREE.MeshPhysicalMaterial({color: 0xaaaaaa});
-			tv.material.roughness = 10;
-			tv.material.metalness = 1;
-			tv.scale.set(0.05, 0.05, 0.05);
-			tv.castShadow = true;
-			tv.receiveShadow = true;
-			scene.add(tv);
-		}, undefined, function ( error ) {
-			console.error( error );
-			throw Error("Can't open file 'tv.glb'");
-		} );
-		this.#showVideo('/static/modeles/pong.mp4')
-	}
-
-	#createScreen(scene)
-	{
-		const	geometry			= new THREE.PlaneGeometry(4.1, 3, 50, 50); 
-		const	positionAttribute	= geometry.attributes.position;
-		const	vertices 			= positionAttribute.array;
-		const	material			= new THREE.MeshStandardMaterial({color: 0xbbbbbb});
-		const	mesh				= new THREE.Mesh(geometry, material);
-		const	pointLight			= new THREE.PointLight( 0xffffff, 10 * this.pointLightIntensity, 0, 2);
-
-		for (let i = 0; i < vertices.length; i += 3)
-		{
-			const x = vertices[i];
-			const y = vertices[i + 1];
-			const distance = (Math.sqrt(x * x + y * y));
-			const height = Math.pow(distance, 2) * -0.02;
-			vertices[i + 2] = height;
-		}
-		positionAttribute.needsUpdate = true;
-		mesh.scale.set(0.41, 0.42);
-		mesh.position.set(-0.155, 1.2, 1.15);
-		mesh.rotation.x = Math.PI + 0.05;
-		mesh.rotation.z = Math.PI;
-		scene.add(mesh);
-		pointLight.position.set(-0.05, 1.2, 0.95);
-		pointLight.castShadow = true;
-		pointLight.shadow.mapSize.width = 2048;
-		pointLight.shadow.mapSize.height = 2048;
-		console.log(pointLight.shadow)
-		scene.add(pointLight);
-		setInterval(() => {
-			const	intensity = Math.random() * 2 + 10;
-			
-			pointLight.intensity = intensity * this.pointLightIntensity > 13 * this.pointLightIntensity ? 13 * this.pointLightIntensity : intensity * this.pointLightIntensity;
-		}, 100);
-		return (mesh);
-	}
-
-	#showVideo(path)
-	{
-		const	canvas		= document.createElement('canvas');
-		const	context		= canvas.getContext('2d', { willReadFrequently: true });
-		const	video		= document.createElement('video');
-		const	texture		= new THREE.CanvasTexture(canvas);
-		const	material	= new THREE.MeshBasicMaterial({ map: texture,color: 0xffffff, transparent: true, opacity: 1 });
-		
-		canvas.width = 534;
-		canvas.height = 360;
-		video.src = path + '?t=' + new Date().getTime();
-		video.loop = true;
-		video.muted = true;
-		video.crossOrigin = 'anonymous';
-
-		video.addEventListener('loadedmetadata', () => {
-			const texture = this.screen.material.map;
-        	texture.needsUpdate = true;
-			video.play().then(() => {
-				updateCanvas();
-			}).catch(err => console.error("Error playing video: ", err));
-		});
-
-		function addNoiseOnImage(context)
-		{
-			const imageData = context.getImageData(0, 0, canvas.width, canvas.height);
-			const data = imageData.data;
-			for (let i = 0; i < data.length; i += 4)
-			{
-				const r = data[i];
-				const g = data[i + 1];
-				const b = data[i + 2];
-				const brightness = (3 * r + 4 * g + b) >>> 3;
-				const noise = Math.random() * 128 - 32;
-				data[i] = data[i + 1] = data[i + 2] = brightness + noise;
-			}
-			context.putImageData(imageData, 0, 0);
-		}
-
-		function updateCanvas()
-		{
-			if (!video.paused && !video.ended)
-			{
-				context.clearRect(0, 0, canvas.width, canvas.height);
-				context.drawImage(video, 0, 0, canvas.width, canvas.height);
-				addNoiseOnImage(context);
-				texture.needsUpdate = true;
-			}
-			requestAnimationFrame(updateCanvas);
-		}
-		texture.offset.set(0.02, 0);
-		this.screen.material = material;
-		video.load();
-	}
-};
-
-export { Screen };

docker-compose/requirements/nginx/static/home3D/home3D.js

@@ -1,162 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   home3D.js                                          :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2024/08/22 17:19:17 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/24 20:44:31 by edbernar         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-import * as THREE from '/static/three/build/three.module.js'
-import { Screen } from '/static/home3D/Screen.js'
-
-import { EffectComposer } from '/static/three/examples/jsm/postprocessing/EffectComposer.js';
-import { RenderPass } from '/static/three/examples/jsm/postprocessing/RenderPass.js';
-import { BokehPass } from '/static/three/examples/jsm/postprocessing/BokehPass.js';
-
-const	scene			= new THREE.Scene();
-const	renderer		= new THREE.WebGLRenderer({antialias: true});
-const	camera			= new THREE.PerspectiveCamera(60, window.innerWidth / window.innerHeight);
-const	ambiantLight	= new THREE.AmbientLight(0xffffff, 35);
-const	screen			= new Screen(scene);
-const	cube			= createCube();
-
-renderer.toneMapping = THREE.LinearToneMapping;
-renderer.shadowMap.enabled = true;
-renderer.shadowMap.type = THREE.PCFSoftShadowMap;
-renderer.setSize(window.innerWidth, window.innerHeight);
-document.body.getElementsByClassName('homeSection')[0].appendChild(renderer.domElement);
-scene.background = new THREE.Color(0x020202)
-camera.position.set(6, 1, -5.5);
-camera.rotation.set(Math.PI + 0.2, 0, Math.PI);
-scene.add(ambiantLight);
-
-let globalSpeed = 0.75;
-
-const composer = new EffectComposer(renderer);
-composer.addPass(new RenderPass(scene, camera));
-
-const dofPass = new BokehPass(scene, camera, {
-    focus: 10.0,
-    aperture: 0.020,
-    maxblur: 0.01,
-});
-composer.addPass(dofPass);
-
-setTimeout(() => {
-	let interval = setInterval(() => {
-		camera.position.x -= (0.01 * globalSpeed);
-		camera.lookAt(screen.tv.position);
-		if (camera.position.x < 3.3)
-			fadeInOut();
-		if (dofPass.materialBokeh.uniforms.aperture.value > 0)
-			dofPass.materialBokeh.uniforms.aperture.value -= 0.0001;
-		if (camera.position.x < 3)
-		{
-			clearInterval(interval);
-			camera.position.set(-2, 4, -6);
-			interval = setInterval(() => {
-				camera.lookAt(screen.tv.position);
-				camera.position.x += (0.01 * globalSpeed);
-				camera.position.y -= (0.005 * globalSpeed);
-				if (camera.position.x > 1.7)
-					fadeInOut();
-				if (camera.position.x > 2)
-				{
-					camera.position.set(0, 1.2, 0);
-					clearInterval(interval);
-					interval = setInterval(() => {
-						camera.lookAt(screen.tv.position);
-						camera.position.y += (0.005 * globalSpeed);
-						camera.position.z -= (0.01 * globalSpeed);
-						if (camera.position.x < -2.3)
-							fadeInOut();
-						if (camera.position.z < -2)
-						{
-							globalSpeed -= 0.001;
-							if (globalSpeed < 0)
-								clearInterval(interval);
-						}
-					}, 10);
-				}
-			}, 10);
-		}
-	}, 10);
-}, 500)
-
-document.addEventListener('resize', () => {
-	renderer.setSize(window.innerWidth, window.innerHeight);
-	camera.aspect = window.innerWidth / window.innerHeight;
-	camera.updateProjectionMatrix();
-});
-
-let isInFade = false;
-
-function fadeInOut()
-{
-	if (isInFade)
-		return;
-	let interval = null;
-	isInFade = true;
-	interval = setInterval(() => {
-		screen.pointLightIntensity -= 0.2;
-		screen.screen.material.opacity -= 0.05;
-		if (screen.screen.material.opacity <= 0)
-		{
-			clearInterval(interval);
-			setTimeout(() => {
-				interval = setInterval(() => {
-					screen.pointLightIntensity += 0.2;
-					screen.screen.material.opacity += 0.05;
-					if (screen.screen.material.opacity >= 1)
-					{
-						clearInterval(interval);
-						isInFade = false;
-					}
-				}, 20);
-			}, 500);
-		}
-	}, 20);
-}
-
-function createCube()
-{
-	const	geometry	= new THREE.BoxGeometry(5, 5, 0.1);
-	const	material	= new THREE.MeshStandardMaterial({color: 0x020202});
-	const	mesh		= new THREE.Mesh(geometry, material);
-
-	mesh.position.set(8, 1, -5);
-	scene.add(mesh);
-}
-
-
-function home3D()
-{
-	createPlane();
-	renderer.setAnimationLoop(loop)
-}
-
-function createPlane()
-{
-	const	geometry	= new THREE.PlaneGeometry(500, 500);
-	const	material	= new THREE.MeshPhysicalMaterial({side: THREE.DoubleSide, color: 0x020202});
-	const	mesh		= new THREE.Mesh(geometry, material);
-
-	mesh.position.set(0, 0, 0);
-	mesh.rotateX(-(Math.PI / 2));
-	mesh.receiveShadow = true;
-	scene.add(mesh);
-}
-
-
-function loop()
-{
-	composer.render();
-	// renderer.render(scene, camera);
-}
-
-
-export { home3D };

docker-compose/requirements/nginx/static/javascript/home3D/Screen.js

@@ -6,12 +6,15 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/22 23:13:53 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/24 20:36:07 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/08/24 23:27:42 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js';
-import * as THREE from '/static/three/build/three.module.js'
+import * as THREE from '/static/javascript/three/build/three.module.js'
+import { GLTFLoader } from '/static/javascript/three/examples/jsm/loaders/GLTFLoader.js';
+
+const	tvModel = '/static/models3D/homePage/tv.glb';
+const	sVideo = '/static/video/homePage/pong.mp4';
 
 const loader = new GLTFLoader();
 
@@ -32,7 +35,7 @@ class Screen
 	{
 
 		this.screen = this.#createScreen(scene);
-		loader.load( './modeles/tv.glb', (gltf) => {
+		loader.load(tvModel, (gltf) => {
 			const tv = gltf.scene.children[0];
 			const boundingBox = new THREE.Box3().setFromObject(tv);
 			const center = boundingBox.getCenter(new THREE.Vector3());
@@ -46,7 +49,7 @@ class Screen
 			tv.castShadow = true;
 			tv.receiveShadow = true;
 			scene.add(tv);
-			this.showVideo('/modeles/pong.mp4');
+			this.showVideo(sVideo);
 		}, undefined, function ( error ) {
 			console.error( error );
 			throw Error("Can't open file 'tv.glb'");
@@ -60,7 +63,6 @@ class Screen
 		const	vertices 			= positionAttribute.array;
 		const	material			= new THREE.MeshStandardMaterial({color: 0xbbbbbb});
 		const	mesh				= new THREE.Mesh(geometry, material);
-		// const	pointLight			= new THREE.PointLight( 0xffffff, 10 * light.point, 0, 2);
 		const	pointLight			= new THREE.SpotLight(0xffffff, 10 * light.point, 0, Math.PI / 1.6);
 
 		for (let i = 0; i < vertices.length; i += 3)
@@ -127,22 +129,6 @@ class Screen
 			}).catch(err => console.error("Error playing video: ", err));
 		});
 
-		// function addNoiseOnImage(context)
-		// {
-		// 	const imageData = context.getImageData(0, 0, canvas.width, canvas.height);
-		// 	const data = imageData.data;
-		// 	for (let i = 0; i < data.length; i += 4)
-		// 	{
-		// 		const r = data[i];
-		// 		const g = data[i + 1];
-		// 		const b = data[i + 2];
-		// 		const brightness = (3 * r + 4 * g + b) >>> 3;
-		// 		const noise = Math.random() * 128 - 32;
-		// 		data[i] = data[i + 1] = data[i + 2] = brightness + noise;
-		// 	}
-		// 	context.putImageData(imageData, 0, 0);
-		// }
-
 		function updateCanvas()
 		{
 			if (canvas.video != null || canvas.video == undefined)
@@ -151,7 +137,6 @@ class Screen
 				{
 					context.clearRect(0, 0, canvas.width, canvas.height);
 					context.drawImage(canvas.video, 0, 0, canvas.width, canvas.height);
-					// addNoiseOnImage(context);
 					texture.needsUpdate = true;
 				}
 				requestAnimationFrame(updateCanvas);

docker-compose/requirements/nginx/static/javascript/home3D/home3D.js

@@ -6,17 +6,17 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/22 17:19:17 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/24 20:36:07 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/08/24 23:24:22 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-import * as THREE from '/static/three/build/three.module.js'
-import { Screen, light } from './Screen.js'
+import * as THREE from '/static/javascript/three/build/three.module.js'
+import { Screen, light } from '/static/javascript/home3D/Screen.js'
+
+import { EffectComposer } from '/static/javascript/three/examples/jsm/postprocessing/EffectComposer.js';
+import { RenderPass } from '/static/javascript/three/examples/jsm/postprocessing/RenderPass.js';
+import { BokehPass } from '/static/javascript/three/examples/jsm/postprocessing/BokehPass.js';
 
-import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer.js';
-import { RenderPass } from 'three/examples/jsm/postprocessing/RenderPass.js';
-import { BokehPass } from 'three/examples/jsm/postprocessing/BokehPass.js';
-import Stats from 'stats.js';
 
 const	scene			= new THREE.Scene();
 const	renderer		= new THREE.WebGLRenderer({antialias: true});
@@ -25,10 +25,6 @@ const	ambiantLight	= new THREE.AmbientLight(0xffffff, 35);
 const	screen			= new Screen(scene);
 const	cube			= createCube();
 
-const stats = new Stats();
-stats.showPanel(0); // 0: fps, 1: ms, 2: mémoire
-document.body.appendChild(stats.dom);
-
 renderer.toneMapping = THREE.LinearToneMapping;
 renderer.shadowMap.enabled = true;
 renderer.shadowMap.type = THREE.PCFSoftShadowMap;
@@ -171,12 +167,12 @@ function createPlane()
 }
 
 const video = {
-	pong: '/modeles/pong.mp4',
-	login: '/modeles/notLogin.webm'
+	pong: '/static/video/homePage/pong.mp4',
+	login: '/static/video/homePage/notLogin.webm'
 }
 let	actualVideo = -1;
 if (Math.random() % 100 > 0.97)
-	video.pong = './modeles/easteregg.webm'
+	video.pong = '/static/video/homePage/easteregg.webm'
 
 setTimeout(() => {
 	screen.changeVideo(video.pong);
@@ -185,21 +181,18 @@ setTimeout(() => {
 
 function loop()
 {
-	stats.begin()
 	raycaster.setFromCamera( mouse, camera );
 	const intersects = raycaster.intersectObjects( scene.children, false );
 	
 	if (!screen.canvasVideo)
 	{
 		composer.render();
-		stats.end();
 		return ;
 	}
 	if (intersects.length === 0)
 	{
 		if (actualVideo != 0)
 		{
-			console.log("change 1");
 			screen.changeVideo(video.pong);
 			actualVideo = 0;
 		}
@@ -208,19 +201,16 @@ function loop()
 	{
 		if (actualVideo != 1)
 		{
-			console.log("change 2");
 			screen.changeVideo(video.login);
 			actualVideo = 1;
 		}
 	}
 	else if (actualVideo != 0)
 	{
-		console.log("change 3");
 		screen.changeVideo(video.pong);
 		actualVideo = 0;
 	}
 	composer.render();
-	stats.end();
 }
 
 

docker-compose/requirements/nginx/static/javascript/liveChat/main.js

@@ -6,13 +6,13 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/04 19:19:10 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/04 23:10:18 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/08/24 23:22:20 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-import { infoPanel } from "../typeResponse/typePrivateListMessage.js";
-import { showActualGameMessage } from "./showActualGameMessage.js";
-import { showListUser } from "./showUserList.js";
+import { infoPanel } from "/static/javascript/typeResponse/typePrivateListMessage.js";
+import { showActualGameMessage } from "/static/javascript/liveChat/showActualGameMessage.js";
+import { showListUser } from "/static/javascript/liveChat/showUserList.js";
 
 /*
 	Todo (Eddy) :

docker-compose/requirements/nginx/static/javascript/liveChat/showActualGameMessage.js

@@ -6,11 +6,11 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/04 19:21:55 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/06 23:19:51 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/08/24 23:28:45 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-import { sendRequest } from "../websocket.js";
+import { sendRequest } from "/static/javascript/websocket.js";
 
 function	showActualGameMessage()
 {

docker-compose/requirements/nginx/static/javascript/liveChat/showPrivateChat.js

@@ -6,14 +6,14 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/04 19:17:54 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/06 23:32:35 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/08/24 23:49:04 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-import { messageList, infoPanel, waitForMessageList } from "../typeResponse/typePrivateListMessage.js";
-import { userMeInfo } from "../typeResponse/typeLogin.js";
-import { showListUser } from "./showUserList.js";
-import { sendRequest } from "../websocket.js";
+import { messageList, infoPanel, waitForMessageList } from "/static/javascript/typeResponse/typePrivateListMessage.js";
+import { userMeInfo } from "/static/javascript/typeResponse/typeLogin.js";
+import { showListUser } from "/static/javascript/liveChat/showUserList.js";
+import { sendRequest } from "/static/javascript/websocket.js";
 
 let savedButtons = [];
 

docker-compose/requirements/nginx/static/javascript/liveChat/showUserList.js

@@ -3,17 +3,17 @@
 /*                                                        :::      ::::::::   */
 /*   showUserList.js                                    :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: edbernar <edbernar@student.42.fr>          +#+  +:+       +#+        */
+/*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/04 19:21:10 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/05 14:28:31 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/08/24 23:31:19 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-import { waitForUserList } from "../typeResponse/typePrivateListUser.js";
-import { userList } from "../typeResponse/typePrivateListUser.js";
-import { showPrivateChat } from "./showPrivateChat.js";
-import { sendRequest } from "../websocket.js";
+import { waitForUserList } from "/static/javascript/typeResponse/typePrivateListUser.js";
+import { userList } from "/static/javascript/typeResponse/typePrivateListUser.js";
+import { showPrivateChat } from "/static/javascript/liveChat/showPrivateChat.js";
+import { sendRequest } from "/static/javascript/websocket.js";
 
 async function	showListUser() {
 	const	divMessageListChatHome = document.getElementById("messageListChatHome");

docker-compose/requirements/nginx/static/javascript/login/main.js

@@ -3,15 +3,15 @@
 /*                                                        :::      ::::::::   */
 /*   main.js                                            :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: madegryc <madegryc@student.42.fr>          +#+  +:+       +#+        */
+/*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/07 17:40:15 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/23 18:35:44 by madegryc         ###   ########.fr       */
+/*   Updated: 2024/08/24 23:42:45 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-import { createNotification as CN } from "../notification/main.js";
-import { userMeInfo, waitForLogin } from "../typeResponse/typeLogin.js";
+import { createNotification as CN } from "/static/javascript/notification/main.js";
+import { userMeInfo, waitForLogin } from "/static/javascript/typeResponse/typeLogin.js";
 
 function	login()
 {

docker-compose/requirements/nginx/static/javascript/main.js

@@ -6,13 +6,13 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/30 13:50:35 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/24 20:40:04 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/08/24 23:24:33 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-import { liveChat } from "/static/liveChat/main.js";
-import { login } from "/static/login/main.js";
-import { home3D } from "/static/home3D/home3D.js"
+import { liveChat } from "/static/javascript/liveChat/main.js";
+import { login } from "/static/javascript/login/main.js";
+import { home3D } from "/static/javascript/home3D/home3D.js"
 
 window.addEventListener('scroll', () => {
 	const scrollPosition = window.scrollY;

docker-compose/requirements/nginx/static/javascript/notification/main.js

@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/04 23:32:52 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/06 23:34:39 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/08/24 23:41:57 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -151,10 +151,10 @@ class notification
 {
 	timer = 5000;
 	defaultIcon = {
-		"warning": "/site/notification/ico/warning.png",
-		"error": "/site/notification/ico/error.png",
-		"success": "/site/notification/ico/success.png",
-		"info": "/site/notification/ico/info.png"
+		"warning": "/static/img/notification/ico/warning.png",
+		"error": "/static/img/notification/ico/error.png",
+		"success": "/static/img/notification/ico/success.png",
+		"info": "/static/img/notification/ico/info.png"
 	};
 
 	constructor() {}

docker-compose/requirements/nginx/static/javascript/three/examples/css2d_label.html

@@ -28,7 +28,7 @@
 
 		<script type="module">
 
-			import * as THREE from '/static/three/build/three.module.js';
+			import * as THREE from '/static/javascript/three/build/three.module.js';
 
 			import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
 			import { CSS2DRenderer, CSS2DObject } from 'three/addons/renderers/CSS2DRenderer.js';

docker-compose/requirements/nginx/static/javascript/three/examples/css3d_molecules.html

@@ -33,7 +33,7 @@
 
 		<script type="module">
 
-			import * as THREE from '/static/three/build/three.module.js';
+			import * as THREE from '/static/javascript/three/build/three.module.js';
 
 			import { TrackballControls } from 'three/addons/controls/TrackballControls.js';
 			import { PDBLoader } from 'three/addons/loaders/PDBLoader.js';

docker-compose/requirements/nginx/static/javascript/three/examples/css3d_orthographic.html

@@ -31,7 +31,7 @@
 
 		<script type="module">
 
-			import * as THREE from '/static/three/build/three.module.js';
+			import * as THREE from '/static/javascript/three/build/three.module.js';
 
 			import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
 			import { CSS3DRenderer, CSS3DObject } from 'three/addons/renderers/CSS3DRenderer.js';

docker-compose/requirements/nginx/static/javascript/three/examples/css3d_periodictable.html

@@ -102,7 +102,7 @@
 
 		<script type="module">
 
-			import * as THREE from '/static/three/build/three.module.js';
+			import * as THREE from '/static/javascript/three/build/three.module.js';
 
 			import TWEEN from 'three/addons/libs/tween.module.js';
 			import { TrackballControls } from 'three/addons/controls/TrackballControls.js';

docker-compose/requirements/nginx/static/javascript/three/examples/css3d_sandbox.html

@@ -27,7 +27,7 @@
 
 		<script type="module">
 
-			import * as THREE from '/static/three/build/three.module.js';
+			import * as THREE from '/static/javascript/three/build/three.module.js';
 
 			import { TrackballControls } from 'three/addons/controls/TrackballControls.js';
 			import { CSS3DRenderer, CSS3DObject } from 'three/addons/renderers/CSS3DRenderer.js';

docker-compose/requirements/nginx/static/javascript/three/examples/css3d_sprites.html

@@ -31,7 +31,7 @@
 
 		<script type="module">
 
-			import * as THREE from '/static/three/build/three.module.js';
+			import * as THREE from '/static/javascript/three/build/three.module.js';
 
 			import TWEEN from 'three/addons/libs/tween.module.js';
 			import { TrackballControls } from 'three/addons/controls/TrackballControls.js';

docker-compose/requirements/nginx/static/javascript/three/examples/css3d_youtube.html

@@ -34,7 +34,7 @@
 
 		<script type="module">
 
-			import * as THREE from '/static/three/build/three.module.js';
+			import * as THREE from '/static/javascript/three/build/three.module.js';
 
 			import { TrackballControls } from 'three/addons/controls/TrackballControls.js';
 			import { CSS3DRenderer, CSS3DObject } from 'three/addons/renderers/CSS3DRenderer.js';

docker-compose/requirements/nginx/static/javascript/three/examples/games_fps.html

@@ -25,7 +25,7 @@
 
 		<script type="module">
 
-			import * as THREE from '/static/three/build/three.module.js';
+			import * as THREE from '/static/javascript/three/build/three.module.js';
 
 			import Stats from 'three/addons/libs/stats.module.js';
 

docker-compose/requirements/nginx/static/javascript/three/examples/jsm/animation/AnimationClipCreator.js

@@ -5,7 +5,7 @@ import {
 	NumberKeyframeTrack,
 	Vector3,
 	VectorKeyframeTrack
-} from 'three';
+} from '/static/javascript/three/build/three.module.js';
 
 class AnimationClipCreator {
 

docker-compose/requirements/nginx/static/javascript/three/examples/jsm/animation/CCDIKSolver.js

@@ -11,7 +11,7 @@ import {
 	Quaternion,
 	SphereGeometry,
 	Vector3
-} from 'three';
+} from '/static/javascript/three/build/three.module.js';
 
 const _q = new Quaternion();
 const _targetPos = new Vector3();

docker-compose/requirements/nginx/static/javascript/three/examples/jsm/animation/MMDAnimationHelper.js

@@ -3,7 +3,7 @@ import {
 	Object3D,
 	Quaternion,
 	Vector3
-} from '/static/three/build/three.module.js';
+} from '/static/javascript/three/build/three.module.js';
 import { CCDIKSolver } from '../animation/CCDIKSolver.js';
 import { MMDPhysics } from '../animation/MMDPhysics.js';
 

docker-compose/requirements/nginx/static/javascript/three/examples/jsm/animation/MMDPhysics.js

@@ -11,7 +11,7 @@ import {
 	Quaternion,
 	SphereGeometry,
 	Vector3
-} from 'three';
+} from '/static/javascript/three/build/three.module.js';
 
 /**
  * Dependencies

docker-compose/requirements/nginx/static/javascript/three/examples/jsm/cameras/CinematicCamera.js

@@ -7,7 +7,7 @@ import {
 	ShaderMaterial,
 	UniformsUtils,
 	WebGLRenderTarget
-} from 'three';
+} from '/static/javascript/three/build/three.module.js';
 
 import { BokehShader, BokehDepthShader } from '../shaders/BokehShader2.js';
 

docker-compose/requirements/nginx/static/javascript/three/examples/jsm/controls/ArcballControls.js

@@ -14,7 +14,7 @@ import {
 	Matrix4,
 	MathUtils,
 	EventDispatcher
-} from '/static/three/build/three.module.js';
+} from '/static/javascript/three/build/three.module.js';
 
 //trackball state
 const STATE = {

docker-compose/requirements/nginx/static/javascript/three/examples/jsm/controls/DragControls.js

@@ -5,7 +5,7 @@ import {
 	Raycaster,
 	Vector2,
 	Vector3
-} from '/static/three/build/three.module.js';
+} from '/static/javascript/three/build/three.module.js';
 
 const _plane = new Plane();
 const _raycaster = new Raycaster();

docker-compose/requirements/nginx/static/javascript/three/examples/jsm/controls/FirstPersonControls.js

@@ -2,7 +2,7 @@ import {
 	MathUtils,
 	Spherical,
 	Vector3
-} from 'three';
+} from '/static/javascript/three/build/three.module.js';
 
 const _lookDirection = new Vector3();
 const _spherical = new Spherical();