From b60fbf85ff85c2bcb42374a8f0367a9ea632eec0 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 16:06:33 +0000 Subject: [PATCH 01/12] Fixed path back to all jobs [ci skip] --- app/templates/job.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/job.html b/app/templates/job.html index c1e5b7e12..ccaee802c 100644 --- a/app/templates/job.html +++ b/app/templates/job.html @@ -14,7 +14,7 @@ GOV.UK Notify | Notifications activity From b624b9d39f1019c11dd9d591846820b179bf02dc Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 16:07:02 +0000 Subject: [PATCH 02/12] Fixed path back to parent job [ci skip] --- app/templates/notification.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/notification.html b/app/templates/notification.html index 9601e5e03..ba5d6f976 100644 --- a/app/templates/notification.html +++ b/app/templates/notification.html @@ -13,7 +13,7 @@ GOV.UK Notify | Notifications activity

This page will be where we show what happened for a specific notification.

- View other notifications in this job + View other notifications in this job

From 87cadc3ddeea46b5dfb30a3b8e908a280579c62e Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 16:13:33 +0000 Subject: [PATCH 03/12] Added the shell user profile page [ci skip] --- app/templates/user-profile.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 app/templates/user-profile.html diff --git a/app/templates/user-profile.html b/app/templates/user-profile.html new file mode 100644 index 000000000..a394b8bd8 --- /dev/null +++ b/app/templates/user-profile.html @@ -0,0 +1,20 @@ +{% extends "admin_template.html" %} + +{% block page_title %} +GOV.UK Notify | User settings +{% endblock %} + +{% block content %} + +
+
+

User profile

+ +

Here's where users can update their profile, password etc.

+ +

Back to dashboard

+ +
+
+ +{% endblock %} From 68f7dfb814f2bc1a68d6fb6e75aaeeb4125fddc2 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 16:15:51 +0000 Subject: [PATCH 04/12] Added the shell manage users page [ci skip] --- app/templates/manage-users.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 app/templates/manage-users.html diff --git a/app/templates/manage-users.html b/app/templates/manage-users.html new file mode 100644 index 000000000..8a93b2072 --- /dev/null +++ b/app/templates/manage-users.html @@ -0,0 +1,20 @@ +{% extends "admin_template.html" %} + +{% block page_title %} +GOV.UK Notify | Manage users +{% endblock %} + +{% block content %} + +
+
+

Manage users

+ +

Here's where you can add or remove users of a service.

+ +

Back to dashboard

+ +
+
+ +{% endblock %} From d534c97333103e1f8a3240ba86240ecca7344b79 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 16:16:58 +0000 Subject: [PATCH 05/12] Added the shell service settings page [ci skip] --- app/templates/service-settings.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 app/templates/service-settings.html diff --git a/app/templates/service-settings.html b/app/templates/service-settings.html new file mode 100644 index 000000000..3e6c7bcb4 --- /dev/null +++ b/app/templates/service-settings.html @@ -0,0 +1,20 @@ +{% extends "admin_template.html" %} + +{% block page_title %} +GOV.UK Notify | Service settings +{% endblock %} + +{% block content %} + +
+
+

Service settings

+ +

Here's where users can update their service profile.

+ +

Back to dashboard

+ +
+
+ +{% endblock %} From 9b1b6e567bc7fd6accda678a49d16325f1ffbd0f Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 16:20:45 +0000 Subject: [PATCH 06/12] Added the shell API keys page [ci skip] --- app/templates/api-keys.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 app/templates/api-keys.html diff --git a/app/templates/api-keys.html b/app/templates/api-keys.html new file mode 100644 index 000000000..557a0c0f0 --- /dev/null +++ b/app/templates/api-keys.html @@ -0,0 +1,20 @@ +{% extends "admin_template.html" %} + +{% block page_title %} +GOV.UK Notify | API keys and documentation +{% endblock %} + +{% block content %} + +
+
+

API keys and documentation

+ +

