darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-16 03:10:16 -04:00
Code Issues Packages Projects Releases Wiki Activity
9,386 Commits 60 Branches 61 Tags
95b41b6bfac983e4217801c57cab5fde88c873d4
Commit Graph

9386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
karlchillmaid
95b41b6bfa Merge pull request #3317 from alphagov/remove-links-from-get-started 
Remove links to templates and permissions
 2020-02-24 10:04:11 +00:00
karlchillmaid
853b2b137c Remove links to templates and permissions 2020-02-24 09:36:23 +00:00
Chris Hill-Scott
0c8c4b80c9 Merge pull request #3319 from alphagov/fix-guidance-service-links 
Fix links to current service pages from guidance
 2020-02-21 14:25:12 +00:00
Leo Hemsted
106228ed09 Merge pull request #3320 from alphagov/remove-generic-400-error-page 
remove admin 400 error handler
 2020-02-21 13:08:53 +00:00
Chris Hill-Scott
60ea2eaa40 Merge pull request #3297 from alphagov/returned-letters-on-dashboard 
Put a count of recently returned letters on the dashboard
 2020-02-21 12:37:35 +00:00
Leo Hemsted
d83250c7c2 remove the generic 400 error page handler 
it just shows a h1, so isn't helpful for people. We can re-use the 500
error page, which includes instructings "Try again later" and
instructions on what to do next (check the status page, email notify
support).

this required refactoring to ensure we can show the 500 error page while
still returning the required status code
 2020-02-21 11:58:37 +00:00
Chris Hill-Scott
a5b7e3b93a Add Design System link classes 
Co-Authored-By: Tom Byers <tombaromba@gmail.com>
 2020-02-21 11:37:01 +00:00
Chris Hill-Scott
da4ff4b448 Add Design System class to remove visited state from links 
Co-Authored-By: Tom Byers <tombaromba@gmail.com>
 2020-02-21 09:29:37 +00:00
Leo Hemsted
f64f5725d1 Treat 400s from the api as internal server errors 
if we expect a 400 (for example, the api returns 400 if the service name
is already in use) then we should handle that from the view function so
we can correctly display a relevation error message to the user. But if
it returns a 400 that we didn't expect (for example, because we sent
variables of the wrong type through to an endpoint with a schema), then
that is a bug that we should fix as any other raised exception. By
treating it as a 500 we encourage users to report it to us, and also
will get an alert email
 2020-02-20 17:51:05 +00:00
Chris Hill-Scott
75927a8d05 Fix links to current service pages from guidance 
This wasn’t working because:
- macros don’t have access to `current_service` from within their scope
- there were no tests for this behaviour
 2020-02-20 15:13:12 +00:00
Chris Hill-Scott
e49d665c44 Merge pull request #3304 from alphagov/day-of-week-on-letter-delivery 
Put day of week on estimated letter delivery page
 2020-02-20 14:00:43 +00:00
Chris Hill-Scott
7e82e86092 Merge pull request #3318 from alphagov/back-link-received-text-messages 
Add a back link to the received messages page
 2020-02-20 14:00:35 +00:00
Tom Byers
7ed5c46f82 Merge pull request #3315 from alphagov/send-generic-title-to-google-analytics 
Make analytics send the same title for all pages
 2020-02-20 13:09:39 +00:00
Chris Hill-Scott
1dcbf7755a Add a back link to the received messages page 
It’s not a top level page (sits within the dashboard) so it should link
back to its parent page.
 2020-02-20 12:12:53 +00:00
Chris Hill-Scott
0e8143da04 Remove ‘originally’ from returned letters report 
We should remove Originally on the individual report pages.
It sounds like we're saying the letter has been sent more than once
since that date.

The dictionary definition for 'originally' as an adverb says:
> used to describe the situation that existed at the beginning of a
> particular period or activity, especially before something was changed

Examples given include:
> The book was originally published in 1935.
 2020-02-20 11:58:58 +00:00
Chris Hill-Scott
678c3df53c Add some context to the list of reports 
We reckon people need some context/expectation setting about what the
date of the report is.
 2020-02-20 11:58:58 +00:00
