Ladebeze66/ft_transcendence
1
0
Fork 0
mirror of https://github.com/AudebertAdrien/ft_transcendence.git synced 2026-11-09 18:17:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge avec adrien

Browse Source
This commit is contained in:
Theouche
2024-09-13 15:32:30 +02:00
parent 7689cf2da0 f06bb700ae
commit ea24accbc4
10 changed files with 323 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pong/static/burger.js
View File

@@ -103,11 +103,10 @@ document.addEventListener('DOMContentLoaded', () => {
console.log('Displaying matches:');
const matchListBody = document.querySelector('#match-list tbody');
matchListBody.innerHTML = '';
if (matches.length != 0) {
matches.forEach(match => {
const row = document.createElement('tr');
const row = document.createElement('tr');
row.innerHTML = `
<td>${match.id}</td>
<td>${match.player1__name}</td>
@@ -137,11 +136,10 @@ document.addEventListener('DOMContentLoaded', () => {
console.log('Displaying players:');
const playersListBody = document.querySelector('#player-list tbody');
playersListBody.innerHTML = '';
if (players.length != 0) {
players.forEach(player => {
const row = document.createElement('tr');
const row = document.createElement('tr');
row.innerHTML = `
<td>${player.id}</td>
<td>${player.name}</td>
@@ -169,9 +167,7 @@ document.addEventListener('DOMContentLoaded', () => {
if (tournois.length != 0) {
tournois.forEach(tournoi => {
console.log('Winner:', tournoi.winner); //debug !!!!!!!!!!!!!!!!!
console.log('Winner:', tournoi.winner__name); //debug !!!!!!!!!!!!!!!!!
const row = document.createElement('tr');
const row = document.createElement('tr');
row.innerHTML = `
<td>${tournoi.id}</td>
<td>${tournoi.name}</td>
@@ -395,4 +391,4 @@ document.addEventListener('DOMContentLoaded', () => {
return color;
}
});
});

2
pong/static/game.js
View File

@@ -360,7 +360,7 @@ document.addEventListener('DOMContentLoaded', () => {
}
function startWebSocketConnection(token, players) {
socket = new WebSocket(`ws://${window.location.host}/ws/game/`);
socket = new WebSocket(`wss://${window.location.host}/ws/game/`);
socket.onopen = function (event) {
console.log('WebSocket connection established');