From 349eb70c2d0b33825e4e41f35e9a2c9ee1d2156a Mon Sep 17 00:00:00 2001 From: Marcel Kornblum Date: Tue, 18 Apr 2023 13:15:34 +0100 Subject: [PATCH] WCM-436 Implement the first design of search v2 (#335) Many changes are in this large piece of work. # Search Functionality * Feature parity with v1 search except search exclusions which were removed * Search is performed using Wagtail's search capabilities * All new views instrumented with new detailed GTM functionality for performance analysis # Interface * Complete redesign of the search page * Searching for pages, people and teams has been unified into one page * "All" search category gives an overview of matching pages, people and teams * Opt-in / opt-out functionality connected to the `user.enable_v2_search` flag: * Opt-in invitation banner appears on all v1 search pages * Opt-out banner appears on all pages, if user is opted in * New view, template to support it * Users will be redirected from v1 to v2 search and vice versa depending on their `user.enable_v2_search` status * For opted-in users, implemented a new site-wide header and navigation: * Unified search bar replacing two distinct bars * Moved site navigation below the red line in the header * Moved the new bar into the new navigation area * Moved the profile widget into the top space where the old search bar used to be * Reworked the navigation design and states on desktop and mobile according to the new designs * Top header bar CSS completely reworked to better fit govuk grid guidelines and the design, as well as responsive layout considerations, if not the govuk CSS implementation * Django template structure reworked slightly to make post-beta rationalisation easier * Feedback mechanisms adopted: * used new django app taking functionality from https://github.com/uktrade/jml * linked from the beta banner, a new form to submit detailed feedback to new model and send email notification * a new "star rating" widget that submits data to GTM and triggers the feedback form # Other / behind the scenes changes * Put `TODO [DWPF-454]` comments in the codebase wherever beta-specific functionality is implemented, making it easier to cleanup the codebase at the end of the beta * Upgraded gov-frontend NPM package to the latest version, including several changes to HTML nodes for compatibility (e.g. `span` => `p` * Removed all hex value colour definitions from CSS, replacing with SCSS vars or functions as appropriate [DWPF-454]: https://uktrade.atlassian.net/browse/DWPF-454?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ > NB requires extra ENV vars: --------- Co-authored-by: Sam Dudley Co-authored-by: Cameron Lamb --- .circleci/config.yml | 4 +- .env.ci | 4 + .env.example | 3 + Makefile | 3 + assets/js/application.js | 10 +- assets/js/peoplefinder.js | 5 +- assets/stylesheets/components/_home.scss | 6 +- assets/stylesheets/components/_layout.scss | 29 +- .../stylesheets/components/_news_article.scss | 2 +- .../stylesheets/components/_peoplefinder.scss | 47 +- .../components/_search_and_profile_bar.scss | 162 +- .../stylesheets/components/_search_field.scss | 238 ++- .../components/_search_results.scss | 162 +- .../stylesheets/govuk-overrides/header.scss | 349 +++- assets/stylesheets/vars/_colors.scss | 6 + config/settings/base.py | 31 + config/urls.py | 8 +- content/models.py | 41 +- core/templates/base.html | 68 +- .../templates/confirm.html | 8 + .../templates/listing.html | 7 + .../templates/submit.html | 8 + core/templates/includes/footer.html | 5 - core/templates/includes/govt_uk_form.html | 12 +- core/templates/includes/header.html | 52 +- core/templates/includes/header_searchv2.html | 46 + core/templates/includes/pagination_v2.html | 39 + core/templates/includes/profile_panel.html | 25 + .../includes/search_and_profile_bar.html | 47 +- core/templates/menus/main_menu.html | 53 +- core/templates/tags/search_beta_banner.html | 52 + core/templatetags/paginator.py | 19 + manifest.yml | 2 +- package-lock.json | 1648 +++-------------- package.json | 22 +- peoplefinder/models.py | 11 +- peoplefinder/services/search.py | 2 +- .../static/peoplefinder/profile-photo.js | 334 ++-- .../peoplefinder/components/checkbox.html | 6 +- .../peoplefinder/components/checkboxes.html | 6 +- .../components/error-summary.html | 47 +- .../peoplefinder/components/input.html | 22 +- .../components/manager/search-form.html | 17 +- .../components/search-result-person.html | 20 +- .../peoplefinder/components/team-card.html | 17 +- .../templates/peoplefinder/search.html | 4 +- peoplefinder/test/test_models.py | 8 + peoplefinder/urls.py | 1 + peoplefinder/views/search.py | 22 +- poetry.lock | 283 ++- pyproject.toml | 24 +- requirements.txt | 36 +- search/forms.py | 13 - search/search.py | 107 +- .../search/partials/page_results.html | 13 - .../search/partials/result/page.html | 17 + .../search/partials/result/people.html | 3 + .../search/partials/result/teams.html | 3 + .../partials/search_category_all_tabs.html | 10 + .../partials/search_category_single_tab.html | 13 + .../search/partials/search_form.html | 19 +- .../search/partials/search_results.html | 16 + .../search/partials/search_results_all.html | 17 + .../partials/search_results_category.html | 43 + .../search_results_single_category.html | 3 + .../search/partials/see_all_results_form.html | 19 - .../search/partials/team_results.html | 5 - search/templates/search/search.html | 23 +- search/templates/search/search_v2.html | 29 + search/templates/search/v2_search.html | 85 - search/templatetags/__init__.py | 0 search/templatetags/search.py | 104 ++ search/test/test_search.py | 2 +- search/test/test_utils.py | 8 + search/urls.py | 15 + search/utils.py | 138 ++ search/views.py | 148 +- 77 files changed, 2553 insertions(+), 2383 deletions(-) create mode 100644 core/templates/django_feedback_govuk/templates/confirm.html create mode 100644 core/templates/django_feedback_govuk/templates/listing.html create mode 100644 core/templates/django_feedback_govuk/templates/submit.html create mode 100644 core/templates/includes/header_searchv2.html create mode 100644 core/templates/includes/pagination_v2.html create mode 100644 core/templates/includes/profile_panel.html create mode 100644 core/templates/tags/search_beta_banner.html create mode 100644 core/templatetags/paginator.py create mode 100644 peoplefinder/test/test_models.py delete mode 100644 search/forms.py delete mode 100644 search/templates/search/partials/page_results.html create mode 100644 search/templates/search/partials/result/page.html create mode 100644 search/templates/search/partials/result/people.html create mode 100644 search/templates/search/partials/result/teams.html create mode 100644 search/templates/search/partials/search_category_all_tabs.html create mode 100644 search/templates/search/partials/search_category_single_tab.html create mode 100644 search/templates/search/partials/search_results.html create mode 100644 search/templates/search/partials/search_results_all.html create mode 100644 search/templates/search/partials/search_results_category.html create mode 100644 search/templates/search/partials/search_results_single_category.html delete mode 100644 search/templates/search/partials/see_all_results_form.html delete mode 100644 search/templates/search/partials/team_results.html create mode 100644 search/templates/search/search_v2.html delete mode 100644 search/templates/search/v2_search.html create mode 100644 search/templatetags/__init__.py create mode 100644 search/templatetags/search.py create mode 100644 search/test/test_utils.py create mode 100644 search/urls.py create mode 100644 search/utils.py diff --git a/.circleci/config.yml b/.circleci/config.yml index fceacab01..4e524ee29 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,9 @@ jobs: command: make build - run: name: install npm packages - command: npm ci + command: | + nvm install 18 + npm ci - run: name: build webpack command: npm run build diff --git a/.env.ci b/.env.ci index 7fce12d48..29c6bcabf 100644 --- a/.env.ci +++ b/.env.ci @@ -38,6 +38,9 @@ PROFILE_EDITED_EMAIL_TEMPLATE_ID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx # Profile deleted PROFILE_DELETED_EMAIL_TEMPLATE_ID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx +# Beta feedback notification +FEEDBACK_NOTIFICATION_EMAIL_TEMPLATE_ID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx + # Hawk authentication HAWK_INCOMING_ACCESS_KEY=xxx HAWK_INCOMING_SECRET_KEY=xxx @@ -54,4 +57,5 @@ PERSON_UPDATE_WEBHOOK_URL= # Home page HIDE_NEWS=False +FEEDBACK_NOTIFICATION_EMAIL_RECIPIENTS="support@example.com," # TESTS_KEEP_DB=1 diff --git a/.env.example b/.env.example index d3c941a88..db6d742a2 100644 --- a/.env.example +++ b/.env.example @@ -70,6 +70,7 @@ PROFILE_DELETION_REQUEST_EMAIL=support@example.com PROFILE_DELETION_REQUEST_EMAIL_TEMPLATE_ID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx PROFILE_EDITED_EMAIL_TEMPLATE_ID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx PROFILE_DELETED_EMAIL_TEMPLATE_ID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx +FEEDBACK_NOTIFICATION_EMAIL_TEMPLATE_ID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxx # Hawk authentication HAWK_INCOMING_ACCESS_KEY=xxx @@ -99,3 +100,5 @@ IMPORT_USER_PWD= # Home page HIDE_NEWS=False + +FEEDBACK_NOTIFICATION_EMAIL_RECIPIENTS="marcel.kornblum@digital.trade.gov.uk," diff --git a/Makefile b/Makefile index d192618fa..46476fbb8 100644 --- a/Makefile +++ b/Makefile @@ -156,3 +156,6 @@ e2e-codegen: poetry run playwright codegen http://localhost:8000 mv .env.orig .env docker stop wagtail-test-server + +dump-db: + pg_dump digital_workspace -U postgres -h localhost -p 5432 -O -x -c -f dw.dump diff --git a/assets/js/application.js b/assets/js/application.js index 74ed53e39..12de76e03 100644 --- a/assets/js/application.js +++ b/assets/js/application.js @@ -1,6 +1,8 @@ -const images = require.context('../images', true) -const imagePath = (name) => images(name, true) +import "htmx.org/dist/htmx.js"; -require.context('govuk-frontend/govuk/assets'); -import { initAll } from 'govuk-frontend'; +const images = require.context("../images", true); +const imagePath = (name) => images(name, true); + +require.context("govuk-frontend/govuk/assets"); +import { initAll } from "govuk-frontend"; initAll(); diff --git a/assets/js/peoplefinder.js b/assets/js/peoplefinder.js index 2a80581c8..7b07fe7af 100644 --- a/assets/js/peoplefinder.js +++ b/assets/js/peoplefinder.js @@ -1,3 +1,2 @@ -import 'htmx.org/dist/htmx.js'; -import 'cropperjs/dist/cropper.css'; -export { default as Cropper } from 'cropperjs'; +import "cropperjs/dist/cropper.css"; +export { default as Cropper } from "cropperjs"; diff --git a/assets/stylesheets/components/_home.scss b/assets/stylesheets/components/_home.scss index ad64cf4d2..f0245c948 100644 --- a/assets/stylesheets/components/_home.scss +++ b/assets/stylesheets/components/_home.scss @@ -15,7 +15,7 @@ section { padding: 0 0 12px 0 !important; margin: 0 0 12px 0; - border-bottom: 5px solid #cf102d; + border-bottom: 5px solid $brand-color-red; } p { @@ -48,7 +48,7 @@ .quick-links { background-color: govuk-colour("light-grey"); - border-bottom: 5px solid #cf102d; + border-bottom: 5px solid $brand-color-red; padding: 12px; margin: 0; @@ -147,7 +147,7 @@ // D and I .news-item-3 { order: 3; - border-bottom: 5px solid #0064C5; + border-bottom: 5px solid $govuk-brand-colour; background-color: govuk-colour("light-grey"); .home-news-item-text-content { padding: 12px; diff --git a/assets/stylesheets/components/_layout.scss b/assets/stylesheets/components/_layout.scss index 65bc4d234..23a1e4fce 100644 --- a/assets/stylesheets/components/_layout.scss +++ b/assets/stylesheets/components/_layout.scss @@ -1,14 +1,16 @@ html { box-sizing: border-box; } -*, *:before, *:after { +*, +*:before, +*:after { box-sizing: inherit; } .ws-video-embed { iframe { - width: 100%!important; - height: calc(100vw * 0.30) + width: 100% !important; + height: calc(100vw * 0.3); } } @@ -18,17 +20,17 @@ html { } .ws-primary-content { - border-top: 1px solid #b1b4b6; - padding-top: 20px; + border-top: 1px solid govuk-colour("mid-grey"); + padding-top: 20px; } .ws-secondary-content { - border-top: 5px solid #cd1632; + border-top: 5px solid $brand-color-primary; padding-top: 20px; } .ws-article-content { - border-top: 1px solid #b1b4b6; + border-top: 1px solid govuk-colour("mid-grey"); } .ws-secondary-meta { @@ -36,15 +38,16 @@ html { } .ws-related-topics { - border-top:3px solid $govuk-error-colour; + border-top: 3px solid $govuk-error-colour; } .ws-hide { - position: absolute !important; /* Outside the DOM flow */ - height: 1px; width: 1px; /* Nearly collapsed */ - overflow: hidden; - clip: rect(1px 1px 1px 1px); /* IE 7+ only support clip without commas */ - clip: rect(1px, 1px, 1px, 1px); /* All other browsers */ + position: absolute !important; /* Outside the DOM flow */ + height: 1px; + width: 1px; /* Nearly collapsed */ + overflow: hidden; + clip: rect(1px 1px 1px 1px); /* IE 7+ only support clip without commas */ + clip: rect(1px, 1px, 1px, 1px); /* All other browsers */ } .ws-children-2-col { diff --git a/assets/stylesheets/components/_news_article.scss b/assets/stylesheets/components/_news_article.scss index 8a5359de8..f110ff796 100644 --- a/assets/stylesheets/components/_news_article.scss +++ b/assets/stylesheets/components/_news_article.scss @@ -34,7 +34,7 @@ h2 { a { - color: #005ea5; + color: $govuk-link-colour; } } diff --git a/assets/stylesheets/components/_peoplefinder.scss b/assets/stylesheets/components/_peoplefinder.scss index edd57bc2a..f50af0a37 100644 --- a/assets/stylesheets/components/_peoplefinder.scss +++ b/assets/stylesheets/components/_peoplefinder.scss @@ -26,7 +26,7 @@ .separated > *:not(:last-child) { padding-right: 10px; margin-right: 10px; - border-right: 1px solid #b1b4b6; + border-right: 1px solid govuk-colour("mid-grey"); } .p-0 { @@ -66,7 +66,7 @@ } .gds-border-bottom-1-grey { - border-bottom: 1px solid #b1b4b6; + border-bottom: 1px solid govuk-colour("mid-grey"); } // Components @@ -95,7 +95,7 @@ .pf-role-form { padding: 20px; - border: 1px solid #b1b4b6; + border: 1px solid govuk-colour("mid-grey"); margin-bottom: 20px; button { @@ -112,15 +112,15 @@ } .success { - border-left: 5px solid green; + border-left: 5px solid $govuk-success-colour; } .warning { - border-left: 5px solid orange; + border-left: 5px solid $brand-color-warning; } .error { - border-left: 5px solid #d4351c; + border-left: 5px solid $govuk-success-colour; } } @@ -185,8 +185,9 @@ .pf-team-card { height: 100%; padding: 22.5px; - border: 1px solid #b1b4b6; - box-shadow: 7px 7px 0 #fff, 8px 8px 0 #b1b4b6; + border: 1px solid govuk-colour("mid-grey"); + box-shadow: 7px 7px 0 govuk-colour("white"), + 8px 8px 0 govuk-colour("mid-grey"); } .pf-team-card__name { @@ -201,7 +202,7 @@ .pf-team-card__metadata { font-size: 14px; - color: #505a5f; + color: govuk-colour("dark-grey"); margin-bottom: 0; } @@ -239,7 +240,7 @@ margin-bottom: 0; margin-left: 0.35em; line-height: 1.6; - border-left: thin solid #000; + border-left: thin solid govuk-colour("black"); &:last-child { border-left: none; @@ -251,12 +252,12 @@ height: 0.6em; margin-right: 0.1em; vertical-align: top; - border-bottom: thin solid #000; + border-bottom: thin solid govuk-colour("black"); content: ""; } &:last-child:before { - border-left: thin solid #000; + border-left: thin solid govuk-colour("black"); } } @@ -295,7 +296,7 @@ padding-bottom: 10px; &:not(:last-child) { - border-bottom: 1px solid #f3f2f1; + border-bottom: 1px solid govuk-colour("light-grey"); } } @@ -313,7 +314,7 @@ } .team-select__current-team { - color: #505a5f; + color: govuk-colour("dark-grey"); text-decoration: line-through; } @@ -334,10 +335,11 @@ display: flex; &__picture { - margin-right: 15px; + width: 25%; + margin-right: 1rem; img { - width: 200px; + max-width: 100%; } &.inactive-profile { @@ -348,6 +350,8 @@ } &__details { + width: 75%; + &__item { margin-bottom: 5px; } @@ -361,3 +365,14 @@ width: 50%; } } + +// @TODO [DWPF-454] remove .search-v2 class and merge all overrides into main declarations +.search-v2 { + .pf-team-card { + box-shadow: none; + } + + .pf-team-card__name { + font-size: 19px; + } +} diff --git a/assets/stylesheets/components/_search_and_profile_bar.scss b/assets/stylesheets/components/_search_and_profile_bar.scss index 2f3ddf183..c91cf941d 100644 --- a/assets/stylesheets/components/_search_and_profile_bar.scss +++ b/assets/stylesheets/components/_search_and_profile_bar.scss @@ -1,63 +1,137 @@ +// @TODO [DWPF-454] remove all instances of .search-and-profile-bar .search-and-profile-bar { - background-color: $brand-color-grey90; - background-image: url("../images/search-and-profile-bar-pattern.png"); + background-color: $brand-color-grey90; + background-image: url("../images/search-and-profile-bar-pattern.png"); } .ws-search-and-profile-bar__search { - padding: govuk-spacing(2) 0; + padding: govuk-spacing(2) 0; } .ws-search-and-profile-bar__profile { - padding: 0 0 0 govuk-spacing(3); + padding: 0 0 0 govuk-spacing(3); - @include govuk-media-query($until: desktop) { - display: none; - } + @include govuk-media-query($until: desktop) { + display: none; + } } -.people-finder-panel { - display: flex; - justify-content: flex-end; +.nav-and-profile-bar { + background-color: $brand-color-navy; + border-top: 5px solid $brand-color-primary; +} - .profile-link { +.people-finder-panel { display: flex; + justify-content: flex-end; + + .profile-link { + display: flex; + + &:link, + &:hover, + &:visited { + color: govuk-colour("white"); + } - &:link, - &:hover, - &:visited { - color: govuk-colour("white"); + &:focus { + @include govuk-focused-text; + + .profile-details { + @include govuk-focused-text; + } + } } - &:focus { - @include govuk-focused-text; + @include govuk-media-query($until: desktop, $media-type: "screen") { + .profile-link { + display: none; + } + } - .profile-details { - @include govuk-focused-text; - } + .profile-details { + @include govuk-font($size: 16, $weight: bold); + background-color: darken($brand-color-grey90, 5%); + padding: govuk-spacing(2) govuk-spacing(3) govuk-spacing(2) govuk-spacing(6); + text-align: right; + color: govuk-colour("white"); } - } - @media only screen and (max-width: 767px) { - .profile-link { - display: none; - } - } - - .profile-details { - @include govuk-font($size: 16, $weight: bold); - background-color: darken($brand-color-grey90, 5%); - padding: govuk-spacing(2) govuk-spacing(3) govuk-spacing(2) govuk-spacing(6); - text-align: right; - color: govuk-colour("white"); - } - - .profile-image { - width: 64px; - height: 64px; - } - - .profile-prompt { - @include govuk-font($size: 14); - display: block; - } + .profile-image { + width: 64px; + height: 64px; + } + + .profile-prompt { + @include govuk-font($size: 14); + display: block; + } +} + +// @TODO [DWPF-454] remove .search-v2 class and merge all overrides into main declarations +.search-v2 { + .people-finder-panel { + .profile-link { + align-items: center; + column-gap: 10px; + } + + .profile-link:focus { + box-shadow: none; + + .profile-details { + box-shadow: none; + } + } + + .profile-details { + padding: 0; + display: flex; + flex-direction: column; + background: none; + color: govuk-colour("black"); + font-weight: normal; + text-decoration-color: govuk-colour("black"); + + .salutation { + text-decoration: underline; + } + + .profile-prompt { + display: inline; + text-decoration: none; + + span { + display: inline-block; + } + } + } + + .profile-image { + width: 40px; + height: 40px; + } + } + + @include govuk-media-query($until: desktop, $media-type: "screen") { + .people-finder-panel { + position: absolute; + top: 15px; + right: 0; + + .profile-link { + display: flex; + column-gap: 5px; + + .profile-prompt { + display: none; + } + + img { + width: 20px; + height: 20px; + } + } + } + } } diff --git a/assets/stylesheets/components/_search_field.scss b/assets/stylesheets/components/_search_field.scss index be63d59f0..25e92159e 100644 --- a/assets/stylesheets/components/_search_field.scss +++ b/assets/stylesheets/components/_search_field.scss @@ -1,118 +1,174 @@ $input-size: 40px; @function encode-hex($hex) { - // Turn colour into a string - $output: inspect($hex); - // Slice the '#' from the start of the string so we can add it back on encoded. - $output: str-slice($output, 2); - // Add the '#' back on the start, but as an encoded character for embedding. - @return "%23" + $output; + // Turn colour into a string + $output: inspect($hex); + // Slice the '#' from the start of the string so we can add it back on encoded. + $output: str-slice($output, 2); + // Add the '#' back on the start, but as an encoded character for embedding. + @return "%23"+$output; } +// @TODO [DWPF-454] remove all instances of .search-and-profile-bar from codebase .search-and-profile-bar { - .govuk-width-container { - display: grid; - //width: auto; - grid-template-columns: repeat(2, 1fr); - column-gap: 20px; - input { - border: none; + .govuk-width-container { + display: grid; + //width: auto; + grid-template-columns: repeat(2, 1fr); + column-gap: 20px; + + input { + border: none; + } } - } } -.search-form { - display: flex; - flex: 0 $input-size; - margin: 12px 0; - input { // overly specific to prevent some overrides from outside - @include govuk-font($size: 16, $line-height: (28 / 16)); - padding: 6px; - margin: 0; - //width: 100%; - height: $input-size; - background: govuk-colour("white"); - border-radius: 0; //otherwise iphones apply an automatic border radius - box-sizing: border-box; - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; - - // the .focus class is added by JS and ensures that the input remains above the label once clicked/filled in - &:focus, - &.focus { - z-index: 2; - } +// @TODO [DWPF-454] remove .nav-and-profile-bar, merge these with more general definitions +.nav-and-profile-bar { + .govuk-width-container { + column-gap: 20px; + + nav { + flex-grow: 5; + } - &:focus { - outline: $govuk-focus-width solid $govuk-focus-colour; - // Ensure outline appears outside of the element - outline-offset: 0; + .site-search { + flex-grow: 10; + } } +} + +.search-form { + display: flex; + flex: 0 $input-size; + margin: 12px 0; - //max-width: 360px; - } - - button { - flex-shrink: 0; - border: 0; - cursor: pointer; - border-radius: 0; - position: relative; - padding: 0; - width: $input-size; - height: $input-size; - background-color: $brand-color-primary; - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 36 36' width='40' height='40'%3E%3Cpath d='M25.7 24.8L21.9 21c.7-1 1.1-2.2 1.1-3.5 0-3.6-2.9-6.5-6.5-6.5S10 13.9 10 17.5s2.9 6.5 6.5 6.5c1.6 0 3-.6 4.1-1.5l3.7 3.7 1.4-1.4zM12 17.5c0-2.5 2-4.5 4.5-4.5s4.5 2 4.5 4.5-2 4.5-4.5 4.5-4.5-2-4.5-4.5z' fill='#{encode-hex(govuk-colour("white"))}'%3E%3C/path%3E%3C/svg%3E"); - background-position: center left; - background-size: $input-size $input-size; - background-repeat: no-repeat; - - text-indent: -5000px; - overflow: hidden; - - &:focus { - z-index: 2; - outline: $govuk-focus-width solid $govuk-focus-colour; - // Ensure outline appears outside of the element - outline-offset: 0; + input { + // overly specific to prevent some overrides from outside + @include govuk-font($size: 16, $line-height: (28 / 16)); + padding: 6px; + margin: 0; + //width: 100%; + height: $input-size; + background: govuk-colour("white"); + border-radius: 0; //otherwise iphones apply an automatic border radius + box-sizing: border-box; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + + // the .focus class is added by JS and ensures that the input remains above the label once clicked/filled in + &:focus, + &.focus { + z-index: 2; + } + + &:focus { + outline: $govuk-focus-width solid $govuk-focus-colour; + // Ensure outline appears outside of the element + outline-offset: 0; + } + + //max-width: 360px; } - &::-moz-focus-inner { - border: 0; + button { + flex-shrink: 0; + border: 0; + cursor: pointer; + border-radius: 0; + position: relative; + padding: 0; + width: $input-size; + height: $input-size; + background-color: $brand-color-primary; + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 36 36' width='40' height='40'%3E%3Cpath d='M25.7 24.8L21.9 21c.7-1 1.1-2.2 1.1-3.5 0-3.6-2.9-6.5-6.5-6.5S10 13.9 10 17.5s2.9 6.5 6.5 6.5c1.6 0 3-.6 4.1-1.5l3.7 3.7 1.4-1.4zM12 17.5c0-2.5 2-4.5 4.5-4.5s4.5 2 4.5 4.5-2 4.5-4.5 4.5-4.5-2-4.5-4.5z' fill='#{encode-hex(govuk-colour("white"))}'%3E%3C/path%3E%3C/svg%3E"); + background-position: center left; + background-size: $input-size $input-size; + background-repeat: no-repeat; + + text-indent: -5000px; + overflow: hidden; + + &:focus { + z-index: 2; + outline: $govuk-focus-width solid $govuk-focus-colour; + // Ensure outline appears outside of the element + outline-offset: 0; + } + + &::-moz-focus-inner { + border: 0; + } } - } } .site-search { - position: absolute; - right: 0; - top:-4px; - align-items: center; - min-width: 260px; - .search-form { - button { - background-color: $govuk-link-colour; + position: absolute; + right: 0; + top: -4px; + align-items: center; + min-width: 260px; + + .search-form { + button { + background-color: $govuk-link-colour; + } + } +} + +// @TODO [DWPF-454] merge these overrides with the relevant base classes +.search-v2 { + .site-search { + position: inherit; + + .search-form { + input { + border: none; + } + } + } + + .search-form { + margin: 7px 0; } - } } .site-search-mobile { - .search-form { - button { - background-color: $govuk-link-colour; + .search-form { + button { + background-color: $govuk-link-colour; + } + } +} + +@include govuk-media-query($until: desktop, $media-type: "screen") { + .site-search { + display: none; + } + + .search-and-profile-bar { + .govuk-width-container { + display: flow-root; + } + } + + // @TODO [DWPF-454] remove this rule + .search-v2-banner { + + .govuk-phase-banner__content { + line-height: 1.5; + } } - } } -@media only screen and (max-width: 767px) { - .site-search { - display: none; - } +// @TODO [DWPF-454] remove this rule, it's only for the custom v2 opt-in banner +.opt-in-invitation { + background-color: $tag-blue-background; + padding: 0 1em; + margin-top: 1em; - .search-and-profile-bar { - .govuk-width-container { - display: flow-root; + .govuk-phase-banner { + border-bottom: none; } - } -} \ No newline at end of file +} diff --git a/assets/stylesheets/components/_search_results.scss b/assets/stylesheets/components/_search_results.scss index e906f47b9..f12370fe7 100644 --- a/assets/stylesheets/components/_search_results.scss +++ b/assets/stylesheets/components/_search_results.scss @@ -17,16 +17,162 @@ } } -.v2-search-results { - &__category { - padding-top: 20px; - margin-bottom: 20px; +// Search v2 +.search-results { + margin-bottom: 2rem; - border: 1px solid $govuk-border-colour; + .search-v2-hide { + display: none; } +} - ul { - padding-left: 0px; - list-style: none; +.search-results__categories { + border-bottom: 1px solid black; + margin-bottom: 1rem; + + div { + display: flex; + flex-direction: column; + gap: 0.25em; + padding-bottom: 1em; + + > a { + padding: 0.4em 1em; + margin-left: -1em; + margin-right: -1em; + + &[data-selected], + &:hover { + color: govuk-colour("white"); + background-color: $govuk-link-colour; + text-decoration: none; + } + &:focus { + color: govuk-colour("black"); + background-color: $govuk-focus-colour; + box-shadow: 0 -2px $govuk-focus-colour, 0 5px govuk-colour("black"); + } + } + } +} + +.search-results__all { + display: grid; + grid-template-columns: 1fr; + grid-template-rows: auto; + gap: 1rem; + + .left-col { + order: 2; + } + + .right-col { + order: 1; + } + + .people { + margin-bottom: 1rem; + } +} + +@include govuk-media-query($from: tablet) { + .search-results__categories { + div { + max-width: 660px; + flex-direction: row; + justify-content: space-between; + padding-bottom: 5px; + + > a { + margin: 0; + padding: 0.25em 0; + + &[data-selected], + &:hover { + color: $govuk-link-colour; + background-color: govuk-colour("white"); + box-shadow: 0 0 govuk-colour("white"), 0 5px $govuk-link-colour; + } + + &:focus { + color: govuk-colour("black"); + background-color: $govuk-focus-colour; + box-shadow: 0 -2px $govuk-focus-colour, 0 5px govuk-colour("black"); + } + } + } + } +} + +@include govuk-media-query($from: desktop) { + .search-results__all { + grid-template-columns: 2fr 1fr; + + .left-col { + order: 1; + } + .right-col { + order: 2; + } } + + .search-results__categories { + div { + max-width: none; + justify-content: flex-start; + gap: 1em; + } + } +} + +.search-results__list { + .pinned { + padding: 1rem; + margin-bottom: 2rem; + background-color: govuk-colour("light-grey"); + } +} + +.search-results__list[data-search-category="teams"] { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(280px, 1fr)); + grid-gap: 1.5rem; + margin-bottom: 1.5rem; +} + +.search-result { + container-type: inline-size; + width: 100%; +} + +.search-result--person { + margin-bottom: 1rem; + + [data-detail-additional] { + display: none; + } +} + +// Show a person's additional details when the container is medium-large. +@container (min-width: 320px) { + .search-result--person [data-detail-additional] { + display: block; + } +} + +.search-result--page { + padding-bottom: 0.5rem; + + &:not(:last-child) { + margin-bottom: 1rem; + border-bottom: 1px solid $govuk-border-colour; + } + + > * { + margin-bottom: 0.5rem; + } +} + +.beta-feedback { + margin-top: 30px; } diff --git a/assets/stylesheets/govuk-overrides/header.scss b/assets/stylesheets/govuk-overrides/header.scss index 4985dddd3..9f030644d 100644 --- a/assets/stylesheets/govuk-overrides/header.scss +++ b/assets/stylesheets/govuk-overrides/header.scss @@ -1,74 +1,347 @@ .govuk-header { - border-bottom: 0; + border-bottom: 0; } .govuk-header__content { - width: auto; - margin-top:10px; + width: auto; + margin-top: 10px; } .govuk-header--ws { - background-color: govuk-colour("white"); + background-color: govuk-colour("white"); } .govuk-header__link--ws { - &:link, - &:visited { - color: govuk-colour("black"); - } + + &:link, + &:visited { + color: govuk-colour("black"); + } } +// TODO [DWPF-454] merge this rule with the below one .govuk-header__container { - border-bottom: 5px solid $brand-color-primary; - margin-bottom: 0; - padding-top: 6px; + border-bottom: 5px solid $brand-color-primary; + margin-bottom: 0; + padding-top: 6px; } -.govuk-header__navigation-item--active--ws { - a { - &:link, - &:hover, - &:visited { - color: $brand-color-primary; +// TODO [DWPF-454] remove .search-v2 class nesting to target directly +.search-v2 { + .govuk-header__container { + padding: 10px 0 6px 0; + border-bottom: none; + } + + .govuk-width-container { + display: flex; + justify-content: space-between; + } + + .govuk-header__logo { + width: fit-content; + float: none; + padding: 0; + margin: 0; + + .govuk-header__link { + margin: 0; + padding: 0; + line-height: auto; + } + + .govuk-header__link:hover { + border: none; + } + } + + .govuk-header__logotype--ws img { + margin: 0; + width: 120px; + height: 54px; + } + + .govuk-header__content { + flex-grow: 10; + display: flex; + justify-content: center; + align-items: center; + padding: 0; + margin: 0; + column-gap: 20px; + } + + .govuk-header__service-name--ws { + font-size: 24px; + margin: 0; + // margin: govuk-spacing(1) 0; + // @include govuk-media-query ($from: mobile) { + // @include govuk-font($size: 27, $weight: bold); + // } + } + + .nav-and-profile-bar { + + .govuk-header__navigation { + margin: 0; + } + + .govuk-header__navigation-list { + margin: 0; + padding: 0; + } + + .govuk-header__link, + .govuk-header__navigation-item, + .govuk-header__navigation-item--active--ws, + .ancestor { + padding-top: 17px; + padding-right: max(15px, calc(15px + env(safe-area-inset-right))); + padding-bottom: 18px; + padding-left: max(20px, calc(20px + env(safe-area-inset-left))); + text-decoration-thickness: 5px; + text-underline-offset: 17px; + + .govuk-header__link--ws { + + &:link, + &:visited { + color: govuk-colour("white"); + } + + &:focus { + color: govuk-colour("black"); + } + } + + } + + .govuk-header__link:hover { + text-decoration-color: $govuk-link-colour; + } + + .govuk-header__link:focus { + color: govuk-colour("black"); + outline: none; + box-shadow: none; + text-decoration: underline; + text-decoration-thickness: 5px; + } + + .govuk-header__navigation-item:focus-within { + background-color: $govuk-focus-colour; + color: govuk-colour("black"); + } + } + + .govuk-header__navigation-item--active--ws, + .ancestor { + a { + + &:link, + &:hover, + &:visited { + color: govuk-colour("white"); + } + + &:focus { + color: govuk-colour("black"); + background-color: $govuk-focus-colour; + } + } + } + + .govuk-header__menu-button[aria-expanded=true]:hover { + box-shadow: 0 0 govuk-colour("white"), + 0 4px $govuk-link-colour; + text-decoration: none; + ; + } +} + +@include govuk-media-query($until: desktop, $media-type: "screen") { + + // @TODO [DWPF-454] remove the .search-v2 nesting and merge with existing rules + .search-v2 { + .govuk-width-container { + flex-direction: column; + + .govuk-header__content { + justify-content: left; + padding: 10px 0 4px 0; + } + } + + .govuk-header__menu-button.govuk-js-header-toggle { + top: 81px; + font-size: 1rem; + } + + .nav-and-profile-bar { + background-color: $brand-color-navy; + + .govuk-width-container { + margin: 0; + } + + .govuk-header__navigation-item, + li.govuk-header__navigation-item--active--ws, + li.ancestor { + padding: 0; + border: none; + } + + .govuk-header__link, + a.govuk-header__navigation-item--active--ws, + a.ancestor { + display: inline-block; + width: 100%; + padding-top: 17px; + padding-bottom: 17px; + text-decoration: none; + } + + .govuk-header__link:hover, + .govuk-header__link:active, + a.govuk-header__navigation-item--active--ws, + a.ancestor { + background-color: $govuk-link-colour; + color: govuk-colour("white"); + text-decoration: none; + } + + .govuk-header__link:focus { + background-color: $govuk-focus-colour; + color: govuk-colour("black"); + text-decoration: none; + } + + .site-search { + display: block; + padding: 0 15px; + background-color: govuk-colour("light-grey"); + } + } + } +} + +@include govuk-media-query($from: tablet, $media-type: "screen") { + .search-v2 { + + .govuk-header__service-name--ws { + font-size: 27px; + } + .nav-and-profile-bar { + + .govuk-header__link, + a.govuk-header__navigation-item--active--ws, + a.ancestor { + padding-right: max(30px, calc(30px + env(safe-area-inset-right))); + padding-left: max(30px, calc(30px + env(safe-area-inset-left))); + } + + .site-search { + padding: 0 30px; + } + } + } +} + +@include govuk-media-query($from: desktop, $media-type: "screen") { + .search-v2 { + .nav-and-profile-bar { + .govuk-header__navigation-list { + display: flex; + gap: 1em; + } + + .govuk-header__link, + .govuk-header__navigation-item, + .govuk-header__navigation-item--active--ws, + .ancestor { + margin: 0; + + } + + .govuk-header__link:first-child, + .govuk-header__navigation-item:first-child, + .govuk-header__navigation-item--active--ws:first-child, + .ancestor:first-child { + padding-left: 0; + + } + + .govuk-header__link, + a.govuk-header__navigation-item--active--ws, + a.ancestor { + padding: 0; + } + + .govuk-header__link, + .govuk-header__navigation-item, + .govuk-header__navigation-item--active--ws, + .ancestor { + padding-right: 0; + padding-left: 0; + + } + + .site-search { + max-width: 33%; + padding: 0; + } + } + } +} + + +.govuk-header__navigation-item--active--ws, +.ancestor { + a { + + &:link, + &:hover, + &:visited { + color: $brand-color-primary + } } - } } .govuk-header__logo--ws { - @include govuk-media-query ($from: desktop) { - width: 20%; - } + @include govuk-media-query ($from: desktop) { + width: 20%; + } } .govuk-header__logotype--ws { - @include govuk-media-query ($from: desktop) { - img { - margin: govuk-spacing(1) 0; + @include govuk-media-query ($from: desktop) { + img { + margin: govuk-spacing(1) 0; + } } - } } .govuk-header__content--ws { - @include govuk-media-query ($from: desktop) { - width: 80%; - margin-top: govuk-spacing(1); - } + @include govuk-media-query ($from: desktop) { + width: 80%; + margin-top: govuk-spacing(1); + } } -.govuk-header__link--service-name--ws { - @include govuk-font($size: 27, $weight: bold); +.govuk-header__service-name--ws { + @include govuk-font($size: 27, $weight: bold); - @include govuk-media-query ($from: desktop) { - margin: govuk-spacing(1) 0; - } + @include govuk-media-query ($from: desktop) { + margin: govuk-spacing(1) 0; + } } .govuk-header__menu-button--ws { - color: govuk-colour("black"); + color: govuk-colour("black"); } .govuk-header__navigation-item--mobile-only { - @include govuk-media-query ($from: desktop) { - display: none; - } + @include govuk-media-query ($from: desktop) { + display: none; + } } diff --git a/assets/stylesheets/vars/_colors.scss b/assets/stylesheets/vars/_colors.scss index 31fa8bf76..2af70149b 100644 --- a/assets/stylesheets/vars/_colors.scss +++ b/assets/stylesheets/vars/_colors.scss @@ -2,10 +2,16 @@ $brand-color-red: #cf102d; $brand-color-navy: #00285f; $brand-color-jade: #004d44; $brand-color-violet: #4814a0; +$tag-blue-background: #D2E2F1; $brand-color-grey90: #404040; $brand-color-grey50: #a7a7a7; $brand-color-grey10: #e7e7e7; +$brand-color-warning: orange; + $brand-color-primary: $brand-color-red; $brand-color-secondary: $brand-color-navy; + +// $govuk-button-background-colour +// $govuk-button-text-colour diff --git a/config/settings/base.py b/config/settings/base.py index a55922c06..b6629bec6 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -16,6 +16,7 @@ env_file = os.path.join(BASE_DIR, ".env") if os.path.exists(env_file): env.read_env(env_file) +env.read_env() VCAP_SERVICES = env.json("VCAP_SERVICES", {}) @@ -118,6 +119,9 @@ "django_chunk_upload_handlers", "django_audit_log_middleware", "rest_framework", + "crispy_forms", + "crispy_forms_gds", + "django_feedback_govuk", ] WAGTAIL_APPS = [ @@ -455,6 +459,12 @@ "level": os.getenv("DJANGO_DB_LOG_LEVEL", "INFO"), "propagate": True, }, + "opensearch": { + "handlers": [ + "stdout", + ], + "level": "INFO", + }, }, } @@ -519,3 +529,24 @@ # Home page HIDE_NEWS = env.bool("HIDE_NEWS", False) + +# Crispy forms +CRISPY_ALLOWED_TEMPLATE_PACKS = ["gds"] +CRISPY_TEMPLATE_PACK = "gds" + +# Feedback +DJANGO_FEEDBACK_GOVUK = { + "SERVICE_NAME": "the beta experience", + "FEEDBACK_NOTIFICATION_EMAIL_TEMPLATE_ID": env( + "FEEDBACK_NOTIFICATION_EMAIL_TEMPLATE_ID" + ), + "FEEDBACK_NOTIFICATION_EMAIL_RECIPIENTS": env.list( + "FEEDBACK_NOTIFICATION_EMAIL_RECIPIENTS", default=[] + ), + "COPY": { + "SUBMIT_TITLE": "Give your feedback on the beta search experience", + "FIELD_SATISFACTION_LEGEND": "How do you feel about your search experience today?", + "FIELD_COMMENT_LEGEND": "Tell us why you gave this response", + "FIELD_COMMENT_HINT": "If you would not like us to contact you for further user research please indicate below. Do not include any personal information.", + }, +} diff --git a/config/urls.py b/config/urls.py index 381c99ed6..dc4961229 100644 --- a/config/urls.py +++ b/config/urls.py @@ -3,6 +3,7 @@ from django.conf.urls import include from django.urls import path from django.views.generic import RedirectView +from django_feedback_govuk import urls as feedback_urls from wagtail import urls as wagtail_urls from wagtail.admin import urls as wagtailadmin_urls from wagtail.contrib.sitemaps.views import sitemap @@ -34,7 +35,8 @@ path("admin/", include(wagtailadmin_urls)), path("documents/", include(wagtaildocs_urls)), path("search/", search_views.search, name="search"), - path("v2-search/", search_views.v2_search, name="v2-search"), + # TODO[DWPF-454] remove this + path("search/", include("search.urls")), path("pingdom/", include("pingdom.urls")), # Peoplefinder path("people/", include(people_urlpatterns)), @@ -42,6 +44,10 @@ path("people-and-teams/", include(people_and_teams_urlpatterns)), path("peoplefinder/api/", include(api_urlpatterns)), path("sitemap.xml", sitemap), + # Feedback + path( + "feedback/", include(feedback_urls), name="feedback" + ), # @TODO [DWPF-454] remove feedback after beta # Wagtail path("", include(wagtail_urls)), ] diff --git a/content/models.py b/content/models.py index cefa15479..4ecf29d9b 100644 --- a/content/models.py +++ b/content/models.py @@ -5,16 +5,18 @@ from django.contrib.contenttypes.fields import GenericForeignKey from django.contrib.contenttypes.models import ContentType from django.db import models +from django.db.models import Q, Subquery from simple_history.models import HistoricalRecords from wagtail.admin.panels import FieldPanel from wagtail.fields import StreamField -from wagtail.models import Page +from wagtail.models import Page, PageManager, PageQuerySet from wagtail.search import index from wagtail.snippets.models import register_snippet from content import blocks from content.utils import manage_excluded, manage_pinned from core.utils import set_seen_cookie_banner +from search.utils import split_query from user.models import User as UserModel @@ -75,7 +77,30 @@ def get_first_publisher(self) -> Optional[UserModel]: return None +class ContentPageQuerySet(PageQuerySet): + def pinned_q(self, query): + pinned = SearchPinPageLookUp.objects.filter_by_query(query) + + return Q(pk__in=Subquery(pinned.values("object_id"))) + + def pinned(self, query): + return self.filter(self.pinned_q(query)) + + def not_pinned(self, query): + return self.exclude(self.pinned_q(query)) + + def exclusions_q(self, query): + exclusions = SearchExclusionPageLookUp.objects.filter_by_query(query) + + return Q(pk__in=Subquery(exclusions.values("object_id"))) + + def exclusions(self, query): + return self.filter(self.exclusions_q(query)) + + class ContentPage(BasePage): + objects = PageManager.from_queryset(ContentPageQuerySet)() + is_creatable = False show_in_menus = True @@ -217,10 +242,20 @@ def save(self, *args, **kwargs): class SearchKeywordOrPhrase(models.Model): keyword_or_phrase = models.CharField(max_length=1000) + # TODO: Remove historical records. history = HistoricalRecords() +class SearchKeywordOrPhraseQuerySet(models.QuerySet): + def filter_by_query(self, query): + query_parts = split_query(query) + + return self.filter(search_keyword_or_phrase__keyword_or_phrase__in=query_parts) + + class SearchExclusionPageLookUp(models.Model): + objects = SearchKeywordOrPhraseQuerySet.as_manager() + search_keyword_or_phrase = models.ForeignKey( SearchKeywordOrPhrase, on_delete=models.CASCADE, @@ -228,10 +263,13 @@ class SearchExclusionPageLookUp(models.Model): content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) object_id = models.PositiveIntegerField() content_object = GenericForeignKey("content_type", "object_id") + # TODO: Remove historical records. history = HistoricalRecords() class SearchPinPageLookUp(models.Model): + objects = SearchKeywordOrPhraseQuerySet.as_manager() + search_keyword_or_phrase = models.ForeignKey( SearchKeywordOrPhrase, on_delete=models.CASCADE, @@ -239,6 +277,7 @@ class SearchPinPageLookUp(models.Model): content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) object_id = models.PositiveIntegerField() content_object = GenericForeignKey("content_type", "object_id") + # TODO: Remove historical records. history = HistoricalRecords() diff --git a/core/templates/base.html b/core/templates/base.html index a77f34308..22bbb001a 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -11,52 +11,82 @@ {% block title %} - {% if self.seo_title %}{{ self.seo_title }}{% else %}{{ self.title }}{% endif %} - {% endblock %} - {% block title_suffix %} - - Digital Workspace + {% if self.seo_title %} + {{ self.seo_title }} + {% else %} + {{ self.title }} + {% endif %} {% endblock %} + {% block title_suffix %}- Digital Workspace{% endblock %} - + - {% if settings.GTM_CODE %} + })(window,document,'script','dataLayer','{{ settings.GTM_CODE }}'); + gtm_data_then_click = function(object, data) { + dataLayer.push(data); + url=object.getAttribute("href"); + setTimeout(function(){location.href = url}, 500); + return false; + }; + {% endif %} - - - - + + + - - + {% render_bundle 'main' 'css' %} {% block stylesheets %}{% endblock %} {% block libraries %}{% endblock %} - {% if settings.GTM_CODE %} + height="0" + width="0" + style="display:none; + visibility:hidden"> {% endif %} - Skip to main content - {% include "includes/header.html" %} - {% include "includes/search_and_profile_bar.html" %} + Skip to main content + {% if user.enable_v2_search %} + {% include "includes/header_searchv2.html" %} + {% else %} + {# @TODO [DWPF-454] Remove these legacy header templates and the if condition #} + {% include "includes/header.html" %} + {% include "includes/search_and_profile_bar.html" %} + {% endif %} + {% if user.enable_v2_search or "search" in request.get_full_path %} + {# @TODO [DWPF-454] Remove this banner and the template file #} + {% include "tags/search_beta_banner.html" %} + {% endif %} {% cookie_banner %} {% site_alert %}
-
+
{% block breadcrumbs %} {% breadcrumbs %} {% endblock %} diff --git a/core/templates/django_feedback_govuk/templates/confirm.html b/core/templates/django_feedback_govuk/templates/confirm.html new file mode 100644 index 000000000..6616fba6b --- /dev/null +++ b/core/templates/django_feedback_govuk/templates/confirm.html @@ -0,0 +1,8 @@ +{% extends "1_col_content.html" %} +{% comment %} @TODO [DWPF-454] remove the package and this template {% endcomment %} +{% load feedback_tags %} +{% block content %} +
+
{% feedback_confirm %}
+
+{% endblock content %} diff --git a/core/templates/django_feedback_govuk/templates/listing.html b/core/templates/django_feedback_govuk/templates/listing.html new file mode 100644 index 000000000..0bcc770ca --- /dev/null +++ b/core/templates/django_feedback_govuk/templates/listing.html @@ -0,0 +1,7 @@ + +{% extends "1_col_content.html" %} +{% comment %} @TODO [DWPF-454] remove the package and this template {% endcomment %} +{% load feedback_tags %} +{% block content %} + {% feedback_listing %} +{% endblock content %} diff --git a/core/templates/django_feedback_govuk/templates/submit.html b/core/templates/django_feedback_govuk/templates/submit.html new file mode 100644 index 000000000..cf67638c2 --- /dev/null +++ b/core/templates/django_feedback_govuk/templates/submit.html @@ -0,0 +1,8 @@ +{% extends "1_col_content.html" %} +{% comment %} @TODO [DWPF-454] remove the package and this template {% endcomment %} +{% load feedback_tags %} +{% block content %} +
+
{% feedback_submit %}
+
+{% endblock content %} diff --git a/core/templates/includes/footer.html b/core/templates/includes/footer.html index db36ca0eb..702fc00c4 100644 --- a/core/templates/includes/footer.html +++ b/core/templates/includes/footer.html @@ -35,11 +35,6 @@

Support links

  • Feedback
    • - {% if user.enable_v2_search %} -
  • - Search v2 -
    • - {% endif %} Built by the DBT Digital, Data and Technology team diff --git a/core/templates/includes/govt_uk_form.html b/core/templates/includes/govt_uk_form.html index 3e8b23459..9d4522f85 100644 --- a/core/templates/includes/govt_uk_form.html +++ b/core/templates/includes/govt_uk_form.html @@ -1,6 +1,7 @@ {% if form.non_field_errors %} - {% endif %} -{% endfor %} \ No newline at end of file +{% endfor %} diff --git a/core/templates/includes/header.html b/core/templates/includes/header.html index a8ecbc6ca..3357bfa3f 100644 --- a/core/templates/includes/header.html +++ b/core/templates/includes/header.html @@ -1,35 +1,37 @@ {% load menu_tags %} {% load render_bundle webpack_static from webpack_loader %} - {#{% get_menu "main" as main_navigation %}#} - - diff --git a/core/templates/includes/header_searchv2.html b/core/templates/includes/header_searchv2.html new file mode 100644 index 000000000..257fb46fd --- /dev/null +++ b/core/templates/includes/header_searchv2.html @@ -0,0 +1,46 @@ +{% load menu_tags %} +{% load render_bundle webpack_static from webpack_loader %} +{# @TODO [DWPF-454] remove search-v2 class, rename this template #} + diff --git a/core/templates/includes/pagination_v2.html b/core/templates/includes/pagination_v2.html new file mode 100644 index 000000000..c5dfd64da --- /dev/null +++ b/core/templates/includes/pagination_v2.html @@ -0,0 +1,39 @@ +{% load paginator %} + + diff --git a/core/templates/includes/profile_panel.html b/core/templates/includes/profile_panel.html new file mode 100644 index 000000000..6cff66d8d --- /dev/null +++ b/core/templates/includes/profile_panel.html @@ -0,0 +1,25 @@ +{% load render_bundle webpack_static from webpack_loader %} +
    + {% if peoplefinder_profile %} + +
    + Hi {{ peoplefinder_profile.first_name|truncatechars:25 }} + View your profile + {% if peoplefinder_profile.profile_completion < 100 %} + ({{ peoplefinder_profile.profile_completion|floatformat:0 }}% complete) + {% endif %} + +
    + {% if peoplefinder_profile.photo %} + Profile image of {{ peoplefinder_profile.get_full_name }} + {% else %} + No photo + {% endif %} +     +{% endif %} +
    diff --git a/core/templates/includes/search_and_profile_bar.html b/core/templates/includes/search_and_profile_bar.html index 84d0e2dcf..9186ee61d 100644 --- a/core/templates/includes/search_and_profile_bar.html +++ b/core/templates/includes/search_and_profile_bar.html @@ -1,13 +1,18 @@ {% load render_bundle webpack_static from webpack_loader %} - +{# TODO [DWPF-454] Delete this template #}
    - {# if not request.user.enable_v2_search #} -
    - - + + + {% if people_and_teams_search_filters %} {% for filter in people_and_teams_search_filters %} @@ -18,32 +23,6 @@ {% endif %}
    - {# else #} - - {# endif #} -
    - {% if peoplefinder_profile %} - -
    - Hi, {{ peoplefinder_profile.first_name|truncatechars:25 }} - - {% if peoplefinder_profile.profile_completion < 100 %} - Set up your profile ({{ peoplefinder_profile.profile_completion|floatformat:0 }}% complete) - {% else %} - View your profile - {% endif %} - -
    - {% if peoplefinder_profile.photo %} - Profile image of {{ peoplefinder_profile.get_full_name }} - {% else %} - No photo - {% endif %} -     - {% endif %} -
    + {% include 'includes/profile_panel.html' %}
    diff --git a/core/templates/menus/main_menu.html b/core/templates/menus/main_menu.html index 0334bf07b..00a8b3735 100644 --- a/core/templates/menus/main_menu.html +++ b/core/templates/menus/main_menu.html @@ -1,33 +1,22 @@ - -
      - -{% for item in menu_items %} -
    • - {% if item.active_class %} - {{ item.text }} - {% else %} - {{ item.text }} - {% endif %} -
      • -{% endfor %} -{# {% if peoplefinder_profile %}#} -{#
    • #} -{# #} -{# My profile ({{ peoplefinder_profile.first_name }})#} -{# #} -{#
      • #} -{# {% endif %}#} -
    • - Data Hub -
      • - -
    • - {% include 'search/partials/search_form.html' %} -
      • +
        + {% for item in menu_items %} +
      • + {% if item.active_class %} + {{ item.text }} + {% else %} + {{ item.text }} + {% endif %} +
        • + {% endfor %} + {# @TODO [DWPF-454] Remove this conditional and contents #} + {% if not user.enable_v2_search %} +
      • + Data Hub +
        • +
      • + {% include 'search/partials/search_form.html' %} +
        • + {% endif %}
      - - -{#
    • #} -{# {{ menu_item.title }}#} -{#
      • #} -{# {% endfor %}#} \ No newline at end of file diff --git a/core/templates/tags/search_beta_banner.html b/core/templates/tags/search_beta_banner.html new file mode 100644 index 000000000..69dc9b02f --- /dev/null +++ b/core/templates/tags/search_beta_banner.html @@ -0,0 +1,52 @@ +{# TODO [DWPF-454] Delete this template #} +{% load feedback_tags %} +{% if user.enable_v2_search %} +
      +
      +
      +

      + beta + + Please let us know what you think of the new experience, or switch back to the original experience. + +

      +
      +
      +
      + + +{% else %} +
      +
      +
      +

      + beta + + We're improving search and navigation. Would you like to try the new search experience? + +

      +
      +
      +
      +{% endif %} diff --git a/core/templatetags/paginator.py b/core/templatetags/paginator.py new file mode 100644 index 000000000..52dd3f381 --- /dev/null +++ b/core/templatetags/paginator.py @@ -0,0 +1,19 @@ +from django import template + + +register = template.Library() + + +@register.filter() +def get_elided_page_range(page): + return page.paginator.get_elided_page_range(page.number, on_each_side=1, on_ends=1) + + +@register.simple_tag(takes_context=True) +def get_pagination_url(context, page): + request = context["request"] + + query_params = request.GET.copy() + query_params["page"] = page + + return "?" + query_params.urlencode() diff --git a/manifest.yml b/manifest.yml index 39dcb3a54..87bda5e8e 100644 --- a/manifest.yml +++ b/manifest.yml @@ -2,7 +2,7 @@ applications: - name: digital-workspace-v2 buildpacks: - - https://github.com/cloudfoundry/nodejs-buildpack.git#v1.7.21 + - https://github.com/cloudfoundry/nodejs-buildpack.git - https://github.com/cloudfoundry/python-buildpack.git services: - pg-digital-workspace diff --git a/package-lock.json b/package-lock.json index 2c295410a..f8fc8e434 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,24 +1,28 @@ { "name": "workspace", "version": "0.1.0", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "workspace", "version": "0.1.0", "dependencies": { - "cropperjs": "^1.5.12", + "cropperjs": "^1.5.13", "css-loader": "^5.2.7", - "govuk-frontend": "^3.14.0", - "htmx.org": "^1.7.0", + "govuk-frontend": "^4.5.0", + "htmx.org": "^1.8.6", "mini-css-extract-plugin": "^1.6.2", - "sass": "^1.49.9", + "sass": "^1.59.3", "sass-loader": "^12.6.0", - "webpack": "^5.70.0", - "webpack-bundle-tracker": "^1.4.0", - "webpack-cli": "^4.9.2", - "y18n": "^4.0.1" + "webpack": "^5.76.2", + "webpack-bundle-tracker": "^1.8.1", + "webpack-cli": "^4.10.0", + "y18n": "^4.0.3" + }, + "engines": { + "node": ">18.0.0", + "npm": ">8.0.0" } }, "node_modules/@discoveryjs/json-ext": { @@ -82,9 +86,9 @@ } }, "node_modules/@types/eslint": { - "version": "8.4.9", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.9.tgz", - "integrity": "sha512-jFCSo4wJzlHQLCpceUhUnXdrPuCNOjGFMQ8Eg6JXxlz3QaCKOb7eGi2cephQdM4XTYsNej69P9JDJ1zqNIbncQ==", + "version": "8.21.2", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.21.2.tgz", + "integrity": "sha512-EMpxUyystd3uZVByZap1DACsMXvb82ypQnGn89e1Y0a+LYu3JJscUd/gqhRsVFDkaD2MIiWo0MT8EfXr3DGRKw==", "dependencies": { "@types/estree": "*", "@types/json-schema": "*" @@ -110,9 +114,9 @@ "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==" }, "node_modules/@types/node": { - "version": "18.11.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.8.tgz", - "integrity": "sha512-uGwPWlE0Hj972KkHtCDVwZ8O39GmyjfMane1Z3GUBGGnkZ2USDq7SxLpVIiIHpweY9DS0QTDH0Nw7RNBsAAZ5A==" + "version": "18.15.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz", + "integrity": "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw==" }, "node_modules/@webassemblyjs/ast": { "version": "1.11.1", @@ -289,9 +293,9 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" }, "node_modules/acorn": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", - "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", + "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", "bin": { "acorn": "bin/acorn" }, @@ -330,10 +334,18 @@ "ajv": "^6.9.1" } }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, "node_modules/anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -369,15 +381,42 @@ "node": ">=8" } }, + "node_modules/browserslist": { + "version": "4.21.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", + "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + } + ], + "dependencies": { + "caniuse-lite": "^1.0.30001449", + "electron-to-chromium": "^1.4.284", + "node-releases": "^2.0.8", + "update-browserslist-db": "^1.0.10" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" }, "node_modules/caniuse-lite": { - "version": "1.0.30001427", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001427.tgz", - "integrity": "sha512-lfXQ73oB9c8DP5Suxaszm+Ta2sr/4tf8+381GkIm1MLj/YdLf+rEDyDSRCzeltuyTVGm+/s18gdZ0q+Wmp8VsQ==", + "version": "1.0.30001466", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001466.tgz", + "integrity": "sha512-ewtFBSfWjEmxUgNBSZItFSmVtvk9zkwkl1OfRZlKA8slltRN+/C/tuGVrF9styXkN36Yu3+SeJ1qkXxDEyNZ5w==", "funding": [ { "type": "opencollective", @@ -447,9 +486,9 @@ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, "node_modules/cropperjs": { - "version": "1.5.12", - "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.5.12.tgz", - "integrity": "sha512-re7UdjE5UnwdrovyhNzZ6gathI4Rs3KGCBSc8HCIjUo5hO42CtzyblmWLj6QWVw7huHyDMfpKxhiO2II77nhDw==" + "version": "1.5.13", + "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.5.13.tgz", + "integrity": "sha512-by7jKAo73y5/Do0K6sxdTKHgndY0NMjG2bEdgeJxycbcmHuCiMXqw8sxy5C5Y5WTOTcDGmbT7Sr5CgKOXR06OA==" }, "node_modules/cross-spawn": { "version": "7.0.3", @@ -503,9 +542,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.284", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", - "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" + "version": "1.4.331", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.331.tgz", + "integrity": "sha512-tdtr9y9oJl8VDiS+HeB6e/JDJqdDGjIk3yRfEMHm5rDnWQ/D5SbafybAayInxolbfbH6pouV5g7ZUAwE/WVtHw==" }, "node_modules/emojis-list": { "version": "3.0.0", @@ -516,9 +555,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz", - "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==", + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", + "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -674,9 +713,9 @@ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" }, "node_modules/govuk-frontend": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.14.0.tgz", - "integrity": "sha512-y7FTuihCSA8Hty+e9h0uPhCoNanCAN+CLioNFlPmlbeHXpbi09VMyxTcH+XfnMPY4Cp++7096v0rLwwdapTXnA==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-4.5.0.tgz", + "integrity": "sha512-gZHDqf5vdlHjmx0NGJiNT12XLyR3d5KCS4AnlC3xTWOObJ0kQROrkIFyp3w4/PY3EQiYdgacVaJ6lizzygnzYw==", "engines": { "node": ">= 4.2.0" } @@ -706,9 +745,9 @@ } }, "node_modules/htmx.org": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-1.8.2.tgz", - "integrity": "sha512-jJzX0vaq6UguwI8wN/bGugsmbi8TItptGq6Jmcglf11iWqgjC54Tzqo9ugRzfkU9ZaAInRHAbsbs2fHuxtgRkQ==" + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-1.8.6.tgz", + "integrity": "sha512-88U8qwaIs4sZjzZvHgAX62B6qZoEdQNSYCRHARtYhSrk+iCUd3al8/0CrLwD8Tephsoodsf0gN9NbRrrmlJIfw==" }, "node_modules/icss-utils": { "version": "5.1.0", @@ -722,9 +761,9 @@ } }, "node_modules/immutable": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz", - "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==" + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz", + "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==" }, "node_modules/import-local": { "version": "3.1.0", @@ -838,20 +877,6 @@ "node": ">= 10.13.0" } }, - "node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -862,6 +887,17 @@ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -871,9 +907,9 @@ } }, "node_modules/klona": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz", - "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", + "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", "engines": { "node": ">= 8" } @@ -899,17 +935,6 @@ "node": ">=8.9.0" } }, - "node_modules/loader-utils/node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -936,11 +961,21 @@ "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==" }, + "node_modules/lodash.frompairs": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.frompairs/-/lodash.frompairs-4.0.1.tgz", + "integrity": "sha512-dvqe2I+cO5MzXCMhUnfYFa9MD+/760yx2aTAN1lqEcEkf896TxgrX373igVdqSJj6tQd0jnSLE1UMuKufqqxFw==" + }, "node_modules/lodash.get": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==" }, + "node_modules/lodash.topairs": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.topairs/-/lodash.topairs-4.3.0.tgz", + "integrity": "sha512-qrRMbykBSEGdOgQLJJqVSdPWMD7Q+GJJ5jMRfQYb+LTLsw3tYVIabnCzRqTJb2WTo17PG5gNzXuFaZgYH/9SAQ==" + }, "node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -1013,9 +1048,9 @@ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" }, "node_modules/node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==" + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz", + "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==" }, "node_modules/normalize-path": { "version": "3.0.0", @@ -1107,9 +1142,9 @@ } }, "node_modules/postcss": { - "version": "8.4.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz", - "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==", + "version": "8.4.21", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", + "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", "funding": [ { "type": "opencollective", @@ -1185,9 +1220,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.10", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", - "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", + "version": "6.0.11", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz", + "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==", "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -1202,9 +1237,9 @@ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" }, "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "engines": { "node": ">=6" } @@ -1294,9 +1329,9 @@ ] }, "node_modules/sass": { - "version": "1.55.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz", - "integrity": "sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==", + "version": "1.59.3", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.59.3.tgz", + "integrity": "sha512-QCq98N3hX1jfTCoUAsF3eyGuXLsY7BCnCEg9qAact94Yc21npG2/mVOqoDvE0fCbWDqiM4WlcJQla0gWG2YlxQ==", "dependencies": { "chokidar": ">=3.0.0 <4.0.0", "immutable": "^4.0.0", @@ -1378,9 +1413,9 @@ } }, "node_modules/serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", + "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", "dependencies": { "randombytes": "^2.1.0" } @@ -1420,6 +1455,14 @@ "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==" }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/source-map-js": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", @@ -1428,6 +1471,40 @@ "node": ">=0.10.0" } }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", @@ -1448,9 +1525,9 @@ } }, "node_modules/terser": { - "version": "5.15.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", - "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==", + "version": "5.16.6", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.6.tgz", + "integrity": "sha512-IBZ+ZQIA9sMaXmRZCUMDjNH0D5AQQfdn4WUjHL0+1lF4TP1IHRJbrhb6fNaXWikrYQTSkb7SLxkeXAiy1p7mbg==", "dependencies": { "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", @@ -1465,15 +1542,15 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.6", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz", - "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==", + "version": "5.3.7", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz", + "integrity": "sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==", "dependencies": { - "@jridgewell/trace-mapping": "^0.3.14", + "@jridgewell/trace-mapping": "^0.3.17", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.14.1" + "serialize-javascript": "^6.0.1", + "terser": "^5.16.5" }, "engines": { "node": ">= 10.13.0" @@ -1497,23 +1574,6 @@ } } }, - "node_modules/terser/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/terser/node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -1525,6 +1585,31 @@ "node": ">=8.0" } }, + "node_modules/update-browserslist-db": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", + "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + } + ], + "dependencies": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + }, + "bin": { + "browserslist-lint": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -1551,9 +1636,9 @@ } }, "node_modules/webpack": { - "version": "5.74.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz", - "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==", + "version": "5.76.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.2.tgz", + "integrity": "sha512-Th05ggRm23rVzEOlX8y67NkYCHa9nTNcwHPBhdg+lKG+mtiW7XgggjAeeLnADAe7mLjJ6LUNfgHAuRRh+Z6J7w==", "dependencies": { "@types/eslint-scope": "^3.7.3", "@types/estree": "^0.0.51", @@ -1597,36 +1682,19 @@ } }, "node_modules/webpack-bundle-tracker": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/webpack-bundle-tracker/-/webpack-bundle-tracker-1.6.0.tgz", - "integrity": "sha512-aDb5WpHyo/U23UsAFHadUJavOAcpcEDrdSOb2ExlSrsoYBnJlECC37wekDRQ9UwRKvNjVdjZWJ/NI8/dVaVp8w==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/webpack-bundle-tracker/-/webpack-bundle-tracker-1.8.1.tgz", + "integrity": "sha512-X1qtXG4ue92gjWQO2VhLVq8HDEf9GzUWE0OQyAQObVEZsFB1SUtSQ7o47agF5WZIaHfJUTKak4jEErU0gzoPcQ==", "dependencies": { "lodash.assign": "^4.2.0", "lodash.defaults": "^4.2.0", "lodash.foreach": "^4.5.0", + "lodash.frompairs": "^4.0.1", "lodash.get": "^4.4.2", + "lodash.topairs": "^4.3.0", "strip-ansi": "^6.0.0" } }, - "node_modules/webpack-bundle-tracker/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "engines": { - "node": ">=8" - } - }, - "node_modules/webpack-bundle-tracker/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/webpack-cli": { "version": "4.10.0", "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz", @@ -1702,66 +1770,6 @@ "source-map": "~0.6.1" } }, - "node_modules/webpack-sources/node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/webpack/node_modules/browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - } - ], - "dependencies": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, - "node_modules/webpack/node_modules/update-browserslist-db": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", - "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - } - ], - "dependencies": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" - }, - "bin": { - "browserslist-lint": "cli.js" - }, - "peerDependencies": { - "browserslist": ">= 4.21.0" - } - }, "node_modules/webpack/node_modules/webpack-sources": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", @@ -1799,1247 +1807,5 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" } - }, - "dependencies": { - "@discoveryjs/json-ext": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", - "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==" - }, - "@jridgewell/gen-mapping": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", - "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", - "requires": { - "@jridgewell/set-array": "^1.0.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" - } - }, - "@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==" - }, - "@jridgewell/set-array": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==" - }, - "@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", - "requires": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" - } - }, - "@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" - }, - "@jridgewell/trace-mapping": { - "version": "0.3.17", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", - "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", - "requires": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" - } - }, - "@types/eslint": { - "version": "8.4.9", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.9.tgz", - "integrity": "sha512-jFCSo4wJzlHQLCpceUhUnXdrPuCNOjGFMQ8Eg6JXxlz3QaCKOb7eGi2cephQdM4XTYsNej69P9JDJ1zqNIbncQ==", - "requires": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "@types/eslint-scope": { - "version": "3.7.4", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz", - "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==", - "requires": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, - "@types/estree": { - "version": "0.0.51", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", - "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==" - }, - "@types/json-schema": { - "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==" - }, - "@types/node": { - "version": "18.11.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.8.tgz", - "integrity": "sha512-uGwPWlE0Hj972KkHtCDVwZ8O39GmyjfMane1Z3GUBGGnkZ2USDq7SxLpVIiIHpweY9DS0QTDH0Nw7RNBsAAZ5A==" - }, - "@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", - "requires": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" - } - }, - "@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==" - }, - "@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==" - }, - "@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==" - }, - "@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", - "requires": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==" - }, - "@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" - } - }, - "@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", - "requires": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", - "requires": { - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==" - }, - "@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" - } - }, - "@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" - } - }, - "@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" - } - }, - "@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" - } - }, - "@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", - "requires": { - "@webassemblyjs/ast": "1.11.1", - "@xtuc/long": "4.2.2" - } - }, - "@webpack-cli/configtest": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", - "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==", - "requires": {} - }, - "@webpack-cli/info": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz", - "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==", - "requires": { - "envinfo": "^7.7.3" - } - }, - "@webpack-cli/serve": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz", - "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==", - "requires": {} - }, - "@xtuc/ieee754": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==" - }, - "@xtuc/long": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" - }, - "acorn": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", - "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==" - }, - "acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", - "requires": {} - }, - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "requires": {} - }, - "anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==" - }, - "binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "requires": { - "fill-range": "^7.0.1" - } - }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" - }, - "caniuse-lite": { - "version": "1.0.30001427", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001427.tgz", - "integrity": "sha512-lfXQ73oB9c8DP5Suxaszm+Ta2sr/4tf8+381GkIm1MLj/YdLf+rEDyDSRCzeltuyTVGm+/s18gdZ0q+Wmp8VsQ==" - }, - "chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", - "requires": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "fsevents": "~2.3.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - } - }, - "chrome-trace-event": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", - "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==" - }, - "clone-deep": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", - "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", - "requires": { - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.2", - "shallow-clone": "^3.0.0" - } - }, - "colorette": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", - "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==" - }, - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - }, - "cropperjs": { - "version": "1.5.12", - "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.5.12.tgz", - "integrity": "sha512-re7UdjE5UnwdrovyhNzZ6gathI4Rs3KGCBSc8HCIjUo5hO42CtzyblmWLj6QWVw7huHyDMfpKxhiO2II77nhDw==" - }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, - "css-loader": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.7.tgz", - "integrity": "sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==", - "requires": { - "icss-utils": "^5.1.0", - "loader-utils": "^2.0.0", - "postcss": "^8.2.15", - "postcss-modules-extract-imports": "^3.0.0", - "postcss-modules-local-by-default": "^4.0.0", - "postcss-modules-scope": "^3.0.0", - "postcss-modules-values": "^4.0.0", - "postcss-value-parser": "^4.1.0", - "schema-utils": "^3.0.0", - "semver": "^7.3.5" - } - }, - "cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" - }, - "electron-to-chromium": { - "version": "1.4.284", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz", - "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==" - }, - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" - }, - "enhanced-resolve": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz", - "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==", - "requires": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - } - }, - "envinfo": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", - "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==" - }, - "es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==" - }, - "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" - }, - "eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - } - }, - "esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "requires": { - "estraverse": "^5.2.0" - }, - "dependencies": { - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==" - } - } - }, - "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" - }, - "events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" - }, - "fastest-levenshtein": { - "version": "1.0.16", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", - "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==" - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "optional": true - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" - }, - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "requires": { - "is-glob": "^4.0.1" - } - }, - "glob-to-regexp": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" - }, - "govuk-frontend": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-3.14.0.tgz", - "integrity": "sha512-y7FTuihCSA8Hty+e9h0uPhCoNanCAN+CLioNFlPmlbeHXpbi09VMyxTcH+XfnMPY4Cp++7096v0rLwwdapTXnA==" - }, - "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, - "htmx.org": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-1.8.2.tgz", - "integrity": "sha512-jJzX0vaq6UguwI8wN/bGugsmbi8TItptGq6Jmcglf11iWqgjC54Tzqo9ugRzfkU9ZaAInRHAbsbs2fHuxtgRkQ==" - }, - "icss-utils": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", - "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "requires": {} - }, - "immutable": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz", - "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==" - }, - "import-local": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", - "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", - "requires": { - "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" - } - }, - "interpret": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", - "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==" - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-core-module": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz", - "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==", - "requires": { - "has": "^1.0.3" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" - }, - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "requires": { - "isobject": "^3.0.1" - } - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==" - }, - "jest-worker": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", - "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", - "requires": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "dependencies": { - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" - }, - "kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" - }, - "klona": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz", - "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==" - }, - "loader-runner": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", - "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==" - }, - "loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - }, - "dependencies": { - "json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" - } - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "requires": { - "p-locate": "^4.1.0" - } - }, - "lodash.assign": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", - "integrity": "sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==" - }, - "lodash.defaults": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", - "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==" - }, - "lodash.foreach": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", - "integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==" - }, - "lodash.get": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", - "integrity": "sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==" - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "requires": { - "yallist": "^4.0.0" - } - }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" - }, - "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" - }, - "mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "requires": { - "mime-db": "1.52.0" - } - }, - "mini-css-extract-plugin": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz", - "integrity": "sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q==", - "requires": { - "loader-utils": "^2.0.0", - "schema-utils": "^3.0.0", - "webpack-sources": "^1.1.0" - } - }, - "nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==" - }, - "neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" - }, - "node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==" - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "requires": { - "p-limit": "^2.2.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" - }, - "path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" - }, - "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" - }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==" - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "requires": { - "find-up": "^4.0.0" - } - }, - "postcss": { - "version": "8.4.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz", - "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==", - "requires": { - "nanoid": "^3.3.4", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" - } - }, - "postcss-modules-extract-imports": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", - "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "requires": {} - }, - "postcss-modules-local-by-default": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", - "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", - "requires": { - "icss-utils": "^5.0.0", - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.1.0" - } - }, - "postcss-modules-scope": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", - "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", - "requires": { - "postcss-selector-parser": "^6.0.4" - } - }, - "postcss-modules-values": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", - "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", - "requires": { - "icss-utils": "^5.0.0" - } - }, - "postcss-selector-parser": { - "version": "6.0.10", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", - "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", - "requires": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" - } - }, - "postcss-value-parser": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" - }, - "randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "requires": { - "safe-buffer": "^5.1.0" - } - }, - "readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "requires": { - "picomatch": "^2.2.1" - } - }, - "rechoir": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", - "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", - "requires": { - "resolve": "^1.9.0" - } - }, - "resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", - "requires": { - "is-core-module": "^2.9.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "resolve-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", - "requires": { - "resolve-from": "^5.0.0" - } - }, - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - }, - "sass": { - "version": "1.55.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.55.0.tgz", - "integrity": "sha512-Pk+PMy7OGLs9WaxZGJMn7S96dvlyVBwwtToX895WmCpAOr5YiJYEUJfiJidMuKb613z2xNWcXCHEuOvjZbqC6A==", - "requires": { - "chokidar": ">=3.0.0 <4.0.0", - "immutable": "^4.0.0", - "source-map-js": ">=0.6.2 <2.0.0" - } - }, - "sass-loader": { - "version": "12.6.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz", - "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==", - "requires": { - "klona": "^2.0.4", - "neo-async": "^2.6.2" - } - }, - "schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", - "requires": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - } - }, - "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", - "requires": { - "lru-cache": "^6.0.0" - } - }, - "serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", - "requires": { - "randombytes": "^2.1.0" - } - }, - "shallow-clone": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", - "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", - "requires": { - "kind-of": "^6.0.2" - } - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" - }, - "source-list-map": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", - "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==" - }, - "source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==" - }, - "supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" - }, - "tapable": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==" - }, - "terser": { - "version": "5.15.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", - "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==", - "requires": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - } - } - }, - "terser-webpack-plugin": { - "version": "5.3.6", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz", - "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==", - "requires": { - "@jridgewell/trace-mapping": "^0.3.14", - "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.14.1" - } - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "requires": { - "is-number": "^7.0.0" - } - }, - "uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "requires": { - "punycode": "^2.1.0" - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" - }, - "watchpack": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", - "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", - "requires": { - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.1.2" - } - }, - "webpack": { - "version": "5.74.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz", - "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==", - "requires": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^0.0.51", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", - "browserslist": "^4.14.5", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.10.0", - "es-module-lexer": "^0.9.0", - "eslint-scope": "5.1.1", - "events": "^3.2.0", - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", - "json-parse-even-better-errors": "^2.3.1", - "loader-runner": "^4.2.0", - "mime-types": "^2.1.27", - "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", - "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", - "watchpack": "^2.4.0", - "webpack-sources": "^3.2.3" - }, - "dependencies": { - "browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", - "requires": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" - } - }, - "update-browserslist-db": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", - "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", - "requires": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" - } - }, - "webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==" - } - } - }, - "webpack-bundle-tracker": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/webpack-bundle-tracker/-/webpack-bundle-tracker-1.6.0.tgz", - "integrity": "sha512-aDb5WpHyo/U23UsAFHadUJavOAcpcEDrdSOb2ExlSrsoYBnJlECC37wekDRQ9UwRKvNjVdjZWJ/NI8/dVaVp8w==", - "requires": { - "lodash.assign": "^4.2.0", - "lodash.defaults": "^4.2.0", - "lodash.foreach": "^4.5.0", - "lodash.get": "^4.4.2", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "requires": { - "ansi-regex": "^5.0.1" - } - } - } - }, - "webpack-cli": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz", - "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==", - "requires": { - "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.2.0", - "@webpack-cli/info": "^1.5.0", - "@webpack-cli/serve": "^1.7.0", - "colorette": "^2.0.14", - "commander": "^7.0.0", - "cross-spawn": "^7.0.3", - "fastest-levenshtein": "^1.0.12", - "import-local": "^3.0.2", - "interpret": "^2.2.0", - "rechoir": "^0.7.0", - "webpack-merge": "^5.7.3" - }, - "dependencies": { - "commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==" - } - } - }, - "webpack-merge": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", - "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", - "requires": { - "clone-deep": "^4.0.1", - "wildcard": "^2.0.0" - } - }, - "webpack-sources": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", - "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", - "requires": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } - } - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "requires": { - "isexe": "^2.0.0" - } - }, - "wildcard": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", - "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==" - }, - "y18n": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==" - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - } } } diff --git a/package.json b/package.json index fffade268..e1e71c1aa 100644 --- a/package.json +++ b/package.json @@ -3,17 +3,17 @@ "author": "Department for Business and Trade", "private": true, "dependencies": { - "cropperjs": "^1.5.12", + "cropperjs": "^1.5.13", "css-loader": "^5.2.7", - "govuk-frontend": "^3.14.0", - "htmx.org": "^1.7.0", + "govuk-frontend": "^4.5.0", + "htmx.org": "^1.8.6", "mini-css-extract-plugin": "^1.6.2", - "sass": "^1.49.9", + "sass": "^1.59.3", "sass-loader": "^12.6.0", - "webpack": "^5.70.0", - "webpack-bundle-tracker": "^1.4.0", - "webpack-cli": "^4.9.2", - "y18n": "^4.0.1" + "webpack": "^5.76.2", + "webpack-bundle-tracker": "^1.8.1", + "webpack-cli": "^4.10.0", + "y18n": "^4.0.3" }, "version": "0.1.0", "scripts": { @@ -27,5 +27,9 @@ "last 1 firefox version", "last 1 safari version", "IE 11" - ] + ], + "engines": { + "npm": ">8.0.0", + "node": ">18.0.0" + } } diff --git a/peoplefinder/models.py b/peoplefinder/models.py index 8e11270ea..9c571997b 100644 --- a/peoplefinder/models.py +++ b/peoplefinder/models.py @@ -13,6 +13,7 @@ from django.utils import timezone from django_chunk_upload_handlers.clam_av import validate_virus_check_result from wagtail.search import index +from wagtail.search.queryset import SearchableQuerySetMixin # United Kingdom @@ -168,7 +169,7 @@ def get_queryset(self): return super().get_queryset().exclude(is_active=False) -class PersonQuerySet(models.QuerySet): +class PersonQuerySet(SearchableQuerySetMixin, models.QuerySet): def active(self): return self.exclude(is_active=False) @@ -554,9 +555,9 @@ def get_workdays_display(self) -> str: return ", ".join(map(str, workdays)) -class TeamQuerySet(models.QuerySet): +class TeamQuerySet(SearchableQuerySetMixin, models.QuerySet): def with_all_parents(self): - return self.values("pk").annotate( + return self.annotate( all_parents=ArrayAgg( Func( Value("slug"), @@ -573,6 +574,8 @@ def with_all_parents(self): function="jsonb_build_object", output_field=JSONField(), ), + # Filter out the last team (deepest). + filter=~Q(children__parent=F("pk")), ordering="-children__depth", ), ) @@ -594,7 +597,7 @@ def with_parents(self, parent_field: str = "pk"): With a specified `parent_field`: >>> team = Team.objects.with_parents(parent_field="slug").get(slug="software") >>> team.ancestry - ["spacex", "engineering", "software"] + ['spacex', 'engineering', 'software'] Args: parent_field: The parent field to populate the array with. diff --git a/peoplefinder/services/search.py b/peoplefinder/services/search.py index 800a08d9a..bcab3bd17 100644 --- a/peoplefinder/services/search.py +++ b/peoplefinder/services/search.py @@ -18,7 +18,7 @@ def search(request: HttpRequest, query: str, filters: list[str]) -> SearchResult person_results = [] if TEAMS_FILTER in filters: - team_results = s.search(query, Team)[:50] + team_results = s.search(query, Team.objects.with_all_parents())[:50] if PEOPLE_FILTER in filters: qs = Person.objects.all() diff --git a/peoplefinder/static/peoplefinder/profile-photo.js b/peoplefinder/static/peoplefinder/profile-photo.js index 00a94124f..5149412dd 100644 --- a/peoplefinder/static/peoplefinder/profile-photo.js +++ b/peoplefinder/static/peoplefinder/profile-photo.js @@ -8,7 +8,7 @@ * * ### `photo-url` * URL for the current profile photo. - * + * * ### `no-photo-url` * URL for the image to use when the profile has no photo. * @@ -17,51 +17,53 @@ * * ### `y-name` * Name given to the y crop input which will be submitted. - * + * * ### `width-name` * Name given to the width crop input which will be submitted. - * + * * ### `height-name` * Name given to the height crop input which will be submitted. - * + * * ### `remove-photo-name` * Name given to the remove photo checkbox input which will be submitted. - * + * * ## Notes * - does not use a shadow dom * - so we can use GDS styles * - and the input can be submitted */ class ProfilePhoto extends HTMLElement { - constructor() { - super(); - - this.validFileExtensions = ['jpeg', 'jpg', 'png']; - - this.cropper = null; - - // binding methods - this.handleChangePhoto = this.handleChangePhoto.bind(this); - this.handleClearImage = this.handleClearImage.bind(this); - this.setErrors = this.setErrors.bind(this); - this.clearErrors = this.clearErrors.bind(this); - } - - connectedCallback() { - this.name = this.getAttribute('name'); - this.photoUrl = this.getAttribute('photo-url') || ""; - this.noPhotoUrl = this.getAttribute('no-photo-url'); - this.cropFieldNames = { - x: this.getAttribute('x-name'), - y: this.getAttribute('y-name'), - width: this.getAttribute('width-name'), - height: this.getAttribute('height-name'), - } - this.removePhotoName = this.getAttribute('remove-photo-name'); - - const photoHeadingText = this.photoUrl ? 'Current profile photo' : 'No current profile photo'; - - this.innerHTML = ` + constructor() { + super(); + + this.validFileExtensions = ["jpeg", "jpg", "png"]; + + this.cropper = null; + + // binding methods + this.handleChangePhoto = this.handleChangePhoto.bind(this); + this.handleClearImage = this.handleClearImage.bind(this); + this.setErrors = this.setErrors.bind(this); + this.clearErrors = this.clearErrors.bind(this); + } + + connectedCallback() { + this.name = this.getAttribute("name"); + this.photoUrl = this.getAttribute("photo-url") || ""; + this.noPhotoUrl = this.getAttribute("no-photo-url"); + this.cropFieldNames = { + x: this.getAttribute("x-name"), + y: this.getAttribute("y-name"), + width: this.getAttribute("width-name"), + height: this.getAttribute("height-name"), + }; + this.removePhotoName = this.getAttribute("remove-photo-name"); + + const photoHeadingText = this.photoUrl + ? "Current profile photo" + : "No current profile photo"; + + this.innerHTML = `

      ${photoHeadingText}

      @@ -78,11 +80,11 @@ class ProfilePhoto extends HTMLElement { - +
      Choose a picture that helps others recognise you. Your picture must be at least 500 by 500 pixels and no more than 8MB. Once you have chosen a picture, you will be able to crop it. - +
      Clear image -
      \ No newline at end of file +
      diff --git a/peoplefinder/templates/peoplefinder/components/checkboxes.html b/peoplefinder/templates/peoplefinder/components/checkboxes.html index c29e6ed73..8da25cb16 100644 --- a/peoplefinder/templates/peoplefinder/components/checkboxes.html +++ b/peoplefinder/templates/peoplefinder/components/checkboxes.html @@ -11,9 +11,9 @@ {% if field.errors %} {% for error in field.errors %} - +

      Error: {{ error }} - +

      {% endfor %} {% endif %} @@ -27,4 +27,4 @@
    {% endfor %} - \ No newline at end of file + diff --git a/peoplefinder/templates/peoplefinder/components/error-summary.html b/peoplefinder/templates/peoplefinder/components/error-summary.html index e0864dfb6..f8d2800df 100644 --- a/peoplefinder/templates/peoplefinder/components/error-summary.html +++ b/peoplefinder/templates/peoplefinder/components/error-summary.html @@ -1,26 +1,27 @@ {% if form.errors %} -