Populate nav with signal/context processor

shiftregister/app/signals.py

@@ -2,6 +2,7 @@ from django.db.models.signals import pre_save
 from django.dispatch import receiver
 from django.shortcuts import reverse
 from django.template import Context, Template
+from shiftregister.core.signals import populate_nav
 from .models import Message, Shift
 
 
@@ -37,3 +38,40 @@ def notify_shift_changed(sender, **kwargs):
                 for reg in instance.shiftregistration_set.all()
             )
         )
+
+
+@receiver(populate_nav, dispatch_uid="populate_app_nav")
+def populate_app_nav(sender, **kwargs):
+    request = sender
+    nav_items = []
+
+    helper = request.helper
+    if helper is None:
+        nav_items.append({"link": reverse("register"), "text": "Anmelden"})
+    else:
+        if not helper.number_validated:
+            nav_items.append(
+                {
+                    "class": "has-text-danger",
+                    "text": "Bestätige deine Telefonnummer über den Link in der SMS",
+                }
+            )
+
+        important_shift = helper.important_shift()
+        if important_shift is not None:
+            template = Template(
+                '{% if is_running %}Laufende{% else %}Nächste{% endif %} Schicht ({{ start_at|date:"H:i" }})'
+            )
+            text = template.render(
+                Context(
+                    {
+                        "is_running": important_shift.is_running,
+                        "start_at": important_shift.start_at,
+                    }
+                )
+            )
+            nav_items.append(
+                {"link": reverse("shift", args=(important_shift.pk,)), "text": text}
+            )
+
+    return nav_items

shiftregister/app/templates/helper_base.html

@@ -2,22 +2,6 @@
 
 {% block title %}Help!{% endblock %}
 
-{% block navbar %}
-<div class="navbar-start">
-{% if not helper%}
-    <a class="navbar-item" href="{% url 'register' %}">Anmelden</a>
-{% else %}
-{% if not helper.number_validated %}
-    <p class="navbar-item has-text-danger">Bestätige deine Telefonnummer über den Link in der SMS</p>
-{% endif %}
-{% if helper.important_shift %}
-    <a class="navbar-item" href="{% url 'shift' helper.important_shift.pk %}">{%if helper.important_shift.is_running%}Laufende{% else %}Nächste{% endif %} Schicht ({{ helper.important_shift.start_at|date:"H:i" }})</a>
-{% endif %}
-{% endif %}
-</div>
-<div class="navbar-end"></div>
-{% endblock %}
-
 {% block body %}
 <section class="section">
     <div class="container">
@@ -36,6 +20,7 @@
 {% endblock %}
 
 {% block footer %}
+<div class="content">
 {% if DEBUG %}
     (Debug-Modus)
 {% if helper %}
@@ -43,4 +28,5 @@
     <a href="{{ helper.logintoken_set.first.get_absolute_url }}">login url</a>
 {% endif %}
 {% endif %}
+</div>
 {% endblock %}

shiftregister/app/templates/shiftlist.html

@@ -1,6 +1,7 @@
 {% extends "helper_base.html" %}
 
 {% block title %}Freie Schichten{% endblock %}
+
 {% block content %}
 {% if current_shift %}
 <h3 class="title">Aktuelle Schicht</h3>

shiftregister/app/templates/wait_confirmation.html

@@ -1,6 +1,7 @@
 {% extends "helper_base.html" %}
 
 {% block title %}Registrierung{% endblock %}
+
 {% block content %}
 Hallo {{ helper.name }},<br>
 wir haben dir eine SMS an {{ helper.phone }} mit einem Bestätigungslink geschickt. Sobald du diesen anklickst, kann es losgehen!

shiftregister/core/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

shiftregister/core/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class CoreConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "shiftregister.core"

shiftregister/core/context_processors.py

@@ -0,0 +1,14 @@
+from .signals import populate_nav
+
+
+def nav(request):
+    nav_items = [
+        item
+        for _, items in populate_nav.send(sender=request)
+        if isinstance(items, list)
+        for item in items
+    ]
+
+    return {
+        "nav_items": nav_items,
+    }

