-
{% for user_ in user_list %}
-
-
+
{% if user_.first_name %} diff --git a/application/app/templates/userPanel.html b/application/app/templates/userPanel.html index 447c2d8..32afe40 100644 --- a/application/app/templates/userPanel.html +++ b/application/app/templates/userPanel.html @@ -3,7 +3,7 @@-+
{% if user.first_name != "" %} {% translate "User" %}: {{ user.first_name }} {{ user.last_name }} ({{ user.username }}) diff --git a/application/app/urls.py b/application/app/urls.py index e720876..788ecd9 100644 --- a/application/app/urls.py +++ b/application/app/urls.py @@ -16,9 +16,10 @@ urlpatterns = [ path('accounts/password_change/', auth_views.PasswordChangeView.as_view(), name='password_change'), path('accounts/password_change_done/', views.redirect_home, name='password_change_done'), path('admin/', adminSite.urls), + # custom-handled resources + path('profilepictures', views.profile_pictures), # API # path('api/order-drink', views.api_order_drink), path('api/deposit', views.api_deposit), path('api/supply', views.api_supply) - #path('api/get-statistics', views.api_get_statistics) ] \ No newline at end of file diff --git a/application/app/views.py b/application/app/views.py index 8511249..d3fafb5 100644 --- a/application/app/views.py +++ b/application/app/views.py @@ -1,12 +1,16 @@ import json import sys +from pathlib import Path + +from django.conf import settings from django.contrib.auth import authenticate from django.contrib.auth import get_user_model from django.contrib.auth import login from django.contrib.auth.decorators import login_required from django.contrib.auth.forms import AuthenticationForm from django.http.response import HttpResponseRedirect +from django.http.response import FileResponse from django.http.response import HttpResponse from django.shortcuts import render @@ -20,6 +24,9 @@ from .models import Drink from .models import Order from .models import RegisterTransaction +# + +profile_pictures_path = Path(settings.PROFILE_PICTURES).resolve() # login view @@ -112,6 +119,23 @@ def redirect_home(request): return HttpResponseRedirect("/") +# Custom-Handled Resources + +def profile_pictures(request): + if not "name" in request.GET: + return HttpResponse(b"", status=400) + print(request.GET["name"]) + ppic_filepath = Path(profile_pictures_path / request.GET["name"]).resolve() + try: + ppic_filepath.relative_to(profile_pictures_path) + except: + return HttpResponse("No.", status=403) + if ppic_filepath.is_file(): + return FileResponse(ppic_filepath.open('rb')) + else: + return FileResponse(b"", status=404) + + # API for XHR requests # @login_required diff --git a/application/drinks_manager/settings.py b/application/drinks_manager/settings.py index 9523d14..d01503f 100644 --- a/application/drinks_manager/settings.py +++ b/application/drinks_manager/settings.py @@ -175,3 +175,5 @@ try: CURRENCY_SUFFIX = os.environ["CURRENCY_SUFFIX"] except KeyError: CURRENCY_SUFFIX = "$" + +PROFILE_PICTURES = os.environ["PROFILE_PICTURES"] diff --git a/lib/env.sh b/lib/env.sh index 8781ef1..67c9e68 100644 --- a/lib/env.sh +++ b/lib/env.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash export DJANGO_SK_ABS_FP="$(pwd)/config/secret_key.txt" +export PROFILE_PICTURES="$(pwd)/profilepictures/" export STATIC_FILES="$(pwd)/static/" export APP_VERSION="12" export PYTHONPATH="$(pwd)/packages/" diff --git a/static/profilepictures/default.svg b/profilepictures/default.svg similarity index 100% rename from static/profilepictures/default.svg rename to profilepictures/default.svg From 1e32e2b5dd415a13e71b8dafd40567bcc3da68a0 Mon Sep 17 00:00:00 2001 From: W13R <9070224-W13R@users.noreply.gitlab.com> Date: Thu, 3 Nov 2022 20:45:52 +0100 Subject: [PATCH 3/7] The application now correctly encodes the url query string for the profile-picture name (for security reasons), removed a left-over print-statement --- application/app/templates/registration/login.html | 2 +- application/app/templates/userPanel.html | 2 +- application/app/views.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/application/app/templates/registration/login.html b/application/app/templates/registration/login.html index 765172e..184022f 100644 --- a/application/app/templates/registration/login.html +++ b/application/app/templates/registration/login.html @@ -69,7 +69,7 @@
-
{% for user_ in user_list %}
-
-
+
{% if user_.first_name %} diff --git a/application/app/templates/userPanel.html b/application/app/templates/userPanel.html index 32afe40..7e95ff6 100644 --- a/application/app/templates/userPanel.html +++ b/application/app/templates/userPanel.html @@ -3,7 +3,7 @@-{% if user.first_name != "" %} {% translate "User" %}: {{ user.first_name }} {{ user.last_name }} ({{ user.username }}) diff --git a/application/app/views.py b/application/app/views.py index d3fafb5..f380851 100644 --- a/application/app/views.py +++ b/application/app/views.py @@ -124,7 +124,6 @@ def redirect_home(request): def profile_pictures(request): if not "name" in request.GET: return HttpResponse(b"", status=400) - print(request.GET["name"]) ppic_filepath = Path(profile_pictures_path / request.GET["name"]).resolve() try: ppic_filepath.relative_to(profile_pictures_path) From 8599f49857b0eab793d1ee1065f2e819e732a01f Mon Sep 17 00:00:00 2001 From: W13R <9070224-W13R@users.noreply.gitlab.com> Date: Fri, 4 Nov 2022 20:35:28 +0100 Subject: [PATCH 4/7] Refactored CSS and HTML templates and polished UI (#10), changed JavaScript variable names to camelCase, adjusted filenames and some url parameter names in urlpatterns, and more. --- .../{baseLayout.html => baselayout.html} | 9 +- application/app/templates/deposit.html | 26 ++-- ...{globalMessage.html => globalmessage.html} | 2 +- application/app/templates/history.html | 9 +- application/app/templates/index.html | 10 +- application/app/templates/order.html | 84 ++++++------ .../templates/registration/logged_out.html | 4 +- .../app/templates/registration/login.html | 42 +++--- application/app/templates/statistics.html | 25 ++-- application/app/templates/supply.html | 41 +++--- .../{userPanel.html => userpanel.html} | 28 ++-- application/app/urls.py | 2 +- application/app/views.py | 16 +-- application/locale/de/LC_MESSAGES/django.po | 24 ++-- static/css/appform.css | 61 +++++++++ ...umberInput.css => custom_number_input.css} | 13 +- static/css/deposit.css | 3 - static/css/history.css | 2 +- static/css/index.css | 15 ++- static/css/login.css | 33 +++-- static/css/main.css | 124 ++++++------------ static/css/order.css | 3 - static/css/statistics.css | 30 ++--- static/css/supply.css | 6 - ...mNumberInput.js => custom_number_input.js} | 14 +- static/js/deposit.js | 22 ++-- static/js/login.js | 56 ++++---- static/js/main.js | 14 +- static/js/order.js | 54 ++++---- static/js/supply.js | 32 ++--- 30 files changed, 401 insertions(+), 403 deletions(-) rename application/app/templates/{baseLayout.html => baselayout.html} (84%) rename application/app/templates/{globalMessage.html => globalmessage.html} (65%) rename application/app/templates/{userPanel.html => userpanel.html} (56%) create mode 100644 static/css/appform.css rename static/css/{customNumberInput.css => custom_number_input.css} (78%) delete mode 100644 static/css/deposit.css delete mode 100644 static/css/order.css delete mode 100644 static/css/supply.css rename static/js/{customNumberInput.js => custom_number_input.js} (64%) diff --git a/application/app/templates/baseLayout.html b/application/app/templates/baselayout.html similarity index 84% rename from application/app/templates/baseLayout.html rename to application/app/templates/baselayout.html index ced9bb8..7d0a5e3 100644 --- a/application/app/templates/baseLayout.html +++ b/application/app/templates/baselayout.html @@ -16,13 +16,13 @@ -
+- {% include "globalMessage.html" %} + {% include "globalmessage.html" %} {% if user.is_authenticated %} - {% include "userPanel.html" %} + {% include "userpanel.html" %} {% endif %} @@ -30,14 +30,13 @@ {% if user.is_authenticated or "accounts/login/" in request.path or "accounts/logout/" in request.path or "admin/logout/" in request.path %} -{% block heading %}{% endblock %}
{% block content %}{% endblock %}{% else %} -+{% translate "An error occured. Please log out and log in again." %}
log out diff --git a/application/app/templates/deposit.html b/application/app/templates/deposit.html index dac6950..cec4ef2 100644 --- a/application/app/templates/deposit.html +++ b/application/app/templates/deposit.html @@ -1,4 +1,4 @@ -{% extends "baseLayout.html" %} +{% extends "baselayout.html" %} {% load i18n %} @@ -7,29 +7,29 @@ {% endblock %} {% block headAdditional %} - + {% endblock %} -{% block heading %} - {% translate "Deposit" %} -{% endblock %} {% block content %} -
-
-