Chris Hill-Scott
d00e37541c Make dashboard navigation active for returned letters 2020-02-20 11:58:57 +00:00
Chris Hill-Scott
64074eed03 Say ‘1 hour/month ago’ not ‘an hour/a month ago’ 
I think it read better without the indefinite article when it’s, for
example, placed alongside messages that read ‘2 hours ago’.
 2020-02-20 11:58:57 +00:00
Chris Hill-Scott
9590643527 Use humanize for fuzzy time differences 
It seems to do a bit better than ago (e.g. 4 months vs 146 days), and
looks like it’s maintained more often.
 2020-02-20 11:58:57 +00:00
Chris Hill-Scott
f369f76ae4 Count recently-returned letters on the dashboard 
Currently you have no way of getting to the returned letter page. This
commit adds a link to it from the dashboard, following the pattern of
the new received text messages banner.
 2020-02-20 11:58:57 +00:00
Chris Hill-Scott
74e70ed8bc Refactor summaries into model 
This lets us encapsulate some of the logic that’s currently cluttering
up the view/template layer.
 2020-02-20 11:58:57 +00:00
Tom Byers
8a98c73b08 Make analytics send the same title for all pages 
Sets it on the tracker which means this value gets
sent for each:
- pageview
- event

See: https://developers.google.com/analytics/devguides/collection/analyticsjs/pages

We can only test that this has been set on the
tracker, not how that effects what is sent to GA,
in the JS tests.

This change has been tested in-browser with the
Chrome Analytics Debugger. This revealed the
contents of what is in the beacon sent to GA and
allowed confirmation the title was being set
correctly.

See: https://chrome.google.com/webstore/detail/google-analytics-debugger/jnkmfdileelhofjcijamephohjechhna/related
 2020-02-20 11:46:19 +00:00
Chris Hill-Scott
46e16c64fc Say ‘Uploaded’ for one-off precompiled letters 
This calls back to what the user has actively done. _Provided as a PDF_
is more passive and suitable for PDF letters sent using the API.
 2020-02-19 17:18:03 +00:00
Chris Hill-Scott
904007201f Make date of sending relative 
This is a friendlier and better way of showing dates anywhere except in
a report which might be archived and referred back to later.

Bit trickier to implement here because a dat requires ‘on’ beforehand,
but we don’t say ‘on today’ in English.
 2020-02-19 17:11:31 +00:00
karlchillmaid
5ba5ee2502 Merge pull request #3302 from alphagov/guidance-simplify-numbered-lists 
Guidance simplify numbered lists
 2020-02-19 16:31:31 +00:00
Chris Hill-Scott
8a91068682 Merge pull request #3312 from alphagov/revert-3311-revert-3295-restyle-template-stats 
Revert "Revert "Restyle template statistics and received text messages""
 2020-02-19 13:17:56 +00:00
Chris Hill-Scott
46a4e1c612 Add a macro for generating current service links 
This is a convenient way of being able to link into pages of the the app
from guidance. It handles the case where the current service is not
known, either because the user hasn’t chosen one, or because they’re not
signed in.

This commit also cleans up some unused Jinja imports.
 2020-02-19 08:22:45 +00:00
Chris Hill-Scott
3bbd5381c6 Revert "Revert "Restyle template statistics and received text messages"" 2020-02-18 16:16:51 +00:00
Pea M. Tyczynska
a8ca8c1835 Merge pull request #3311 from alphagov/revert-3295-restyle-template-stats 
Revert "Restyle template statistics and received text messages"
 2020-02-18 15:04:59 +00:00
Pea M. Tyczynska
e97f9f7fa4 Merge pull request #3310 from alphagov/fix-reset-password 
Fix reset password flow
 2020-02-18 15:03:11 +00:00
Chris Hill-Scott
6bdd776780 Revert "Restyle template statistics and received text messages" 2020-02-18 14:58:33 +00:00
Pea Tyczynska
3a93fe6892 Fix reset password flow 
It was broken because of mismatch in update password argument
 2020-02-18 14:50:27 +00:00
