From 9556c4c22477a4f7d4834b29ef6a7d87b69578c9 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 14:46:40 +0000 Subject: [PATCH 01/13] Added shell page for sending email --- app/templates/send_email.html | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 app/templates/send_email.html diff --git a/app/templates/send_email.html b/app/templates/send_email.html new file mode 100644 index 000000000..9161af232 --- /dev/null +++ b/app/templates/send_email.html @@ -0,0 +1,21 @@ +{% extends "admin_template.html" %} + +{% block page_title %} +GOV.UK Notify | Send email +{% endblock %} + +{% block content %} + +
+
+

Send email

+ +

This page will be where we construct email messages

+ +

+ Continue +

+
+
+ +{% endblock %} From e394f6eac22aa4b8a38558a98d549f96c50082fe Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 14:47:41 +0000 Subject: [PATCH 02/13] Create shell page for checking email messages before sending --- app/templates/check_email.html | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 app/templates/check_email.html diff --git a/app/templates/check_email.html b/app/templates/check_email.html new file mode 100644 index 000000000..6f6bd51af --- /dev/null +++ b/app/templates/check_email.html @@ -0,0 +1,21 @@ +{% extends "admin_template.html" %} + +{% block page_title %} +GOV.UK Notify | Send email +{% endblock %} + +{% block content %} + +
+
+

Send email

+ +

This page will be where we check the email messages we're about to send

+ +

+ Send email messages +

+
+
+ +{% endblock %} From a33398a46a655c09518af124ac2160794c77b444 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 14:49:11 +0000 Subject: [PATCH 03/13] Added email sending views to the index --- app/main/views/index.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/main/views/index.py b/app/main/views/index.py index a40d3a0cf..fb7d299c9 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("/send-email") +def sendemail(): + return render_template('send_email.html') + + +@main.route("/check-email") +def checkemail(): + return render_template('check_email.html') From 996853d8fd9fa6c1a0ef7f41315923c15fe86152 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 14:53:25 +0000 Subject: [PATCH 04/13] Added links to the send pages for email and sms --- app/templates/dashboard.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/templates/dashboard.html b/app/templates/dashboard.html index fe6c6908e..d566dbb39 100644 --- a/app/templates/dashboard.html +++ b/app/templates/dashboard.html @@ -1,7 +1,7 @@ {% extends "admin_template.html" %} {% block page_title %} -Hello world! +GOV.UK Notify | Dashboard {% endblock %} {% block content %} @@ -10,8 +10,11 @@ Hello world!

Dashboard

-

Insert dashboard here.

+
-{% endblock %} \ No newline at end of file +{% endblock %} From d36f86d2c24e86d8b527a93d41da7107eb22461b Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 15:08:12 +0000 Subject: [PATCH 05/13] Added shell page for sending activity (jobs index) --- app/templates/jobs.html | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 app/templates/jobs.html diff --git a/app/templates/jobs.html b/app/templates/jobs.html new file mode 100644 index 000000000..c3127a92c --- /dev/null +++ b/app/templates/jobs.html @@ -0,0 +1,21 @@ +{% extends "admin_template.html" %} + +{% block page_title %} +GOV.UK Notify | Notifications activity +{% endblock %} + +{% block content %} + +
+
+

Notifications activity

+ +

This page will be where we show the list of jobs that this service has processed

+ +

+ view a particular notification job +

+
+
+ +{% endblock %} From 2cb2d538eaa00a795e3b818be1619e802336dafd Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 15:13:25 +0000 Subject: [PATCH 06/13] Added shell page for sending activity (job contents) --- app/templates/job.html | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 app/templates/job.html diff --git a/app/templates/job.html b/app/templates/job.html new file mode 100644 index 000000000..1a97f2653 --- /dev/null +++ b/app/templates/job.html @@ -0,0 +1,21 @@ +{% extends "admin_template.html" %} + +{% block page_title %} +GOV.UK Notify | Notifications activity +{% endblock %} + +{% block content %} + +
+
+

Notifications for a specific job

+ +

This page will be where we list the notifications for a specific job.

+ +

+ view a specific notification +

