Commit Graph

158 Commits

Author SHA1 Message Date
Chris Hill-Scott
4c14e273c2 Try out previewing messages 2015-12-11 12:02:21 +00:00
Chris Hill-Scott
64f03bed06 Make labels blocks, put next to message templates 2015-12-11 11:39:52 +00:00
Chris Hill-Scott
703eed3d36 Add 'back' button 2015-12-11 09:49:39 +00:00
Chris Hill-Scott
8a34fa7e0a Use Flask for routing
This commit:
- replaces links that look like buttons with forms and submit buttons
- splits the view code for SMS into its own file
- moves the routing into the Python by adding handling for `post` requests
- uses Flask’s `url_for` to generate URLs, rather than hard coding them (so that
  it’s easier to change the URLs)
- chages the URLs for sending text messages
2015-12-11 09:49:38 +00:00
Chris Hill-Scott
dbc55e76b0 Add table of recipients
Uses an adapted version of the 'summary table' pattern from Digital Marketplace
frontend toolkit:
http://alphagov.github.io/digitalmarketplace-frontend-toolkit/summary-table.html
2015-12-11 09:49:38 +00:00
Chris Hill-Scott
c4df25c8db Add a non-JS template picker
We could do something with Javascript to only show the selected template. For
now this is something that works without Javascript.

This means we can put off getting the build and testing pipeline for Javascript
set up, which is a bigger and more unknown piece of work.
2015-12-11 09:49:38 +00:00
Chris Hill-Scott
73ccea4d1f Add GOV.UK Elements as a submodule
Since GOV.UK Elements is versionned now it makes sense to bring it in as a
dependency. This enforces a separation between what generic stuff we’re using
from Elements and what is specific to our app.

The benefit is that when the generic stuff changes it will be easy to bring
those changes in.

This commit also bumps GOV.UK frontend toolkit to the latest version (v4.5.0).
2015-12-11 09:49:31 +00:00
Chris Hill-Scott
1f39a0fe61 Hard code some data in the Python
This commit adds some stubbed data for the pages. The structure of the data
is just a proposal, but it gives the templates something to work with for now.
2015-12-11 09:48:59 +00:00
Chris Hill-Scott
b46872d2b9 Add a template filter for message placeholders
As a first guess placeholders can be added to messages with the
`((placeholder))` syntax.

This commit adds a Jinja template filter to convert strings containing
said-formatted strings into HTML, which can then be styled to highlight which
parts will be substituted in messages.
2015-12-11 09:48:59 +00:00
Chris Hill-Scott
a5f4580a7f Get SASS compilation working
Main thing that was missing was including the main CSS file in the template.

There are a few hacky bits here, like moving the whole of toolkit inside the
stylesheets directory.

