From d78fcd7cdae73fff97926a05dd1627972a7f3325 Mon Sep 17 00:00:00 2001 From: Kum1ta Date: Wed, 25 Sep 2024 17:08:50 +0200 Subject: [PATCH] Game - reset ball position when goal Site - starting settings --- .../file/server/server/templates/index.html | 1 + .../server/server/templates/settingsPage.html | 55 ++++++++++ .../djangoserver/file/server/server/urls.py | 1 + .../djangoserver/file/server/server/views.py | 9 +- .../nginx/static/javascript/Page.js | 4 +- .../static/javascript/multiOnlineGame/Map.js | 6 +- .../multiOnlineGame/multiOnlineGamePage.js | 2 +- .../javascript/settingsPage/settingsPage.js | 26 +++++ .../nginx/static/style/settings/settings.css | 102 ++++++++++++++++++ 9 files changed, 200 insertions(+), 6 deletions(-) create mode 100644 docker-compose/requirements/djangoserver/file/server/server/templates/settingsPage.html create mode 100644 docker-compose/requirements/nginx/static/javascript/settingsPage/settingsPage.js create mode 100644 docker-compose/requirements/nginx/static/style/settings/settings.css diff --git a/docker-compose/requirements/djangoserver/file/server/server/templates/index.html b/docker-compose/requirements/djangoserver/file/server/server/templates/index.html index 58bf62e..58465ba 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/templates/index.html +++ b/docker-compose/requirements/djangoserver/file/server/server/templates/index.html @@ -13,6 +13,7 @@ + diff --git a/docker-compose/requirements/djangoserver/file/server/server/templates/settingsPage.html b/docker-compose/requirements/djangoserver/file/server/server/templates/settingsPage.html new file mode 100644 index 0000000..d82a824 --- /dev/null +++ b/docker-compose/requirements/djangoserver/file/server/server/templates/settingsPage.html @@ -0,0 +1,55 @@ +
+
+
+
+ + + +
+ +
+ + + +
+ +
+ + + +
+
+ +
+
+ + +
+ +
+ + +
+ +
+ + + +
+ + +
+
+
\ 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 0d0bf6e..ed6767a 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/urls.py +++ b/docker-compose/requirements/djangoserver/file/server/server/urls.py @@ -33,6 +33,7 @@ urlpatterns = [ path("404", views.err404, name='err404'), path("pfp/", views.pfp, name='pfp'), path("banner/", views.banner, name='banner'), + path("settingsPage", views.settingsPage, name='settingsPage'), ] handler404 = "server.views.handler404" diff --git a/docker-compose/requirements/djangoserver/file/server/server/views.py b/docker-compose/requirements/djangoserver/file/server/server/views.py index 511ab5e..dbf3a3f 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/views.py +++ b/docker-compose/requirements/djangoserver/file/server/server/views.py @@ -147,4 +147,11 @@ def banner(request, str): ret = FileResponse(open(image_path, 'rb'), content_type='image/png') except Exception: ret = FileResponse("banner not found", status=404) - return ret \ No newline at end of file + return ret + +def settingsPage(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, "settingsPage.html", {}) diff --git a/docker-compose/requirements/nginx/static/javascript/Page.js b/docker-compose/requirements/nginx/static/javascript/Page.js index d033e2d..ad4c26a 100644 --- a/docker-compose/requirements/nginx/static/javascript/Page.js +++ b/docker-compose/requirements/nginx/static/javascript/Page.js @@ -6,12 +6,13 @@ /* By: edbernar