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

Feature/update contentful #113

Merged
merged 3 commits into from
Jul 24, 2024
Merged

Conversation

simonjfirth
Copy link
Contributor

Updated Contentful KV secret name for C&S so it doesn't collide with PT secret name

@simonjfirth simonjfirth merged commit 4949241 into Development Jul 24, 2024
@simonjfirth simonjfirth deleted the feature/update-contentful branch July 24, 2024 11:25
simonjfirth added a commit that referenced this pull request Aug 8, 2024
* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------

Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>

* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Hidden cookie banner (#115)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added default page to handle base route (#116)

* feat: removed header text (#117)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: allowed accordions to display richtext (#118)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added support for excel sheets (#119)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added back to top button (#120)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: use current tab (#122)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Updated styling to elements and added missing classes (#123)

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: ThomasWhittington <46750921+ThomasWhittington@users.noreply.github.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
simonjfirth added a commit that referenced this pull request Aug 12, 2024
* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------

Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>

* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Hidden cookie banner (#115)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added default page to handle base route (#116)

* feat: removed header text (#117)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: allowed accordions to display richtext (#118)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added support for excel sheets (#119)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added back to top button (#120)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: use current tab (#122)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Updated styling to elements and added missing classes (#123)

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: ThomasWhittington <46750921+ThomasWhittington@users.noreply.github.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
ThomasWhittington added a commit that referenced this pull request Aug 19, 2024
* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------

Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>

* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Hidden cookie banner (#115)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added default page to handle base route (#116)

* feat: removed header text (#117)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: allowed accordions to display richtext (#118)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added support for excel sheets (#119)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added back to top button (#120)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: use current tab (#122)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* remove comment

* Added basic print button (#130)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
ThomasWhittington added a commit that referenced this pull request Aug 20, 2024
* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------




* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------



* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------



* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------



* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------



* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------



* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------



* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)



* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------




* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------



* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------



* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------



* Hidden cookie banner (#115)



* Added default page to handle base route (#116)

* feat: removed header text (#117)



* feat: allowed accordions to display richtext (#118)



* feat: added support for excel sheets (#119)



* feat: added back to top button (#120)



* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------



* feat: use current tab (#122)



* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------



* remove comment

* Added basic print button (#130)



* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------



* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)



---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
ThomasWhittington added a commit that referenced this pull request Aug 20, 2024
* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------




* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------



* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------



* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------



* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------



* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------



* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------



* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)



* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------




* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------



* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------



* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------



* Hidden cookie banner (#115)



* Added default page to handle base route (#116)

* feat: removed header text (#117)



* feat: allowed accordions to display richtext (#118)



* feat: added support for excel sheets (#119)



* feat: added back to top button (#120)



* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------



* feat: use current tab (#122)



* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------



* remove comment

* Added basic print button (#130)



* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------



* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)



---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
ThomasWhittington added a commit that referenced this pull request Aug 20, 2024
* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------

Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>

* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Hidden cookie banner (#115)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added default page to handle base route (#116)

* feat: removed header text (#117)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: allowed accordions to display richtext (#118)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added support for excel sheets (#119)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added back to top button (#120)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: use current tab (#122)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* remove comment

* Added basic print button (#130)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added support for plantech cookies (#139)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added new blocks and some refactors (#138) (#141)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------




* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------



* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------



* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------



* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------



* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------



* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------



* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)



* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------




* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------



* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------



* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------



* Hidden cookie banner (#115)



* Added default page to handle base route (#116)

* feat: removed header text (#117)



* feat: allowed accordions to display richtext (#118)



* feat: added support for excel sheets (#119)



* feat: added back to top button (#120)



* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------



* feat: use current tab (#122)



* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------



* remove comment

* Added basic print button (#130)



* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------



* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)



---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Added new blocks and some refactors (#138) (#142)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------




* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------



* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------



* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------



* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------



* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------



* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------



* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)



* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------




* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------



* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------



* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------



* Hidden cookie banner (#115)



* Added default page to handle base route (#116)

* feat: removed header text (#117)



* feat: allowed accordions to display richtext (#118)



* feat: added support for excel sheets (#119)



* feat: added back to top button (#120)



* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------



* feat: use current tab (#122)



* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------



* remove comment

* Added basic print button (#130)



* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------



* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)



---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
ThomasWhittington added a commit that referenced this pull request Aug 21, 2024
* Development (#143)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------

Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>

* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Hidden cookie banner (#115)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added default page to handle base route (#116)

* feat: removed header text (#117)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: allowed accordions to display richtext (#118)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added support for excel sheets (#119)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added back to top button (#120)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: use current tab (#122)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* remove comment

* Added basic print button (#130)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added support for plantech cookies (#139)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added new blocks and some refactors (#138) (#141)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------




* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------



* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------



* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------



* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------



* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------



* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------



* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)



* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------




* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------



* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------



* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------



* Hidden cookie banner (#115)



* Added default page to handle base route (#116)

* feat: removed header text (#117)



* feat: allowed accordions to display richtext (#118)



* feat: added support for excel sheets (#119)



* feat: added back to top button (#120)



* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------



* feat: use current tab (#122)



* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------



* remove comment

* Added basic print button (#130)



* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------



* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)



---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Added new blocks and some refactors (#138) (#142)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------




* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------



* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------



* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------



* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------



* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------



* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------



* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)



* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------




* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------



* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------



* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------



* Hidden cookie banner (#115)



* Added default page to handle base route (#116)

* feat: removed header text (#117)



* feat: allowed accordions to display richtext (#118)



* feat: added support for excel sheets (#119)



* feat: added back to top button (#120)



* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------



* feat: use current tab (#122)



* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------



* remove comment

* Added basic print button (#130)



* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------



* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)



---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Removed duplicate css and changed column width of additional parts

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
ThomasWhittington added a commit that referenced this pull request Aug 22, 2024
* Development (#143)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------

Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>

* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Hidden cookie banner (#115)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added default page to handle base route (#116)

* feat: removed header text (#117)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: allowed accordions to display richtext (#118)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added support for excel sheets (#119)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added back to top button (#120)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: use current tab (#122)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* remove comment

* Added basic print button (#130)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added support for plantech cookies (#139)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added new blocks and some refactors (#138) (#141)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------




* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------



* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------



* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------



* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------



* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------



* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------



* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)



* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------




* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------



* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------



* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------



* Hidden cookie banner (#115)



* Added default page to handle base route (#116)

* feat: removed header text (#117)



* feat: allowed accordions to display richtext (#118)



* feat: added support for excel sheets (#119)



* feat: added back to top button (#120)



* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------



* feat: use current tab (#122)



* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------



* remove comment

* Added basic print button (#130)



* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------



* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)



---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Added new blocks and some refactors (#138) (#142)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------




* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------



* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------



* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------



* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------



* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------



* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------



* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)



* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------




* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------



* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------



* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------



* Hidden cookie banner (#115)



* Added default page to handle base route (#116)

* feat: removed header text (#117)



* feat: allowed accordions to display richtext (#118)



* feat: added support for excel sheets (#119)



* feat: added back to top button (#120)



* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------



* feat: use current tab (#122)



* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------



* remove comment

* Added basic print button (#130)



* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------



* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)



---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* removed duplicates

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
ThomasWhittington added a commit that referenced this pull request Aug 27, 2024
* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------

Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>

* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Hidden cookie banner (#115)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added default page to handle base route (#116)

* feat: removed header text (#117)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: allowed accordions to display richtext (#118)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added support for excel sheets (#119)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added back to top button (#120)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: use current tab (#122)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* remove comment

* Added basic print button (#130)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added support for plantech cookies (#139)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added new blocks and some refactors (#138) (#141)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------




* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------



* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------



* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------



* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------



* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------



* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------



* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)



* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------




* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------



* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------



* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------



* Hidden cookie banner (#115)



* Added default page to handle base route (#116)

* feat: removed header text (#117)



* feat: allowed accordions to display richtext (#118)



* feat: added support for excel sheets (#119)



* feat: added back to top button (#120)



* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------



* feat: use current tab (#122)



* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------



* remove comment

* Added basic print button (#130)



* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------



* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)



---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Added new blocks and some refactors (#138) (#142)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------




* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------



* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------



* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------



* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------



* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------



* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------



* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)



* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------




* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------



* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------



* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------



* Hidden cookie banner (#115)



* Added default page to handle base route (#116)

* feat: removed header text (#117)



* feat: allowed accordions to display richtext (#118)



* feat: added support for excel sheets (#119)



* feat: added back to top button (#120)



* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------



* feat: use current tab (#122)



* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------



* remove comment

* Added basic print button (#130)



* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------



* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)



---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Feature/tag filtering (#133)

* Added default page to handle base route

* Created the ability to filter content by tags

* Fixed empty reference aria label

* Updated controller to support page type

* Tidy up

* Removed spacing

* Fixed unit tests

* Moved iD

* Feature/css cleanup (#144)

* Development (#143)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------

Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>

* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Hidden cookie banner (#115)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added default page to handle base route (#116)

* feat: removed header text (#117)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: allowed accordions to display richtext (#118)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added support for excel sheets (#119)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added back to top button (#120)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: use current tab (#122)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* remove comment

* Added basic print button (#130)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added support for plantech cookies (#139)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added new blocks and some refactors (#138) (#141)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------




* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------



* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------



* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------



* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------



* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------



* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------



* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)



* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------




* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------



* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------



* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------



* Hidden cookie banner (#115)



* Added default page to handle base route (#116)

* feat: removed header text (#117)



* feat: allowed accordions to display richtext (#118)



* feat: added support for excel sheets (#119)



* feat: added back to top button (#120)



* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------



* feat: use current tab (#122)



* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------



* remove comment

* Added basic print button (#130)



* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------



* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)



---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Added new blocks and some refactors (#138) (#142)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------




* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------



* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------



* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------



* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------



* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------



* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------



* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)



* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------




* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------



* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------



* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------



* Hidden cookie banner (#115)



* Added default page to handle base route (#116)

* feat: removed header text (#117)



* feat: allowed accordions to display richtext (#118)



* feat: added support for excel sheets (#119)



* feat: added back to top button (#120)



* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------



* feat: use current tab (#122)



* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------



* remove comment

* Added basic print button (#130)



* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------



* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)



---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Removed duplicate css and changed column width of additional parts

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Fix/merge with main (#146)

* Development (#143)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------

Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>

* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Hidden cookie banner (#115)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added default page to handle base route (#116)

* feat: removed header text (#117)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: allowed accordions to display richtext (#118)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added support for excel sheets (#119)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added back to top button (#120)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: use current tab (#122)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* remove comment

* Added basic print button (#130)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: update beta banner feedback link

*…
jimwashbrook added a commit that referenced this pull request Aug 28, 2024
* Fix: Cookies and column widths (#145)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------

Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>

* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Hidden cookie banner (#115)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added default page to handle base route (#116)

* feat: removed header text (#117)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: allowed accordions to display richtext (#118)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added support for excel sheets (#119)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added back to top button (#120)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: use current tab (#122)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* remove comment

* Added basic print button (#130)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added support for plantech cookies (#139)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added new blocks and some refactors (#138) (#141)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------




* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------



* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------



* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------



* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------



* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------



* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------



* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)



* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------




* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------



* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------



* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------



* Hidden cookie banner (#115)



* Added default page to handle base route (#116)

* feat: removed header text (#117)



* feat: allowed accordions to display richtext (#118)



* feat: added support for excel sheets (#119)



* feat: added back to top button (#120)



* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------



* feat: use current tab (#122)



* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------



* remove comment

* Added basic print button (#130)



* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------



* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)



---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Added new blocks and some refactors (#138) (#142)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------




* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------



* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------



* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------



* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------



* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------



* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------



* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)



* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------




* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------



* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------



* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------



* Hidden cookie banner (#115)



* Added default page to handle base route (#116)

* feat: removed header text (#117)



* feat: allowed accordions to display richtext (#118)



* feat: added support for excel sheets (#119)



* feat: added back to top button (#120)



* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------



* feat: use current tab (#122)



* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------



* remove comment

* Added basic print button (#130)



* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------



* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)



---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Feature/tag filtering (#133)

* Added default page to handle base route

* Created the ability to filter content by tags

* Fixed empty reference aria label

* Updated controller to support page type

* Tidy up

* Removed spacing

* Fixed unit tests

* Moved iD

* Feature/css cleanup (#144)

* Development (#143)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------

Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>

* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Hidden cookie banner (#115)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added default page to handle base route (#116)

* feat: removed header text (#117)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: allowed accordions to display richtext (#118)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added support for excel sheets (#119)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added back to top button (#120)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: use current tab (#122)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* remove comment

* Added basic print button (#130)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added support for plantech cookies (#139)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added new blocks and some refactors (#138) (#141)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------




* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------



* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------



* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------



* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------



* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------



* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------



* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)



* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------




* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------



* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------



* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------



* Hidden cookie banner (#115)



* Added default page to handle base route (#116)

* feat: removed header text (#117)



* feat: allowed accordions to display richtext (#118)



* feat: added support for excel sheets (#119)



* feat: added back to top button (#120)



* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------



* feat: use current tab (#122)



* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------



* remove comment

* Added basic print button (#130)



* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------



* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)



---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Added new blocks and some refactors (#138) (#142)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------




* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------



* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------



* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------



* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------



* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------



* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------



* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)



* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------




* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------



* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------



* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------



* Hidden cookie banner (#115)



* Added default page to handle base route (#116)

* feat: removed header text (#117)



* feat: allowed accordions to display richtext (#118)



* feat: added support for excel sheets (#119)



* feat: added back to top button (#120)



* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------



* feat: use current tab (#122)



* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------



* remove comment

* Added basic print button (#130)



* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------



* feat: update beta banner feedback link

* feat: added basic retry on contentful api calls (#137)



---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Removed duplicate css and changed column width of additional parts

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>
Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com>
Co-authored-by: jack.coggin <jack.coggin@and.digital>
Co-authored-by: Iain STANGER <Iain.STANGER@EDUCATION.GOV.UK>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Fix/merge with main (#146)

* Development (#143)

* Added test project

* Added ADR docs

* Added basic unit tests

* added ADR

* updated folder structure

* restructure

* Added architecture diagram

* More unit tests

* Added DI test

* Added contentful model for richtext

* Updated content service (#82)

* Updated content service

* uncommented tests

* undid spacing change

---------

Co-authored-by: Simon FIRTH <Simon.FIRTH@EDUCATION.GOV.UK>
Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Created contentful stub

* Updated to query builder

* Add renderer for rich text content (#75)

* add renderer for rich text content

* Add interface for content renderer

* remove unused using statements

* refactor: use partial views to handle rich text rendering

* Add new project for e2e cypress tests

* remove magic strings

* wip: Add mock content for e2e tests

* Update page heading and add support for subheadings

* update mockContent for e2e tests

* add rich text support for horizontal rule

* add support for embedded image assets

* Add support for embedded video

* add support for embedded vimeo player

* Changed views to use explicit models

* Added dev settings to gitignore

* Removed main

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* updated e2e and app settings

* Updated tests

* Fixed/ added some tests for coverage

* Added tests for HttpClients

* Added service tests

* Refactored tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* wip: render linked entry and asset from within rich text

* wip: render download component

* display corresponding icon for download filetype

* update e2e tests

* Feature/ rework/embedded entries (#87)

* Added basic support for embeddedEntries

* Added includes to configuration

* Updated tests for new model

* Simplified include logic

* Fixed client test

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* update entry partial

* revert ContentService changes

* use target variable in entry partial

* tweak entry partial

* update file icons

* Added terraform scripts

* add accordion component

* Added workflows and actions

* adding missing WAF and updated contentful environment

* update integration tests

* wip: add accessibility tweaks, accessibilty tests and page layout updates

* Added support for cards and grid containers. Updated dfeFrontend to 2.0.1 (#91)

* Updated DfeFrontend

* Added basic card support

* Card cleanup

* Added grid container

* Updated svgs

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* use dfe container width and update header styling

* updated workflow

* TF changes to get inital build going

* fixed tflint

* removed unused vars from pr-check

* added dev environment

* lock updated

* reformatted locals.tf

* terraform-docs: automated action

* include hero in header

* fix e2e tests

* Updated JS + CSS files

* add support for multiple accordion sections

* resolve assets for e2e testing

* Capitalise development branch name (#93)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Feature/app insights (#97)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* Feature/vault (#98)

* Capitalise development branch name

* force workflow to appear in actions

* Matrix deploy push

* made context root

* moved docker file location

* adjusted docker file location

* lowercase dockerfile name

* moved docker file

* updated matrix deploy

* updated deploy script

* updated image name

* revision create change

* Added env variable

* updated to main

* updated cli version

* removed env

* updated workflow to dispatch

* Added application insights + secret management

* modified matrix deploy to run on completed PR

* Added Keyvault secret API to application startup

* fixed YAML

* modifed matrix deloy (#100)

* Updated workflow so it can be manually fired (#102)

* modifed matrix deloy

* changed to workflow dispatch

* removed env

* changed keyvault name

* changed keyvault name

* re-added env

* Adding landing page (#104)

* Created temp home page

* updated is Preview to true for home page

* Preview mode bug fixes for home page

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added mapping layer to produce cleaner models (#96)

* Added basic caching layer (#106)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added cache clear endpoint and ignoring cache when in preview (#107)

* Added cache clear endpoint and ignoring cache when in preview

* Added some tests for caching

* modifed cache controller to API type + respond with OK

* removed unused controller map

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>
Co-authored-by: simonjfirth <simon.j.firth@gmail.com>

* add gtm and clarity tracking to application

* remove unnecessary ms clarity tag

* add cookie consent banner

* remove comments

* change consent cookie values to true or false

* add download last updated date and update styling

* Feature/model mapping refactor (#110)

* Model rework for better testability

* Added better tests for model mapping

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Feature/plantech prep (#112)

* Model rework for better testability

* Added better tests for model mapping

* Made modifications to allow c&s to run as part of plantech

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Made app settings not publish

* Removed some code smells

* Explicit types in tests

* Feature/update contentful (#113)

* Updated contentful secret value to it doesn't collide with PT integration

* removed temp code

* Cleaned up some more smells (#114)

* Cleaned up some more smells

* changed to index

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Hidden cookie banner (#115)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Added default page to handle base route (#116)

* feat: removed header text (#117)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: allowed accordions to display richtext (#118)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added support for excel sheets (#119)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: added back to top button (#120)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* feat: use current tab (#122)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* Updated styling to elements and added missing classes (#123)

* feature: add feedback banner to all pages

* Removed route sitemap base route which was causing a multiple route match in PT (#125)

* add thankyou message to feedback banner

* feat: render or hide feedback banner based on contentful boolean

* wip: reenable content cookies to test conditional rendering for feedback banner

* Feature/side nav (#128)

* Started to create vertical navigation

* First draft of unit tests

* update to tests

* cleaned unit tests

* Updated JS + CSS files

* Cleanup

* Update to broken unit tests

* reverted flag

* removed ref

* removed unused controller tests

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* remove comment

* Added basic print button (#130)

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

* add plan tech name to header (#131)

* Tidy up (#132)

* Added basic sonar check (#135)

* Added basic sonar check

* Build and test enabled

* Removed manual trigger on deploy

* Removed push builds

* Fixed branch name

---------

Co-authored-by: Tom Whittington <tom.whittington@education.gov.uk>

…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants