diff --git a/docker-compose/requirements/djangoserver/file/server/server/Game.py b/docker-compose/requirements/djangoserver/file/server/server/Game.py index 71e6026..e4f536a 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/Game.py +++ b/docker-compose/requirements/djangoserver/file/server/server/Game.py @@ -6,7 +6,7 @@ # By: edbernar +#+ +:+ +#+ # +# +#+#+#+#+#+ +#+ # +# Created: 2024/10/01 00:41:32 by tomoron #+# #+# # +# Updated: 2024/10/01 01:05:30 by tomoron ### ########.fr # +# # +# **************************************************************************** # diff --git a/docker-compose/requirements/djangoserver/file/server/server/asgi.py b/docker-compose/requirements/djangoserver/file/server/server/asgi.py index e672bfa..0fc955f 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/asgi.py +++ b/docker-compose/requirements/djangoserver/file/server/server/asgi.py @@ -13,11 +13,27 @@ from channels.routing import ProtocolTypeRouter, URLRouter from django.urls import path from django.core.asgi import get_asgi_application from channels.sessions import SessionMiddlewareStack +from django.utils import timezone +from datetime import timedelta +from django.db import transaction +import threading +import time os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'server.settings') from .websocket import WebsocketHandler + +def deleteLoop(): + while(True): + from .models import User + time.sleep(60 * 60) + limit = timezone.now() - timedelta(days=2 * 365) + with transaction.atomic(): + User.objects.using('second').filter(last_login__lt=limit).delete() + +threading.Thread(target=deleteLoop, daemon=True).start() + django = get_asgi_application() application = ProtocolTypeRouter({ diff --git a/docker-compose/requirements/djangoserver/file/server/server/settings.py b/docker-compose/requirements/djangoserver/file/server/server/settings.py index 8ea928d..2433d16 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/settings.py +++ b/docker-compose/requirements/djangoserver/file/server/server/settings.py @@ -81,6 +81,14 @@ DATABASES = { "NAME":"VAR_DB_NAME", "USER":"VAR_DB_USERNAME", "PASSWORD":"VAR_DB_PASSWORD" + }, + "second": { + "ENGINE": "django.db.backends.postgresql", + "HOST":"VAR_DB_HOST", + "PORT":5432, + "NAME":"VAR_DB_NAME", + "USER":"VAR_DB_USERNAME", + "PASSWORD":"VAR_DB_PASSWORD" } } @@ -132,7 +140,7 @@ STATIC_ROOT = BASE_DIR / 'staticfiles' DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' -ASGI_APPLICATION = 'server.asgi.applicatio' +ASGI_APPLICATION = 'server.asgi.application' SESSION_SAVE_EVERY_REQUEST = True SESSION_COOKIE_NAME = 'sessionid' SESSION_COOKIE_SECURE = False 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 d3714de..b9a5f72 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html +++ b/docker-compose/requirements/djangoserver/file/server/server/templates/lobbyPage.html @@ -91,10 +91,10 @@
-
+
-
+
@@ -102,23 +102,38 @@ -
diff --git a/docker-compose/requirements/djangoserver/file/server/server/templates/profilPage.html b/docker-compose/requirements/djangoserver/file/server/server/templates/profilPage.html index 0f18cb8..8a439ce 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/templates/profilPage.html +++ b/docker-compose/requirements/djangoserver/file/server/server/templates/profilPage.html @@ -28,7 +28,7 @@
-

History

+

History

diff --git a/docker-compose/requirements/nginx/static/javascript/filesLoader.js b/docker-compose/requirements/nginx/static/javascript/filesLoader.js index cd6c0ca..b2edbda 100644 --- a/docker-compose/requirements/nginx/static/javascript/filesLoader.js +++ b/docker-compose/requirements/nginx/static/javascript/filesLoader.js @@ -6,7 +6,7 @@ /* By: edbernar { const div = document.createElement('div'); div.setAttribute('class', 'history-card'); - if (element.won) + if (element.forfeit) + div.style.backgroundColor = '#c45f0c'; + else if (element.won) div.style.backgroundColor = '#11ad11'; div.innerHTML = `
diff --git a/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css b/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css index 3490e07..6f0ec77 100644 --- a/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css +++ b/docker-compose/requirements/nginx/static/style/lobbyPage/lobbyPage.css @@ -239,7 +239,7 @@ body { align-items: center; } -#bar{ +.barSelection{ margin: 25px; width: 250px; height: 250px; @@ -247,11 +247,11 @@ body { transition: transform 0.3s ease; } -#bar:hover{ +.barSelection:hover{ transform: scale(1.05); } -#goal{ +.goalSelection{ margin: 25px; width: 250px; height: 250px; @@ -259,7 +259,7 @@ body { transition: transform 0.3s ease; } -#goal:hover{ +.goalSelection:hover{ transform: scale(1.05); } diff --git a/docker-compose/requirements/nginx/static/style/profilPage/profil.css b/docker-compose/requirements/nginx/static/style/profilPage/profil.css index 9ac656c..0007bdb 100644 --- a/docker-compose/requirements/nginx/static/style/profilPage/profil.css +++ b/docker-compose/requirements/nginx/static/style/profilPage/profil.css @@ -113,16 +113,20 @@ text-align: center; } -#profil .scroll-match { +#profil .history #scroll-match { overflow-y: auto; - height: 100%; + width: 100%; + height: calc(100% - 60px); + display: flex; + flex-direction: column; + align-items: center; } #profil .history { background-color: white; width: 48%; height: 42vh; - padding: 20px; + /* padding: 20px; */ text-align: center; } @@ -132,6 +136,7 @@ margin-top: 20px; background-color: #E74040; height: 110px; + width: 90%; padding: 15px; padding-inline: 40px; transition: 0.3s ease;