Commit Graph

1859 Commits

Author SHA1 Message Date
Chris Hill-Scott
acc13feddb Add prompt to add first template to dashboard
https://www.pivotaltracker.com/story/show/112814667

> As you need to have templates to send any notifications, we should be nudging
> people to do that when they sign in.
>
> This should be in the dashboard, with a link to manage templates.
>
> Should be bright and shiny and only show if the service has no templates.

This commit adds the above.

It also rationalises the language (some places used ‘create template’, others
used ‘add template’, this changes everything to the latter).
2016-02-02 10:14:04 +00:00
Adam Shimali
9e8c0b8d59 Moved mobile validation to utils module for use in csv upload as well.
This could be moved to shared utils code base at some point.
2016-02-01 16:57:40 +00:00
Adam Shimali
b5b13254c7 Merge pull request #131 from alphagov/use-template-var
Small bug fixes
2016-02-01 14:23:36 +00:00
Chris Hill-Scott
3617f2e936 Move service and user nav to proposition header
This commit moves user-related navigation into the proposition header (the black
bar) at the top of the site. It adds some custom SASS to override GOV.UK
template and align these navigation items to the right (because it looks
better).

It then removes the service chooser dropdown (and its associated SASS and JS) in
favour of a link alongside the user-related navigation items. ‘Switch service’
is the best language for this that we’ve come up with so far.

This means that the only way of adding a new service is from the `/services`
page. So this commit removes the redirect if you land on this page with only one
service (else it would prevent you from ever being able to add more).
2016-02-01 13:52:45 +00:00
Rebecca Law
8f7b7122a1 Fixes for small bug found 2016-02-01 13:48:43 +00:00
Adam Shimali
b73a5d8710 Pass selected template id to api when creating job.
Moved query params for original file name and template id
to session.
2016-02-01 11:28:36 +00:00
Adam Shimali
4ea50499c3 List and individual job pages now fetch data from api.
Few bug fixes around job uuid.
2016-01-29 15:35:35 +00:00
Adam Shimali
5196436645 Better bucket name pending possible change to uuid for service primary
key.

Also small bugfix around file name and original file name
2016-01-29 12:19:50 +00:00
NIcholas Staples
0dc6f7be1a Merge pull request #124 from alphagov/create-job
Uploading csv creates job via api
2016-01-29 11:27:26 +00:00
Rebecca Law
867ef7ad99 Default service name if service name is not set on the session.
Pop service name off the session on sign out.
2016-01-29 10:40:55 +00:00
Adam Shimali
0995cd2e3c Uploading csv creates job via api 2016-01-29 10:30:02 +00:00
Rebecca Law
0dd20abbb3 Replace Current service with chosen service name. 2016-01-28 17:20:34 +00:00
Nicholas Staples
62150e5596 Added fixes for forms to hide potential email philshing scams. 2016-01-28 16:36:36 +00:00
Adam Shimali
414e468cb0 Link to send email broken in nav 2016-01-28 14:17:13 +00:00
Nicholas Staples
ab20eaa491 Fix for service settings. 2016-01-28 12:38:43 +00:00
Adam Shimali
91465520a0 Call to client for password check incorrectly passed user instead
of user.id
2016-01-28 12:31:24 +00:00
Nicholas Staples
e322a5f1c3 Review comment fixes. 2016-01-28 11:34:15 +00:00
Nicholas Staples
ca8d78aee5 Fix for forgot my password. 2016-01-27 18:01:43 +00:00
Nicholas Staples
91bd3e9fdb Fix for email update. 2016-01-27 17:30:48 +00:00
Nicholas Staples
c123098e14 Bug fixes. 2016-01-27 17:26:22 +00:00
Nicholas Staples
2d35f5f36a All tests passing and merged with master. 2016-01-27 16:30:33 +00:00
NIcholas Staples
68891d8eb8 Merge pull request #112 from alphagov/post-hack-day
Show all links in side navigation again
2016-01-27 12:25:00 +00:00
Nicholas Staples
6959d695d3 Working tests, hopefully all code changes done. 2016-01-27 12:22:32 +00:00
Chris Hill-Scott
3a864ad132 Use real templates when sending text messages
Sets the value of `template` to the ID of the chosen template when submitting
the form.
2016-01-26 17:17:46 +00:00
Chris Hill-Scott
e03813ceef Make 'API key was revoked' banner green 2016-01-26 16:26:08 +00:00
Adam Shimali
b394a18b4e Incrementing of failed logins happens on api side 2016-01-26 12:36:05 +00:00
Nicholas Staples
ce81a6f540 Work in progress. 2016-01-25 10:47:27 +00:00
Adam Shimali
4674bd6b68 Reintroduce some tests. A bit of cleanup of mocks.
User object fields made a bit clearer and simple test to
verify user added.
2016-01-23 23:14:50 +00:00
Adam Shimali
ba0d0d49e1 Fixed tests 2016-01-22 19:32:08 +00:00
Adam Shimali
f8fc8e951a If user is logged in and visits / /sign-in or /register they will
be redirected to choose service.
2016-01-22 17:24:14 +00:00
Rebecca Law
6ef9becf8f Able to get services by user id 2016-01-22 16:46:59 +00:00
Nicholas Staples
96d38b8189 Added check for password on service change page, work in progress. 2016-01-22 16:34:36 +00:00
Chris Hill-Scott
9ee8610da0 Rename content to template content
WTForms sets the `id` of a `textarea` element to the variable name to which the
form control is assigned.

