Add master template & remove utils/templates and tags

maykinmedia · Nov 27, 2024 · ee4057d · ee4057d
1 parent 4a79fa5
commit ee4057d
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 103 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -1,14 +1,14 @@
 [pycodestyle]
 [pep8]
 [flake8]
-ignore=
-    # Formatting rules incompatible with black
+ignore =
+# Formatting rules incompatible with black
     W293,W291,E501,E261,W503
-max-line-length=88
-exclude=migrations,static,media
+max-line-length = 88
+exclude = migrations,static,media
 per-file-ignores =
-    # Config uses layered wildcard imports
-    src/open_producten/conf/*:F405
+# Config uses layered wildcard imports
+    src/open_producten/conf/*:F405,F403
 
 [isort]
 combine_as_imports = true
@@ -21,9 +21,9 @@ use_parentheses = True
 ensure_newline_before_comments = True
 skip = env,node_modules
 skip_glob = **/migrations/**
-known_django=django
-known_first_party=open_producten
-sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
+known_django = django
+known_first_party = open_producten
+sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
 
 [coverage:run]
 branch = True
@@ -46,4 +46,4 @@ exclude_also =
     @(abc\.)?abstractmethod
     raise NotImplementedError
     \.\.\.
-    pass
+    pass
diff --git a/src/open_producten/templates/master.html b/src/open_producten/templates/master.html
@@ -0,0 +1,65 @@
+{% load static %}<!DOCTYPE html>
+<html lang="en" class="view {% block view_class %}view--{{ request.resolver_match.namespaces|join:'-' }}-{{ request.resolver_match.url_name }}{% endblock %}">
+    <head>
+        <meta charset="utf-8">
+        <title>{% block title %}Open_Producten{% endblock %}</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <link href="{% static 'ico/favicon.svg' %}" sizes="any" rel="icon" type="image/svg+xml" />
+        <link href="{% static 'ico/favicon-96x96.png' %}" sizes="96x96" rel="icon" type="image/png" />
+        <link href="{% static 'ico/favicon-32x32.png' %}" sizes="32x32" rel="icon" type="image/png" />
+        <link href="{% static 'ico/favicon.png' %}" sizes="16x16" rel="icon" type="image/png" />
+        <link href="{% static 'ico/favicon.png' %}" rel="shortcut icon">
+        {% block extra_css %}{% endblock %}
+    </head>
+
+    <body class="view__body">
+        <main>
+            {% block content %}
+                Override <code>{% verbatim %}{% block content %}{% endverbatim %}</code>
+                to get some actual content.
+            {% endblock %}
+        </main>
+
+        <footer class="footer container">
+            <div class="footer__row">
+              <div class="footer__col footer__col--small">
+                <img src="{% static 'ico/favicon-96x96.png' %}" alt="Maykin logo" height="48">
+                <p>
+                  Developed by <a class="link" href="https://www.maykinmedia.nl">Maykin</a><br>
+                  within the <a class="link" href="https://opengem.nl">Open Gemeente Initiatief</a> &copy; 2024<br>
+
+                </p>
+              </div>
+              <div class="footer__col">
+                <h5 class="footer__header">open_producten</h5>
+                <ul class="footer__list">
+                  <li><a class="link link--muted" href="https://hub.docker.com/r/maykinmedia/open-producten">Docker images</a></li>
+                  <li><a class="link link--muted" href="https://github.com/maykinmedia/open-producten">Code on Github</a></li>
+                </ul>
+              </div>
+              <div class="footer__col">
+                <h5 class="footer__header">Other</h5>
+                <ul class="footer__list">
+                  <li>Report <a class="link link--muted" href="https://github.com/maykinmedia/open-producten/issues">issues</a> for questions, bugs or wishes</li>
+                  <li>Read more on <a class="link link--muted" href="https://commonground.nl/">Common Ground</a></li>
+                </ul>
+              </div>
+            </div>
+
+            <div class="footer__row">
+              <div class="footer__col">
+                <code>{{ settings.RELEASE }}</code>
+              </div>
+              <div class="footer__col footer__col--right">
+                <code>{{ settings.GIT_SHA|default:"" }}</code>
+              </div>
+            </div>
+          </footer>
+
+        {% if dsn %}
+            <script src="https://browser.sentry-cdn.com/5.10.1/bundle.min.js" integrity="sha384-sAOze6ZTBIpiWBF3VlUteSInM4rYpjxrejp1wMmmKqA9clRZ1vZJ36Ihmt1ilTrG" crossorigin="anonymous"></script>
+            <script>Sentry.init({ dsn: '{{ dsn }}'});</script>
+        {% endif %}
+
+    </body>
+</html>
diff --git a/src/open_producten/urls.py b/src/open_producten/urls.py
@@ -14,8 +14,10 @@
 )
 from maykin_2fa import monkeypatch_admin
 from maykin_2fa.urls import urlpatterns, webauthn_urlpatterns
+from mozilla_django_oidc_db.views import AdminLoginFailure
 
 from open_producten.accounts.views.password_reset import PasswordResetView
+
 # from open_producten.locations.router import location_urlpatterns
 # from open_producten.products.router import product_urlpatterns
 # from open_producten.producttypen.router import product_type_urlpatterns
@@ -25,6 +27,8 @@
 monkeypatch_admin()
 
 handler500 = "open_producten.utils.views.server_error"
+
+admin.site.enable_nav_sidebar = False
 admin.site.site_header = "Open Producten admin"
 admin.site.site_title = "Open Producten admin"
 admin.site.index_title = "Open Producten dashboard"
@@ -42,6 +46,9 @@
         auth_views.PasswordResetDoneView.as_view(),
         name="password_reset_done",
     ),
+    # OIDC urls
+    path("admin/login/failure/", AdminLoginFailure.as_view(), name="admin-oidc-error"),
+    path("auth/oidc/", include("mozilla_django_oidc.urls")),
     # Use custom login views for the admin + support hardware tokens
     path("admin/", include((urlpatterns, "maykin_2fa"))),
     path("admin/", include((webauthn_urlpatterns, "two_factor"))),
@@ -96,5 +103,5 @@
     import debug_toolbar
 
     urlpatterns = [
-        path("__debug__/", include(debug_toolbar.urls)),
-    ] + urlpatterns
+                      path("__debug__/", include(debug_toolbar.urls)),
+                  ] + urlpatterns
diff --git a/src/open_producten/utils/geocode.py b/src/open_producten/utils/geocode.py
@@ -27,7 +27,7 @@ def __init__(
         scheme="https",
         user_agent=None,
         ssl_context=DEFAULT_SENTINEL,
-        adapter_factory=None
+        adapter_factory=None,
     ):
         super().__init__(
             scheme=scheme,

diff --git a/src/open_producten/utils/templates/utils/includes/version_info.html b/src/open_producten/utils/templates/utils/includes/version_info.html
diff --git a/src/open_producten/utils/templatetags/__init__.py b/src/open_producten/utils/templatetags/__init__.py
diff --git a/src/open_producten/utils/templatetags/utils.py b/src/open_producten/utils/templatetags/utils.py
diff --git a/src/open_producten/utils/tests/test_templatetags.py b/src/open_producten/utils/tests/test_templatetags.py