shiftregister/core/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

shiftregister/core/signals.py

@@ -0,0 +1,3 @@
+from django.dispatch import Signal
+
+populate_nav = Signal()

shiftregister/core/templates/400.html

@@ -0,0 +1 @@
+{% extends "error.html" %}

shiftregister/core/templates/404.html

@@ -0,0 +1,5 @@
+{% extends "error.html" %}
+
+{% block error_message %}Seite nicht gefunden{% endblock %}
+
+{% block error_text %}{% endblock %}

shiftregister/core/templates/500.html

@@ -0,0 +1,5 @@
+{% extends "error.html" %}
+
+{% block error_message %}Es ist ein Fehler aufgetreten{% endblock %}
+
+{% block error_text %}Wir arbeiten dran. Bei dringenden Problemen wende dich bitte an den Infopoint.{% endblock %}

shiftregister/core/templates/base.html

@@ -33,6 +33,7 @@
         }
     }
     </style>
+{% block head %}{% endblock %}
 </head>
 <body class="is-flex is-flex-direction-column">
     <nav class="navbar">
@@ -46,8 +47,14 @@
                 </a>
             </div>
 	    <div class="navbar-menu" id="main-nav">
-{% block navbar %}
+                <div class="navbar-start">
-{% endblock navbar %}
+{% for item in nav_items %}
+                    <{% if item.link %}a{% else %}p{% endif %} class="navbar-item{% if item.class %} {{ item.class }}{% endif %}"{% if item.link %} href="{{ item.link }}"{% endif %}>
+                        {{ item.text }}
+                    </{% if item.link %}a{% else %}p{% endif %}>
+{% endfor %}
+                </div>
+                <div class="navbar-end"></div>
             </div>
         </div>
     </nav>
@@ -55,14 +62,16 @@
     <section class="section">
         <div class="container">
 {% include 'notifications.html' %}
+{% block content %}{% endblock %}
         </div>
     </section>
 {% endblock %}
     <footer class="footer">
-        <div class="container">
+        <div class="container is-flex is-flex-wrap-wrap is-justify-content-space-between">
 {% block footer %}
+            <div class="content"><a href="https://git.as42.net/kontakt/shiftregister">shiftregister</a> by flo, Luca &amp; xAndy</div>
 {% endblock %}
-            <div class="breadcrumb has-dot-separator is-right">
+            <div class="breadcrumb has-dot-separator is-flex-grow-1 is-right ml-5">
                 <ul>
                     <li><a href="{% url 'pages:view' 'map' %}">Karte</a></li>
                     <li><a href="{% url 'pages:view' 'faq' %}">Häufig gestellte Fragen</a></li>

shiftregister/core/templates/error.html

@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+
+{% block title %}Fehler{% endblock %}
+
+{% block body %}
+<section class="section">
+    <div class="container">
+        <div class="content">
+            <h1 class="title">{% block error_message %}Fehler{% endblock %}</h1>
+{% block error_text %}
+            <p class="is-family-monospace">¯\_(ツ)_/¯</p>
+{% endblock %}
+        </div>
+        <a class="button" href="{% url 'index' %}">Zurück zur Schichtübersicht</a>
+{% if user.is_authenticated %}
+        <a class="button" href="{% url 'team:index' %}">Zurück zur Teamansicht</a>
+{% endif %}
+    </div>
+</section>
+{% endblock %}

shiftregister/core/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

shiftregister/core/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

shiftregister/pages/templates/page.html

@@ -2,22 +2,6 @@
 
 {% block title %}{{ page.title }}{% endblock %}
 
-{% block navbar %}
-<div class="navbar-start">
-{% if not helper%}
-    <a class="navbar-item" href="{% url 'register' %}">Anmelden</a>
-{% else %}
-{% if not helper.number_validated %}
-    <p class="navbar-item has-text-danger">Bestätige deine Telefonnummer über den Link in der SMS</p>
-{% endif %}
-{% if helper.important_shift %}
-    <a class="navbar-item" href="{% url 'shift' helper.important_shift.pk %}">{% if helper.important_shift.is_running %}Laufende{% else %}Nächste{% endif %} Schicht ({{ helper.important_shift.start_at|date:"H:i" }})</a>
-{% endif %}
-{% endif %}
-</div>
-<div class="navbar-end"></div>
-{% endblock %}
-
 {% block body %}
 <section class="section">
     <div class="container">

