From 90dc5dac8440b256e5c3ac418614b425c3d47f68 Mon Sep 17 00:00:00 2001 From: AdrienLSH Date: Tue, 14 May 2024 13:26:22 +0200 Subject: [PATCH 1/5] ProfilePageView: fix winrate --- django/frontend/static/js/views/ProfilePageView.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/django/frontend/static/js/views/ProfilePageView.js b/django/frontend/static/js/views/ProfilePageView.js index 08a4bc6..aea532c 100644 --- a/django/frontend/static/js/views/ProfilePageView.js +++ b/django/frontend/static/js/views/ProfilePageView.js @@ -21,7 +21,7 @@ export default class extends AbstractView { await this.fillHistory(games); await this.fillStatistics(games); - if (this.profile.id === client.me.id) + if (!client.me || this.profile.id === client.me.id) return; const addFriendButton = document.getElementById('addFriendButton'), @@ -78,8 +78,8 @@ export default class extends AbstractView { */ async fillStatistics(games) { - let winrateDiv = document.getElementById("winrate"); - + const winrateDiv = document.getElementById("winrate"); + let win = 0; let lose = 0; @@ -87,13 +87,17 @@ export default class extends AbstractView { if (game.finished === false) return - if (client.me.id === game.winner.id) + if (this.profile.id === game.winner.id) win++; else lose++; }); - winrateDiv.innerText = `winrate: ${win + lose === 0 ? "🤓" : win / (win + lose)}` + if (games.length) { + winrateDiv.innerText = `Winrate: ${win / (win + lose) * 100}%`; + } else { + winrateDiv.innerText = `Winrate: 🤓` + } } async fillHistory(games) From 3039ad831adbb46c547e64a34ec080e1985abcf8 Mon Sep 17 00:00:00 2001 From: AdrienLSH Date: Tue, 14 May 2024 14:03:20 +0200 Subject: [PATCH 2/5] bind volume in docker compose --- docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index bf3dd82..3d76ff4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,10 @@ services: container_name: django restart: always env_file: .env + volumes: + - type: bind + source: ./django + target: /app depends_on: db: condition: service_healthy From 6b85256ca68aedc5f36439e529a8fa087e7b3241 Mon Sep 17 00:00:00 2001 From: starnakin Date: Tue, 14 May 2024 12:43:53 +0200 Subject: [PATCH 3/5] fix: docker compose work on 42 computor --- docker-compose.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3d76ff4..261d5b0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -name: ft_transcendence +version: '3.8' services: django: @@ -18,7 +18,6 @@ services: depends_on: db: condition: service_healthy - restart: true db: image: postgres From bae91624f5c08ca09071d3214aeec69d553afdfc Mon Sep 17 00:00:00 2001 From: starnakin Date: Tue, 14 May 2024 14:21:30 +0200 Subject: [PATCH 4/5] pong: online: semi: fix lag --- django/games/routine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/games/routine.py b/django/games/routine.py index 59e0493..0c5c5d2 100644 --- a/django/games/routine.py +++ b/django/games/routine.py @@ -303,7 +303,7 @@ async def async_routine(game: PongGame): ball_routine.cancel() return - await asyncio.sleep(0.05) + await asyncio.sleep(1) def routine(game: PongGame): From e47aa3a2af63ce7833ac6dcb59e574396113b965 Mon Sep 17 00:00:00 2001 From: starnakin Date: Tue, 14 May 2024 14:21:51 +0200 Subject: [PATCH 5/5] pong: multiplayer: try: fix: collision --- django/games/objects/pong/PongGame.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/games/objects/pong/PongGame.py b/django/games/objects/pong/PongGame.py index 1aca573..bf073e1 100644 --- a/django/games/objects/pong/PongGame.py +++ b/django/games/objects/pong/PongGame.py @@ -50,9 +50,9 @@ class PongGame(AGame): for i in range(4): if i < nb_players: - self.players.append(PongPlayer(self, players[i], None, Segment(corners[i], corners[(i + 1) % 4]))) + self.players.append(PongPlayer(self, players[i], None, Segment(corners[(i + 1) % 4], corners[i]))) else: - self.walls.append(Segment(corners[i], corners[(i + 1) % 4])) + self.walls.append(Segment(corners[(i + 1) % 4], corners[i])) self.ball: Ball = Ball()