From 96648ed58b846544a5f8a08eca75c41431df0d6d Mon Sep 17 00:00:00 2001 From: Chris Heathcote Date: Mon, 30 Nov 2015 16:08:44 +0000 Subject: [PATCH 1/4] Added email and text message not received pages in registration flow --- app/main/views/index.py | 10 +++++++++ app/templates/email-not-received.html | 28 +++++++++++++++++++++++++ app/templates/text-not-received-2.html | 29 ++++++++++++++++++++++++++ app/templates/text-not-received.html | 27 ++++++++++++++++++++++++ app/templates/verify-mobile.html | 2 +- app/templates/verify.html | 4 ++-- 6 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 app/templates/email-not-received.html create mode 100644 app/templates/text-not-received-2.html create mode 100644 app/templates/text-not-received.html diff --git a/app/main/views/index.py b/app/main/views/index.py index a40d3a0cf..89bf7efca 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -66,3 +66,13 @@ def sendsms(): @main.route("/check-sms") def checksms(): return render_template('check_sms.html') + + +@main.route("/email-not-received") +def emailnotreceived(): + return render_template('email-not-received.html') + + +@main.route("/text-not-received") +def textnotreceived(): + return render_template('text-not-received.html') diff --git a/app/templates/email-not-received.html b/app/templates/email-not-received.html new file mode 100644 index 000000000..462fbb961 --- /dev/null +++ b/app/templates/email-not-received.html @@ -0,0 +1,28 @@ +{% extends "admin_template.html" %} + +{% block page_title %} +GOV.UK Notify +{% endblock %} + +{% block content %} + +
+
+

Check your email address

+ +

Check your email address is correct and resend a confirmation code.

+ +

+ +
+ Your email address must end in .gov.uk +

+ + +

+ Resend confirmation code +

+
+
+ +{% endblock %} \ No newline at end of file diff --git a/app/templates/text-not-received-2.html b/app/templates/text-not-received-2.html new file mode 100644 index 000000000..c5ffb8e8e --- /dev/null +++ b/app/templates/text-not-received-2.html @@ -0,0 +1,29 @@ +{% extends "admin_template.html" %} + +{% block page_title %} +GOV.UK Notify +{% endblock %} + +{% block content %} + + + +
+
+

Check your mobile number

+ +

Check your mobile phone number is correct and resend a confirmation code.

+ +

+ + +

+ + +

+ Resend confirmation code +

+
+
+ +{% endblock %} \ No newline at end of file diff --git a/app/templates/text-not-received.html b/app/templates/text-not-received.html new file mode 100644 index 000000000..ce8fff18c --- /dev/null +++ b/app/templates/text-not-received.html @@ -0,0 +1,27 @@ +{% extends "admin_template.html" %} + +{% block page_title %} +GOV.UK Notify +{% endblock %} + +{% block content %} + +
+
+

Check your mobile number

+ +

Check your mobile phone number is correct and resend a confirmation code.

+ +

+ + +

+ + +

+ Resend confirmation code +

+
+
+ +{% endblock %} \ No newline at end of file diff --git a/app/templates/verify-mobile.html b/app/templates/verify-mobile.html index 92e77f3b5..178cc00d0 100644 --- a/app/templates/verify-mobile.html +++ b/app/templates/verify-mobile.html @@ -17,7 +17,7 @@ Hello world!
- I haven't received a text + I haven't received a text

diff --git a/app/templates/verify.html b/app/templates/verify.html index 9d407edff..ff462664f 100644 --- a/app/templates/verify.html +++ b/app/templates/verify.html @@ -17,13 +17,13 @@ Hello world!
- I haven't received an email + I haven't received an email


- I haven't received a text + I haven't received a text

