Skip to content

Commit 89df774

Browse files
frankierobertofrankieroberto
committed
Move onboarding pages into a new 'apply' folder
1 parent f0db913 commit 89df774

File tree

9 files changed

+98
-34
lines changed

9 files changed

+98
-34
lines changed

app/views/regions/onboarding3.html renamed to app/views/apply/email-confirmed.html

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{% endblock %}
66

77
{% block header %}
8-
{% include "includes/header-logged-in-region.html" %}
8+
{% include "includes/header-logged-out.html" %}
99
{% endblock %}
1010

1111

@@ -24,19 +24,9 @@
2424
html: panelHtml
2525
}) }}
2626

27-
<p>You should now receive an email to verify your application.</p>
28-
2927
<p>Once verified, you'll then get an email within 7 working days telling you if your NHS region has approved your application or not.</p>
3028

31-
32-
<button class="nhsuk-button nhsuk-button--secondary" data-module="nhsuk-button" type="submit">
33-
Resend verification email
34-
</button>
35-
36-
37-
<p>You can <a href="/regions/onboarding0">make another application</a>.</p>
38-
39-
29+
<p>You can <a href="/apply/onboarding0">make another application</a>.</p>
4030

4131

4232
</div>

‎app/views/apply/email.html‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{% extends 'layout.html' %}
2+
3+
{% block pageTitle %}
4+
East of England
5+
{% endblock %}
6+
7+
{% block header %}
8+
{% endblock %}
9+
10+
{% block footer %}
11+
{% endblock %}
12+
13+
{% block content %}
14+
<div class="nhsuk-grid-row">
15+
<div class="nhsuk-grid-column-two-thirds">
16+
17+
<h1 class="nhsuk-heading-l">Email inbox</h1>
18+
19+
<div class="app-email-preview app-email-preview--okta">
20+
<p>From: [email protected]<br>
21+
Subject: Confirm your email address to apply to use NHS Record a vaccination
22+
</p>
23+
<hr>
24+
<p>Hi Jane,</p>
25+
26+
<p>You have applied to use NHS Record a vaccination for your pharmacy.</p>
27+
28+
<p>Follow this link to verify your email address and continue the application:</p>
29+
30+
<p><a href="/apply/email-confirmed">Confirm email address</a></p>
31+
32+
</div>
33+
34+
<hr>
35+
36+
37+
</div>
38+
</div>
39+
{% endblock %}

app/views/regions/onboarding.html renamed to app/views/apply/onboarding.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{% endblock %}
66

77
{% block header %}
8-
{% include "includes/header-logged-in-region.html" %}
8+
{% include "includes/header-logged-out.html" %}
99
{% endblock %}
1010

1111

@@ -105,42 +105,42 @@ <h1 class="nhsuks-heading-xl">Apply to use the Record a vaccination service</h1>
105105
<label class="nhsuk-body-m nhsuk-u-margin-bottom-1" for="organisationCode">
106106
Community pharmacy
107107
</label>
108-
109-
108+
109+
110110
<div class="nhsuk-hint" id="organisationName-hint">
111111
Search by name or ODS code
112112
</div>
113113
<select class="nhsuk-select" id="organisationCode" name="organisationCode"
114114
data-module="autocomplete" data-autoselect="" data-display-menu="" data-min-length="" data-show-all-values="" data-show-no-options-found="">
115115
<option selected value=""></option>
116-
116+
117117
{% set options = [] %}
118-
118+
119119
{% for code, name in data.nhsTrusts %}
120120
{% set options = (options.push({
121121
label: name + " (" + code + ")",
122122
value: code
123123
}), options) %}
124124
{% endfor %}
125-
125+
126126
{% for code, data in data.nhsPharmacies %}
127127
{% set options = (options.push({
128128
label: data.name + ", " + data.address + ", " + (data.postcode | upper) + " (" + code + ")",
129129
value: code
130130
}), options) %}
131131
{% endfor %}
132-
132+
133133
{% for option in (options | sort(false, true, "label")) %}
134134
<option value="{{ option.value }}">{{ option.label }}</option>
135135
{% endfor %}
136136
</select>
137137
</div>
138-
138+
139139
{{ button({
140140
"text": "Submit application"
141141
}) }}
142142
</form>
143-
143+
144144

145145
</div>
146146
</div>

app/views/regions/onboarding0.html renamed to app/views/apply/onboarding0.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{% endblock %}
66

77
{% block header %}
8-
{% include "includes/header-logged-in-region.html" %}
8+
{% include "includes/header-logged-out.html" %}
99
{% endblock %}
1010

1111

