diff --git a/docker-compose/requirements/djangoserver/file/server/server/templates/tournamentPage.html b/docker-compose/requirements/djangoserver/file/server/server/templates/tournamentPage.html index 6a35e3f..2291608 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/templates/tournamentPage.html +++ b/docker-compose/requirements/djangoserver/file/server/server/templates/tournamentPage.html @@ -14,13 +14,13 @@

username3

-

username9

-
+

username9

+

username12

-

VS

+

VS

@@ -29,7 +29,7 @@

username2

-
+

username4

@@ -58,7 +58,7 @@

username13

-
+

username14

@@ -98,15 +98,13 @@

Informations

-
-

edbernard won against madegryc !

- -
+

Chat

-
+
+

>

diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/tournamentRequest.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/tournamentRequest.py index ee43fbd..922b373 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/tournamentRequest.py +++ b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/tournamentRequest.py @@ -6,7 +6,7 @@ # By: edbernar { - if (info.id == 0) + if (!found && info.id == 0 || info.id == content.id) + { found = true; + alreadyConnected = info.id == content.id; + } if (!found) i++; }); @@ -54,6 +64,12 @@ class TournamentPage console.warn("Tournament is full."); return ; } + if (alreadyConnected) + { + console.warn("Player is already in game."); + return ; + } + newInfo(`${content.username} joined the tournament.`); document.getElementById('user-' + playerNb[i]).innerText = content.username; document.getElementById('pfp-' + playerNb[i]).style.backgroundImage = `url(${content.pfp})`; playerList['player' + playerNb[i]].id = content.id; @@ -63,11 +79,11 @@ class TournamentPage static leaveOpponent(content) { - let found = false; - let i = 0; + let found = false; + let i = 0; Object.values(playerList).forEach((info) => { - if (info.id == content.id) + if (!found && info.id == content.id) found = true; if (!found) i++; @@ -77,15 +93,38 @@ class TournamentPage console.warn(`Opponent can't be remove cause he is not in this tournament`); return ; } + newInfo(`${playerList['player' + playerNb[i]].username} left the tournament.`); document.getElementById('user-' + playerNb[i]).innerText = "Nobody"; document.getElementById('pfp-' + playerNb[i]).style.backgroundImage = null; while (i < playerNb.length - 1) { playerList['player' + playerNb[i]] = playerList['player' + playerNb[i + 1]]; + console.log(playerList['player' + playerNb[i]]); + document.getElementById('user-' + playerNb[i]).innerText = playerList['player' + playerNb[i]].username; + document.getElementById('pfp-' + playerNb[i]).style.backgroundImage = `url(${playerList['player' + playerNb[i]].pfp})`; i++; } - playerList['player' + playerNb[i]] = {id: 0, name: null, pfp: null}; + playerList['player' + playerNb[i]] = {id: 0, username: null, pfp: null}; + document.getElementById('user-' + playerNb[i]).innerText = playerList['player' + playerNb[i]].username; + document.getElementById('pfp-' + playerNb[i]).style.backgroundImage = `url(${playerList['player' + playerNb[i]].pfp})`; + } + + static newMessage(content) + { + const newText = document.createElement('p'); + + newText.innerText = `${content.username} : ${content.message}`; + divChat.appendChild(newText); } } +function newInfo(message) +{ + const newDiv = document.createElement('div'); + + newDiv.setAttribute('class', 'alert-info'); + newDiv.innerHTML = `

${message}

