Contact us before login (#994)

* update contact us page

* update and extend test

* force build

* setup github actions for feature branch

* updated for comments

* update heading sizes

* update heading heirarchy

.github/workflows/main.yml

@@ -5,12 +5,12 @@ name: Build
 on:
   push:
     branches:
-      - main
+      - survey-respondent-help-journey
     paths-ignore:
       - _infra/spinnaker/**
   pull_request:
     branches:
-      - main
+      - survey-respondent-help-journey
     paths-ignore:
       - _infra/spinnaker/**
 

README.md

@@ -131,4 +131,4 @@ gpg --armor --export ED1B7A3EADF95687
 ```
 current saved exported  public private keys are dev-public-key.asc dev-private-key.asc
 The private key is only supplied for testing decryption
-passphase if needed is PASSWORD1
+passphase if needed is PASSWORD1

frontstage/templates/contact-us.html

@@ -1,23 +1,42 @@
 
 {% extends "layouts/_block_content.html" %}
 {% from "components/address-output/_macro.njk" import onsAddressOutput %}
+{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
 
 {% set page_title = "Contact us" %}
 
+{% set breadcrumbsData = [
+    {
+        "text": "Back",
+        "url": "/sign-in/",
+        "id": "b-item"
+    }
+] %}
+{% block breadcrumbs %}
+    {{
+        onsBreadcrumbs({
+            "ariaLabel": "Breadcrumbs",
+            "id": "breadcrumbs",
+            "itemsList": breadcrumbsData
+        })
+    }}
+{% endblock breadcrumbs %}
+
 {% block main %}
+    <h1 class="ons-u-fs-xxl">Contact us</h1>
 
-    <h1 class="ons-u-fs-xl">Contact us</h1>
+    <h2>
+        Email
+    </h2>
+        <p><a href="mailto:[email protected]">[email protected]</a></p>
 
     <h2>
-        Telephone
+        Phone
     </h2>
-    <div class="ons-u-fs-r">
-        <p><a href="tel:+44-300-1234-931">0300 1234 931</a></p>
-    </div>
-    <div class="ons-u-fs-r">
-        <p class="ons-u-mb-l">Opening hours:<br />
-            Monday to Thursday 8:30am – 5pm<br/>
-            Friday 8:30am - 4:30pm</p>
+    <div class="ons-u-mb-xs">
+        <p> +44 300 1234 931<br/>
+            Monday to Thursday 8:30am to 5:00pm<br/>
+            Friday 8:30am to 4:00pm</p>
     </div>
     <h2>
         Post

tests/unit/views/test_cookies_and_contact.py

@@ -38,4 +38,4 @@ def test_contact_success(self, mock_request):
 
         self.assertEqual(response.status_code, 200)
         self.assertTrue("Contact us".encode() in response.data)
-        self.assertTrue("Opening hours:".encode() in response.data)
+        self.assertIn(b'href="/sign-in/"', response.data)