@@ -57,7 +57,7 @@ <h2 class="nhsuk-label-wrapper">
5757

5858

5959

60-
<form action="/regions/onboarding1" method="post">
60+
<form action="/apply/onboarding1" method="post">
6161

6262

6363

app/views/regions/onboarding00.html renamed to app/views/apply/onboarding00.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{% endblock %}
66

77
{% block header %}
8-
{% include "includes/header-logged-in-region.html" %}
8+
{% include "includes/header-logged-out.html" %}
99
{% endblock %}
1010

1111

app/views/regions/onboarding1.html renamed to app/views/apply/onboarding1.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
{% endblock %}
66

77
{% block header %}
8-
{% include "includes/header-logged-in-region.html" %}
8+
{% include "includes/header-logged-out.html" %}
99
{% endblock %}
1010

1111
{% block beforeContent %}
1212
{{ backLink({
13-
href: "/regions/onboarding0",
13+
href: "/apply/onboarding0",
1414
text: "Back"
1515
}) }}
1616
{% endblock %}
@@ -82,7 +82,7 @@ <h1 class="nhsuk-heading-l">Check these details</h1>
8282

8383
{{ button({
8484
"text": "Continue",
85-
href: "/regions/onboarding2"
85+
href: "/apply/onboarding2"
8686
}) }}
8787

8888
{% endif %}

app/views/regions/onboarding2.html renamed to app/views/apply/onboarding2.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
{% endblock %}
66

77
{% block header %}
8-
{% include "includes/header-logged-in-region.html" %}
8+
{% include "includes/header-logged-out.html" %}
99
{% endblock %}
1010

1111

1212
{% block beforeContent %}
1313
{{ backLink({
14-
href: "/regions/onboarding1",
14+
href: "/apply/onboarding1",
1515
text: "Back"
1616
}) }}
1717
{% endblock %}
@@ -55,7 +55,7 @@ <h1 class="nhsuk-heading-l">Add your contact details</h1>
5555

5656
<p>You must use an NHS-approved email address. See the <a href="https://digital.nhs.uk/services/care-identity-service/applications-and-services/apply-for-care-id/care-identity-email-domain-allow-list" target="_blank">list of approved email domains (opens in new tab)</a>.</p>
5757

58-
<form action="/regions/onboarding3" method="post" novalidate="true">
58+
<form action="/apply/onboarding3" method="post" novalidate="true">
5959

6060
{{ input({
6161
"label": {
@@ -101,7 +101,7 @@ <h1 class="nhsuk-heading-l">Add your contact details</h1>
101101

102102

103103
{{ button({
104-
"text": "Apply"
104+
"text": "Continue"
105105
}) }}
106106
</form>
107107

‎app/views/apply/onboarding3.html‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{% extends 'layout.html' %}
2+
3+
{% block pageTitle %}
4+
On boarding
5+
{% endblock %}
6+
7+
{% block header %}
8+
{% include "includes/header-logged-out.html" %}
9+
{% endblock %}
10+
11+
12+
13+
{% block content %}
14+
<div class="nhsuk-grid-row">
15+
<div class="nhsuk-grid-column-two-thirds">
16+
17+
<h1 class="nhsuk-heading-l">Check your email</h1>
18+
19+
<p>We’ve sent you a link to verify your email address.</p>
20+
21+
<p>It should arrive within a few minutes. Check your junk folder.</p>
22+
23+
24+
<p><a href="#" class="nhsuk-link">
25+
Resend verification email
26+
</a></p>
27+
28+
</div>
29+
</div>
30+
31+
32+
{% endblock %}

‎app/views/index.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,16 @@ <h1>
3131
Prototype
3232
</h1>
3333

34-
<h2>Main interface</h2>
3534

36-
<p><a href="/sign-in">Signed out page</a></p>
35+
<h2>Signed-out interface</h2>
36+
37+
<p><a href="/sign-in">Home page</a></p>
38+
39+
<p><a href="/apply/onboarding0">Apply to use the service</a></p>
3740

3841
<p><a href="/email-invite">Email invite</a></p>
3942

43+
<h2>Main interface</h2>
4044

4145
<ul>
4246
<li><a href="/home">Home</a></li>
@@ -53,7 +57,6 @@ <h2>Regions interface</h2>
5357
<ul>
5458
<li><a href="/regions">Regions interface</a></li>
5559
<li><a href="/regions/index1">Test interface</a></li>
56-
<li><a href="/regions/onboarding">Apply to RAVS</a></li>
5760
</ul>
5861

5962
<h2>Support interface</h2>

0 commit comments

Comments
 (0)