This conflicts with the page container, which is styled by targeting `#content`.
2016-01-22 14:51:00 +00:00
Nicholas Staples
5d5505bbff Delete template fix. 2016-01-22 11:36:49 +00:00
Nicholas Staples
dc7504b5a9 Edit form now populated correctly. 2016-01-22 11:24:33 +00:00
Nicholas Staples
ac433835f0 Fixed viewing templates. 2016-01-22 11:20:39 +00:00
Nicholas Staples
bb853ee95a Added fixes, displaying templates still needs to be fixed. 2016-01-22 11:14:56 +00:00
Rebecca Law
46e0e3fd1b Merge branch 'master' into api-keys-flow
Conflicts:
	tests/app/main/views/test_api_keys.py
2016-01-21 15:50:00 +00:00
Rebecca Law
e7713a8b7f Added a validator so that the key name is unique per service. 2016-01-21 14:15:36 +00:00
Rebecca Law
8737edfad1 Merge branch 'master' of github.com:alphagov/notifications-admin into api-keys-flow
Conflicts:
	tests/app/main/views/test_api_keys.py
2016-01-21 12:31:28 +00:00
Rebecca Law
90fca93308 Implementation of api key pages.
Revoke page will show the correct key name
Show api keys shows a well formatted expiry date
Fix tests for api key endpoints.
2016-01-21 12:28:05 +00:00
Adam Shimali
856b6adb56 First slice full sign in flow 2016-01-21 11:33:53 +00:00
NIcholas Staples
33075178e8 Merge pull request #94 from alphagov/verify-user
Verify activate and login user with sms and email code
2016-01-21 09:45:19 +00:00
Rebecca Law
41c775cd68 Created api_key_api_client.
Implementation of create, revoke and show api keys for service.
These calls work, however we still need to fix the tests.
2016-01-20 17:32:55 +00:00
Adam Shimali
6a1cc32fd3 Merge pull request #93 from alphagov/send-sms-page-2
Put message previews on ‘Send SMS’ page
2016-01-20 16:36:34 +00:00
Chris Hill-Scott
9784a9936c Add pages for create/view/revoke API keys
Copying what they’ve done on GOV.UK Pay, we should let users:
- generate as many keys as they want
- only see the key at time of creation
- give keys a name
- revoke any key at any time (this should be a one way operation)

And based on discussions with @minglis and @servingUpAces, the keys should be
used in conjunction with some kind of service ID, which gets encrypted with the
key. In other words the secret itself never gets sent over the wire.

This commit adds the UI (but not the underlying API integration) for doing the
above.
2016-01-20 16:22:23 +00:00
Adam Shimali
ca3d3240a6 Verify activate and login user with sms and email code 2016-01-20 15:34:42 +00:00
Chris Hill-Scott
f36a1bb6c9 Make SMS templates plausible for hack day
This commit replaces the previous SMS templates.

I’ve written a couple of new ones which are plausible for developers on the
hack day:
- one with placeholders
- one without
2016-01-20 13:12:21 +00:00
Nicholas Staples
ae781bc58d Merge remote-tracking branch 'origin/master' into implement_send_sms_and_email 2016-01-20 11:46:57 +00:00
Nicholas Staples
2cc9dc6995 Work in progress. 2016-01-20 11:46:39 +00:00