From 1b4ce6b7be141f9c94ce1862c66ccee760c7d8c2 Mon Sep 17 00:00:00 2001 From: ThomasWhittington <46750921+ThomasWhittington@users.noreply.github.com> Date: Thu, 22 Aug 2024 10:54:47 +0100 Subject: [PATCH] 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 Co-authored-by: Tom Whittington * 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 * 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 * Feature/ rework/linking (#86) * Lowered HR to Hr * Added support for linking to content --------- Co-authored-by: Tom Whittington * 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 * 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 * 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 * Added mapping layer to produce cleaner models (#96) * Added basic caching layer (#106) Co-authored-by: Tom Whittington * 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 Co-authored-by: simonjfirth * 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 * 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 * 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 * Hidden cookie banner (#115) Co-authored-by: Tom Whittington * Added default page to handle base route (#116) * feat: removed header text (#117) Co-authored-by: Tom Whittington * feat: allowed accordions to display richtext (#118) Co-authored-by: Tom Whittington * feat: added support for excel sheets (#119) Co-authored-by: Tom Whittington * feat: added back to top button (#120) Co-authored-by: Tom Whittington * Update download component mapping and styling * Added citation block (#121) * feat: added citation block * fix: fixed tests --------- Co-authored-by: Tom Whittington * feat: use current tab (#122) Co-authored-by: Tom Whittington * 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 * 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 * feat: update beta banner feedback link * feat: added basic retry on contentful api calls (#137) Co-authored-by: Tom Whittington * Added support for plantech cookies (#139) Co-authored-by: Tom Whittington * 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 Co-authored-by: Simon FIRTH Co-authored-by: simonjfirth Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com> Co-authored-by: jack.coggin Co-authored-by: Iain STANGER Co-authored-by: github-actions[bot] 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 Co-authored-by: Simon FIRTH Co-authored-by: simonjfirth Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com> Co-authored-by: jack.coggin Co-authored-by: Iain STANGER Co-authored-by: github-actions[bot] Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: Tom Whittington Co-authored-by: Simon FIRTH Co-authored-by: simonjfirth Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com> Co-authored-by: jack.coggin Co-authored-by: Iain STANGER Co-authored-by: github-actions[bot] Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * removed duplicates --------- Co-authored-by: Tom Whittington Co-authored-by: Simon FIRTH Co-authored-by: simonjfirth Co-authored-by: jack-coggin <119428483+jack-coggin@users.noreply.github.com> Co-authored-by: jack.coggin Co-authored-by: Iain STANGER Co-authored-by: github-actions[bot] Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/Dfe.ContentSupport.Web/wwwroot/css/cands-site.css | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/Dfe.ContentSupport.Web/wwwroot/css/cands-site.css b/src/Dfe.ContentSupport.Web/wwwroot/css/cands-site.css index ec40241..9787741 100644 --- a/src/Dfe.ContentSupport.Web/wwwroot/css/cands-site.css +++ b/src/Dfe.ContentSupport.Web/wwwroot/css/cands-site.css @@ -31,7 +31,6 @@ video { padding-left: 134px; } - .attachment .attachment-thumbnail { position: relative; float: left; @@ -290,7 +289,6 @@ dl.gem-c-metadata__list { font-size: 19px; line-height: 1.25; font-weight: 600; - color: #505a5f; margin-bottom: 15px; padding-top: 0; } @@ -339,10 +337,6 @@ dl.gem-c-metadata__list { border-left: 4px solid #347ca9; } -.dfe-vertical-nav__link:focus { - background: inherit; -} - .dfe-vertical-nav__section-item--current { border-left: 4px solid #003a69; font-weight: 700;