Skip to content

Commit

Permalink
Fix: Cookies and column widths (#145)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
Co-authored-by: Tom Whittington <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------

Co-authored-by: Tom Whittington <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

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

* Added basic caching layer (#106)

Co-authored-by: Tom Whittington <[email protected]>

* 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 <[email protected]>
Co-authored-by: simonjfirth <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Hidden cookie banner (#115)

Co-authored-by: Tom Whittington <[email protected]>

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

* feat: removed header text (#117)

Co-authored-by: Tom Whittington <[email protected]>

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

Co-authored-by: Tom Whittington <[email protected]>

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

Co-authored-by: Tom Whittington <[email protected]>

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

Co-authored-by: Tom Whittington <[email protected]>

* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------

Co-authored-by: Tom Whittington <[email protected]>

* feat: use current tab (#122)

Co-authored-by: Tom Whittington <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* feat: update beta banner feedback link

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

Co-authored-by: Tom Whittington <[email protected]>

* Added support for plantech cookies (#139)

Co-authored-by: Tom Whittington <[email protected]>

* 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 <[email protected]>
Co-authored-by: Simon FIRTH <[email protected]>
Co-authored-by: simonjfirth <[email protected]>
Co-authored-by: jack-coggin <[email protected]>
Co-authored-by: jack.coggin <[email protected]>
Co-authored-by: Iain STANGER <[email protected]>
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 <[email protected]>
Co-authored-by: Simon FIRTH <[email protected]>
Co-authored-by: simonjfirth <[email protected]>
Co-authored-by: jack-coggin <[email protected]>
Co-authored-by: jack.coggin <[email protected]>
Co-authored-by: Iain STANGER <[email protected]>
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 <[email protected]>
Co-authored-by: Tom Whittington <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------

Co-authored-by: Tom Whittington <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

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

* Added basic caching layer (#106)

Co-authored-by: Tom Whittington <[email protected]>

* 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 <[email protected]>
Co-authored-by: simonjfirth <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Hidden cookie banner (#115)

Co-authored-by: Tom Whittington <[email protected]>

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

* feat: removed header text (#117)

Co-authored-by: Tom Whittington <[email protected]>

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

Co-authored-by: Tom Whittington <[email protected]>

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

Co-authored-by: Tom Whittington <[email protected]>

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

Co-authored-by: Tom Whittington <[email protected]>

* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------

Co-authored-by: Tom Whittington <[email protected]>

* feat: use current tab (#122)

Co-authored-by: Tom Whittington <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* feat: update beta banner feedback link

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

Co-authored-by: Tom Whittington <[email protected]>

* Added support for plantech cookies (#139)

Co-authored-by: Tom Whittington <[email protected]>

* 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 <[email protected]>
Co-authored-by: Simon FIRTH <[email protected]>
Co-authored-by: simonjfirth <[email protected]>
Co-authored-by: jack-coggin <[email protected]>
Co-authored-by: jack.coggin <[email protected]>
Co-authored-by: Iain STANGER <[email protected]>
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 <[email protected]>
Co-authored-by: Simon FIRTH <[email protected]>
Co-authored-by: simonjfirth <[email protected]>
Co-authored-by: jack-coggin <[email protected]>
Co-authored-by: jack.coggin <[email protected]>
Co-authored-by: Iain STANGER <[email protected]>
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 <[email protected]>
Co-authored-by: Simon FIRTH <[email protected]>
Co-authored-by: simonjfirth <[email protected]>
Co-authored-by: jack-coggin <[email protected]>
Co-authored-by: jack.coggin <[email protected]>
Co-authored-by: Iain STANGER <[email protected]>
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 <[email protected]>
Co-authored-by: Simon FIRTH <[email protected]>
Co-authored-by: simonjfirth <[email protected]>
Co-authored-by: jack-coggin <[email protected]>
Co-authored-by: jack.coggin <[email protected]>
Co-authored-by: Iain STANGER <[email protected]>
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 <[email protected]>
Co-authored-by: Tom Whittington <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Feature/ rework/linking (#86)

* Lowered HR to Hr

* Added support for linking to content

---------

Co-authored-by: Tom Whittington <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

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

* Added basic caching layer (#106)

Co-authored-by: Tom Whittington <[email protected]>

* 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 <[email protected]>
Co-authored-by: simonjfirth <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Hidden cookie banner (#115)

Co-authored-by: Tom Whittington <[email protected]>

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

* feat: removed header text (#117)

Co-authored-by: Tom Whittington <[email protected]>

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

Co-authored-by: Tom Whittington <[email protected]>

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

Co-authored-by: Tom Whittington <[email protected]>

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

Co-authored-by: Tom Whittington <[email protected]>

* Update download component mapping and styling

* Added citation block (#121)

* feat: added citation block

* fix: fixed tests

---------

Co-authored-by: Tom Whittington <[email protected]>

* feat: use current tab (#122)

Co-authored-by: Tom Whittington <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* feat: update beta banner feedback link

*…
  • Loading branch information
9 people authored Aug 27, 2024
1 parent b4abeaa commit a4ecec2
Show file tree
Hide file tree
Showing 20 changed files with 224 additions and 562 deletions.
47 changes: 23 additions & 24 deletions .github/workflows/code-pr-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,18 @@ jobs:
distribution: "microsoft"
java-version: "17"

# - name: Start SonarCloud scanner
# run: |
# dotnet-sonarscanner begin \
# /k:"DFE-Digital_sts-content-support" \
# /o:"dfe-digital" \
# /d:sonar.login="${{ secrets.SONAR_TOKEN }}" \
# /d:sonar.host.url="https://sonarcloud.io" \
# /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml \
# /d:sonar.coverage.exclusions=**/Program.cs,**/wwwroot/** \
# /d:sonar.issue.ignore.multicriteria=e1 \
# /d:sonar.issue.ignore.multicriteria.e1.ruleKey=csharpsquid:S6602 \
# /d:sonar.issue.ignore.multicriteria.e1.resourceKey=src/**/*.cs
- name: Start SonarCloud scanner
run: |
dotnet-sonarscanner begin \
/k:"DFE-Digital_sts-content-support" \
/o:"dfe-digital" \
/d:sonar.login="${{ secrets.SONAR_TOKEN }}" \
/d:sonar.host.url="https://sonarcloud.io" \
/d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml \
/d:sonar.coverage.exclusions=**/Program.cs,**/wwwroot/** \
/d:sonar.issue.ignore.multicriteria=e1 \
/d:sonar.issue.ignore.multicriteria.e1.ruleKey=csharpsquid:S6602 \
/d:sonar.issue.ignore.multicriteria.e1.resourceKey=src/**/*.cs
- name: Build web app
uses: ./.github/actions/build-dotnet-app
Expand All @@ -71,15 +71,14 @@ jobs:
with:
solution_filename: sts-contentsupport.sln

# - name: Merge test results
# run: dotnet-coverage merge -f xml -o "coverage.xml" -s "coverage.settings.xml" -r coverage.cobertura.xml
#
# - name: End SonarCloud Scanner
# run: dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
#
# - name: Archive code coverage results
# uses: actions/upload-artifact@v4
# with:
# name: code-coverage-report
# path: coverage.xml
#
- name: Merge test results
run: dotnet-coverage merge -f xml -o "coverage.xml" -s "coverage.settings.xml" -r coverage.cobertura.xml

- name: End SonarCloud Scanner
run: dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"

- name: Archive code coverage results
uses: actions/upload-artifact@v4
with:
name: code-coverage-report
path: coverage.xml
6 changes: 5 additions & 1 deletion src/Dfe.ContentSupport.Web/Controllers/ContentController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ public async Task<IActionResult> Home()
return View(defaultModel);
}



[HttpGet("{slug}/{page?}")]
public async Task<IActionResult> Index(string slug, string page = "", bool isPreview = false)
public async Task<IActionResult> Index(string slug, string page = "", bool isPreview = false, [FromQuery] List<string>? tags = null)
{
if (!ModelState.IsValid) return RedirectToAction("error");
if (string.IsNullOrEmpty(slug)) return RedirectToAction("error");
Expand All @@ -38,10 +40,12 @@ public async Task<IActionResult> Index(string slug, string page = "", bool isPre
if (resp is null) return RedirectToAction("error");

resp = layoutService.GenerateLayout(resp, Request, page);
ViewBag.tags = tags;

return View("CsIndex", resp);
}


public IActionResult Privacy()
{
return View();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ namespace Dfe.ContentSupport.Web.Controllers;
public class SitemapController(IContentService contentfulService) : Controller
{


[HttpGet]
[Route("/sitemap.xml")]
public async Task<IActionResult> Sitemap()
Expand Down
26 changes: 7 additions & 19 deletions src/Dfe.ContentSupport.Web/Dfe.ContentSupport.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,12 @@
</PropertyGroup>

<ItemGroup>
<Content Remove="appsettings.json"/>
</ItemGroup>

<ItemGroup>
<None Include="appsettings.json">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>Never</CopyToPublishDirectory>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1"/>
<PackageReference Include="Azure.Identity" Version="1.11.4"/>
<PackageReference Include="contentful.aspnetcore" Version="7.5.1"/>
<PackageReference Include="contentful.csharp" Version="7.5.1"/>
<PackageReference Include="GovUk.Frontend.AspNetCore" Version="1.5.0"/>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0"/>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
<PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
<PackageReference Include="Azure.Identity" Version="1.11.4" />
<PackageReference Include="contentful.aspnetcore" Version="7.5.1" />
<PackageReference Include="contentful.csharp" Version="7.5.1" />
<PackageReference Include="GovUk.Frontend.AspNetCore" Version="1.5.0" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
</Project>
3 changes: 1 addition & 2 deletions src/Dfe.ContentSupport.Web/Models/ContentBase.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using System.Diagnostics.CodeAnalysis;

namespace Dfe.ContentSupport.Web.Models;

[ExcludeFromCodeCoverage]
public class ContentBase : ContentType
public class ContentBase : Contentful.Core.Models.Entry<ContentBase>
{
public string InternalName { get; set; } = null!;

Expand Down
3 changes: 2 additions & 1 deletion src/Dfe.ContentSupport.Web/Models/ContentItemBase.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Diagnostics.CodeAnalysis;
using Contentful.Core.Models;
using System.Diagnostics.CodeAnalysis;

namespace Dfe.ContentSupport.Web.Models;

Expand Down
2 changes: 1 addition & 1 deletion src/Dfe.ContentSupport.Web/Models/Mapped/CsPage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ public class CsPage
public DateTime? UpdatedAt { get; init; }
public bool HasFeedbackBanner { get; set; }
public List<PageLink>? MenuItems { get; set; }

public List<string> Tags { get;set; } = null!;
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ public class RichTextContentItem : CsContentItem
public List<RichTextContentItem> Content { get; set; } = null!;
public RichTextNodeType NodeType { get; set; } = RichTextNodeType.Unknown;
public string Value { get; set; } = null!;
public List<string> Tags { get; set; } = [];
}
24 changes: 19 additions & 5 deletions src/Dfe.ContentSupport.Web/Services/ModelMapper.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Dfe.ContentSupport.Web.Common;
using Contentful.Core.Models;
using Dfe.ContentSupport.Web.Common;
using Dfe.ContentSupport.Web.Configuration;
using Dfe.ContentSupport.Web.Models;
using Dfe.ContentSupport.Web.Models.Mapped;
Expand Down Expand Up @@ -29,12 +30,20 @@ public CsPage MapToCsPage(ContentSupportPage incoming)
HasPrint = incoming.HasPrint,
Content = MapEntriesToContent(incoming.Content),
ShowVerticalNavigation = incoming.ShowVerticalNavigation,
CreatedAt = incoming.Sys.CreatedAt,
UpdatedAt = incoming.Sys.UpdatedAt
CreatedAt = incoming.SystemProperties.CreatedAt,
UpdatedAt = incoming.SystemProperties.UpdatedAt,
Tags = FlattenMetadata(incoming.Metadata)
};
return result;
}

private static List<string> FlattenMetadata(ContentfulMetadata item)
{
if (item is null) return [];

return item.Tags.Select(o => o.Sys.Id).ToList();
}

private List<CsContentItem> MapEntriesToContent(List<Entry> entries)
{
return entries.Select(ConvertEntryToContentItem).ToList();
Expand All @@ -59,6 +68,7 @@ public CsContentItem ConvertEntryToContentItem(Entry entry)
Subtitle = entry.Subtitle,
NodeType = ConvertToRichTextNodeType(richText.NodeType),
Content = MapRichTextNodes(richText.Content),
Tags = FlattenMetadata(entry.Metadata)
};
return item;
}
Expand All @@ -69,11 +79,14 @@ public List<RichTextContentItem> MapRichTextNodes(List<ContentItem> nodes)
{ NodeType = RichTextNodeType.Unknown, InternalName = node.InternalName }).ToList();
}


public RichTextContentItem? MapContent(ContentItem contentItem)
{
RichTextContentItem? item;
var nodeType = ConvertToRichTextNodeType(contentItem.NodeType);
var internalName = contentItem.InternalName;


switch (nodeType)
{
case RichTextNodeType.Text:
Expand All @@ -84,7 +97,7 @@ public List<RichTextContentItem> MapRichTextNodes(List<ContentItem> nodes)
break;
case RichTextNodeType.Hyperlink:
var uri = contentItem.Data.Uri.ToString();
item = new Hyperlink
item = new Models.Mapped.Standard.Hyperlink
{
Uri = uri,
IsVimeo = uri.Contains("vimeo.com")
Expand Down Expand Up @@ -137,12 +150,13 @@ public List<RichTextContentItem> MapRichTextNodes(List<ContentItem> nodes)
item.Content = MapRichTextNodes(contentItem.Content);
item.Value = contentItem.Value;
item.InternalName = internalName;
item.Tags = FlattenMetadata(contentItem.Metadata);
return item;
}

public CustomComponent? GenerateCustomComponent(Target target)
{
var contentType = target.Sys.ContentType?.Sys.Id;
var contentType = target.SystemProperties.ContentType?.SystemProperties.Id;
if (contentType is null) return null;
return contentType switch
{
Expand Down
4 changes: 1 addition & 3 deletions src/Dfe.ContentSupport.Web/Views/Content/CsIndex.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@
{
<partial name="_Content" model="@content"/>
}
</div>

<div class="govuk-grid-column-full">

@if (Model.HasCitation)
{
<partial name="_Citation" model="Model"/>
Expand Down
41 changes: 23 additions & 18 deletions src/Dfe.ContentSupport.Web/Views/Shared/RichText/_RichText.cshtml
Original file line number Diff line number Diff line change
@@ -1,61 +1,66 @@
@model RichTextContentItem

@{
var tags = ViewBag.tags ?? new List<string>();
}


@if (tags.Count == 0 || (Model.Tags.Count == 0 || Model.Tags.Exists(el => tags.Contains(el))))
{
var nodeType = Model.NodeType;

switch (nodeType)
{
case RichTextNodeType.Document:
<partial name="RichText/_Document" model="@Model"/>
<partial name="RichText/_Document" model="@Model" />
break;
case RichTextNodeType.Paragraph:
<partial name="RichText/_Paragraph" model="@Model"/>
<partial name="RichText/_Paragraph" model="@Model" />
break;
case RichTextNodeType.Heading2:
case RichTextNodeType.Heading3:
case RichTextNodeType.Heading4:
case RichTextNodeType.Heading5:
case RichTextNodeType.Heading6:
<partial name="RichText/_H" model="@Model"/>
<partial name="RichText/_H" model="@Model" />
break;
case RichTextNodeType.UnorderedList:
<partial name="RichText/_UnorderedList" model="@Model"/>
<partial name="RichText/_UnorderedList" model="@Model" />
break;
case RichTextNodeType.OrderedList:
<partial name="RichText/_OrderedList" model="@Model"/>
<partial name="RichText/_OrderedList" model="@Model" />
break;
case RichTextNodeType.ListItem:
<partial name="RichText/_ListItem" model="@Model"/>
<partial name="RichText/_ListItem" model="@Model" />
break;
case RichTextNodeType.Hyperlink:
<partial name="RichText/_Hyperlink" model="@Model"/>
<partial name="RichText/_Hyperlink" model="@Model" />
break;
case RichTextNodeType.Table:
<partial name="RichText/_Table" model="@Model"/>
<partial name="RichText/_Table" model="@Model" />
break;
case RichTextNodeType.TableRow:
<partial name="RichText/_TableRow" model="@Model"/>
<partial name="RichText/_TableRow" model="@Model" />
break;
case RichTextNodeType.TableHeaderCell:
<partial name="RichText/_TableHeaderCell" model="@Model"/>
<partial name="RichText/_TableHeaderCell" model="@Model" />
break;
case RichTextNodeType.TableCell:
<partial name="RichText/_TableCell" model="@Model"/>
<partial name="RichText/_TableCell" model="@Model" />
break;
case RichTextNodeType.Hr:
<hr/>
<hr />
break;
case RichTextNodeType.EmbeddedAsset:
<partial name="RichText/_Asset" model="@Model"/>
<partial name="RichText/_Asset" model="@Model" />
break;
case RichTextNodeType.Text:
<partial name="RichText/_Text" model="@Model"/>
<partial name="RichText/_Text" model="@Model" />
break;
case RichTextNodeType.EmbeddedEntry:
<partial name="RichText/_Entry" model="@Model"/>
<partial name="RichText/_Entry" model="@Model" />
break;
default:
<partial name="_UnsupportedElement" model="@Model"/>
<partial name="_UnsupportedElement" model="@Model" />
break;
}
}
}
20 changes: 0 additions & 20 deletions src/Dfe.ContentSupport.Web/appsettings.json

This file was deleted.

Loading

0 comments on commit a4ecec2

Please sign in to comment.