Merge branch 'devel' into 'main'

Release 5.0 (devel -> main)

See merge request W13R/drinks-manager!1

application/app/middleware.py

@@ -0,0 +1,11 @@
+
+# Define CSP middleware:
+
+def csp_middleware(get_response):
+
+    def middleware(request):
+        response = get_response(request)
+        response["content-security-policy"] = "default-src 'self'"
+        return response
+
+    return middleware

application/app/templates/baseLayout.html

@@ -22,9 +22,7 @@
 
         {% if user.is_authenticated %}
 
-        <div class="userPanel">
             {% include "userPanel.html" %}
-        </div>
 
         {% endif %}
 

application/app/templates/order.html

@@ -1,6 +1,7 @@
 {% extends "baseLayout.html" %}
 
 {% load i18n %}
+{% load l10n %}
 
 {% block title %}
 {% translate "Drinks - Order" %}
@@ -31,7 +32,7 @@
 
                 <div class="row">
                     <div class="column">{% translate "Price per Item" %} ({{ currency_suffix }}):</div>
-                    <div class="column" id="pricePerDrink" data-drink-price="{{ drink.price }}">{{ drink.price }}</div>
+                    <div class="column" id="pricePerDrink" data-drink-price="{% localize off %}{{ drink.price }}{% endlocalize %}">{{ drink.price }}</div>
                 </div>
 
                 {% if not drink.binary_availability %}

application/app/templates/userPanel.html

@@ -1,31 +1,36 @@
 {% load i18n %}
 
-<div class="dropDownMenu" id="dropDownMenu">
-    <button class="dropDownButton" id="dropDownMenuButton">
-        <div>
-            {% if user.first_name != "" %}
-                {% translate "User" %}: {{ user.first_name }} {{ user.last_name }} ({{ user.username }})
-            {% else %}
-                {% translate "User" %}: {{ user.username }}
-            {% endif %}
-            &nbsp;-&nbsp;
-            {% if user.balance < 0.01 %}
-                <span class="userBalanceWarn">{% translate "Balance" %}: {{ user.balance }}{{ currency_suffix }}</span>
-            {% else %}
-                <span>{% translate "Balance" %}: {{ user.balance }}{{ currency_suffix }}</span>
-            {% endif %}
-        </div>
-    </button>
-    <div class="dropDownList">
-        <a class="button dropDownChoice" id="navBarBtnHome" href="/">Home</a>
-        <a class="button dropDownChoice" id="navBarBtnHistory" href="/history">{% translate "History" %}</a>
-        <a class="button dropDownChoice" id="navBarBtnStatistics" href="/statistics">{% translate "Statistics" %}</a>
-        <a class="button dropDownChoice" id="navBarBtnDeposit" href="/deposit">{% translate "Deposit" %}</a>
-        {% if user.is_superuser %}
-            <a class="button dropDownChoice" href="/admin/">Admin Panel</a>
+<div class="userPanel">
+    <div class="userInfo">
+        {% if user.first_name != "" %}
+            {% translate "User" %}: {{ user.first_name }} {{ user.last_name }} ({{ user.username }})
         {% else %}
-        <a class="button dropDownChoice" href="/accounts/password_change/">{% translate "Change Password" %}</a>
+            {% translate "User" %}: {{ user.username }}
         {% endif %}
-        <a class="button dropDownChoice" href="/accounts/logout">{% translate "Logout" %}</a>
+        &nbsp;-&nbsp;
+        {% if user.balance < 0.01 %}
+            <span class="userBalanceWarn">{% translate "Balance" %}: {{ user.balance }}{{ currency_suffix }}</span>
+        {% else %}
+            <span>{% translate "Balance" %}: {{ user.balance }}{{ currency_suffix }}</span>
+        {% endif %}
+    </div>
+    <div class="horizontalButtonList">
+        <a class="button" id="navBarBtnHome" href="/">Home</a>
+        <a class="button" id="navBarBtnDeposit" href="/deposit">{% translate "Deposit" %}</a>
+        <div class="dropDownMenu" id="dropDownMenu">
+            <button class="dropDownButton" id="dropDownMenuButton">
+                <div>{% translate "Account" %}</div>
+            </button>
+            <div class="dropDownList">
+                <a class="button dropDownChoice" id="navBarBtnHistory" href="/history">{% translate "History" %}</a>
+                <a class="button dropDownChoice" id="navBarBtnStatistics" href="/statistics">{% translate "Statistics" %}</a>
+                {% if user.is_superuser %}
+                    <a class="button dropDownChoice" href="/admin/">Admin Panel</a>
+                {% else %}
+                    <a class="button dropDownChoice" href="/accounts/password_change/">{% translate "Change Password" %}</a>
+                {% endif %}
+                <a class="button dropDownChoice" href="/accounts/logout">{% translate "Logout" %}</a>
+            </div>
+        </div>
     </div>
 </div>

application/app/views.py

@@ -65,7 +65,7 @@ def login_page(request):
 @login_required
 def index(request):
     context = {
-        "available_drinks": Drink.objects.filter(available__gt=0).filter(deleted=False),
+        "available_drinks": Drink.objects.filter(available__gt=0).filter(deleted=False).order_by('product_name'),
     }
     return render(request, "index.html", context)
 

application/drinks_manager/settings.py

@@ -36,12 +36,6 @@ ALLOWED_HOSTS = [
 ]
 
 
-### CSP Configuration ###
-
-
-CSP_DEFAULT_SRC = ("'self'", )
-
-
 ### ----------------- ###
 
 
