Commit Graph

5138 Commits

Author SHA1 Message Date
karlchillmaid
0ee322f137 Merge branch 'master' into features-content-updates 2019-04-16 13:50:50 +01:00
karlchillmaid
527d8ff10f Correct table 2019-04-16 13:49:46 +01:00
karlchillmaid
521c7824d6 Update link 2019-04-16 10:25:33 +01:00
karlchillmaid
487919970b Update link 2019-04-16 10:25:02 +01:00
karlchillmaid
3f4ca1018d Updated link 2019-04-16 10:23:10 +01:00
karlchillmaid
d12c184d7e Update links 2019-04-16 10:21:01 +01:00
karlchillmaid
fe8e10a42a Update links
One left to do
2019-04-16 10:19:45 +01:00
karlchillmaid
6830a412de Update links 2019-04-16 10:18:33 +01:00
karlchillmaid
27d4b702cc Update links
One left to do
2019-04-16 10:16:19 +01:00
karlchillmaid
839fc99f30 Update links 2019-04-16 10:04:12 +01:00
Tom Byers
7a6579e8cb Merge pull request #2903 from alphagov/update-node-version
Update node version
2019-04-15 15:44:22 +01:00
karlchillmaid
230ba7bcb1 Update link 2019-04-15 15:28:37 +01:00
karlchillmaid
d97707652f Update links 2019-04-15 15:22:50 +01:00
Chris Hill-Scott
8626777fde Don’t let services go live without an organisation
We shouldn’t be making services live without an agreement in place. In
order to have an agreement in place we need to know what organisation
operates the service.

If a service comes along but belongs to an organisation we don’t know
about then we should create that organisation. This commits removes the
link, which should force this to happen.
2019-04-12 22:42:23 +01:00
Chris Hill-Scott
700e073d0f Stop sending service domain to the API
The API doesn’t look at it, and the rest of the admin code isn’t calling
the method with this argument any more.
2019-04-12 17:15:51 +01:00
Pea (Malgorzata Tyczynska)
5ac6255be7 Merge pull request #2897 from alphagov/overlay-for-failed-letters
Precompiled show preview with overlay when validation fails
2019-04-12 16:37:53 +01:00
Chris Hill-Scott
8084dce705 Merge pull request #2896 from alphagov/remove-domains-yml
Use organisations from database rather than YAML file
2019-04-12 16:37:15 +01:00
Tom Byers
a8a29698cb Replace gulp-base64 with gulp-base64-inline
The gulp-base64 package has 11 dependencies with
vulnerabilities listed against them as of this
time. It also doesn't seem to be maintained any
more. The last commit was in 2015 and there are
issues and pull requests up to bump the
dependencies.

This replaces it with gulp-base64-inline.

gulp-base64-inline takes a single path, which it
prepends to any image paths it finds. Our image
paths are actually URLs, not filesystem paths so
we need to send it a relative path to repoint the
URL.

This commit includes changes that remove a few
`@import`s from one of our sass partials.

They aren't needed as those files are imported
further up the stack and `_typography.scss` has an
import in it that overwrites the new
`_url-helpers.scss` we added here.
2019-04-12 15:36:57 +01:00
Tom Byers
01b97986f6 Update diff-dom package to 3.1.0
Since it moved to ES Modules in version 2.3.1,
diff-dom stopped including the `diffDOM.js` file
in its NPM package.

We don't do any kind of bundling in our build yet,
just concatenation of our scripts and some
minification of the results so we can't take
advantage of this yet.

The `diffDOM.js` file is still available in the
Github release so this moves to referencing that
in the `package.json` instead, until we start
using a bundler.

I opened an issue to check this is what the author
intended:

https://github.com/fiduswriter/diffDOM/issues/84

The latest version also adds Rollup as a peer
dependency.
2019-04-12 15:36:57 +01:00
Chris Hill-Scott
3212915a51 Simplifying code for checking email domains
Since this code isn’t trying to inherit from the code that also looked
up domain names in `domains.yml` it can go back to being a lot simpler.

This code is thoroughly tested already here:
a249382e69/tests/app/main/test_validators.py (L74-L155)
2019-04-12 15:23:08 +01:00
Chris Hill-Scott
07c7544049 Use crown not crown_status as prop name
It’s confusing having a property name which is different from the
attribute returned in the JSON from the API.
2019-04-12 15:23:08 +01:00
Chris Hill-Scott
5d091b214a Remove domains.yml file
Since we’ve now removed the code that reads this file, it can safely be
deleted.
2019-04-12 15:23:08 +01:00
Chris Hill-Scott
9d99c78c3a Remove code that reads domains.yml
Since we’ve removed calls to this code from the rest of the app, it can
safely be removed now.
2019-04-12 15:23:08 +01:00
Chris Hill-Scott
470b8a2912 Remove domains from branding forms
We’re deprecating storing the domain as text on a branding in favour of
a database relationship between branding and organisation.

