diff --git a/app/main/__init__.py b/app/main/__init__.py
index 578ea5e92..4a78540b1 100644
--- a/app/main/__init__.py
+++ b/app/main/__init__.py
@@ -4,5 +4,6 @@ main = Blueprint('main', __name__)
from app.main.views import (
index, sign_in, sign_out, register, two_factor, verify, sms, add_service,
- code_not_received, jobs, dashboard, templates, service_settings, forgot_password, new_password, styleguide
+ code_not_received, jobs, dashboard, templates, service_settings, forgot_password,
+ new_password, styleguide, user_profile
)
diff --git a/app/main/forms.py b/app/main/forms.py
index e4559a164..5ad1d04b5 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -31,8 +31,8 @@ def mobile_number():
Regexp(regex=mobile_number_regex, message='Enter a +44 mobile number')])
-def password():
- return PasswordField('Create a password',
+def password(label='Create a password'):
+ return PasswordField(label,
validators=[DataRequired(message='Password can not be empty'),
Length(10, 255, message='Password must be at least 10 characters'),
Blacklist(message='That password is blacklisted, too common')])
@@ -152,6 +152,31 @@ class NewPasswordForm(Form):
new_password = password()
+class ChangePasswordForm(Form):
+ old_password = password('Current password')
+ new_password = password('New password')
+
+
class CsvUploadForm(Form):
file = FileField('File to upload', validators=[DataRequired(
message='Please pick a file'), CsvFileValidator()])
+
+
+class ChangeNameForm(Form):
+ new_name = StringField(u'Your name')
+
+
+class ChangeEmailForm(Form):
+ email_address = email_address()
+
+
+class ConfirmEmailForm(Form):
+ email_code = email_code()
+
+
+class ChangeMobileNumberForm(Form):
+ mobile_number = mobile_number()
+
+
+class ConfirmMobileNumberForm(Form):
+ sms_code = sms_code()
diff --git a/app/main/views/index.py b/app/main/views/index.py
index fb14d2b5d..eb41d0720 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -32,12 +32,6 @@ def checkemail():
return render_template('views/check-email.html')
-@main.route("/user-profile")
-@login_required
-def userprofile():
- return render_template('views/user-profile.html')
-
-
@main.route("/manage-users")
@login_required
def manageusers():
diff --git a/app/main/views/user_profile.py b/app/main/views/user_profile.py
new file mode 100644
index 000000000..1b8db76cb
--- /dev/null
+++ b/app/main/views/user_profile.py
@@ -0,0 +1,139 @@
+from flask import request, render_template, redirect, url_for
+from flask.ext.login import current_user
+from app.main import main
+from app.main.forms import (
+ ChangePasswordForm, ChangeNameForm, ChangeEmailForm, ConfirmEmailForm,
+ ChangeMobileNumberForm, ConfirmMobileNumberForm, ConfirmPasswordForm
+)
+
+
+@main.route("/user-profile")
+def userprofile():
+ return render_template('views/user-profile.html')
+
+
+@main.route("/user-profile/name", methods=['GET', 'POST'])
+def userprofile_name():
+
+ form = ChangeNameForm()
+
+ if request.method == 'GET':
+ if current_user.is_authenticated():
+ form.new_name.data = current_user.name
+ return render_template(
+ 'views/user-profile/change.html',
+ thing='name',
+ form_field=form.new_name
+ )
+ elif request.method == 'POST':
+ return redirect(url_for('.userprofile'))
+
+
+@main.route("/user-profile/email", methods=['GET', 'POST'])
+def userprofile_email():
+
+ form = ChangeEmailForm()
+
+ if request.method == 'GET':
+ if current_user.is_authenticated():
+ form.email_address.data = current_user.email_address
+ return render_template(
+ 'views/user-profile/change.html',
+ thing='email address',
+ form_field=form.email_address
+ )
+ elif request.method == 'POST':
+ return redirect(url_for('.userprofile_email_authenticate'))
+
+
+@main.route("/user-profile/email/authenticate", methods=['GET', 'POST'])
+def userprofile_email_authenticate():
+
+ form = ConfirmPasswordForm()
+
+ if request.method == 'GET':
+ return render_template(
+ 'views/user-profile/authenticate.html',
+ thing='email address',
+ form=form,
+ back_link=url_for('.userprofile_email')
+ )
+ elif request.method == 'POST':
+ return redirect(url_for('.userprofile_email_confirm'))
+
+
+@main.route("/user-profile/email/confirm", methods=['GET', 'POST'])
+def userprofile_email_confirm():
+
+ form = ConfirmEmailForm()
+
+ if request.method == 'GET':
+ return render_template(
+ 'views/user-profile/confirm.html',
+ form_field=form.email_code,
+ thing='email address'
+ )
+ elif request.method == 'POST':
+ return redirect(url_for('.userprofile'))
+
+
+@main.route("/user-profile/mobile-number", methods=['GET', 'POST'])
+def userprofile_mobile_number():
+
+ form = ChangeMobileNumberForm()
+
+ if request.method == 'GET':
+ if current_user.is_authenticated():
+ form.mobile_number.data = current_user.mobile_number
+ return render_template(
+ 'views/user-profile/change.html',
+ thing='mobile number',
+ form_field=form.mobile_number
+ )
+ elif request.method == 'POST':
+ return redirect(url_for('.userprofile_mobile_number_authenticate'))
+
+
+@main.route("/user-profile/mobile-number/authenticate", methods=['GET', 'POST'])
+def userprofile_mobile_number_authenticate():
+
+ form = ConfirmPasswordForm()
+
+ if request.method == 'GET':
+ return render_template(
+ 'views/user-profile/authenticate.html',
+ thing='mobile number',
+ form=form,
+ back_link=url_for('.userprofile_mobile_number_confirm')
+ )
+ elif request.method == 'POST':
+ return redirect(url_for('.userprofile_mobile_number_confirm'))
+
+
+@main.route("/user-profile/mobile-number/confirm", methods=['GET', 'POST'])
+def userprofile_mobile_number_confirm():
+
+ form = ConfirmMobileNumberForm()
+
+ if request.method == 'GET':
+ return render_template(
+ 'views/user-profile/confirm.html',
+ form_field=form.sms_code,
+ thing='mobile number'
+ )
+ elif request.method == 'POST':
+ return redirect(url_for('.userprofile'))
+
+
+@main.route("/user-profile/password", methods=['GET', 'POST'])
+def userprofile_password():
+
+ form = ChangePasswordForm()
+
+ if request.method == 'GET':
+ return render_template(
+ 'views/user-profile/change-password.html',
+ form=form
+ )
+ elif request.method == 'POST':
+ return redirect(url_for('.userprofile'))
diff --git a/app/templates/views/signin.html b/app/templates/views/signin.html
index fe6210b0b..add765160 100644
--- a/app/templates/views/signin.html
+++ b/app/templates/views/signin.html
@@ -17,7 +17,7 @@ Sign in
diff --git a/app/templates/views/user-profile.html b/app/templates/views/user-profile.html
index 3384c9ba5..05af98581 100644
--- a/app/templates/views/user-profile.html
+++ b/app/templates/views/user-profile.html
@@ -1,19 +1,35 @@
{% extends "withnav_template.html" %}
-{% from "components/page-footer.html" import page_footer %}
+{% from "components/table.html" import list_table, row, field %}
{% block page_title %}
-GOV.UK Notify | User settings
+ GOV.UK Notify | Your profile
{% endblock %}
{% block maincolumn_content %}
- User profile
+ Your profile
- Here's where users can update their profile, password etc.
-
- {{ page_footer(
- back_link = url_for('.dashboard'),
- back_link_text = 'Back to dashboard'
- ) }}
+ {% call(item) list_table(
+ [
+ {'label': 'Name', 'value': current_user.name, 'url': url_for('.userprofile_name')},
+ {'label': 'Email address', 'value': current_user.email_address, 'url': url_for('.userprofile_email')},
+ {'label': 'Mobile number', 'value': current_user.mobile_number, 'url': url_for('.userprofile_mobile_number')},
+ {'label': 'Password', 'value': 'Last changed 1 January 2016, 10:00AM', 'url': url_for('.userprofile_password')},
+ ],
+ caption='Account settings',
+ field_headings=['Setting', 'Value', 'Link to change'],
+ field_headings_visible=False,
+ caption_visible=False
+ ) %}
+ {% call field() %}
+ {{ item.label }}
+ {% endcall %}
+ {% call field() %}
+ {{ item.value }}
+ {% endcall %}
+ {% call field(align='right') %}
+ Change
+ {% endcall %}
+ {% endcall %}
{% endblock %}
diff --git a/app/templates/views/user-profile/authenticate.html b/app/templates/views/user-profile/authenticate.html
new file mode 100644
index 000000000..8587bcc85
--- /dev/null
+++ b/app/templates/views/user-profile/authenticate.html
@@ -0,0 +1,26 @@
+{% extends "withnav_template.html" %}
+{% from "components/textbox.html" import textbox %}
+{% from "components/page-footer.html" import page_footer %}
+
+{% block page_title %}
+GOV.UK Notify | Service settings
+{% endblock %}
+
+{% block maincolumn_content %}
+
+ Change your {{ thing }}
+
+
+
+{% endblock %}
diff --git a/app/templates/views/user-profile/change-password.html b/app/templates/views/user-profile/change-password.html
new file mode 100644
index 000000000..108258bfb
--- /dev/null
+++ b/app/templates/views/user-profile/change-password.html
@@ -0,0 +1,27 @@
+{% extends "withnav_template.html" %}
+{% from "components/textbox.html" import textbox %}
+{% from "components/page-footer.html" import page_footer %}
+
+{% block page_title %}
+GOV.UK Notify | Service settings
+{% endblock %}
+
+{% block maincolumn_content %}
+
+ Change your password
+
+
+
+{% endblock %}
diff --git a/app/templates/views/user-profile/change.html b/app/templates/views/user-profile/change.html
new file mode 100644
index 000000000..27224d410
--- /dev/null
+++ b/app/templates/views/user-profile/change.html
@@ -0,0 +1,31 @@
+{% extends "withnav_template.html" %}
+{% from "components/textbox.html" import textbox %}
+{% from "components/page-footer.html" import page_footer %}
+
+{% block page_title %}
+GOV.UK Notify | Service settings
+{% endblock %}
+
+{% block maincolumn_content %}
+
+ Change your {{ thing }}
+
+
+ {% if preamble %}
+
+ {{ preamble }}
+
+ {% endif %}
+
+
+
+
Change your {{ thing }}
+
+
+
+
+ We’ve sent a code to your new {{ thing }}.
+
+
+
+