From ad85a6f7120243a6fe930c79f37813ea5fb4d16d Mon Sep 17 00:00:00 2001 From: Kum1ta Date: Thu, 10 Oct 2024 14:39:04 +0200 Subject: [PATCH] Site - change button on tournament page - add input for nb bot for tournament in lobby page - add nb in request 0 tournament Game - remove some dev input - add pub --- .../server/server/templates/lobbyPage.html | 2 ++ .../server/templates/tournamentPage.html | 4 ++-- .../server/typeRequests/tournamentRequest.py | 3 ++- .../djangoserver/file/server/server/urls.py | 2 +- .../nginx/static/javascript/lobbyPage/main.js | 22 ++++++++++++++++--- .../javascript/multiOnlineGame/Player.js | 3 ++- .../multiOnlineGame/multiOnlineGamePage.js | 22 +++---------------- .../tournamentPage/TournamentPage.js | 6 ++++- .../javascript/tournamentPage/just_test.js | 22 ------------------- .../javascript/typeResponse/typeGame.js | 3 +-- 10 files changed, 37 insertions(+), 52 deletions(-) delete mode 100644 docker-compose/requirements/nginx/static/javascript/tournamentPage/just_test.js diff --git a/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html b/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html index 5b806f0..e5eae5c 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html +++ b/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html @@ -195,6 +195,8 @@

Tournament code

+ +
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 2291608..37c31de 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/templates/tournamentPage.html +++ b/docker-compose/requirements/djangoserver/file/server/server/templates/tournamentPage.html @@ -113,8 +113,8 @@
-
-

Start

+
+

Quit

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 f61ae1c..452e378 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 { + tournamentCodeInput.addEventListener('keypress', (event) => { if (event.key == 'Enter') startTournmament(); }); + tournamentCodeInput.addEventListener('input', () => { + if (tournamentCodeInput.value.length == 0) + nbBot.style.display = 'flex'; + else + nbBot.style.display = 'none'; + }); listSelectCard = document.getElementsByClassName('select-card'); listSelectCard[0].addEventListener('click', selectGameModeOne); listSelectCard[1].addEventListener('click', selectGameModeTwo); @@ -178,8 +185,17 @@ function startMatchmaking(ranked) function startTournmament() { const code = document.getElementById('tournamentCode').value; + const nbBot = document.getElementById('nbBot').value; - sendRequest("tournament", {action: 0, code: code}); + if (code != '') + sendRequest("tournament", {action: 0, code: code}); + else if (nbBot != '') + { + if (parseInt(nbBot) >= 0 && parseInt(nbBot) <= 7) + sendRequest("tournament", {action: 0, code: '', nbBot: parseInt(nbBot)}); + else + CN.new("Error", "You must enter a valid number of bot"); + } } function closePopUpWhenClickOutsite (event) diff --git a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js index 5b44527..3b13785 100644 --- a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js +++ b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/Player.js @@ -6,7 +6,7 @@ /* By: edbernar { this.mapVar.putVideoOnCanvas(0, null); + this.mapVar.putVideoOnCanvas(2, 3); }, 4000); ball.setVisibility(false); diff --git a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js index 7ac73cd..e3d945f 100644 --- a/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js +++ b/docker-compose/requirements/nginx/static/javascript/multiOnlineGame/multiOnlineGamePage.js @@ -6,7 +6,7 @@ /* By: edbernar { @@ -197,6 +180,7 @@ class MultiOnlineGamePage if (session) session.end(); observer.disconnect(); + map.putVideoOnCanvas(0, null); VrButton = null; window.removeEventListener('resize', windowUpdater); if (interval) diff --git a/docker-compose/requirements/nginx/static/javascript/tournamentPage/TournamentPage.js b/docker-compose/requirements/nginx/static/javascript/tournamentPage/TournamentPage.js index 2985a41..b95eac0 100644 --- a/docker-compose/requirements/nginx/static/javascript/tournamentPage/TournamentPage.js +++ b/docker-compose/requirements/nginx/static/javascript/tournamentPage/TournamentPage.js @@ -6,7 +6,7 @@ /* By: edbernar { + sendRequest("tournament", {action: 1}); + pageRenderer.changePage("lobbyPage", false); + }); } static dispose() diff --git a/docker-compose/requirements/nginx/static/javascript/tournamentPage/just_test.js b/docker-compose/requirements/nginx/static/javascript/tournamentPage/just_test.js deleted file mode 100644 index 0cdc1f0..0000000 --- a/docker-compose/requirements/nginx/static/javascript/tournamentPage/just_test.js +++ /dev/null @@ -1,22 +0,0 @@ -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}); - -typeTournament({action: 3, username: "Eddy", message: "Bonsoir"}); - -typeTournament({action: 4, id:4, username: "Zouave"}); \ No newline at end of file diff --git a/docker-compose/requirements/nginx/static/javascript/typeResponse/typeGame.js b/docker-compose/requirements/nginx/static/javascript/typeResponse/typeGame.js index 74520df..3e78542 100644 --- a/docker-compose/requirements/nginx/static/javascript/typeResponse/typeGame.js +++ b/docker-compose/requirements/nginx/static/javascript/typeResponse/typeGame.js @@ -6,7 +6,7 @@ /* By: edbernar