Move status screen to its own app

pyproject.toml

@@ -53,7 +53,7 @@ sentry-sdk = "^1.14.0"
 
 [tool.black]
 line-length = 119
-target-version = ["py310"]
+target-version = ["py311"]
 exclude = '''
 /(
   migrations
@@ -62,5 +62,5 @@ exclude = '''
 '''
 
 [build-system]
-requires = ["poetry>=0.12"]
-build-backend = "poetry.masonry.api"
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"

website/orders/migrations/0009_order_picked_up_order_picked_up_at.py → website/orders/migrations/0003_order_picked_up_order_picked_up_at.py

@@ -1,11 +1,12 @@
-# Generated by Django 4.2.9 on 2024-03-10 09:10
+# Generated by Django 5.0.4 on 2024-04-28 19:53
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
+
     dependencies = [
-        ("orders", "0008_order_priority"),
+        ("orders", "0002_initial"),
     ]
 
     operations = [

website/orders/urls.py

@@ -12,5 +12,4 @@
     path("<shift:shift>/admin/", views.ShiftManagementView.as_view(), name="shift_admin"),
     path("<shift:shift>/overview/", views.ShiftView.as_view(), name="shift_overview"),
     path("<shift:shift>/join/", views.JoinShiftView.as_view(), name="shift_join"),
-    path("<shift:shift>/status/", views.StatusScreen.as_view(), name="status"),
 ]

website/orders/views.py

@@ -145,17 +145,6 @@ def post(self, request, **kwargs):
             return render(request, self.template_name, {"shift": shift})
 
 
-class StatusScreen(TemplateView):
-    """Status screen for a Shift."""
-
-    template_name = "orders/status_screen.html"
-
-    def get(self, request, **kwargs):
-        """GET request for status screen view."""
-        shift = kwargs.get("shift")
-        return render(request, self.template_name, {"shift": shift})
-
-
 class AccountHistoryTabView(LoginRequiredMixin, TemplateView):
     """Account order history view."""
 

website/status_screen/apps.py

@@ -0,0 +1,8 @@
+from django.apps import AppConfig
+
+
+class StatusScreenConfig(AppConfig):
+    """Status Screen App Config."""
+
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "status_screen"

website/orders/templates/orders/status_screen.html → website/status_screen/templates/status_screen/status_screen.html

@@ -2,7 +2,7 @@
 {% load static %}
 
 {% block styles %}
-    <link rel="stylesheet" href="{% static 'orders/css/status-screen.css' %}"/>
+    <link rel="stylesheet" href="{% static 'status_screen/css/status-screen.css' %}"/>
 {% endblock %}
 
 {% block header %}

website/status_screen/urls.py

@@ -0,0 +1,7 @@
+from django.urls import path
+
+from status_screen import views
+
+urlpatterns = [
+    path("<shift:shift>/", views.StatusScreen.as_view(), name="status"),
+]

website/status_screen/views.py

@@ -0,0 +1,13 @@
+from django.shortcuts import render
+from django.views.generic import TemplateView
+
+
+class StatusScreen(TemplateView):
+    """Status screen for a Shift."""
+
+    template_name = "status_screen/status_screen.html"
+
+    def get(self, request, **kwargs):
+        """GET request for status screen view."""
+        shift = kwargs.get("shift")
+        return render(request, self.template_name, {"shift": shift})

website/tosti/settings/base.py

@@ -37,6 +37,7 @@
     "transactions",
     "orders",
     "silvasoft",
+    "status_screen",
     "oauth2_provider",
     "corsheaders",
     "yivi",
@@ -195,7 +196,8 @@
     ),
     "VENUES_SEND_RESERVATION_REQUEST_EMAILS_TO": (
         "[email protected], [email protected]",
-        "Where to send venue reservation request notifications to (e-mail address), enter multiple addresses by using a comma (,)",
+        "Where to send venue reservation request notifications to (e-mail address), enter multiple addresses by using "
+        "a comma (,)",
         str,
     ),
     "SHIFTS_DEFAULT_MAX_ORDERS_TOTAL": (70, "Default maximum number of orders per shift", int),
@@ -282,4 +284,4 @@
 AGE_VERIFICATION_INSTITUTE_VALUE = "ru.nl"
 
 YIVI_SERVER_URL = os.environ.get("YIVI_SERVER_URL")
-YIVI_SERVER_TOKEN = os.environ.get("YIVI_SERVER_TOKEN")
+YIVI_SERVER_TOKEN = os.environ.get("YIVI_SERVER_TOKEN")

website/tosti/urls.py

@@ -50,6 +50,10 @@
         "fridges/",
         include(("fridges.urls", "fridges"), namespace="fridges"),
     ),
+    path(
+        "status/",
+        include(("status_screen.urls", "status_screen"), namespace="status_screen"),
+    ),
     path("api/", include("tosti.api.urls")),
     path("saml/", include("djangosaml2.urls")),
     path(