We need to do this now in order to remove the validation on these fields
(which depends on the data in `domains.yml`)
2019-04-12 15:23:07 +01:00
Chris Hill-Scott
9684e962ae Refactor go live tags into service model
Since this function only takes one argument, a service, it might as well
be a method of the service.
2019-04-12 15:19:32 +01:00
Chris Hill-Scott
3565ffc33f Remove dependence on domains.yml from settings
Settings looked at `domains.yml` when users were making go live requests
or email branding requests.

This will allow us to remove the `domains.yml` file, by using
information about organisations that is now stored in the database
instead.
2019-04-12 15:19:31 +01:00
Chris Hill-Scott
b41c3779c4 Merge pull request #2906 from alphagov/auto-service-counts
Automate counting of live services and orgs
2019-04-12 14:15:41 +01:00
Chris Hill-Scott
835d11d8d6 Remove domains.yml dependence from agreement pages
This will allow us to remove the `domains.yml` file, by using
information about organisations that is now stored in the database
instead.
2019-04-12 14:12:10 +01:00
Chris Hill-Scott
98249158cb Stop trying to infer branding when adding services
The API handles this now.
2019-04-12 14:08:33 +01:00
Chris Hill-Scott
72f49a9a1e Remove dependence on domains.yml from static pages
This will allow us to remove the `domains.yml` file, by using
information about organisations that is now stored in the database
instead.
2019-04-12 14:05:00 +01:00
Chris Hill-Scott
718f440720 Get info about organisations from database table
This is the first step of replacing the `domains.yml` file.

In order to replicate the same functionality we get from the
`domains.yml` file and its associated code this commit adds a
`Organisation` model. This model copies a lot of methods from the
`AgreementInfo` class which wrapped the `domains.yml` file.

It factors out some stuff that would otherwise be duplicated between the
`Organisation` and `Service` model, in such a way that could be reused
for making other models in the future.

This commit doesn’t change other parts of the code to make use of this
new model yet – that will come in subsequent commits.
2019-04-12 14:01:14 +01:00
Chris Hill-Scott
9863aa3c48 Automate counting of live services and orgs
Returns the data calculated by the API. Stored in Redis against a
hardcoded key so that no-one hammering the home page is directly hitting
the database.
2019-04-12 13:59:33 +01:00
karlchillmaid
747b68a272 Remove reference to scheduling
Remove reference to scheduling
2019-04-12 11:48:06 +01:00
karlchillmaid
ea00f901fb Clarify scheduling information
Clarify scheduling information
2019-04-12 11:47:38 +01:00
karlchillmaid
d53499ed11 Correct 'message status' nav label 2019-04-11 16:32:48 +01:00
karlchillmaid
2c62409dbd Update status information 2019-04-11 16:32:02 +01:00
karlchillmaid
f997b446ff Update app/templates/views/service-settings/request-to-go-live.html
Co-Authored-By: quis <me@quis.cc>
2019-04-11 15:44:28 +01:00
Chris Hill-Scott
436d023722 Block incomplete requests to go live
Dealing with users who request to go live but haven’t completed all the
steps still represents a significant support overhead for our team.
We’ve made some improvements to the percentage of incomplete requests
with a better page design, but ultimately because it still shows the
button people think it’s OK to press the button while some of the items
on the page still say [Not completed].

We can do this now because organisations are in the database, which
means we can mark the agreement signed as soon as we get it back,
without having to deploy code.
2019-04-11 14:35:30 +01:00
Chris Hill-Scott
30504a8026 Fix tests 2019-04-11 12:00:37 +01:00
Chris Hill-Scott
fe204614ad Add new pages to navigation dictionaries 2019-04-11 11:47:09 +01:00
karlchillmaid
6f3af4a262 Update How to pay
Update How to pay
2019-04-11 10:31:33 +01:00
karlchillmaid
cf9001d6e8 Amends based on 2i
Amends based on 2i
2019-04-11 10:31:33 +01:00
karlchillmaid
cd1d6d7994 Amends based on 2i
Amends based on 2i
2019-04-11 10:31:32 +01:00
karlchillmaid
eb63761dda Amends based on 2i
Amends based on 2i
2019-04-11 10:31:32 +01:00
karlchillmaid
f399151a2e Amends based on 2i
Amends based on 2i
2019-04-11 10:31:32 +01:00
karlchillmaid
e95777b9e0 Remove GOV.UK 2019-04-11 10:31:32 +01:00
karlchillmaid
3dd4b5d96c Content amends
Content amends based on Roz's feedback
2019-04-11 10:31:32 +01:00
karlchillmaid
298ae25eab Update introduction and text message content
Make 'Create account' intro text dependent on sign in.

Add a line about trial mode.

Remove the 'Multiple services' section of Text messages
2019-04-11 10:31:32 +01:00
karlchillmaid
d98b676d9d Update letters list
Update letters list
2019-04-11 10:31:31 +01:00
karlchillmaid
00e2c214aa Reorder menu
Reorder menu, change 'status' to 'statuses'
2019-04-11 10:31:31 +01:00