Would arguably be cleaner using something that isn’t Flask Assets, but that’s
something for later.
2015-12-11 09:48:59 +00:00
Chris Hill-Scott
2f980ab622 Move all pages into their own directory
There are a lot of pages. It seems like a good idea to keep them in one place,
so they don’t get mixed up with partials and layouts.
2015-12-11 09:48:52 +00:00
Rebecca Law
2b4097dd2d 109526036: Updates as per comments made on pull request. 2015-12-10 15:21:06 +00:00
Rebecca Law
20fa259316 109526036: Removed sms code from the session on sign-in 2015-12-10 14:51:20 +00:00
Rebecca Law
588730d594 109526036: Persist the verify code to the db.
The codes are hashed and saved to the db.
The code is marked as used once a valid code is submitted.
The code is valid for 1 hour.
The codes are no longer saved to the session.
2015-12-10 14:48:01 +00:00
minglis
3b327c9986 Merge pull request #22 from alphagov/implement_two_factor
Implement two factor
2015-12-09 14:20:29 +00:00
Chris Heathcote
b60b4f6d3a Merge pull request #23 from alphagov/change_labels
Change labels
2015-12-09 14:14:38 +00:00
Rebecca Law
b1bf156b93 Merge pull request #21 from alphagov/ph-manage-template
Added skeleton page for view and edit templates
2015-12-09 14:11:05 +00:00
Rebecca Law
27572ddb08 Add indexes for the users table 2015-12-09 13:20:00 +00:00
Rebecca Law
f19cebd5fc Use the labels in the template rather than the form 2015-12-09 12:02:59 +00:00
Rebecca Law
5afb36cf71 Put the label in the templates rather than use the form label.
Just to make it easier.
2015-12-09 12:01:07 +00:00
Rebecca Law
9ba229820a 109638656: Implementation of two factor verification
Validation of the code is done in the form, when the form.validate_on_submit is called the validate code methods are called as well.
2015-12-09 11:36:57 +00:00
Pete Herlihy
b038e00fab Added mange templates link to the dashboard 2015-12-09 11:14:45 +00:00
Pete Herlihy
80461e330c Added an add template button to manage templates page 2015-12-09 11:09:29 +00:00
Pete Herlihy
c145a07072 Added link to template edit page 2015-12-09 10:58:01 +00:00
Pete Herlihy
65c661d8d7 Created an initial page for editing templates [ci skip] 2015-12-09 10:52:09 +00:00
Pete Herlihy
a357fea7af Added route to the edit template page [ci skip] 2015-12-09 10:50:01 +00:00
Pete Herlihy
b5f0fc3012 Added route to the manage templates page [ci skip] 2015-12-09 10:49:05 +00:00
Pete Herlihy
7f1cdd2d27 Added initial template manage page [ci skip] 2015-12-09 10:47:38 +00:00
Rebecca Law
1af2dd5e98 109638656: Use Regex validator for sms code to ensure it is 5 digits. 2015-12-09 10:17:50 +00:00
Rebecca Law
2e59870490 109638656: Implement two factor verify flow
When user enters valid sms code they are redirected to the dashboard.
Otherwise, form errors are present.
2015-12-09 10:17:09 +00:00
Rebecca Law
c946f85f9d 109638656: Send sms code from sign-in post. 2015-12-09 10:16:30 +00:00
Rebecca Law
eae2756a5e 109638656: Initial implementation for two-factor 2015-12-09 10:15:41 +00:00
Rebecca Law
ae19161b32 109526520: Use Regex validator to test the code is 5 digits. 2015-12-09 10:12:21 +00:00
Rebecca Law
9923c14e73 109526520: Changed the code form fields to StringField
When the codes were IntegerFields and the code started with zero, the zero was trimmed, resulting in a failed match.
2015-12-09 10:12:21 +00:00
Rebecca Law
bef2258803 109526520: Add custom validators for the VerifyForm
If the email_code or sms_code entered does not pass check password, then add errors to the form.
2015-12-09 10:12:21 +00:00
Rebecca Law
4486a859f8 109638656: fix the login_manager.login_view 2015-12-09 10:12:21 +00:00
Rebecca Law
16618e80f9 109526520: Implement verify flow
When a person registers with a valid mobile number and email address,
a code will be sent to each. That person can enter the verify codes and continue to the add-service page.
2015-12-09 10:12:21 +00:00
Rebecca Law
56db1ad400 109526520: fix code style 2015-12-09 10:12:21 +00:00
Rebecca Law
6d47c01117 109526520: Implememt verify post method. 2015-12-09 10:12:20 +00:00
Rebecca Law
69da9f8f32 109526520: render verify template with VerifyForm 2015-12-09 10:12:20 +00:00
Rebecca Law
ab36653f24 Merge pull request #20 from alphagov/phase-banner
Added CSS to make the phase banner work and stick in the right position
2015-12-08 14:59:21 +00:00
Chris Heathcote
7df62585a7 Added CSS to make the phase banner work and stick in the right position 2015-12-08 14:17:40 +00:00
Rebecca Law
60ed0c541b Remove the temporary endpoint to create users. 2015-12-08 09:03:48 +00:00
Rebecca Law
105ddfd616 Merge pull request #19 from alphagov/home-link
Changed main GOV.UK link depending on whether user is logged in or not
2015-12-07 16:57:08 +00:00
Chris Heathcote
12cbc04080 Changed main GOV.UK link depending on whether user is logged in or not
Goes to / for not logged in, /dashboard for logged in.
2015-12-07 16:18:05 +00:00
Martyn Inglis
f42a2d2030 Merge branch 'master' of github.com:alphagov/notifications-admin 2015-12-07 13:41:40 +00:00
Martyn Inglis
5040affc64 upstart puts FLASK_CONFIG into env on AWS.
If present then read the config file pointed at by this property to do environment specific overrides
2015-12-07 13:39:56 +00:00
Chris Heathcote
ae4272bdf5 Merge pull request #17 from lolylena/master
Minor amends to text
2015-12-07 13:35:46 +00:00
Martyn Inglis
49aaa116bc Look in environ for AWS properties 2015-12-07 12:10:04 +00:00
Martyn Inglis
7aacd9f1bd Read config file if in AWS 2015-12-07 11:53:14 +00:00