From 88e3fa3d973e6dfe69dc641b03f02f764061805f Mon Sep 17 00:00:00 2001 From: Kum1ta Date: Sun, 15 Sep 2024 00:06:51 +0200 Subject: [PATCH] Site - Started multi online game Django - Add some path --- .../server/templates/waitingGamePage.html | 9 +++ .../djangoserver/file/server/server/urls.py | 2 + .../djangoserver/file/server/server/views.py | 12 ++++ .../nginx/static/javascript/Page.js | 4 +- .../nginx/static/javascript/lobbyPage/main.js | 21 +++++-- .../nginx/static/javascript/login/main.js | 2 +- .../javascript/typeResponse/typeLogin.js | 2 +- .../static/javascript/waitingGame/main.js | 62 +++++++++++++++++++ .../static/style/lobbyPage/lobbyPage.css | 9 +++ 9 files changed, 115 insertions(+), 8 deletions(-) create mode 100644 docker-compose/requirements/djangoserver/file/server/server/templates/waitingGamePage.html create mode 100644 docker-compose/requirements/nginx/static/javascript/waitingGame/main.js diff --git a/docker-compose/requirements/djangoserver/file/server/server/templates/waitingGamePage.html b/docker-compose/requirements/djangoserver/file/server/server/templates/waitingGamePage.html new file mode 100644 index 0000000..1eb28ec --- /dev/null +++ b/docker-compose/requirements/djangoserver/file/server/server/templates/waitingGamePage.html @@ -0,0 +1,9 @@ +
+

PTME

+
+
+

Waiting for other players to start the game

+
+
+

Return to lobby

+
\ No newline at end of file diff --git a/docker-compose/requirements/djangoserver/file/server/server/urls.py b/docker-compose/requirements/djangoserver/file/server/server/urls.py index ff5fbbf..d9beaf5 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/urls.py +++ b/docker-compose/requirements/djangoserver/file/server/server/urls.py @@ -22,7 +22,9 @@ urlpatterns = [ path("homePage",views.homePage, name='homePage'), path("lobbyPage", views.lobbyPage, name='lobbyPage'), path("multiLocalGamePage", views.multiLocalGamePage, name='multiLocalGamePage'), + path("waitingGamePage", views.waitingGamePage, name='waitingGamePage'), path("game", views.game, name='game'), + path("wait_game", views.game, name='wait_game'), path("login42", views.login42, name='login42'), path("logout", views.logout, name='logout'), path("verify", views.verify, name='verify'), diff --git a/docker-compose/requirements/djangoserver/file/server/server/views.py b/docker-compose/requirements/djangoserver/file/server/server/views.py index 1ae5041..4e275fc 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/views.py +++ b/docker-compose/requirements/djangoserver/file/server/server/views.py @@ -37,11 +37,23 @@ def multiLocalGamePage(request): return(HttpResponse("you are not logged in",status=403)) return render(request, "multiLocalGamePage.html", {}) +def waitingGamePage(request): + if(request.method != "POST"): + return index(request) + if(not request.session.get("logged_in", False)): + return(HttpResponse("you are not logged in",status=403)) + return render(request, "waitingGamePage.html", {}) + def game(request): if(not request.session.get("logged_in", False)): return(HttpResponse("you are not logged in",status=403)) return redirect("/lobby") +def wait_game(request): + if(not request.session.get("logged_in", False)): + return(HttpResponse("you are not logged in",status=403)) + return redirect("/lobby") + def verify(request): req_token = request.GET.get('token', None) if(req_token == None): diff --git a/docker-compose/requirements/nginx/static/javascript/Page.js b/docker-compose/requirements/nginx/static/javascript/Page.js index a89a076..72c94a3 100644 --- a/docker-compose/requirements/nginx/static/javascript/Page.js +++ b/docker-compose/requirements/nginx/static/javascript/Page.js @@ -6,11 +6,12 @@ /* By: edbernar { @@ -93,6 +93,17 @@ function startMultiLocal() }, 500); } +function startMatchmaking() +{ + document.body.style.animation = "none"; + document.body.offsetHeight; + document.body.style.animation = "startGameAnim 0.5s"; + document.body.style.opacity = 0; + setTimeout(() => { + pageRenderer.changePage("waitingGamePage"); + }, 500); +} + function showGameMode() { document.getElementById('loginPopup').style.display = 'flex'; diff --git a/docker-compose/requirements/nginx/static/javascript/login/main.js b/docker-compose/requirements/nginx/static/javascript/login/main.js index 3263bc0..cd32ee4 100644 --- a/docker-compose/requirements/nginx/static/javascript/login/main.js +++ b/docker-compose/requirements/nginx/static/javascript/login/main.js @@ -6,7 +6,7 @@ /* By: edbernar { + if (points.length < 3) + points += '.'; + else + points = ''; + sentence.innerText = text + points; + }, 500); + sendRequest("game", {action: 0}) + returnButton.addEventListener('click', returnToLobby); + } + + static dispose() + { + if (intervalPoints) + clearInterval(intervalPoints); + intervalPoints = null; + } +} + +function returnToLobby() +{ + for (let i = 0; i < document.body.children.length; i++) + { + document.body.children[i].style.animation = "anim3 0.6s"; + } + setTimeout(() => { + pageRenderer.changePage('lobbyPage'); + }, 500); +} + +export { WaitingGamePage }; \ No newline at end of file diff --git a/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css b/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css index 573525b..41e0545 100644 --- a/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css +++ b/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css @@ -30,6 +30,15 @@ } } +@keyframes anim3 { + 0% { + opacity: 1; + } + 100% { + opacity: 0; + } +} + * { margin: 0; padding: 0;