Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into fix/400HeadResponse
Browse files Browse the repository at this point in the history
  • Loading branch information
GeorgeGoodall committed Jul 10, 2024
2 parents 2b286e7 + 22e8824 commit bacdb61
Show file tree
Hide file tree
Showing 70 changed files with 2,460 additions and 585 deletions.
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

0 comments on commit bacdb61

Please sign in to comment.