Commit Graph

264 Commits

Author SHA1 Message Date
Martyn Inglis
ec08a5229f Updated travis for codedeploy deploy 2015-12-16 14:02:12 +00:00
Martyn Inglis
4f94714ec1 Merge branch 'master' of github.com:alphagov/notifications-admin 2015-12-16 14:01:09 +00:00
Martyn Inglis
3247330da5 Updated travis for codedeploy deploy 2015-12-16 14:00:38 +00:00
Martyn Inglis
2308867132 Install SASS gem 2015-12-16 11:02:54 +00:00
Pete Herlihy
a534441fa0 Merge pull request #30 from alphagov/new-nav
Create side navigation for logged in pages
2015-12-15 15:17:25 +00:00
Chris Heathcote
6fa29e769d Rolling back to thirds 2015-12-15 13:57:19 +00:00
Chris Heathcote
1ad5f7f8e6 Trialling 1/4 width nav 2015-12-15 13:48:23 +00:00
minglis
5d2bc74d38 Merge pull request #31 from alphagov/add-service
Add service
2015-12-15 11:57:17 +00:00
Chris Heathcote
17850dc170 Changed nav urls to be url_fors 2015-12-15 10:52:24 +00:00
Rebecca Law
258ae3674b 110067722: Fix code style 2015-12-15 10:32:26 +00:00
Rebecca Law
eb0cff18c5 110067722: Add form validation for duplicate service name. 2015-12-15 10:32:26 +00:00
Rebecca Law
23b5cffbe8 110067722: Update template with the form. 2015-12-15 10:32:26 +00:00
Rebecca Law
43f2605ac4 110067722: Post add-service endpoint saves the service and maps it to the user. 2015-12-15 10:32:26 +00:00
Rebecca Law
350ccda208 110067722: Added endpoints for add-service
Post is not complete as of yet.
2015-12-15 10:32:25 +00:00
Rebecca Law
4b01335703 110067722: Create the model and dao for services.
This commit creates the data model for services and user_to_service.
The dao is also created to insert, get, activate, and unrestrict the service.
2015-12-15 10:31:27 +00:00
Chris Heathcote
8939f710a9 Move navigation into its own css file 2015-12-14 17:05:39 +00:00
Chris Heathcote
89189f2e35 Add URLs to main nav; add user profile to nav 2015-12-14 16:58:43 +00:00
Chris Heathcote
15c9269a80 Added main nav to logged in pages 2015-12-14 16:53:07 +00:00
Chris Heathcote
ec020a42f4 Initial nav & implementation on dashboard 2015-12-14 16:37:15 +00:00
Martyn Inglis
6c40e72e78 Removed buildpacks 2015-12-14 16:04:25 +00:00
Martyn Inglis
78c885943b Update to gemfile 2015-12-14 15:46:46 +00:00
Martyn Inglis
1877bc3c44 Multiple buildpacks added 2015-12-14 15:34:42 +00:00
minglis
e133baa6b3 Merge pull request #26 from alphagov/persis_verify_codes
Persis verify codes
2015-12-14 14:56:28 +00:00
minglis
be594e9a0a Merge pull request #28 from alphagov/refator_unit_tests
Refator unit tests
2015-12-14 14:55:22 +00:00
Rebecca Law
caabda92e0 Test for VerifyForm and TwoFactorForm 2015-12-14 14:09:29 +00:00
Rebecca Law
295dbeb7d1 Create unit tests that test the forms. 2015-12-14 13:25:27 +00:00
Rebecca Law
c0550d2c61 Refactor unit tests 2015-12-14 13:25:27 +00:00
Rebecca Law
49a8caefa0 Add the live envirornment 2015-12-14 11:00:29 +00:00
minglis
69ac2694a5 Merge pull request #27 from alphagov/send-sms-flow
Put elements on pages for ‘send text messages’ flow
2015-12-14 10:40:55 +00:00
Chris Hill-Scott
7ac08e9a85 Simplify check and send SMS page
This commit:
- removes the row numbering so it’s easier to scan the list of phone numbers
- adds subheadings for 'first three' and 'last three'
- puts the 'see all' link at the end
2015-12-11 17:27:26 +00:00
Chris Hill-Scott
262cbffad8 Install SASS Gem on Travis
This is what was making the build fail :(((((
2015-12-11 16:31:29 +00:00
Chris Hill-Scott
c6a73c287a Improvements to send SMS page
- make messages align horizontally
- change wording of step 2 (from Lorena)
2015-12-11 14:32:43 +00:00
Chris Hill-Scott
d2562889b8 Replace CSV preview with rendered messages
If there are less than 7 messages, show them all.

If there are more than 7, show the first and last three, and a link to the
remaining x.
2015-12-11 14:02:42 +00:00
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
Rebecca Law
6373455204 Update migration scripts to match the data model 2015-12-11 10:29:23 +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
01c5bf5190 Update README.md 2015-12-10 16:47:29 +00:00
Rebecca Law
1ce8170ce1 109526036:Mark the sms code as being used on the two-factor page 2015-12-10 16:38:34 +00:00
Rebecca Law
bbecc03531 109526036: Fix bug.
If one of the codes was invalid and one was valid on the verify page the valid code would be marked as used.
2015-12-10 16:34:29 +00:00
minglis
48ab4c5d00 Merge pull request #25 from alphagov/persis_verify_codes
Persist verify codes
2015-12-10 15:54:39 +00:00
Rebecca Law
2b4097dd2d 109526036: Updates as per comments made on pull request. 2015-12-10 15:21:06 +00:00