From 0ef69a42262a6064c5129351c0398faa12cdcf5b Mon Sep 17 00:00:00 2001
From: Matt Shaw <matthew.shaw@landregistry.gov.uk>
Date: Tue, 3 Sep 2024 16:04:15 +0100
Subject: [PATCH] follow service navigation patterns

---
 app/templates/base.html                     | 12 +++++++++--
 app/templates/demos/autocomplete.html       | 22 ---------------------
 app/templates/demos/bank_details.html       | 22 ---------------------
 app/templates/demos/component.html          | 20 -------------------
 app/templates/demos/components.html         | 18 -----------------
 app/templates/demos/conditional_reveal.html | 22 ---------------------
 app/templates/demos/create_account.html     | 22 ---------------------
 app/templates/demos/forms.html              | 19 ------------------
 app/templates/demos/kitchen_sink.html       | 22 ---------------------
 app/templates/main/index.html               |  6 ------
 10 files changed, 10 insertions(+), 175 deletions(-)

diff --git a/app/templates/base.html b/app/templates/base.html
index 071e1d3..08868ff 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -4,6 +4,7 @@
 {%- from 'govuk_frontend_jinja/components/error-summary/macro.html' import govukErrorSummary-%}
 {%- from 'govuk_frontend_jinja/components/notification-banner/macro.html' import govukNotificationBanner -%}
 {%- from 'govuk_frontend_jinja/components/phase-banner/macro.html' import govukPhaseBanner -%}
+{%- from 'govuk_frontend_jinja/components/service-navigation/macro.html' import govukServiceNavigation -%}
 
 {% set assetPath = url_for('static', filename='').rstrip('/') %}
 
@@ -108,10 +109,17 @@
 
 {% block header %}
   {{ govukHeader({
-    'homepageUrl': url_for('main.index'),
+    'classes': 'govuk-header--full-width-border',
+    'homepageUrl': 'https://www.gov.uk/'
+  }) }}
+
+  {{ govukServiceNavigation({
     'serviceName': config['SERVICE_NAME'],
     'serviceUrl': url_for('main.index'),
-    'useTudorCrown': true
+    'navigation': [
+      {'href': url_for('demos.components'), 'text': 'Components'},
+      {'href': url_for('demos.forms'), 'text': 'Forms'}
+    ]
   }) }}
 {% endblock %}
 
diff --git a/app/templates/demos/autocomplete.html b/app/templates/demos/autocomplete.html
index daf2927..5856de2 100644
--- a/app/templates/demos/autocomplete.html
+++ b/app/templates/demos/autocomplete.html
@@ -1,29 +1,7 @@
 {% extends "base.html" %}
 
-{%- from 'govuk_frontend_jinja/components/breadcrumbs/macro.html' import govukBreadcrumbs -%}
-
 {% block pageTitle %}{%- if form.errors %}Error: {% endif -%}Autocomplete – GOV.UK{% endblock %}
 
-{% block beforeContent %}
-  {{ super() }}
-  {{ govukBreadcrumbs({
-    'collapseOnMobile': True,
-    'items': [
-        {
-            'text': "Home",
-            'href': url_for('main.index')
-        },
-        {
-            'text': "Forms",
-            'href': url_for('demos.forms')
-        },
-        {
-            'text': "Autocomplete"
-        }
-    ]
-  }) }}
-{% endblock %}
-
 {% block content %}
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
diff --git a/app/templates/demos/bank_details.html b/app/templates/demos/bank_details.html
index d47562a..ded06a4 100644
--- a/app/templates/demos/bank_details.html
+++ b/app/templates/demos/bank_details.html
@@ -1,29 +1,7 @@
 {% extends "base.html" %}
 
-{%- from 'govuk_frontend_jinja/components/breadcrumbs/macro.html' import govukBreadcrumbs -%}
-
 {% block pageTitle %}{%- if form.errors %}Error: {% endif -%}Bank details – GOV.UK{% endblock %}
 
-{% block beforeContent %}
-  {{ super() }}
-  {{ govukBreadcrumbs({
-    'collapseOnMobile': True,
-    'items': [
-        {
-            'text': "Home",
-            'href': url_for('main.index')
-        },
-        {
-            'text': "Forms",
-            'href': url_for('demos.forms')
-        },
-        {
-            'text': "Bank details"
-        }
-    ]
-  }) }}
-{% endblock %}
-
 {% block content %}
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
diff --git a/app/templates/demos/component.html b/app/templates/demos/component.html
index 2e982b9..6782922 100644
--- a/app/templates/demos/component.html
+++ b/app/templates/demos/component.html
@@ -39,26 +39,6 @@
 
 {% block pageTitle %}{{component | replace("-", " ") | capitalize}} – GOV.UK{% endblock %}
 
-{% block beforeContent %}
-  {{ super() }}
-  {{ govukBreadcrumbs({
-    'collapseOnMobile': True,
-    'items': [
-        {
-            'text': "Home",
-            'href': url_for('main.index')
-        },
-        {
-            'text': "Components",
-            'href': url_for('demos.components')
-        },
-        {
-            'text': component | replace("-", " ") | capitalize
-        }
-    ]
-  }) }}
-{% endblock %}
-
 {% block content %}
   <span class="govuk-caption-xl">Components</span>
   <h1 class="govuk-heading-xl">{{component | replace("-", " ") | capitalize}}</h1>
diff --git a/app/templates/demos/components.html b/app/templates/demos/components.html
index 8b8a8e0..0b879bd 100644
--- a/app/templates/demos/components.html
+++ b/app/templates/demos/components.html
@@ -1,23 +1,5 @@
 {% extends "base.html" %}
 
