| {% translate "last 30 actions" %} | +{% translate "last 30 actions" %} | +|||
|---|---|---|---|---|
| {{ h.0 }} {{ currency_suffix }} | -{{ h.1 }} | -{{ h.2 }} | +{{ h.0 }} | +{{ h.1 }} |
{% if drink and drink.available > 0 and not drink.deleted %}
{% if user.balance > 0 or user.allow_order_with_negative_balance %}
-
{% translate "Order" %}
- {% else %} -
+
{% endif %}
{% else %}
diff --git a/app/templates/registration/login.html b/app/templates/registration/login.html
index 657c713..837dc70 100644
--- a/app/templates/registration/login.html
+++ b/app/templates/registration/login.html
@@ -10,7 +10,7 @@
{% block headAdditional %}
-
+
{% endblock %}
{% block content %}
@@ -19,7 +19,7 @@
{% endif %}
{% translate "Your balance is too low to order a drink." %}
- {% translate "back" %} + {% translate "back" %}
-
+
{% translate "Choose your account" %}
-
{% for user_ in user_list %}
@@ -48,8 +48,6 @@
{{ user_.last_name }},
{% endif %}
{{ user_.first_name }}
- {% elif user_.last_name %}
- {{ user_.last_name }}
{% else %}
{{ user_.username }}
{% endif %}
diff --git a/app/templates/statistics.html b/app/templates/statistics.html
index 93f3a9e..4f938b9 100644
--- a/app/templates/statistics.html
+++ b/app/templates/statistics.html
@@ -8,96 +8,57 @@
{% block content %}
{% translate "Statistics" %}
-
-
-
{% translate "orders / drink" %}
+
+
-
+
-{% translate "Orders per drink" %}
| {% translate "drink" %} | -{% translate "all" %} | {% translate "you" %} | +{% translate "all" %} | |
|---|---|---|---|---|
| {{ key }} | -{{ values.a|default:0 }} | -{{ values.b|default:0 }} | +{{ values.a|default:"0" }} | +{{ values.b|default:"0" }} |
-
-
{% translate "orders / month" %}
+
+
- {% translate "Orders per month (last 12 months)" %}
| {% translate "month" %} | -{% translate "all" %} | {% translate "you" %} | +{% translate "all" %} | |
|---|---|---|---|---|
| {{ key }} | -{{ values.a|default:0 }} | -{{ values.b|default:0 }} | +{{ values.a|default:"0" }} | +{{ values.b|default:"0" }} |
-
-{% translate "orders / weekday" %}
+
+
-{% translate "Orders per weekday" %}
| {% translate "day" %} | -{% translate "all" %} | {% translate "you" %} | +{% translate "all" %} | ||
|---|---|---|---|---|---|
| {{ values.0 }} | -{{ values.1|default:0 }} | -{{ values.2|default:0 }} | +{{ key }} | +{{ values.a|default:"0" }} | +{{ values.b|default:"0" }} |
- {% if user.is_superuser or perms.app.view_order %}
-
{% endblock %}
\ No newline at end of file
diff --git a/app/templates/supply.html b/app/templates/supply.html
index bcbc3d0..f907f2d 100644
--- a/app/templates/supply.html
+++ b/app/templates/supply.html
@@ -9,22 +9,28 @@
{% block content %}
{% if user.is_superuser or user.allowed_to_supply %}
-
-
-
-
- {% endif %}
- {% if user.is_superuser or perms.app.view_registertransaction %}
- {% translate "order sum" %}
-| {% translate "user" %} | -{% translate "sum" %} | -
|---|---|
| {{ values.0 }} | -{{ values.1|default:0.0 }} {{ currency_suffix }} | -
-
-
-
- {% endif %}
-{% translate "deposit sum" %}
-| {% translate "user" %} | -{% translate "sum" %} | -
|---|---|
| {{ values.0 }} | -{{ values.1|default:0.0 }} {{ currency_suffix }} | -
{% translate "Supply" %}
- - - + {% else %}
diff --git a/app/templates/transfer.html b/app/templates/transfer.html
deleted file mode 100644
index bf0524b..0000000
--- a/app/templates/transfer.html
+++ /dev/null
@@ -1,54 +0,0 @@
-{% extends "baselayout.html" %}
-
-{% load i18n %}
-
-{% block title %}
-{% translate "Drinks - Transfer" %}
-{% endblock %}
-
-{% block headAdditional %}
-
-
-{% endblock %}
-
-{% block content %}
-
\ No newline at end of file
diff --git a/app/urls.py b/app/urls.py
index 1fa379d..f6f8cc4 100644
--- a/app/urls.py
+++ b/app/urls.py
@@ -10,7 +10,6 @@ urlpatterns = [
path('history/', views.history),
path('deposit/', views.deposit),
path('statistics/', views.statistics),
- path('transfer/', views.transfer),
path('supply/', views.supply),
path('accounts/login/', views.login_page, name="login"),
path('accounts/logout/', auth_views.LogoutView.as_view(), name='logout'),
@@ -20,6 +19,5 @@ urlpatterns = [
# API #
path('api/order-drink', views.api_order_drink),
path('api/deposit', views.api_deposit),
- path('api/transfer', views.api_transfer),
path('api/supply', views.api_supply)
]
diff --git a/app/views.py b/app/views.py
index ba864a4..7f3ea30 100644
--- a/app/views.py
+++ b/app/views.py
@@ -25,7 +25,7 @@ from .models import RegisterTransaction
def login_page(request):
- userlist = get_user_model().objects.filter(hide_from_userlist=False).filter(is_active=True).order_by("username")
+ userlist = get_user_model().objects.filter(is_superuser=False).filter(is_active=True).order_by("username")
if request.method == "POST":
form = AuthenticationForm(request.POST)
username = request.POST['username']
@@ -50,6 +50,7 @@ def login_page(request):
"user_list": userlist
})
+
@login_required
def index(request):
context = {
@@ -57,6 +58,7 @@ def index(request):
}
return render(request, "index.html", context)
+
@login_required
def history(request):
context = {
@@ -64,6 +66,7 @@ def history(request):
}
return render(request, "history.html", context)
+
@login_required
def order(request, drinkid):
try:
@@ -73,6 +76,7 @@ def order(request, drinkid):
except Drink.DoesNotExist:
return HttpResponseRedirect("/")
+
@login_required
def deposit(request):
return render(request, "deposit.html", {})
@@ -80,32 +84,24 @@ def deposit(request):
@login_required
def statistics(request):
- user = request.user
context = {
- "orders_per_month": db_queries.select_orders_per_month(user),
- "orders_per_weekday": db_queries.select_orders_per_weekday(user),
- "orders_per_drink": db_queries.select_orders_per_drink(user),
+ "orders_per_month": db_queries.orders_per_month(request.user),
+ "orders_per_weekday": db_queries.orders_per_weekday(request.user),
+ "orders_per_drink": db_queries.orders_per_drink(request.user),
}
- # Advanced statistics
- if user.has_perm("app.view_order") or user.is_superuser:
- context["order_sum_per_user"] = db_queries.select_order_sum_per_user_all_users()
- if user.has_perm("app.view_registertransaction") or user.is_superuser:
- context["deposit_sum_per_user"] = db_queries.select_deposit_sum_per_user_all_users()
return render(request, "statistics.html", context)
-@login_required
-def transfer(request):
- userlist = get_user_model().objects.filter(hide_from_userlist=False).filter(is_active=True).order_by("username")
- return render(request, "transfer.html", {"user_list": userlist})
@login_required
def supply(request):
return render(request, "supply.html")
+
@login_required
def redirect_home(request):
return HttpResponseRedirect("/")
+
# API for XHR requests #
@login_required
@@ -127,6 +123,7 @@ def api_order_drink(request):
print(f"An exception occured while processing an order: User: {user.username} - Exception: {e}", file=sys.stderr)
return HttpResponse(b"", status=500)
+
@login_required
def api_deposit(request):
# check request -> deposit
@@ -143,35 +140,9 @@ def api_deposit(request):
return HttpResponse("success", status=200)
else: raise Exception("Deposit amount too big or small.")
except Exception as e:
- print(f"An exception occured while processing a deposit transaction: User: {user.username} - Exception: {e}", file=sys.stderr)
+ print(f"An exception occured while processing a transaction: User: {user.username} - Exception: {e}", file=sys.stderr)
return HttpResponse(b"", status=500)
-@login_required
-def api_transfer(request):
- # check request -> transfer
- user = request.user
- try:
- recipient = get_user_model().objects.get(id=int(request.POST["recipientuser"]))
- if recipient.id == user.id:
- raise Exception(f"User {user.username} tried to transfer to themself.")
- amount = decimal.Decimal(request.POST["transferamount"])
- if 0.00 < amount <= user.balance:
- # create transaction
- RegisterTransaction.objects.create(
- transaction_sum=-amount,
- comment=f"Transfer to {recipient.username}",
- is_transfer=True,
- user=user)
- RegisterTransaction.objects.create(
- transaction_sum=amount,
- comment=f"Transfer from {user.username}",
- is_transfer=True,
- user=recipient)
- return HttpResponse("success", status=200)
- else: raise Exception("Transfer amount too big or small.")
- except Exception as e:
- print(f"An exception occured while processing a transfer transaction: User: {user.username} - Exception: {e}", file=sys.stderr)
- return HttpResponse(b"", status=500)
@login_required
def api_supply(request):
diff --git a/data/Caddyfile b/data/Caddyfile
index d790c4e..c5bbc58 100644
--- a/data/Caddyfile
+++ b/data/Caddyfile
@@ -9,8 +9,7 @@
{$CADDY_HOSTS} {
# the tls certificates
- # tls {$DATADIR}/tls/server.pem {$DATADIR}/tls/server-key.pem
- tls internal
+ tls {$DATADIR}/tls/server.pem {$DATADIR}/tls/server-key.pem
route {
# profile pictures
file_server /profilepictures/* {
@@ -18,11 +17,7 @@
}
# static files
file_server /static/* {
- root {$ROOTDIR}
- }
- # django static files
- file_server /django_static/* {
- root {$DATADIR}/django_static/..
+ root {$DATADIR}/static/..
}
# favicon
redir /favicon.ico /static/favicon.ico
diff --git a/data/profilepictures/default.svg b/data/profilepictures/default.svg
index edc6946..7138ef3 100644
--- a/data/profilepictures/default.svg
+++ b/data/profilepictures/default.svg
@@ -1 +1,28 @@
-
\ No newline at end of file
+
+
+
+
diff --git a/project/settings.py b/project/settings.py
index 56ff5fb..a5362ca 100644
--- a/project/settings.py
+++ b/project/settings.py
@@ -149,8 +149,8 @@ LOCALE_PATHS = [
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.1/howto/static-files/
-STATIC_URL = "django_static/"
-STATIC_ROOT = BASE_DIR / "data" / "django_static"
+STATIC_URL = "static/"
+STATIC_ROOT = BASE_DIR / "data" / "static"
# Default primary key field type
# https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field
diff --git a/requirements.txt b/requirements.txt
index ceb35b8..2be275b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django~=4.2
-psycopg2~=2.9
-uvicorn[standard]~=0.27
+Django~=4.1
+psycopg2~=2.9.5
+uvicorn~=0.20.0
PyYAML~=6.0
diff --git a/scripts/_bootstrap.py b/scripts/_bootstrap.py
index c162c03..9533953 100755
--- a/scripts/_bootstrap.py
+++ b/scripts/_bootstrap.py
@@ -14,17 +14,6 @@ from time import sleep
from yaml import safe_load
-banner = r""" ___ _ _
-| \ _ _ (_) _ _ | |__ ___ ___
-| |) || '_|| || ' \ | / /(_-< |___|
-|___/ |_| |_||_||_||_\_\/__/
- __ __ Version {version}
-| \/ | __ _ _ _ __ _ __ _ ___ _ _
-| |\/| |/ _` || ' \ / _` |/ _` |/ -_)| '_|
-|_| |_|\__,_||_||_|\__,_|\__, |\___||_|
- |___/
-"""
-
base_directory = Path(__file__).parent.parent
data_directory = base_directory / "data"
logfile_directory = data_directory / "logs"
@@ -32,7 +21,6 @@ configuration_file = data_directory / "config.yml"
caddyfile = data_directory / "Caddyfile"
logfile_caddy = logfile_directory / "caddy.log"
logfile_app = logfile_directory / "app.log"
-logfile_sessioncleanup = logfile_directory / "session-cleanup.log"
class MonitoredSubprocess:
@@ -91,29 +79,27 @@ def cleanup_procs(processes):
def start_and_monitor(monitored_subprocesses: list):
- # display banner
- print(banner.format(version=os.environ["APP_VERSION"]))
# start processes
- for p in monitored_subprocesses:
- p.try_start()
- register_exithandler(cleanup_procs, monitored_subprocesses)
- # monitor processes
- try:
- while True:
- sleep(1)
- for p in monitored_subprocesses:
- returncode = p.s.poll()
- if returncode is None:
- continue
- else:
- print(f"{p.name} stopped with exit code {returncode}.")
- if p.try_start() is False:
- # stop everything if the process
- # has exceeded max. tries
- exit()
- except KeyboardInterrupt:
- print("Received KeyboardInterrupt, exiting...")
- exit()
+ for p in monitored_subprocesses:
+ p.try_start()
+ register_exithandler(cleanup_procs, monitored_subprocesses)
+ # monitor processes
+ try:
+ while True:
+ sleep(1)
+ for p in monitored_subprocesses:
+ returncode = p.s.poll()
+ if returncode is None:
+ continue
+ else:
+ print(f"{p.name} stopped with exit code {returncode}.")
+ if p.try_start() is False:
+ # stop everything if the process
+ # has exceeded max. tries
+ exit()
+ except KeyboardInterrupt:
+ print("Received KeyboardInterrupt, exiting...")
+ exit()
if __name__ == "__main__":
@@ -131,7 +117,6 @@ if __name__ == "__main__":
["./venv/bin/python3", "./manage.py", "migrate", "--noinput"], env=os.environ).wait()
# Caddy configuration via env
environment_caddy = os.environ
- environment_caddy["ROOTDIR"] = str(base_directory.absolute())
environment_caddy["DATADIR"] = str(data_directory.absolute())
environment_caddy["CADDY_HOSTS"] = ", ".join(config["caddy"]["hosts"])
environment_caddy["HTTP_PORT"] = str(config["caddy"]["http_port"])
@@ -185,6 +170,6 @@ if __name__ == "__main__":
MonitoredSubprocess(
"Session Autocleaner",
["./scripts/_session-autocleaner.py", str(config["app"]["session_clear_interval"])],
- logfile_sessioncleanup)
+ logfile_app)
]
start_and_monitor(procs)
diff --git a/start.sh b/start.sh
index cd50964..a7c635a 100755
--- a/start.sh
+++ b/start.sh
@@ -11,6 +11,6 @@ chmod -c -R g-w,o-rwx .gitignore
export PYTHONPATH="$basedir"
export DJANGO_SETTINGS_MODULE="project.settings"
-export APP_VERSION="22"
+export APP_VERSION="15"
exec ./scripts/_bootstrap.py "$@"
diff --git a/static/fonts/Inter-Bold.ttf b/static/fonts/Inter-Bold.ttf
deleted file mode 100644
index 8e82c70..0000000
Binary files a/static/fonts/Inter-Bold.ttf and /dev/null differ
diff --git a/static/fonts/Inter-Regular.ttf b/static/fonts/Inter-Regular.ttf
deleted file mode 100644
index 8d4eebf..0000000
Binary files a/static/fonts/Inter-Regular.ttf and /dev/null differ
diff --git a/static/js/main.js b/static/js/main.js
deleted file mode 100644
index 5fab451..0000000
--- a/static/js/main.js
+++ /dev/null
@@ -1,21 +0,0 @@
-document.addEventListener("DOMContentLoaded", () => {
- let dropdownmenuElement = document.getElementById("dropdownmenu");
- let dropdownmenuButtonElement = document.getElementById("dropdownmenu-button");
- let dropdownmenuNopeElement = document.getElementById("dropdownnope");
- function toggleDropDown() {
- if (dropdownmenuElement.classList.contains("dropdownvisible")) {
- dropdownmenuElement.classList.remove("dropdownvisible");
- dropdownmenuNopeElement.classList.remove("dropdownvisible");
- } else {
- dropdownmenuElement.classList.add("dropdownvisible");
- dropdownmenuNopeElement.classList.add("dropdownvisible");
- }
- }
- if (dropdownmenuButtonElement != null) {
- dropdownmenuButtonElement.addEventListener("click", toggleDropDown);
- dropdownmenuNopeElement.addEventListener("click", () => {
- dropdownmenuElement.classList.remove("dropdownvisible");
- dropdownmenuNopeElement.classList.remove("dropdownvisible");
- })
- }
-});
diff --git a/static/material-icons/arrow-drop-down.svg b/static/material-icons/arrow-drop-down.svg
deleted file mode 100644
index 051a82d..0000000
--- a/static/material-icons/arrow-drop-down.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/static/material-icons/menu.svg b/static/material-icons/menu.svg
deleted file mode 100644
index 91b846d..0000000
--- a/static/material-icons/menu.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
{% translate "Transfer Money" %}
- - - - -{% endblock %} \ No newline at end of file diff --git a/app/templates/userpanel.html b/app/templates/userpanel.html index 966f86e..159dcf5 100644 --- a/app/templates/userpanel.html +++ b/app/templates/userpanel.html @@ -2,14 +2,19 @@ {% load static %}
-
+
- 
{% if user.first_name != "" %}
- {{ user.first_name }} {{ user.last_name }} ({{ user.username }}){% else %}{{ user.username }}{% endif %}
+
-
+
+
+ {% if user.first_name != "" %}
+ {% translate "User" %}: {{ user.first_name }} {{ user.last_name }} ({{ user.username }})
+ {% else %}
+ {% translate "User" %}: {{ user.username }}
+ {% endif %}
-
{% if user.balance < 0.01 %}
- {% translate "Balance" %}: {{ user.balance }} {{ currency_suffix }}
+ {% translate "Balance" %}: {{ user.balance }}{{ currency_suffix }}
{% else %}
- {% translate "Balance" %}: {{ user.balance }} {{ currency_suffix }}
+ {% translate "Balance" %}: {{ user.balance }}{{ currency_suffix }}
{% endif %}
@@ -18,20 +23,20 @@
{% translate "Deposit" %}
{% translate "Logout" %}