Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hoff-714 Firearms: Layout table Storage Add Another Address #502

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Hoff-714 Firearms: Layout table Storage Add Another Address #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 12 additions & 51 deletions .snyk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@ ignore:
- hof > browserify > shell-quote:
reason: Need to update browserify in HOF when new version is available.
expires: '2024-10-18T14:58:46.388Z'
SNYK-JS-CACHEDPATHRELATIVE-2342653:
- hof > browserify > cached-path-relative:
reason: Need to update browserify in HOF when new version is available.
expires: '2024-10-18T14:58:46.388Z'
- hof > browserify > module-deps > cached-path-relative:
reason: Need to update browserify in HOF when new version is available.
expires: '2024-10-18T14:58:46.388Z'
SNYK-JS-MINIMIST-2429795:
- hof > minimist:
reason: Need to update browserify in HOF when new version is available.
Expand All @@ -46,22 +39,6 @@ ignore:
- hof > browserify > module-deps > detective > minimist:
reason: Need to update browserify in HOF when new version is available.
expires: '2024-10-01T14:58:46.388Z'
SNYK-JS-DICER-2311764:
- busboy-body-parser > busboy > dicer:
reason: No update available
expires: '2024-10-10T12:21:04.350Z'
SNYK-JS-AXIOS-6032459:
- hof > notifications-node-client > axios:
reason: Need to update notifications-node-client in HOF to version 8.0.0.
expires: '2024-10-03T00:00:00.000Z'
SNYK-JS-AXIOS-6124857:
- hof > notifications-node-client > axios:
reason: Need to update notifications-node-client in HOF to version 8.0.0.
expires: '2024-10-03T00:00:00.000Z'
SNYK-JS-AXIOS-6144788:
- hof > notifications-node-client > axios:
reason: Need to update notifications-node-client in HOF to version 8.0.0.
expires: '2024-10-03T00:00:00.000Z'
SNYK-JS-INFLIGHT-6095116:
- '*':
reason: No update available.
Expand All @@ -74,40 +51,24 @@ ignore:
- hof > winston > async:
reason: No update available.
expires: '2024-10-03T00:00:00.000Z'
SNYK-JS-BRACES-6838727:
- hof > chokidar > braces:
reason: Need to update braces in HOF to version 3.0.3
expires: '2024-10-03T00:00:00.000Z'
SNYK-JS-BROWSERIFYSIGN-6037026:
- hof > browserify > crypto-browserify> browserify-sign
reason: Need to update browserify-sign in HOF to version 4.2.2
expires: '2024-10-03T00:00:00.000Z'
SNYK-JS-DICER-2311764:
- busboy-body-parser > busboy > dicer
reason: No update available.
- busboy-body-parser > busboy > dicer:
reason: No update available.
expires: '2024-10-03T00:00:00.000Z'
SNYK-JS-FOLLOWREDIRECTS-6141137:
- notifications-node-client > axios > follow-redirects
reason: Need to update version 1.15.4
expires: '2024-8-03T00:00:00.000Z'
SNYK-JS-FOLLOWREDIRECTS-6444610:
- notifications-node-client > axios > follow-redirects
reason: Need to update version 1.15.6
expires: '2024-8-03T00:00:00.000Z'
SNYK-JS-NODEMAILER-6219989:
- hof > nodemailer
- hof > nodemailer:
reason: Need to update nodemailer in HOF to version 6.9.9
expires: '2024-10-03T00:00:00.000Z'
SNYK-JS-REQUEST-3361831:
- hof > request
reason: No update available.
expires: '2024-10-03T00:00:00.000Z'
SNYK-JS-TOUGHCOOKIE-5672873:
- hof > request > tough-cookie
reason: Need to update tough-cookie in HOF to version 4.1.9
expires: '2024-10-03T00:00:00.000Z'
SNYK-JS-UNDERSCORE-1080984:
- hof > nodemailer-smtp-transport > smtp-connection > httpntlm > underscore
- hof > nodemailer-smtp-transport > smtp-connection > httpntlm > underscore:
reason: Need to update underscore in HOF to version 1.13.0-2, 1.12.1
expires: '2024-10-03T00:00:00.000Z'
SNYK-JS-AXIOS-6032459:
- hof > notifications-node-client > axios:
reason: Need to update notifications-node-client in HOF to version 8.0.0.
expires: '2024-10-03T00:00:00.000Z'
SNYK-JS-AXIOS-6124857:
- hof > notifications-node-client > axios:
reason: Need to update notifications-node-client in HOF to version 8.0.0.
expires: '2024-10-03T00:00:00.000Z'
patch: {}
16 changes: 11 additions & 5 deletions apps/common/views/partials/add-another-address-summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
{{#hasAddresses}}
<div id="address-summary">
<h2>{{#t}}pages.{{field}}-address.summary{{/t}}</h2>
<table class="table-address-loop">
<caption class="govuk-table__caption govuk-table__caption--m">{{#t}}pages.{{field}}-address.summary{{/t}}</caption>
{{#hasCategories}}
{{> partials-location-categories}}
{{/hasCategories}}
{{^hasCategories}}
<tbody>
{{> partials-location-categories}}
{{/hasCategories}}
{{^hasCategories}}
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th scope="col" class="govuk-table__header govuk-visually-hidden">Addresses</th>
<th scope="col" class="govuk-table__header govuk-visually-hidden">Action</th>
</tr>
</thead>
<tbody>
{{#items}}
<tr class="address-summary">
<td>{{address}}</td>
Expand Down
8 changes: 7 additions & 1 deletion apps/museums/views/partials/add-another-address-summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{{#hasItems}}
<div id="address-summary">
<h2>{{#t}}pages.{{field}}.header{{/t}}</h2>
<table class="table-address-loop">
<caption class="govuk-table__caption govuk-table__caption--m">{{#t}}pages.{{field}}.header{{/t}}</caption>
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th scope="col" class="govuk-table__header govuk-visually-hidden">Addresses</th>
<th scope="col" class="govuk-table__header govuk-visually-hidden">Action</th>
</tr>
</thead>
<tbody>
{{#items}}
<tr class="address-summary">
Expand Down
10 changes: 8 additions & 2 deletions apps/new-dealer/views/partials/add-another-address-summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
{{#items.length}}
<div id="address-summary">
<h2>{{#t}}pages.{{field}}.header{{/t}}</h2>
<table class="table-address-loop">
<caption class="govuk-table__caption govuk-table__caption--m">{{#t}}pages.{{field}}.header{{/t}}</caption>
{{#hasCategories}}
{{> partials-location-categories}}
{{/hasCategories}}
{{^hasCategories}}
<tbody>
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th scope="col" class="govuk-table__header govuk-visually-hidden">Addresses</th>
<th scope="col" class="govuk-table__header govuk-visually-hidden">Action</th>
</tr>
</thead>
<tbody>
{{#items}}
<tr class="address-summary">
<td>{{address}}</td>
Expand Down
16 changes: 11 additions & 5 deletions apps/shooting-clubs/views/partials/add-another-address-summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
{{#items.length}}
<div id="address-summary">
<h2>{{#t}}pages.{{field}}.header{{/t}}</h2>
<table class="table-address-loop">
{{#hasCategories}}
{{> partials-location-categories}}
{{/hasCategories}}
{{^hasCategories}}
<tbody>
<caption class="govuk-table__caption govuk-table__caption--m">{{#t}}pages.{{field}}.header{{/t}}</caption>
{{#hasCategories}}
{{> partials-location-categories}}
{{/hasCategories}}
{{^hasCategories}}
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th scope="col" class="govuk-table__header govuk-visually-hidden">Addresses</th>
<th scope="col" class="govuk-table__header govuk-visually-hidden">Action</th>
</tr>
</thead>
{{#items}}
<tr class="address-summary">
<td>{{address}}</td>
Expand Down
7 changes: 3 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"dependencies": {
"busboy-body-parser": "^0.3.0",
"debug": "^2.6.8",
"express": "4.17.3",
"express": "^4.19.2",
"hof": "^20.4.0",
"hot-shots": "^5.9.0",
"i18n-lookup": "^1.0.0",
Expand All @@ -38,7 +38,7 @@
"lodash": "^4.17.21",
"moment": "^2.29.4",
"mustache": "^2.3.0",
"notifications-node-client": "6.0.0",
"notifications-node-client": "^8.0.0",
"typeahead-aria": "^1.0.4",
"uuid": "^3.1.0"
},
Expand All @@ -50,11 +50,10 @@
"eslint": "^7.32.0",
"eslint-config-hof": "^1.2.1",
"funkie": "^0.0.6",
"funkie-chromedriver": "0.0.1",
"mocha": "^9.0.3",
"mock-fs": "^5.0.0",
"nyc": "^15.1.0",
"playwright": "^1.22.2",
"playwright": "~1.36.2",
"proxyquire": "^2.1.3",
"sinon": "^11.1.2",
"sinon-chai": "^3.7.0",
Expand Down
13 changes: 13 additions & 0 deletions pull-request-template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## What?
## Why?
## How?
## Testing?
## Screenshots (optional)
## Anything Else? (optional)
## Check list
- [ ] I have reviewed my own pull request for linting issues (e.g. adding new lines)
- [ ] I have written tests (if relevant)
- [ ] I have created a JIRA number for my branch
- [ ] I have created a JIRA number for my commit
- [ ] Ensure drone builds are green especially tests
- [ ] I will squash the commits before merging
Loading