diff --git a/docker-compose/requirements/djangoserver/file/server/server/templates/profilPage.html b/docker-compose/requirements/djangoserver/file/server/server/templates/profilPage.html
index c2c8493..244e4cb 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/templates/profilPage.html
+++ b/docker-compose/requirements/djangoserver/file/server/server/templates/profilPage.html
@@ -12,8 +12,8 @@
@@ -29,6 +29,7 @@
diff --git a/docker-compose/requirements/nginx/static/img/profilPage/addConv.png b/docker-compose/requirements/nginx/static/img/profilPage/addConv.png
deleted file mode 100644
index 0bfdfe0..0000000
Binary files a/docker-compose/requirements/nginx/static/img/profilPage/addConv.png and /dev/null differ
diff --git a/docker-compose/requirements/nginx/static/img/profilPage/addConv.svg b/docker-compose/requirements/nginx/static/img/profilPage/addConv.svg
new file mode 100644
index 0000000..05c1eff
--- /dev/null
+++ b/docker-compose/requirements/nginx/static/img/profilPage/addConv.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/docker-compose/requirements/nginx/static/img/profilPage/invite.png b/docker-compose/requirements/nginx/static/img/profilPage/invite.png
deleted file mode 100644
index 198b71d..0000000
Binary files a/docker-compose/requirements/nginx/static/img/profilPage/invite.png and /dev/null differ
diff --git a/docker-compose/requirements/nginx/static/img/profilPage/invite.svg b/docker-compose/requirements/nginx/static/img/profilPage/invite.svg
new file mode 100644
index 0000000..d0eaa71
--- /dev/null
+++ b/docker-compose/requirements/nginx/static/img/profilPage/invite.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Ball.js b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Ball.js
index 6d9b59f..c3eea1b 100644
--- a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Ball.js
+++ b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Ball.js
@@ -3,10 +3,10 @@
/* ::: :::::::: */
/* Ball.js :+: :+: :+: */
/* +:+ +:+ +:+ */
-/* By: hubourge +#+ +:+ +#+ */
+/* By: madegryc +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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()
diff --git a/docker-compose/requirements/nginx/static/javascript/notification/main.js b/docker-compose/requirements/nginx/static/javascript/notification/main.js
index e66be94..038b7bf 100644
--- a/docker-compose/requirements/nginx/static/javascript/notification/main.js
+++ b/docker-compose/requirements/nginx/static/javascript/notification/main.js
@@ -3,10 +3,10 @@
/* ::: :::::::: */
/* main.js :+: :+: :+: */
/* +:+ +:+ +:+ */
-/* By: edbernar +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 = "×";
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(() => {
diff --git a/docker-compose/requirements/nginx/static/style/profilPage/profil.css b/docker-compose/requirements/nginx/static/style/profilPage/profil.css
index 3a87e12..839ffea 100644
--- a/docker-compose/requirements/nginx/static/style/profilPage/profil.css
+++ b/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{
- 
- 
+ 
+ 