-{%- from 'govuk_frontend_jinja/components/breadcrumbs/macro.html' import govukBreadcrumbs -%}
-
-{% block beforeContent %}
-    {{ super() }}
-    {{ govukBreadcrumbs({
-        'collapseOnMobile': True,
-        'items': [
-            {
-                'text': "Home",
-                'href': url_for('main.index')
-            },
-            {
-                'text': "Components"
-            }
-        ]
-    }) }}
-{% endblock %}
-
 {% block content %}
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
diff --git a/app/templates/demos/conditional_reveal.html b/app/templates/demos/conditional_reveal.html
index 1c5779c..d4cff36 100644
--- a/app/templates/demos/conditional_reveal.html
+++ b/app/templates/demos/conditional_reveal.html
@@ -1,29 +1,7 @@
 {% extends "base.html" %}
 
-{%- from 'govuk_frontend_jinja/components/breadcrumbs/macro.html' import govukBreadcrumbs -%}
-
 {% block pageTitle %}{%- if form.errors %}Error: {% endif -%}Conditionally revealed inputs – GOV.UK{% endblock %}
 
-{% block beforeContent %}
-  {{ super() }}
-  {{ govukBreadcrumbs({
-    'collapseOnMobile': True,
-    'items': [
-        {
-            'text': "Home",
-            'href': url_for('main.index')
-        },
-        {
-            'text': "Forms",
-            'href': url_for('demos.forms')
-        },
-        {
-            'text': "Conditional reveal"
-        }
-    ]
-  }) }}
-{% endblock %}
-
 {% block content %}
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
diff --git a/app/templates/demos/create_account.html b/app/templates/demos/create_account.html
index 8c530f0..70aa93a 100644
--- a/app/templates/demos/create_account.html
+++ b/app/templates/demos/create_account.html
@@ -1,29 +1,7 @@
 {% extends "base.html" %}
 
-{%- from 'govuk_frontend_jinja/components/breadcrumbs/macro.html' import govukBreadcrumbs -%}
-
 {% block pageTitle %}{%- if form.errors %}Error: {% endif -%}Create an account – GOV.UK{% endblock %}
 
-{% block beforeContent %}
-  {{ super() }}
-  {{ govukBreadcrumbs({
-    'collapseOnMobile': True,
-    'items': [
-        {
-            'text': "Home",
-            'href': url_for('main.index')
-        },
-        {
-            'text': "Forms",
-            'href': url_for('demos.forms')
-        },
-        {
-            'text': "Create account"
-        }
-    ]
-  }) }}
-{% endblock %}
-
 {% block content %}
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
diff --git a/app/templates/demos/forms.html b/app/templates/demos/forms.html
index 62d4ec9..f1f9ae6 100644
--- a/app/templates/demos/forms.html
+++ b/app/templates/demos/forms.html
@@ -1,24 +1,5 @@
 {% extends "base.html" %}
 
-{%- from 'govuk_frontend_jinja/components/breadcrumbs/macro.html' import govukBreadcrumbs -%}
-
-{% block beforeContent %}
-    {{ super() }}
-
-    {{ govukBreadcrumbs({
-        'collapseOnMobile': True,
-        'items': [
-            {
-                'text': "Home",
-                'href': url_for('main.index')
-            },
-            {
-                'text': "Forms"
-            }
-        ]
-    }) }}
-{% endblock %}
-
 {% block content %}
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
diff --git a/app/templates/demos/kitchen_sink.html b/app/templates/demos/kitchen_sink.html
index 6e18367..91c231e 100644
--- a/app/templates/demos/kitchen_sink.html
+++ b/app/templates/demos/kitchen_sink.html
@@ -1,29 +1,7 @@
 {% extends "base.html" %}
 
-{%- from 'govuk_frontend_jinja/components/breadcrumbs/macro.html' import govukBreadcrumbs -%}
-
 {% block pageTitle %}{%- if form.errors %}Error: {% endif -%}Kitchen sink – GOV.UK{% endblock %}
 
-{% block beforeContent %}
-  {{ super() }}
-  {{ govukBreadcrumbs({
-    'collapseOnMobile': True,
-    'items': [
-        {
-            'text': "Home",
-            'href': url_for('main.index')
-        },
-        {
-            'text': "Forms",
-            'href': url_for('demos.forms')
-        },
-        {
-            'text': "Kitchen sink"
-        }
-    ]
-  }) }}
-{% endblock %}
-
 {% block content %}
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
diff --git a/app/templates/main/index.html b/app/templates/main/index.html
index dc6483c..9dc7d5e 100644
--- a/app/templates/main/index.html
+++ b/app/templates/main/index.html
@@ -39,12 +39,6 @@ <h2 class="govuk-heading-m">Features</h2>
       <li>Rate limiting</li>
     </ul>
 
-    <h2 class="govuk-heading-m">Demos</h2>
-    <ul class="govuk-list govuk-list--bullet govuk-list--spaced">
-      <li><a class="govuk-link" href="{{ url_for('demos.components')}}">Components</a></li>
-      <li><a class="govuk-link" href="{{ url_for('demos.forms')}}">Forms</a></li>
-    </ul>
-
     <h2 class="govuk-heading-m">Documentation</h2>
     <p class="govuk-body">Detailed documentation on the features listed above and the next steps to start building out your app on top of this template is on <a class="govuk-link"
         href="https://github.com/LandRegistry/govuk-frontend-flask#readme">GitHub</a></p>