shiftregister/settings.py

@@ -40,11 +40,12 @@ ALLOWED_HOSTS = list(filter(lambda s: s != "", getenv("ALLOWED_HOSTS", "").split
 INSTALLED_APPS = [
     "dynamic_preferences",
     "shiftregister.app.apps.AppConfig",
+    "shiftregister.core.apps.CoreConfig",
     "shiftregister.importer.apps.ImporterConfig",
-    "shiftregister.team.apps.TeamConfig",
-    "shiftregister.pages.apps.PagesConfig",
     "shiftregister.metrics.apps.MetricsConfig",
+    "shiftregister.pages.apps.PagesConfig",
     "shiftregister.signage.apps.SignageConfig",
+    "shiftregister.team.apps.TeamConfig",
     "django.contrib.admin",
     "django.contrib.auth",
     "django.contrib.contenttypes",
@@ -72,7 +73,7 @@ LOGIN_URL = "/admin/login/"
 TEMPLATES = [
     {
         "BACKEND": "django.template.backends.django.DjangoTemplates",
-        "DIRS": [BASE_DIR / "templates"],
+        "DIRS": [],
         "APP_DIRS": True,
         "OPTIONS": {
             "context_processors": [
@@ -81,6 +82,7 @@ TEMPLATES = [
                 "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",
                 "shiftregister.app.context_processors.proc",
+                "shiftregister.core.context_processors.nav",
             ],
         },
     },

shiftregister/signage/templates/partials/worklist_shift.html

@@ -1,41 +1,40 @@
 <div class="column is-one-quarter">
-<div class="box {%if not  shift.teambackup_set.all%} has-background-warning{%endif%}">
+    <div class="box{% if not shift.teambackup_set.all %} has-background-warning{% endif %}">
-    <div class="content">
+        <div class="content">
-        <strong>Ort:</strong> {{ shift.room.name }}<br>
+            <strong>Ort:</strong> {{ shift.room.name }}<br>
-        <strong>Beginn:</strong> {{ shift.start_at }}<br>
+            <strong>Beginn:</strong> {{ shift.start_at }}<br>
-        <strong>Dauer:</strong> {{ shift.duration }}<br>
+            <strong>Dauer:</strong> {{ shift.duration }}<br>
-        <strong>Belegung:</strong> {{ shift.shiftregistration_set.count }}/{{ shift.required_helpers|default:shift.room.required_helpers }}
+            <strong>Belegung:</strong> {{ shift.shiftregistration_set.count }}/{{ shift.required_helpers|default:shift.room.required_helpers }}
-        <hr>
+            <hr>
-        <ul>
+            <ul>
-            {% for item in shift.teambackup_set.all%}
+{% for item in shift.teambackup_set.all %}
-            <li>{{item.name}}</li>
+                <li>{{ item.name }}</li>
-            {%endfor%}
+{% endfor %}
-        </ul>
+            </ul>
-        <form action="{%url 'signage:work_add' shift.pk%}" method="post">
+            <form action="{% url 'signage:work_add' shift.pk %}" method="post">
-            {% csrf_token %}
+                {% csrf_token %}
-        {% for field in form %}
+{% for field in form %}
-            <div class="field">
+                <div class="field">
-        {% if field.widget_type == 'checkbox' %}
+{% if field.widget_type == 'checkbox' %}
-                <div class="control">
+                    <div class="control">
-                    <label class="checkbox" for="{{ field.id_for_label }}">{{ field }} {{ field.label }}</label>
+                        <label class="checkbox" for="{{ field.id_for_label }}">{{ field }} {{ field.label }}</label>
+                    </div>
+{% else %}
+                    <label class="label" for="{{ field.id_for_label }}">{{ field.label }}</label>
+                    <div class="control">
+                        {{ field }}
+                    </div>
+{% endif %}
+{% for error in field.errors %}
+                    <p class="help is-danger">{{ error }}</p>
+{% endfor %}
+{% if field.help_text %}
+                    <p class="help">{{ field.help_text }}</p>
+{% endif %}
                 </div>
-        {% else %}
+{% endfor %}
-                <label class="label" for="{{ field.id_for_label }}">{{ field.label }}</label>
+                <button class="button is-link" type="submit">Team hinzufügen</button>
-                <div class="control">
+            </form>
-                    {{ field }}
+        </div>
-                </div>
-        {% endif %}
-        {% for error in field.errors %}
-                <p class="help is-danger">{{ error }}</p>
-        {% endfor %}
-        {% if field.help_text %}
-                <p class="help">{{ field.help_text }}</p>
-        {% endif %}
-            </div>
-        {% endfor %}
-            <button class="button is-link" type="submit">Team hinzufuegen</button>
-        </form>
     </div>
-
 </div>
-</div>

shiftregister/signage/templates/signage_base.html

@@ -1,23 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Team{% endblock %}
-
-{% block navbar %}
-<div class="navbar-start">
-    <a class="navbar-item" href="{% url 'team:shift_overview' %}">Schichtübersicht</a>
-    <a class="navbar-item" href="{% url 'team:shift_free' %}">Freie Schichten</a>
-    <a class="navbar-item" href="{% url 'team:shift_all' %}">Alle Schichten</a>
-    <a class="navbar-item" href="{% url 'team:bulk_message' %}">Massen-Nachricht</a>
-</div>
-<div class="navbar-end"></div>
-{% endblock %}
-
-{% block body %}
-<section class="section">
-    <div class="container">
-{% include 'notifications.html' %}
-{% block content %}{% endblock %}
-    </div>
-</section>
-{% endblock %}
-

shiftregister/signage/templates/terminal.html

@@ -1,90 +1,63 @@
-{% load static %}
+{% extends "base.html" %}
-<!DOCTYPE html>
-<html lang="de">
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width,initial-scale=1">
-    <title>{% block title %}Help!{% endblock %} &ndash; Helfer*innen</title>
-    <link rel="icon" href="{% static 'tonkakt.svg' %}" sizes="any" type="image/svg+xml">
-    <link rel="stylesheet" href="{% static 'bulma.min.css' %}">
-    <link rel="stylesheet" href="{% static 'bulma-prefers-dark.min.css' %}">
-    <style>
-    @font-face {
-        font-family: "Maven Pro";
-        src: url("{% static 'MavenPro-VariableFont:wght.ttf' %}");
-    }
 
-    * {
+{% block head %}
-        font-family: "Maven Pro", sans-serif !important;
+<script>
-    }
+window.addEventListener('load', () => {
+    const max = document.body.scrollHeight - window.innerHeight;
+    let current = 0;
+    let interval;
+    let interacted = false;
 
-    :root {
+    window.addEventListener('click', () => interacted = true);
-        --background: #fff;
+    window.addEventListener('touchstart', () => interacted = true);
-    }
 
-    @media (prefers-color-scheme: dark) {
+    setTimeout(() => {
-        :root {
+        window.scrollTo({top: 0});
-            --background: #17181c;
+    }, 10);
-        }
-    }
-    </style>
-    <script>
-        window.addEventListener('load', () => {
-            const max = document.body.scrollHeight - window.innerHeight;
-            let current = 0;
-            let interval;
-            let interacted = false;
 
-            window.addEventListener('click', () => interacted = true);
+    if (max > 0) {
-            window.addEventListener('touchstart', () => interacted = true);
+        setTimeout(() => {
-
+            if (interacted) return;
-            setTimeout(() => {
+            interval = setInterval(() => {
-                window.scrollTo({top: 0});
-            }, 10);
-
-            if (max > 0) {
-                setTimeout(() => {
-                    if (interacted) return;
-                    interval = setInterval(() => {
-                        if (interacted) return;
-                        current += 1;
-
-                        window.scrollTo({top: current});
-
-                        if (window.scrollY >= max) {
-                            if (interacted) return;
-                            clearInterval(interval);
-                            setTimeout(() => {
-                                window.location.reload();
-                            }, 5000)
-                        }
-                    }, 20);
-                }, 5000)
-            }
-
-            setTimeout(() => {
                 if (interacted) return;
-                window.location.reload();
+                current += 1;
-            }, 120 * 1000)
+
-        });
+                window.scrollTo({top: current});
-    </script>
+
-</head>
+                if (window.scrollY >= max) {
-<body>
+                    if (interacted) return;
-    <section class="section">
+                    clearInterval(interval);
-        <div class="container">
+                    setTimeout(() => {
-            <table class="table">
+                        window.location.reload();
-                <tbody>
+                    }, 5000)
-                        {% for shift in shifts %}
+                }
-                        <tr>
+            }, 20);
-                            <td>{{shift.start_at}}</td>
+        }, 5000)
-                            <td>{{ shift.registration_count }}/{{ shift.required_helpers|default:shift.room.required_helpers }}</td>
+    }
-                            <td>{{shift.room.name}} </td>
+
-                            <td><b>{%for item in shift.teambackup_set.all%}{{item.name}}{% if not forloop.last %}, {% endif %}{%empty%}</b> <div class="has-text-danger">unbesetzt</div> <b>{%endfor%}</b></td>
+    setTimeout(() => {
-                        </tr>
+        if (interacted) return;
-                        {% endfor %}
+        window.location.reload();
-                    </tbody>
+    }, 120 * 1000)
-            </table>
+});
-        </div>
+</script>
-    </section>
+{% endblock %}
-</body>
+
-</html>
+{% block body %}
+<section class="section">
+    <div class="container">
+        <table class="table">
+            <tbody>
+                    {% for shift in shifts %}
+                    <tr>
+                        <td>{{shift.start_at}}</td>
+                        <td>{{ shift.registration_count }}/{{ shift.required_helpers|default:shift.room.required_helpers }}</td>
+                        <td>{{shift.room.name}} </td>
+                        <td><b>{%for item in shift.teambackup_set.all%}{{item.name}}{% if not forloop.last %}, {% endif %}{%empty%}</b> <div class="has-text-danger">unbesetzt</div> <b>{%endfor%}</b></td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+        </table>
+    </div>
+</section>
+{% endblock %}

shiftregister/signage/templates/worklist.html

@@ -1,10 +1,13 @@
-{% extends "signage_base.html" %}
+{% extends "base.html" %}
+
+{% block title %}Team{% endblock %}
+
 {% block body %}
 <section class="section">
     <div class="columns is-multiline">
-        {% for shift in shifts %}
+{% for shift in shifts %}
-            {%include 'partials/worklist_shift.html'%}
+            {% include 'partials/worklist_shift.html' %}
-        {% endfor %}
+{% endfor %}
     </div>
 </section>
-{% endblock %}
+{% endblock %}

shiftregister/team/apps.py

@@ -4,3 +4,6 @@ from django.apps import AppConfig
 class TeamConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
     name = "shiftregister.team"
+
+    def ready(self):
+        from . import signals

shiftregister/team/signals.py

@@ -0,0 +1,23 @@
+from django.dispatch import receiver
+from django.shortcuts import reverse
+from shiftregister.core.signals import populate_nav
+
+
+@receiver(populate_nav, dispatch_uid="populate_team_nav")
+def populate_team_nav(sender, **kwargs):
+    request = sender
+    nav_items = []
+
+    if request.user.is_authenticated:
+        nav_items.append(
+            {"link": reverse("team:shift_overview"), "text": "Schichtübersicht"}
+        )
+        nav_items.append(
+            {"link": reverse("team:shift_free"), "text": "Freie Schichten"}
+        )
+        nav_items.append({"link": reverse("team:shift_all"), "text": "Alle Schichten"})
+        nav_items.append(
+            {"link": reverse("team:bulk_message"), "text": "Massen-Nachricht"}
+        )
+
+    return nav_items

shiftregister/team/templates/bulk_message.html

@@ -1,6 +1,7 @@
-{% extends "team_base.html" %}
+{% extends "base.html" %}
 
 {% block title %}Massen-Nachricht{% endblock %}
+
 {% block content %}
 <h3 class="title">Massen-Nachricht versenden</h3>
 <form action="" method="post">

shiftregister/team/templates/helper_detail.html

@@ -1,6 +1,7 @@
-{% extends "team_base.html" %}
+{% extends "base.html" %}
 
 {% block title %}Helferdetails{% endblock %}
+
 {% block content %}
 <h3 class="title">{{ helper.name }}</h3>
 <div class="content">

shiftregister/team/templates/shift_detail.html

@@ -1,4 +1,4 @@
-{% extends "team_base.html" %}
+{% extends "base.html" %}
 
 {% block title %}Schichtdetails{% endblock %}
 

shiftregister/team/templates/shift_list.html

@@ -1,4 +1,4 @@
-{% extends "team_base.html" %}
+{% extends "base.html" %}
 
 {% block title %}{{ title }}{% endblock %}
 

shiftregister/team/templates/shift_overview.html

@@ -1,4 +1,4 @@
-{% extends "team_base.html" %}
+{% extends "base.html" %}
 
 {% block title %}Schichtübersicht{% endblock %}
 

shiftregister/team/templates/team_base.html

@@ -1,22 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Team{% endblock %}
-
-{% block navbar %}
-<div class="navbar-start">
-    <a class="navbar-item" href="{% url 'team:shift_overview' %}">Schichtübersicht</a>
-    <a class="navbar-item" href="{% url 'team:shift_free' %}">Freie Schichten</a>
-    <a class="navbar-item" href="{% url 'team:shift_all' %}">Alle Schichten</a>
-    <a class="navbar-item" href="{% url 'team:bulk_message' %}">Massen-Nachricht</a>
-</div>
-<div class="navbar-end"></div>
-{% endblock %}
-
-{% block body %}
-<section class="section">
-    <div class="container">
-{% include 'notifications.html' %}
-{% block content %}{% endblock %}
-    </div>
-</section>
-{% endblock %}

templates/400.html

@@ -1 +0,0 @@
-{% extends "error_base.html" %}

templates/404.html

@@ -1,3 +0,0 @@
-{% extends "error_base.html" %}
-<h3 class="title">{% block error_message%}Seite nicht gefunden{% endblock %}</h3>
-{% block error_text%}{% endblock %}

templates/500.html

@@ -1,3 +0,0 @@
-{% extends "error_base.html" %}
-<h3 class="title">{% block error_message%}Es ist ein Fehler aufgetreten{% endblock %}</h3>
-{% block error_text%}Wir arbeiten dran. Bei dringenden Problemen kannst du dich an den Infopoint wenden.{% endblock %}

templates/error_base.html

@@ -1,32 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Fehler{% endblock %}
-
-{% block navbar %}
-<div class="navbar-start">
-{% if not helper%}
-    <a class="navbar-item" href="{% url 'register' %}">Anmelden</a>
-{% else %}
-{% if not helper.number_validated %}
-    <p class="navbar-item has-text-danger">Bestätige deine Telefonnummer über den Link in der SMS</p>
-{% endif %}
-{% if helper.important_shift %}
-    <a class="navbar-item" href="{% url 'shift' helper.important_shift.pk %}">{%if helper.important_shift.is_running%}Laufende{% else %}Nächste{% endif %} Schicht ({{ helper.important_shift.start_at|date:"H:i" }})</a>
-{% endif %}
-{% endif %}
-</div>
-<div class="navbar-end"></div>
-{% endblock %}
-
-{% block body %}
-<section class="section">
-    <div class="container">
-        <h3 class="title">{% block error_message%}Fehler{% endblock %}</h3>
-            {% block error_text%}<pre>¯\_(ツ)_/¯</pre>{% endblock %}<br>
-            <a href="{% url 'index' %}" class="button">Zurück zur Schichtübersicht</a>
-{% if user.is_authenticated %}
-            <a href="{% url 'team:index' %}" class="button">Zurück zur Teamansicht</a>
-{% endif %}
-    </div>
-</section>
-{% endblock %}