Chris Hill-Scott
a86f0a6efc Merge pull request #3295 from alphagov/restyle-template-stats 
Restyle template statistics and received text messages
 2020-02-18 14:30:06 +00:00
Chris Hill-Scott
583213c29f Merge pull request #3309 from alphagov/conversation-title 
Updating the page title attribute on text message conversations
 2020-02-18 13:44:35 +00:00
Pete Herlihy
f9e2e49dad Updating the page title attribute on text message conversations 
Changing to "Received text message"
 2020-02-18 13:29:18 +00:00
Tom Byers
0335e7ad17 Give dashboard banner items some vertical space 
Giving the count-label some vertical margin means
it has enough space when the flexbox contents
wrap.

This requires a bit extra on the top to counter
the negative margin the count has subtracting 5px
from the parent box.
 2020-02-18 13:14:56 +00:00
Tom Byers
08781a497f Update app/assets/stylesheets/components/banner.scss 
Put borders back on dashboard banner focus state

Co-Authored-By: Chris Hill-Scott <me@quis.cc>
 2020-02-18 11:55:20 +00:00
Tom Byers
6911319298 Update app/assets/stylesheets/components/banner.scss 
Adjustment to the vertical padding on the dashboard

Co-Authored-By: Chris Hill-Scott <me@quis.cc>
 2020-02-18 11:54:26 +00:00
Tom Byers
484bcfbae7 Update app/assets/stylesheets/components/banner.scss 
Slight adjustment to vertical spacing on the dashboard banner count. See: https://github.com/alphagov/notifications-admin/pull/3295#discussion_r380616204

Co-Authored-By: Chris Hill-Scott <me@quis.cc>
 2020-02-18 11:53:21 +00:00
Pea M. Tyczynska
49eb2a8354 Merge pull request #3281 from alphagov/re-validate-email 
Check access to email address after 90 days
 2020-02-18 11:10:31 +00:00
Chris Hill-Scott
98fba0e451 Update app/templates/views/dashboard/_inbox.html 
Co-Authored-By: Tom Byers <tombaromba@gmail.com>
 2020-02-18 11:07:40 +00:00
karlchillmaid
f4e4de0d03 Fix settings links 2020-02-18 10:35:21 +00:00
Tom Byers
cd262559cc Refactor dashboard banner CSS and fix its text 
Switches the CSS to use flexbox for layout and
uses a macro to let the text support single and
multiple messsages.
 2020-02-17 16:44:41 +00:00
Chris Hill-Scott
78ac345148 Put day of week on 
This helps people understand how delivery dates fit into the week,
because if sending a letter spans the weekend it will take a bit longer.

We can remove `|string` now because `utc_string_to_aware_gmt_datetime`
now accepts datetimes.
 2020-02-17 13:01:37 +00:00
Pea M. Tyczynska
c24a60a6a7 Update content following content review 
Co-Authored-By: karlchillmaid <karl.chillmaid@digital.cabinet-office.gov.uk>

Also update content for resend email and sms 2FA code page
 2020-02-17 11:36:05 +00:00
Pea Tyczynska
e413798b4d Change email_access_validated_at formatting to be more in line with other dates on User model 2020-02-17 11:34:25 +00:00
Pea Tyczynska
7d460fe483 Move date-checking logic to utils and unit test it 2020-02-17 11:34:25 +00:00
Pea Tyczynska
caf77341b3 Send 2fa email and move user to waiting page when they need to re-validate email access 2020-02-17 11:34:24 +00:00
Chris Hill-Scott
84df70e520 Use a <caption> for the template statistics table 
This is semantically more accurate because it’s describing the whole
table, not just the first column.

Adjusting the font-size to make it sit within the ‘In the last 7 days’
section. Adjusting the spacing because now that we have more borders we
don’t need quite so much whitespace to separate different bits of the
page.
 2020-02-17 11:11:53 +00:00
Chris Hill-Scott
42373e3615 Always use smaller font size for totals 
This means the font size matches the counts on the usage section, and on
the new received text messages banner.
 2020-02-17 10:31:59 +00:00