@@ -67,7 +61,7 @@ MIDDLEWARE = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     "django_currentuser.middleware.ThreadLocalUserMiddleware",
-    "csp.middleware.CSPMiddleware"
+    "app.middleware.csp_middleware"
 ]
 
 ROOT_URLCONF = 'drinks_manager.urls'

lib/activate-devel-env.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+source ./lib/env.sh
+source ./config/config.sh
+export DJANGO_DEBUG=true
+export PYTHONPATH="./packages"

lib/env.sh

@@ -2,5 +2,5 @@
 
 export DJANGO_SK_ABS_FP="$(pwd)/config/secret_key.txt"
 export STATIC_FILES="$(pwd)/static/"
-export APP_VERSION="4.0"
+export APP_VERSION="5.0"
 export PYTHONPATH="$(pwd)/packages/"

pip-dependencies.txt

@@ -1,5 +1,4 @@
 django~=3.2.7
 django-currentuser==0.5.3
-django-csp==3.7
 psycopg2~=2.9.1
 uvicorn~=0.17.6

static/css/deposit.css

@@ -1,11 +1,3 @@
 #depositAmount {
     width: 10rem;
-}
-main {
-    margin-top: 0;
-}
-@media only screen and (max-width: 700px) {
-    main {
-        margin-top: -15vh;
-    }
 }

static/css/login.css

@@ -54,7 +54,6 @@ main > h1 {
     flex-direction: column;
     justify-content: start;
     align-items: center;
-    margin-top: 10vh;
 }
 .passwordOverlay > form {
     min-width: unset;

static/css/main.css

@@ -58,20 +58,23 @@ main {
     align-items: center;
     flex-grow: 1;
     width: 100%;
-    margin-top: calc(-14rem + 2vh);
+    margin-top: 5vh;
 }
 .userPanel {
-    width: 100%;
     display: flex;
     flex-direction: row;
     justify-content: center;
-    align-items: flex-start;
-    min-width: fit-content;
+    align-items: center;
     margin-top: 1rem;
-    pointer-events: none;
+    font-size: 1rem;
+    width: 90%;
 }
-.userPanel > div {
-    margin: 0 1rem;
+.userInfo span {
+    font-size: 1.1rem;
+}
+.userPanel > .horizontalButtonList {
+    margin-left: auto;
+    margin-right: 0;
 }
 .userBalanceWarn {
     color: var(--color-error);
@@ -118,25 +121,19 @@ main > h1 {
     box-shadow: none;
     text-align: center;
     justify-content: center;
-    pointer-events: all;
 }
 .dropDownButton, .dropDownChoice {
     font-size: 1rem;
 }
-.dropDownButton > div::after {
-    content: '\25BC';
-    display: inline-block;
-    transition: transform 100ms;
-    padding: 0 .3rem;
-}
 .dropDownList {
+    position: absolute;
     display: flex;
     flex-direction: column;
     pointer-events: none;
     border-radius: var(--glass-corner-radius) !important;
     backdrop-filter: var(--glass-blur);
     z-index: 200;
-    margin-top: .5rem;
+    margin-top: 3.2rem;
     opacity: 0%;
     transition: opacity 100ms;
 }
@@ -166,12 +163,6 @@ main > h1 {
     visibility: visible;
     pointer-events: visible;
 }
-.dropDownVisible > .dropDownButton > div::after {
-    transform: rotate(180deg);
-}
-.userPanel .dropDownButton, .userPanel .dropDownChoice {
-    font-size: 1.1rem;
-}
 /* FOOTER */
 .footer {
     z-index: 990;
@@ -215,8 +206,8 @@ tr:nth-child(2n+2) {
 }
 /*
 Rounded corners on table cells apparently don't work with
-Firefox (91), so Firefox users won't have rounded corners
-on tables. Won't fix that by myself.
+Firefox, so Firefox users won't have rounded corners
+on tables. Can't fix that by myself.
 */
 table tr:first-child th:first-child {
     border-top-left-radius: var(--glass-corner-radius);
@@ -285,7 +276,6 @@ form .button, form button {
     align-items: center;
     justify-content: center;
     font-family: var(--font-family);
-    font-size: .9rem;
     text-decoration: none;
     text-align: center !important;
     background: var(--glass-bg);
@@ -341,7 +331,9 @@ input[type="text"], input[type="password"], input[type="number"] {
     flex-direction: row;
     align-items: flex-end;
     justify-content: space-between;
-    width: 100%;
+}
+.horizontalButtonList > .button, .horizontalButtonList > button, .horizontalButtonList > div {
+    margin: 0 .5rem;
 }
 .errorText {
     margin-top: 1rem;
@@ -365,8 +357,9 @@ h1 {
         justify-content: start;
         align-items: center;
     }
-    .userPanel > div {
-        margin: 0;
-        margin-bottom: .5rem;
+    .userPanel > .horizontalButtonList {
+        margin-right: 0;
+        margin-left: 0;
+        margin-top: .5rem;
     }
 }

static/css/order.css

@@ -1,11 +1,3 @@
-main {
-    margin-top: 0;
-}
 form {
     width: 22rem;
-}
-@media only screen and (max-width: 700px) {
-    main {
-        margin-top: -15vh;
-    }
 }

static/js/order.js

@@ -14,7 +14,7 @@ document.addEventListener("DOMContentLoaded", () => {
 
     // calculate & display sum
 
-    let order_price_per_drink = parseFloat(document.getElementById("pricePerDrink").dataset.drinkPrice.replace(",", "."));
+    let order_price_per_drink = parseFloat(document.getElementById("pricePerDrink").dataset.drinkPrice);
 
     function calculate_and_display_sum() {