Site :

- Fix icon invit game
    - Fix bug history
    - Add scroll history (maybe)
    - Fix cross notification to real cross

docker-compose/requirements/nginx/static/img/profilPage/addConv.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="none" stroke="white" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12.007 19.98A9.9 9.9 0 0 1 7.7 19L3 20l1.3-3.9C1.976 12.663 2.874 8.228 6.4 5.726c3.526-2.501 8.59-2.296 11.845.48c1.992 1.7 2.93 4.04 2.747 6.34M16 19h6m-3-3v6"/></svg>

docker-compose/requirements/nginx/static/img/profilPage/invite.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 256 256"><path fill="white" d="M216 34h-64a6 6 0 0 0-4.76 2.34l-65.39 85L70.6 110.1a14 14 0 0 0-19.8 0l-12.7 12.7a14 14 0 0 0 0 19.81L59.51 164L30.1 193.42a14 14 0 0 0 0 19.8l12.69 12.69a14 14 0 0 0 19.8 0L92 196.5l21.4 21.4a14 14 0 0 0 19.8 0l12.7-12.69a14 14 0 0 0 0-19.81l-11.25-11.25l85-65.39A6 6 0 0 0 222 104V40a6 6 0 0 0-6-6M54.1 217.42a2 2 0 0 1-2.83 0l-12.68-12.69a2 2 0 0 1 0-2.82L68 172.5L83.51 188Zm83.31-20.7l-12.69 12.7a2 2 0 0 1-2.84 0l-75.29-75.3a2 2 0 0 1 0-2.83l12.69-12.7a2 2 0 0 1 2.84 0l75.29 75.3a2 2 0 0 1 0 2.83M210 101.05l-83.91 64.55l-13.6-13.6l51.75-51.76a6 6 0 0 0-8.48-8.48L104 143.51l-13.6-13.6L155 46h55Z"/></svg>

docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Ball.js

@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   Ball.js                                            :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: hubourge <hubourge@student.42.fr>          +#+  +:+       +#+        */
+/*   By: madegryc <madegryc@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/20 17:02:47 by edbernar          #+#    #+#             */
-/*   Updated: 2024/09/30 16:06:58 by hubourge         ###   ########.fr       */
+/*   Updated: 2024/09/30 19:17:05 by madegryc         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -30,6 +30,13 @@ class Ball
 		this.limits = map.playerLimits;
 		this.resetPosBall();
 		scene.add(this.object);
+		// this.world = new CANNON.World();
+		// this.ballBody = new CANNON.Body({
+		// 	shape: new CANNON.Sphere(0.15),
+		// 	mass: 10,
+		// });
+		// this.ballBody.position.copy(this.object.position);
+		// this.world.addBody(this.ballBody);
 	}
 
 	#createBall()

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

@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   main.js                                            :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
+/*   By: madegryc <madegryc@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/04 23:32:52 by edbernar          #+#    #+#             */
-/*   Updated: 2024/09/28 00:38:44 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/09/30 19:07:35 by madegryc         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,7 +15,7 @@ function	createHeader(title, img)
 	const	divHeader		= document.createElement("div");
 	const	icon			= document.createElement("img");
 	const	h1Title			= document.createElement("h1");
-	const	cross			= document.createElement("p");
+	const	cross			= document.createElement("span");
 	const	titleTextNode	= document.createTextNode(title);
 
 	divHeader.classList.add("header");
@@ -30,14 +30,12 @@ function	createHeader(title, img)
 	h1Title.style.textAlign = "center";
 	h1Title.style.width = "100%";
 	h1Title.style.marginTop = "5px";
-	cross.innerHTML = "X";
+	cross.innerHTML = "&times";
 	cross.style.position = 'absolute';
 	cross.style.cursor = 'pointer';
 	cross.style.margin = '0';
 	cross.style.right = '10px';
-	cross.style.marginTop = '5px';
-	cross.style.fontSize = '20px';
-	cross.style.fontWeight = 'bold';
+	cross.style.fontSize = '25px';
 	cross.addEventListener("click", () => {
 		divHeader.parentNode.style.animation = "slideOut 0.21s";
 		setTimeout(() => {

docker-compose/requirements/nginx/static/style/profilPage/profil.css

@@ -112,6 +112,11 @@
     text-align: center;
 }
 
+#profil .scroll-match {
+    overflow-y: auto;
+    height: 100%;
+}
+
 #profil .history {
     background-color: white;
     width: 48%;
@@ -188,14 +193,16 @@
     cursor: pointer;
 }
 
-#profil .user-1 {
+#profil #user-1 {
     display: flex;
     align-items: center;
+    flex-direction: column;
 }
 
-#profil .user-2 {
+#profil #user-2 {
     display: flex;
     align-items: center;
+    flex-direction: column;
 }
 
 #profil .versus{