Merge branch 'main' into fmd-765-automate-issue-creation-for-dependab…

…ot-pr
ministryofjustice · Sep 9, 2024 · d001697 · d001697
2 parents 0e6db94 + 0d450c2
commit d001697
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 51 deletions.
diff --git a/core/settings.py b/core/settings.py
@@ -32,7 +32,7 @@
     pass
 
 # Application definition
-INSTALLED_APPS = [
+INSTALLED_APPS: list[str] = [
     "django.contrib.auth",
     "django.contrib.contenttypes",
     "django.contrib.sessions",
@@ -46,10 +46,14 @@
     "waffle",
 ]
 
+INTERNAL_IPS: list[str] = [
+    "127.0.0.1",
+]
+
 if os.environ.get("AZURE_AUTH_ENABLED", "true") != "false":
     INSTALLED_APPS.append("azure_auth")
 
-MIDDLEWARE = [
+MIDDLEWARE: list[str] = [
     "django_prometheus.middleware.PrometheusBeforeMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "whitenoise.middleware.WhiteNoiseMiddleware",
@@ -224,6 +228,11 @@
         environment=ENV or "local",
     )
 
+# add debug toolbar when not running tests
+if DEBUG and not TESTING:
+    INSTALLED_APPS.insert(-1, "debug_toolbar")
+    MIDDLEWARE.insert(1, "debug_toolbar.middleware.DebugToolbarMiddleware")
+
 # Enable / Disable Azure Auth
 if not os.environ.get("AZURE_AUTH_ENABLED", "true") == "false":
     # Adds the Azure Authentication middleware to the Django Authentication middleware

diff --git a/core/urls.py b/core/urls.py
@@ -15,6 +15,8 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 
+from debug_toolbar.toolbar import debug_toolbar_urls
+from django.conf import settings
 from django.urls import include, path
 
 app_name = "core"
@@ -26,4 +28,9 @@
     path("", include("django_prometheus.urls")),
 ]
 
+if settings.DEBUG and not settings.TESTING:
+    urlpatterns = [
+        *urlpatterns,
+    ] + debug_toolbar_urls()
+
 handler404 = "core.views.handler404"
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -22,6 +22,7 @@ django-azure-auth = "2.0.2"
 django-waffle = "^4.1.0"
 psycopg = "^3.2.1"
 psycopg-binary = "^3.2.1"
+django-debug-toolbar = "^4.4.6"
 redis = {extras = ["hiredis"], version = "^5.0.8"}
 
 [tool.poetry.group.dev.dependencies]

diff --git a/templates/400.html b/templates/400.html
@@ -3,14 +3,10 @@
 
 {% block content %}
 
-  <div class="govuk-width-container">
-    <main class="govuk-main-wrapper govuk-main-wrapper--l" id="main-content" role="main">
-      <div class="govuk-grid-row">
-        <div class="govuk-grid-column-two-thirds">
-          <h1 class="govuk-heading-l">{{h1_value}}</h1>
-        </div>
-      </div>
-    </main>
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <h1 class="govuk-heading-l">{{h1_value}}</h1>
   </div>
+</div>
 
 {% endblock content %}
diff --git a/templates/404.html b/templates/404.html
@@ -4,20 +4,16 @@
 
 {% block content %}
 
-  <div class="govuk-width-container">
-    <main class="govuk-main-wrapper govuk-main-wrapper--l" id="main-content" role="main">
-      <div class="govuk-grid-row">
-        <div class="govuk-grid-column-two-thirds">
-          <h1 class="govuk-heading-l">{{h1_value}}</h1>
-          <p class="govuk-body">
-            {% translate "If you typed the web address, check it is correct." %}
-          </p>
-          <p class="govuk-body">
-            {% translate "If you pasted the web address, check you copied the entire address." %}
-          </p>
-        </div>
-      </div>
-    </main>
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <h1 class="govuk-heading-l">{{h1_value}}</h1>
+    <p class="govuk-body">
+      {% translate "If you typed the web address, check it is correct." %}
+    </p>
+    <p class="govuk-body">
+      {% translate "If you pasted the web address, check you copied the entire address." %}
+    </p>
   </div>
+</div>
 
 {% endblock content %}
diff --git a/templates/500.html b/templates/500.html
@@ -4,18 +4,14 @@
 
 {% block content %}
 
-  <div class="govuk-width-container">
-    <main class="govuk-main-wrapper govuk-main-wrapper--l" id="main-content" role="main">
-      <div class="govuk-grid-row">
-        <div class="govuk-grid-column-two-thirds">
-          <h1 class="govuk-heading-l">{{h1_value}}</h1>
-          <p class="govuk-body">
-            {% translate "There is a problem with the server." %}
-          </p>
-          {% include "partial/contact_team.html" %}
-        </div>
-      </div>
-    </main>
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <h1 class="govuk-heading-l">{{h1_value}}</h1>
+    <p class="govuk-body">
+      {% translate "There is a problem with the server." %}
+    </p>
+    {% include "partial/contact_team.html" %}
   </div>
+</div>
 
 {% endblock content %}
diff --git a/templates/500_datahub_unavailable.html b/templates/500_datahub_unavailable.html
@@ -3,19 +3,14 @@
 {% load static %}
 
 {% block content %}
-
-  <div class="govuk-width-container">
-    <main class="govuk-main-wrapper govuk-main-wrapper--l" id="main-content" role="main">
-      <div class="govuk-grid-row">
-        <div class="govuk-grid-column-two-thirds">
-          <h1 class="govuk-heading-l">{{h1_value}}</h1>
-          <p class="govuk-body">
-            {% translate "The DataHub catalogue is currently unavailable. Please try again in a few minutes." %}
-          </p>
-          {% include "partial/contact_team.html" %}
-        </div>
-      </div>
-    </main>
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <h1 class="govuk-heading-l">{{h1_value}}</h1>
+    <p class="govuk-body">
+      {% translate "The DataHub catalogue is currently unavailable. Please try again in a few minutes." %}
+    </p>
+    {% include "partial/contact_team.html" %}
   </div>
+</div>
 
 {% endblock content %}
diff --git a/templates/base/head.html b/templates/base/head.html
@@ -1,5 +1,6 @@
 {% load static %}
 {% load page_title %}
+
 <head>
   <meta charset="utf-8">
   <title>{{h1_value|render_title}}</title>
@@ -12,4 +13,5 @@
   <link rel="manifest" href="{% static 'assets/manifest.json' %}">
   <link rel="stylesheet" type="text/css" href="{% static 'assets/css/base.css' %}">
   <meta property="og:image" content="{% static 'assets/images/govuk-opengraph-image.png' %}">
+  <meta name="robots" content="noindex, nofollow" />
 </head>