Here's where developers can access information about the API and access keys

+ +

Back to dashboard

+ +
+
+ +{% endblock %} From e488abadd20e2f0ca016456ca6d7483fd2ca3913 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 16:22:35 +0000 Subject: [PATCH 07/12] Updated the dashboard with links to the admin type pages [ci skip] --- app/templates/dashboard.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/templates/dashboard.html b/app/templates/dashboard.html index 1608f5851..4266e5f76 100644 --- a/app/templates/dashboard.html +++ b/app/templates/dashboard.html @@ -14,6 +14,10 @@ GOV.UK Notify | Dashboard
  • Send text messages
  • Send email messages
  • View notifications activity
    • +
  • User profile
    • +
  • Manage users
    • +
  • Service settings
    • +
  • API keys and documentation
    • From 2a70bbe27678e43e35519ad8020a4b013697fdba Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 16:23:41 +0000 Subject: [PATCH 08/12] Updated the URL from `_` to `-` on send sms page --- app/templates/{send_sms.html => send-sms.html} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/templates/{send_sms.html => send-sms.html} (100%) diff --git a/app/templates/send_sms.html b/app/templates/send-sms.html similarity index 100% rename from app/templates/send_sms.html rename to app/templates/send-sms.html From d6b2ec83d867612fcac5065336cfd9b097fdb868 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 16:24:24 +0000 Subject: [PATCH 09/12] Updated the URL from `_` to `-` on send email page --- app/templates/{send_email.html => send-email.html} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/templates/{send_email.html => send-email.html} (100%) diff --git a/app/templates/send_email.html b/app/templates/send-email.html similarity index 100% rename from app/templates/send_email.html rename to app/templates/send-email.html From ed39494d5dffd5bfa26215afc26c95156493517c Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 16:25:16 +0000 Subject: [PATCH 10/12] Updated the URL from `_` to `-` on check sms page [ci skip] --- app/templates/{check_sms.html => check-sms.html} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/templates/{check_sms.html => check-sms.html} (100%) diff --git a/app/templates/check_sms.html b/app/templates/check-sms.html similarity index 100% rename from app/templates/check_sms.html rename to app/templates/check-sms.html From 911642e407214c4d0f5dc9cabdc55d24b657da2b Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 16:25:38 +0000 Subject: [PATCH 11/12] Updated the URL from `_` to `-` on check email page [ci skip] --- app/templates/{check_email.html => check-email.html} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/templates/{check_email.html => check-email.html} (100%) diff --git a/app/templates/check_email.html b/app/templates/check-email.html similarity index 100% rename from app/templates/check_email.html rename to app/templates/check-email.html From b9c5c374e9e7f5555ac083756821889aae570638 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 16:28:17 +0000 Subject: [PATCH 12/12] Added routes the new admin page shells /user-profile /manage-users /service-settings /api-keys --- app/main/views/index.py | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/app/main/views/index.py b/app/main/views/index.py index aa3f28495..2c775dbe4 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -60,22 +60,22 @@ def twofactor(): @main.route("/send-sms") def sendsms(): - return render_template('send_sms.html') + return render_template('send-sms.html') @main.route("/check-sms") def checksms(): - return render_template('check_sms.html') + return render_template('check-sms.html') @main.route("/send-email") def sendemail(): - return render_template('send_email.html') + return render_template('send-email.html') @main.route("/check-email") def checkemail(): - return render_template('check_email.html') + return render_template('check-email.html') @main.route("/jobs") @@ -91,3 +91,23 @@ def showjob(): @main.route("/jobs/job/notification") def shownotification(): return render_template('notification.html') + + +@main.route("/user-profile") +def userprofile(): + return render_template('user-profile.html') + + +@main.route("/manage-users") +def manageusers(): + return render_template('manage-users.html') + + +@main.route("/service-settings") +def servicesettings(): + return render_template('service-settings.html') + + +@main.route("/api-keys") +def apikeys(): + return render_template('api-keys.html')