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.

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

Absorb/endpoint submission form #111

Merged
merged 109 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
1f9d407
initial commit
GeorgeGoodall Jun 6, 2024
06dd681
add standard linting
GeorgeGoodall Jun 6, 2024
3a8b544
add linting scripts
GeorgeGoodall Jun 6, 2024
03b91b4
add husky and init command
GeorgeGoodall Jun 6, 2024
d5e2b7f
add husky scripts and empty index.js
GeorgeGoodall Jun 6, 2024
e261fc0
add lint and test github ci action
GeorgeGoodall Jun 6, 2024
2e67fca
Merge pull request #1 from digital-land/repoSetup
GeorgeGoodall Jun 6, 2024
e6ecc91
setting up the form wizard and adding the start page
GeorgeGoodall Jun 7, 2024
ada9e8f
linting
GeorgeGoodall Jun 7, 2024
77e13a7
further server setup, getting the start page working
GeorgeGoodall Jun 10, 2024
90d445e
linting
GeorgeGoodall Jun 10, 2024
47971ed
added the basics of all other pages
GeorgeGoodall Jun 10, 2024
206bb54
linting
GeorgeGoodall Jun 10, 2024
6cc726e
get the check-answers page showing the correct answers
GeorgeGoodall Jun 10, 2024
23adfc6
linting
GeorgeGoodall Jun 10, 2024
eb73d97
updated the dataset details and confirmation pages so that they corre…
GeorgeGoodall Jun 10, 2024
7ed2345
make sure back links are setup
GeorgeGoodall Jun 10, 2024
74d71e1
add in the basic configuration file
GeorgeGoodall Jun 10, 2024
1f5f77f
started adding unit tests
GeorgeGoodall Jun 11, 2024
3a8706e
finished unit testing templates
GeorgeGoodall Jun 11, 2024
661d53a
update github workflow so we dont need to commit package lock
GeorgeGoodall Jun 11, 2024
e2c9ede
Merge pull request #2 from digital-land/feat/initial-pages
GeorgeGoodall Jun 18, 2024
928b153
add Procfile for heroku
eveleighoj Jun 24, 2024
29fdc61
update procfile
GeorgeGoodall Jun 26, 2024
52cb976
Merge pull request #3 from digital-land/feat/procfile
GeorgeGoodall Jun 26, 2024
8895b1d
make sure to get the port
GeorgeGoodall Jun 26, 2024
0b553fc
Merge pull request #4 from digital-land/heroku
GeorgeGoodall Jun 26, 2024
ca53e2b
started adding logic to construct the emails
GeorgeGoodall Jun 26, 2024
2908510
linting
GeorgeGoodall Jun 26, 2024
492fa40
add in govuk notify
GeorgeGoodall Jun 27, 2024
0d3b71f
add additional params to acknowledged email
GeorgeGoodall Jun 27, 2024
e9c9e8e
added unit test for checkAnswersController
GeorgeGoodall Jun 27, 2024
627a00d
linting
GeorgeGoodall Jun 27, 2024
07ec78e
add some testing
GeorgeGoodall Jun 27, 2024
d6cc560
fix tests
GeorgeGoodall Jun 27, 2024
0a263d2
Merge branch 'govukNotify' into feat/form-validation
GeorgeGoodall Jun 27, 2024
96bc6cd
add validators
GeorgeGoodall Jun 28, 2024
93b1c8f
add new validation message filters and tidy filters code
GeorgeGoodall Jul 2, 2024
7cf6386
linting
GeorgeGoodall Jul 2, 2024
8f43db1
add length validation to endpoints
GeorgeGoodall Jul 2, 2024
65003c1
add validation error messages to lpa details page
GeorgeGoodall Jul 2, 2024
c6f7388
make sure values are populated with any existing values
GeorgeGoodall Jul 2, 2024
a3254af
add validation messages to choose-dataset page
GeorgeGoodall Jul 2, 2024
e72efeb
add in error messages for dataset-details page
GeorgeGoodall Jul 2, 2024
2ac9fec
improve validation error messages
GeorgeGoodall Jul 2, 2024
3f4e23f
fix max length email validation
GeorgeGoodall Jul 2, 2024
32ce47e
fix tests, rewrite generic tests to use jsdom and also add test funct…
GeorgeGoodall Jul 2, 2024
bd5a623
add back in stripWhiteSpace utils function
GeorgeGoodall Jul 2, 2024
55f1135
linting
GeorgeGoodall Jul 2, 2024
cf98f13
move to correct location
GeorgeGoodall Jul 2, 2024
3af4668
add remaining validation tests for lpa-details page
GeorgeGoodall Jul 2, 2024
c83a4ef
finish off the last fest tests and change file from .html to .js
GeorgeGoodall Jul 2, 2024
f385a1c
added missing dependencies
rosado Jul 2, 2024
ef80c99
remove needless assertions
GeorgeGoodall Jul 3, 2024
047475e
change mailClient to use a singleton instead of a wrapper function
GeorgeGoodall Jul 3, 2024
f3fc6c3
linting
GeorgeGoodall Jul 3, 2024
33434c5
import singleton from correct place
GeorgeGoodall Jul 3, 2024
01c2a10
fixed tests
GeorgeGoodall Jul 3, 2024
894167f
refactor code
GeorgeGoodall Jul 3, 2024
eefb6e2
Merge pull request #7 from digital-land/rosado/NOTICKET-missing-deps
GeorgeGoodall Jul 3, 2024
0fbf3b0
Merge remote-tracking branch 'origin/main' into govukNotify
GeorgeGoodall Jul 3, 2024
668bfac
Merge remote-tracking branch 'origin/main' into feat/form-validation
GeorgeGoodall Jul 3, 2024
8ccf0ed
make sure path to assets is correct
GeorgeGoodall Jul 3, 2024
0f1c27e
remove hangover bundle script
GeorgeGoodall Jul 3, 2024
a63b8b1
Merge pull request #8 from digital-land/feat/getFontsWorking
GeorgeGoodall Jul 3, 2024
b13c829
Merge remote-tracking branch 'origin/main' into govukNotify
GeorgeGoodall Jul 4, 2024
8f9ee36
addressing rolands comments
GeorgeGoodall Jul 4, 2024
49cded4
linting
GeorgeGoodall Jul 4, 2024
2c4cb70
Merge pull request #5 from digital-land/govukNotify
GeorgeGoodall Jul 4, 2024
da713a5
Merge remote-tracking branch 'origin/main' into feat/form-validation
GeorgeGoodall Jul 4, 2024
aa1f7ed
add in missing package
GeorgeGoodall Jul 4, 2024
8c8f97c
Merge pull request #6 from digital-land/feat/form-validation
GeorgeGoodall Jul 4, 2024
3cfbd83
updated hasLicence validation message
GeorgeGoodall Jul 5, 2024
1941c72
fix test
GeorgeGoodall Jul 5, 2024
737b779
Merge pull request #11 from digital-land/feat/newValidationMessage
GeorgeGoodall Jul 5, 2024
49e7195
misc content changes
rosado Jul 3, 2024
ed2845e
fix: missing param
rosado Jul 4, 2024
a2f0a7e
fix: linter errors
rosado Jul 4, 2024
c64f5b9
fix after updating main
rosado Jul 4, 2024
7a0f0b6
fix typo
rosado Jul 5, 2024
8c8c26d
use existing variable for header
rosado Jul 5, 2024
799efac
Merge pull request #9 from digital-land/rosado/3310-content-changes
GeorgeGoodall Jul 5, 2024
674d740
Initial merge remote-tracking branch endpoint-submission-form/main in…
GeorgeGoodall Jul 8, 2024
9d01207
Linting
GeorgeGoodall Jul 8, 2024
3126db8
split up form wizards
GeorgeGoodall Jul 8, 2024
a155862
add missing param to add filters method
GeorgeGoodall Jul 8, 2024
d76e61b
remove unused package
GeorgeGoodall Jul 8, 2024
cb5049c
fix add filters params
GeorgeGoodall Jul 8, 2024
9c01609
rename wizards
GeorgeGoodall Jul 8, 2024
8127060
add new folders to nunjucks configure
GeorgeGoodall Jul 8, 2024
42a3322
update steps amd fields
GeorgeGoodall Jul 8, 2024
efa750f
remove old file
GeorgeGoodall Jul 8, 2024
600a3fe
move templates to new folders
GeorgeGoodall Jul 8, 2024
a03a0ef
make sure page names and titles are correct
GeorgeGoodall Jul 8, 2024
7817758
linting
GeorgeGoodall Jul 8, 2024
0981ac5
started fixing unit tests
GeorgeGoodall Jul 8, 2024
9c0836e
change service name
GeorgeGoodall Jul 8, 2024
0736a5b
rename templates folder
GeorgeGoodall Jul 9, 2024
2ec52f5
fix some routing
GeorgeGoodall Jul 9, 2024
2dd6295
update dependencies
GeorgeGoodall Jul 9, 2024
8fbc637
fix scss import
GeorgeGoodall Jul 9, 2024
1dabbf3
remove ignored files
GeorgeGoodall Jul 9, 2024
5d50deb
fix pagination tests and change to use jsdom
GeorgeGoodall Jul 9, 2024
2c9a383
make sure submit is using the correct start template
GeorgeGoodall Jul 9, 2024
5845420
change start page to noPost
GeorgeGoodall Jul 9, 2024
8fc9b8f
add catch to error page render
GeorgeGoodall Jul 9, 2024
e27b5b3
update dev config
GeorgeGoodall Jul 9, 2024
2efa0ed
updated env example
GeorgeGoodall Jul 9, 2024
5962f67
get email from environment
GeorgeGoodall Jul 9, 2024
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
5 changes: 4 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
SESSION_SECRET=your_secret
SESSION_SECRET=your_secret
SENTRY_DSN=You_DSN
GOVUK_NOTIFY_API_KEY=your_api_key
DATA_MANAGEMENT_EMAIL=data_management_team_email_address
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: node index.js
15 changes: 12 additions & 3 deletions config/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ aws: {
s3ForcePathStyle: false,
}
redis: false
url: 'https://publish-planning.data.gov.uk'
serviceName: 'Check planning and housing data for England'
feedbackLink: 'https://docs.google.com/forms/d/e/1FAIpQLSdYXqY0Aaket9XJBiGDhSL_CD_cxHZxgvQCFZZtdURdvvIY5A/viewform'
# ToDo: url and name might need updating
url: 'https://check-planning.data.gov.uk'
serviceName: 'Provide planning and housing data for England'
feedbackLink: 'https://docs.google.com/forms/d/e/1FAIpQLSdYXqY0Aaket9XJBiGDhSL_CD_cxHZxgvQCFZZtdURdvvIY5A/viewform'
email: {
templates: {
RequestTemplateId: 'fa1c2b51-3c91-4f9d-9a18-83639164d552',
AcknowledgementTemplateId: '2a4dff6d-78c4-4fea-a489-c97485453807'
},
dataManagementEmail: '[email protected]'
}

2 changes: 1 addition & 1 deletion config/development.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
asyncRequestApi: {
url: http://development-pub-async-api-lb-2117113766.eu-west-2.elb.amazonaws.com
url: http://development-pub-async-api-lb-69142969.eu-west-2.elb.amazonaws.com
}
aws: {
region: eu-west-2,
Expand Down
4 changes: 3 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ import { setupSession } from './src/serverSetup/session.js'
import { setupNunjucks } from './src/serverSetup/nunjucks.js'
import { setupSentry } from './src/serverSetup/sentry.js'

import { dataSubjects } from './src/utils/utils.js'

dotenv.config()

const app = express()

setupMiddlewares(app)
setupSession(app)
setupNunjucks(app)
setupNunjucks({ app, dataSubjects })
setupRoutes(app)
setupSentry(app)
setupErrorHandlers(app)
Expand Down
Loading
Loading