+
+
+ +{% endblock %} From 3dd81b9b12a68b4312f56f8765466e9a7be171d9 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 15:23:18 +0000 Subject: [PATCH 07/13] Added shell page for sending activity (notification) --- app/templates/notification.html | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 app/templates/notification.html diff --git a/app/templates/notification.html b/app/templates/notification.html new file mode 100644 index 000000000..9601e5e03 --- /dev/null +++ b/app/templates/notification.html @@ -0,0 +1,21 @@ +{% extends "admin_template.html" %} + +{% block page_title %} +GOV.UK Notify | Notifications activity +{% endblock %} + +{% block content %} + +
+
+

A specific notification

+ +

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

+ +

+ View other notifications in this job +

+
+
+ +{% endblock %} From 90603ed2ca32c6806be8b43ed5ffcb42b8f91c45 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 15:26:58 +0000 Subject: [PATCH 08/13] Added link back to activity hub to the jobs page --- app/templates/job.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/templates/job.html b/app/templates/job.html index 1a97f2653..53f62f4ab 100644 --- a/app/templates/job.html +++ b/app/templates/job.html @@ -12,9 +12,10 @@ GOV.UK Notify | Notifications activity

This page will be where we list the notifications for a specific job.

-

- view a specific notification -

+ From b70c05ab8fa387839b5104b255d0da8170b3978a Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 15:34:31 +0000 Subject: [PATCH 09/13] Added activity views to the index --- app/main/views/index.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/app/main/views/index.py b/app/main/views/index.py index fb7d299c9..aa3f28495 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -76,3 +76,18 @@ def sendemail(): @main.route("/check-email") def checkemail(): return render_template('check_email.html') + + +@main.route("/jobs") +def showjobs(): + return render_template('jobs.html') + + +@main.route("/jobs/job") +def showjob(): + return render_template('job.html') + + +@main.route("/jobs/job/notification") +def shownotification(): + return render_template('notification.html') From 9309d3ee6cc6d83b103dabbd23467a74aaa21f47 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 15:35:01 +0000 Subject: [PATCH 10/13] Updated path from jobs to job --- app/templates/jobs.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/jobs.html b/app/templates/jobs.html index c3127a92c..b38f5da9f 100644 --- a/app/templates/jobs.html +++ b/app/templates/jobs.html @@ -13,7 +13,7 @@ GOV.UK Notify | Notifications activity

This page will be where we show the list of jobs that this service has processed

- view a particular notification job + view a particular notification job

From 6d17951ef94382024e84411ef72d67840e510e4c Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 15:35:39 +0000 Subject: [PATCH 11/13] Updated path from job to notification --- 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 53f62f4ab..c1e5b7e12 100644 --- a/app/templates/job.html +++ b/app/templates/job.html @@ -13,7 +13,7 @@ GOV.UK Notify | Notifications activity

This page will be where we list the notifications for a specific job.

From 369de6b62e3f0150dfdd8ff356c61e5abd92fd83 Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Mon, 30 Nov 2015 15:44:16 +0000 Subject: [PATCH 12/13] Added files to support AWS Code deploy --- appspec.yml | 14 ++++++++++++++ scripts/install_dependencies.sh | 3 +++ 2 files changed, 17 insertions(+) create mode 100644 appspec.yml create mode 100644 scripts/install_dependencies.sh diff --git a/appspec.yml b/appspec.yml new file mode 100644 index 000000000..8ccf3f3e1 --- /dev/null +++ b/appspec.yml @@ -0,0 +1,14 @@ +version: 0.0 +os: linux +files: + - source: / + destination: /home/ubuntu/ +hooks: + AfterInstall: + - location: scripts/install_dependencies.sh + timeout: 300 + runas: root + ApplicationStart: + - location: scripts/run_app.sh + timeout: 300 + runas: root diff --git a/scripts/install_dependencies.sh b/scripts/install_dependencies.sh new file mode 100644 index 000000000..f9783ee8b --- /dev/null +++ b/scripts/install_dependencies.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +pip install -r /home/ubuntu/notifications-admin/requirements.txt From 6e1d21b1adfa1577b136fd099f3e1d4431589f61 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Mon, 30 Nov 2015 15:46:21 +0000 Subject: [PATCH 13/13] Added link to activity from the dashboard --- app/templates/dashboard.html | 1 + 1 file changed, 1 insertion(+) diff --git a/app/templates/dashboard.html b/app/templates/dashboard.html index d566dbb39..1608f5851 100644 --- a/app/templates/dashboard.html +++ b/app/templates/dashboard.html @@ -13,6 +13,7 @@ GOV.UK Notify | Dashboard