` + divInfo.appendChild(newDiv); +} + export { TournamentPage } \ No newline at end of file diff --git a/docker-compose/requirements/nginx/static/javascript/tournamentPage/Untitled-1.js b/docker-compose/requirements/nginx/static/javascript/tournamentPage/Untitled-1.js new file mode 100644 index 0000000..f1d9c8b --- /dev/null +++ b/docker-compose/requirements/nginx/static/javascript/tournamentPage/Untitled-1.js @@ -0,0 +1,18 @@ +import("/static/javascript/typeResponse/typeTournament.js") + .then(module => { + window.typeTournament = module.typeTournament; + console.log("Module importé : ", typeTournament); + }) + .catch(error => console.error("Erreur d'import :", error)); + +typeTournament({action: 0, exist: true, isFull: false, started: false, code: "45FD53"}); + +typeTournament({action: 1, id: 3, username: "NeoWander", pfp: "https://www.japanfm.fr/wp-content/uploads/2023/12/gojo-satoru-jjk-scaled.jpg"}); +typeTournament({action: 1, id: 4, username: "SkyVolt", pfp: "https://i.seadn.io/gae/jCQAQBNKmnS_AZ_2jTqBgBLIVYaRFxLX6COWo-HCHrYJ1cg04oBgDfHvOmpqsWbmUaSfBDHIdrwKtGnte3Ph_VwQPJYJ6VFtAf5B?auto=format&dpr=1&w=1000"}); +typeTournament({action: 1, id: 5, username: "QuantumFlare", pfp: "https://wallpapers-clan.com/wp-content/uploads/2022/09/one-piece-pfp-1.jpg"}); +typeTournament({action: 1, id: 6, username: "PixelWhale", pfp: "https://images-wixmp-ed30a86b8c4ca887773594c2.wixmp.com/f/5e5ff9cd-a751-4cd4-b9c5-00aa21620b7b/deu3q3u-6f1ca041-b5b7-46d7-ab06-f8547a7114cc.jpg/v1/fill/w_748,h_734,q_75,strp/cool_pfp_for_anyone__by_snowierev_deu3q3u-fullview.jpg?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1cm46YXBwOjdlMGQxODg5ODIyNjQzNzNhNWYwZDQxNWVhMGQyNmUwIiwiaXNzIjoidXJuOmFwcDo3ZTBkMTg4OTgyMjY0MzczYTVmMGQ0MTVlYTBkMjZlMCIsIm9iaiI6W1t7ImhlaWdodCI6Ijw9NzM0IiwicGF0aCI6IlwvZlwvNWU1ZmY5Y2QtYTc1MS00Y2Q0LWI5YzUtMDBhYTIxNjIwYjdiXC9kZXUzcTN1LTZmMWNhMDQxLWI1YjctNDZkNy1hYjA2LWY4NTQ3YTcxMTRjYy5qcGciLCJ3aWR0aCI6Ijw9NzQ4In1dXSwiYXVkIjpbInVybjpzZXJ2aWNlOmltYWdlLm9wZXJhdGlvbnMiXX0.bIIhpuZAj8GkKnWaCQ-QqVf-q58InCQZthNWr5mno7w"}); +typeTournament({action: 1, id: 7, username: "NovaBlaze", pfp: "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRdyTh5ljvubR6s3LeERqK8DHldWwD3DcwBLw&s"}); +typeTournament({action: 1, id: 8, username: "GlitchPhantom", pfp: "https://images.wondershare.com/filmora/article-images/2022/cool-tiktok-pfp.jpg"}); +typeTournament({action: 1, id: 9, username: "FrostBiteX", pfp: "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQJWyvMlk1053PLnD3PRrz2g_LdQtW2H-M-GQ&s"}); +typeTournament({action: 1, id: 10, username: "LunarEcho", pfp: "https://hypixel.net/attachments/1928357/"}); +typeTournament({action: 2,id: 3}); diff --git a/docker-compose/requirements/nginx/static/javascript/typeResponse/typeTournament.js b/docker-compose/requirements/nginx/static/javascript/typeResponse/typeTournament.js index 501f662..a119ce2 100644 --- a/docker-compose/requirements/nginx/static/javascript/typeResponse/typeTournament.js +++ b/docker-compose/requirements/nginx/static/javascript/typeResponse/typeTournament.js @@ -6,7 +6,7 @@ /* By: edbernar