From 48f722b3b99eb3272b159fbf2f4a87e0b92bf9f8 Mon Sep 17 00:00:00 2001 From: Chris Heathcote Date: Mon, 30 Nov 2015 16:19:59 +0000 Subject: [PATCH 2/4] Added forgot password / create new password screens Create new password would be sent in an email to the user. --- app/main/views/index.py | 10 ++++++++++ app/templates/forgot-password.html | 27 +++++++++++++++++++++++++++ app/templates/new-password.html | 24 ++++++++++++++++++++++++ app/templates/signin.html | 2 +- 4 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 app/templates/forgot-password.html create mode 100644 app/templates/new-password.html diff --git a/app/main/views/index.py b/app/main/views/index.py index ee5e2dab1..02f61ff6c 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -101,3 +101,13 @@ def showjob(): @main.route("/jobs/job/notification") def shownotification(): return render_template('notification.html') + + +@main.route("/forgot-password") +def forgotpassword(): + return render_template('forgot-password.html') + + +@main.route("/new-password") +def newpassword(): + return render_template('new-password.html') diff --git a/app/templates/forgot-password.html b/app/templates/forgot-password.html new file mode 100644 index 000000000..e94945d4f --- /dev/null +++ b/app/templates/forgot-password.html @@ -0,0 +1,27 @@ +{% extends "admin_template.html" %} + +{% block page_title %} +GOV.UK Notify +{% endblock %} + +{% block content %} + +

+
+

Create a new password

+ +

If you have forgotten your password, we can send you an email to create a new password.

+ +

+ + +

+ + +

+ Send email +

+
+
+ +{% endblock %} \ No newline at end of file diff --git a/app/templates/new-password.html b/app/templates/new-password.html new file mode 100644 index 000000000..0d2c811f7 --- /dev/null +++ b/app/templates/new-password.html @@ -0,0 +1,24 @@ +{% extends "admin_template.html" %} + +{% block page_title %} +GOV.UK Notify +{% endblock %} + +{% block content %} + +
+
+

Create a new password

+ +

+ + +

+ +

+ Continue +

+
+
+ +{% endblock %} \ No newline at end of file diff --git a/app/templates/signin.html b/app/templates/signin.html index 3d8df9d9d..3d6609010 100644 --- a/app/templates/signin.html +++ b/app/templates/signin.html @@ -19,7 +19,7 @@ Hello world!


- Forgotten password? + Forgotten password?

From 021ace9a87af90c4fa4c7e029a77527a540b248f Mon Sep 17 00:00:00 2001 From: Chris Heathcote Date: Mon, 30 Nov 2015 16:22:26 +0000 Subject: [PATCH 3/4] Added text to the register screen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Prewar users they’ll need access to their email account and mobile phone when registering. --- app/templates/register.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/templates/register.html b/app/templates/register.html index 18a0131af..74a8eb2f0 100644 --- a/app/templates/register.html +++ b/app/templates/register.html @@ -12,6 +12,8 @@ Hello world!

If you've used GOV.UK Notify before, sign in to your account.

+

You need to have access to your email account and a mobile phone to register.

+

From 1e08c9b1a80a371c01beb1d102fbd62d40af9202 Mon Sep 17 00:00:00 2001 From: Chris Heathcote Date: Mon, 30 Nov 2015 16:41:05 +0000 Subject: [PATCH 4/4] Added two-factor resending to sign in flow. Assumes user will have to get an admin to update phone number if lost. --- app/main/views/index.py | 5 ++++ app/templates/two-factor.html | 2 +- app/templates/verification-not-received.html | 24 ++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 app/templates/verification-not-received.html diff --git a/app/main/views/index.py b/app/main/views/index.py index 22d2db606..34cbd3e4c 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -131,3 +131,8 @@ def servicesettings(): @main.route("/api-keys") def apikeys(): return render_template('api-keys.html') + + +@main.route("/verification-not-received") +def verificationnotreceived(): + return render_template('verification-not-received.html') diff --git a/app/templates/two-factor.html b/app/templates/two-factor.html index 338100141..9c61f9e68 100644 --- a/app/templates/two-factor.html +++ b/app/templates/two-factor.html @@ -16,7 +16,7 @@ Hello world!
- I haven't received a text + I haven't received a text

diff --git a/app/templates/verification-not-received.html b/app/templates/verification-not-received.html new file mode 100644 index 000000000..b21b16850 --- /dev/null +++ b/app/templates/verification-not-received.html @@ -0,0 +1,24 @@ +{% extends "admin_template.html" %} + +{% block page_title %} +GOV.UK Notify +{% endblock %} + +{% block content %} + +

+
+

Resend verification code

+ +

Text messages sometimes take a few minutes to be received.
If you have not received a text message, you can resend.

+ +

If you no longer have access to your mobile phone and registered number, get in contact with your service manager to reset your number.

P> + + +

+ Resend confirmation code +

+
+
+ +{% endblock %} \ No newline at end of file