diff --git a/.bin/install.sh b/.bin/install.sh index d6b5ae3..9f332e4 100644 --- a/.bin/install.sh +++ b/.bin/install.sh @@ -1,11 +1,11 @@ set -e -pipenv install +python -m pipenv install yarn if [ "$SKIP_MIGRATE" != "1" ]; then - pipenv run python manage.py migrate - pipenv run python manage.py preseed_transfer_table auth wagtailcore wagtailimages.image wagtaildocs search stopwatch stopwatch - pipenv run python manage.py createsuperuser + python -m pipenv run python manage.py migrate + python -m pipenv run python manage.py preseed_transfer_table auth wagtailcore wagtailimages.image wagtaildocs search stopwatch stopwatch + python -m pipenv run python manage.py createsuperuser touch stopwatch/settings/local.py fi diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 1df3466..9e95dc1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -14,8 +14,12 @@ ARG INSTALL_NODE="true" ARG NODE_VERSION="lts/*" RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi -# Install system dependencies +# Install system dependencies RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmour -o /usr/share/keyrings/yarn-keyring.gpg \ && sed -i '1s;^deb;deb [signed-by=/usr/share/keyrings/yarn-keyring.gpg];' /etc/apt/sources.list.d/yarn.list + +# ensure GDAL is available for Django +RUN apt update && apt install -y --no-install-recommends gdal-bin libgdal-dev + RUN curl https://raw.githubusercontent.com/commonknowledge/do-app-baseimage-django-node/main/.bin/prepare.sh | /bin/bash diff --git a/.vscode/settings.json b/.vscode/settings.json index b847a8e..aced410 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,5 +3,6 @@ "editor.formatOnSave": true, "[html]": { "editor.formatOnSave": false - } + }, + "python-envs.defaultEnvManager": "ms-python.python:pipenv" } diff --git a/package.json b/package.json index 6d1afbc..01540f7 100644 --- a/package.json +++ b/package.json @@ -34,5 +34,6 @@ "react-window": "^1.8.6", "react-window-infinite-loader": "^1.0.7", "sass": "^1.69.5" - } + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/projects/migrations/0021_alter_event_body_alter_eventtheme_body_and_more.py b/projects/migrations/0021_alter_event_body_alter_eventtheme_body_and_more.py new file mode 100644 index 0000000..213194c --- /dev/null +++ b/projects/migrations/0021_alter_event_body_alter_eventtheme_body_and_more.py @@ -0,0 +1,1321 @@ +# Generated by Django 4.1.13 on 2026-04-01 14:41 + +from django.db import migrations +import stopwatch.models.core +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields +import wagtail.images.blocks +import wagtail.snippets.blocks + + +class Migration(migrations.Migration): + dependencies = [ + ("projects", "0020_auto_20240611_1331"), + ] + + operations = [ + migrations.AlterField( + model_name="event", + name="body", + field=wagtail.fields.StreamField( + [ + ( + "text", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ] + ), + ), + ( + "embed", + wagtail.blocks.StructBlock( + [ + ("embed_url", wagtail.blocks.URLBlock()), + ( + "fullscreen", + wagtail.blocks.BooleanBlock( + default=False, required=False + ), + ), + ] + ), + ), + ( + "downloads", + wagtail.blocks.StructBlock( + [ + ( + "documents", + wagtail.blocks.ListBlock( + wagtail.documents.blocks.DocumentChooserBlock() + ), + ) + ] + ), + ), + ( + "cta", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock(required=True), + ), + ] + ), + ), + ( + "form", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock( + "stopwatch.Form", required=True + ), + ), + ] + ), + ), + ( + "links", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "message", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "links", + wagtail.blocks.StreamBlock( + [ + ( + "alert", + wagtail.blocks.StructBlock( + [ + ( + "heading", + wagtail.blocks.CharBlock(), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + ] + ), + ), + ] + ), + ), + ( + "website", + wagtail.blocks.StructBlock( + [ + ( + "url", + wagtail.blocks.URLBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ( + "email", + wagtail.blocks.StructBlock( + [ + ( + "address", + wagtail.blocks.EmailBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ( + "page", + wagtail.blocks.StructBlock( + [ + ( + "page", + wagtail.blocks.PageChooserBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ] + ), + ), + ] + ), + ), + ( + "newsletter_signup", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock(required=True), + ), + ] + ), + ), + ( + "person_listing", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "people", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Person + ) + ), + ), + ] + ), + ), + ( + "organisation_listing", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock()), + ( + "organisations", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Organisation + ) + ), + ), + ] + ), + ), + ( + "alert", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock()), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + ] + ), + ), + ] + ), + ), + ( + "calendar", + wagtail.blocks.StructBlock( + [ + ( + "site_area", + wagtail.blocks.PageChooserBlock( + help_text="Show all events in the site that are under this page. If blank, show all events on the site.", + required=False, + ), + ) + ] + ), + ), + ( + "accordion", + wagtail.blocks.StreamBlock( + [ + ( + "richtext", + wagtail.blocks.StructBlock( + [ + ( + "title", + wagtail.blocks.CharBlock(label="Title"), + ), + ("content", wagtail.blocks.RichTextBlock()), + ] + ), + ), + ( + "people", + wagtail.blocks.StructBlock( + [ + ( + "title", + wagtail.blocks.CharBlock(label="Title"), + ), + ( + "content", + wagtail.blocks.StructBlock( + [ + ( + "heading", + wagtail.blocks.CharBlock( + required=False + ), + ), + ( + "people", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Person + ) + ), + ), + ] + ), + ), + ] + ), + ), + ] + ), + ), + ( + "report", + wagtail.blocks.StructBlock( + [ + ("year", wagtail.blocks.CharBlock(required=False)), + ("title", wagtail.blocks.CharBlock()), + ( + "description", + wagtail.blocks.TextBlock(required=False), + ), + ( + "cover_image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "document", + wagtail.documents.blocks.DocumentChooserBlock(), + ), + ] + ), + ), + ], + use_json_field=None, + verbose_name="Event details", + ), + ), + migrations.AlterField( + model_name="eventtheme", + name="body", + field=wagtail.fields.StreamField( + [ + ( + "text", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ] + ), + ), + ( + "embed", + wagtail.blocks.StructBlock( + [ + ("embed_url", wagtail.blocks.URLBlock()), + ( + "fullscreen", + wagtail.blocks.BooleanBlock( + default=False, required=False + ), + ), + ] + ), + ), + ( + "downloads", + wagtail.blocks.StructBlock( + [ + ( + "documents", + wagtail.blocks.ListBlock( + wagtail.documents.blocks.DocumentChooserBlock() + ), + ) + ] + ), + ), + ( + "cta", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock(required=True), + ), + ] + ), + ), + ( + "form", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock( + "stopwatch.Form", required=True + ), + ), + ] + ), + ), + ( + "links", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "message", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "links", + wagtail.blocks.StreamBlock( + [ + ( + "alert", + wagtail.blocks.StructBlock( + [ + ( + "heading", + wagtail.blocks.CharBlock(), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + ] + ), + ), + ] + ), + ), + ( + "website", + wagtail.blocks.StructBlock( + [ + ( + "url", + wagtail.blocks.URLBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ( + "email", + wagtail.blocks.StructBlock( + [ + ( + "address", + wagtail.blocks.EmailBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ( + "page", + wagtail.blocks.StructBlock( + [ + ( + "page", + wagtail.blocks.PageChooserBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ] + ), + ), + ] + ), + ), + ( + "newsletter_signup", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock(required=True), + ), + ] + ), + ), + ( + "person_listing", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "people", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Person + ) + ), + ), + ] + ), + ), + ( + "organisation_listing", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock()), + ( + "organisations", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Organisation + ) + ), + ), + ] + ), + ), + ( + "alert", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock()), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + ] + ), + ), + ] + ), + ), + ( + "calendar", + wagtail.blocks.StructBlock( + [ + ( + "site_area", + wagtail.blocks.PageChooserBlock( + help_text="Show all events in the site that are under this page. If blank, show all events on the site.", + required=False, + ), + ) + ] + ), + ), + ( + "accordion", + wagtail.blocks.StreamBlock( + [ + ( + "richtext", + wagtail.blocks.StructBlock( + [ + ( + "title", + wagtail.blocks.CharBlock(label="Title"), + ), + ("content", wagtail.blocks.RichTextBlock()), + ] + ), + ), + ( + "people", + wagtail.blocks.StructBlock( + [ + ( + "title", + wagtail.blocks.CharBlock(label="Title"), + ), + ( + "content", + wagtail.blocks.StructBlock( + [ + ( + "heading", + wagtail.blocks.CharBlock( + required=False + ), + ), + ( + "people", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Person + ) + ), + ), + ] + ), + ), + ] + ), + ), + ] + ), + ), + ( + "report", + wagtail.blocks.StructBlock( + [ + ("year", wagtail.blocks.CharBlock(required=False)), + ("title", wagtail.blocks.CharBlock()), + ( + "description", + wagtail.blocks.TextBlock(required=False), + ), + ( + "cover_image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "document", + wagtail.documents.blocks.DocumentChooserBlock(), + ), + ] + ), + ), + ], + use_json_field=None, + ), + ), + migrations.AlterField( + model_name="project", + name="body", + field=wagtail.fields.StreamField( + [ + ( + "text", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ] + ), + ), + ( + "embed", + wagtail.blocks.StructBlock( + [ + ("embed_url", wagtail.blocks.URLBlock()), + ( + "fullscreen", + wagtail.blocks.BooleanBlock( + default=False, required=False + ), + ), + ] + ), + ), + ( + "downloads", + wagtail.blocks.StructBlock( + [ + ( + "documents", + wagtail.blocks.ListBlock( + wagtail.documents.blocks.DocumentChooserBlock() + ), + ) + ] + ), + ), + ( + "cta", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock(required=True), + ), + ] + ), + ), + ( + "form", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock( + "stopwatch.Form", required=True + ), + ), + ] + ), + ), + ( + "links", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "message", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "links", + wagtail.blocks.StreamBlock( + [ + ( + "alert", + wagtail.blocks.StructBlock( + [ + ( + "heading", + wagtail.blocks.CharBlock(), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + ] + ), + ), + ] + ), + ), + ( + "website", + wagtail.blocks.StructBlock( + [ + ( + "url", + wagtail.blocks.URLBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ( + "email", + wagtail.blocks.StructBlock( + [ + ( + "address", + wagtail.blocks.EmailBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ( + "page", + wagtail.blocks.StructBlock( + [ + ( + "page", + wagtail.blocks.PageChooserBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ] + ), + ), + ] + ), + ), + ( + "newsletter_signup", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock(required=True), + ), + ] + ), + ), + ( + "person_listing", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "people", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Person + ) + ), + ), + ] + ), + ), + ( + "organisation_listing", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock()), + ( + "organisations", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Organisation + ) + ), + ), + ] + ), + ), + ( + "alert", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock()), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + ] + ), + ), + ] + ), + ), + ( + "calendar", + wagtail.blocks.StructBlock( + [ + ( + "site_area", + wagtail.blocks.PageChooserBlock( + help_text="Show all events in the site that are under this page. If blank, show all events on the site.", + required=False, + ), + ) + ] + ), + ), + ( + "accordion", + wagtail.blocks.StreamBlock( + [ + ( + "richtext", + wagtail.blocks.StructBlock( + [ + ( + "title", + wagtail.blocks.CharBlock(label="Title"), + ), + ("content", wagtail.blocks.RichTextBlock()), + ] + ), + ), + ( + "people", + wagtail.blocks.StructBlock( + [ + ( + "title", + wagtail.blocks.CharBlock(label="Title"), + ), + ( + "content", + wagtail.blocks.StructBlock( + [ + ( + "heading", + wagtail.blocks.CharBlock( + required=False + ), + ), + ( + "people", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Person + ) + ), + ), + ] + ), + ), + ] + ), + ), + ] + ), + ), + ( + "report", + wagtail.blocks.StructBlock( + [ + ("year", wagtail.blocks.CharBlock(required=False)), + ("title", wagtail.blocks.CharBlock()), + ( + "description", + wagtail.blocks.TextBlock(required=False), + ), + ( + "cover_image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "document", + wagtail.documents.blocks.DocumentChooserBlock(), + ), + ] + ), + ), + ], + use_json_field=None, + ), + ), + ] diff --git a/stopwatch/migrations/0055_alter_article_body_alter_category_display_filters_and_more.py b/stopwatch/migrations/0055_alter_article_body_alter_category_display_filters_and_more.py new file mode 100644 index 0000000..b9b95e5 --- /dev/null +++ b/stopwatch/migrations/0055_alter_article_body_alter_category_display_filters_and_more.py @@ -0,0 +1,1350 @@ +# Generated by Django 4.1.13 on 2026-04-01 14:41 + +from django.db import migrations, models +import stopwatch.models.core +import wagtail.blocks +import wagtail.documents.blocks +import wagtail.fields +import wagtail.images.blocks +import wagtail.snippets.blocks + + +class Migration(migrations.Migration): + dependencies = [ + ("stopwatch", "0054_category_display_filters"), + ] + + operations = [ + migrations.AlterField( + model_name="article", + name="body", + field=wagtail.fields.StreamField( + [ + ( + "text", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ] + ), + ), + ( + "embed", + wagtail.blocks.StructBlock( + [ + ("embed_url", wagtail.blocks.URLBlock()), + ( + "fullscreen", + wagtail.blocks.BooleanBlock( + default=False, required=False + ), + ), + ] + ), + ), + ( + "downloads", + wagtail.blocks.StructBlock( + [ + ( + "documents", + wagtail.blocks.ListBlock( + wagtail.documents.blocks.DocumentChooserBlock() + ), + ) + ] + ), + ), + ( + "cta", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock(required=True), + ), + ] + ), + ), + ( + "form", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock( + "stopwatch.Form", required=True + ), + ), + ] + ), + ), + ( + "links", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "message", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "links", + wagtail.blocks.StreamBlock( + [ + ( + "alert", + wagtail.blocks.StructBlock( + [ + ( + "heading", + wagtail.blocks.CharBlock(), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + ] + ), + ), + ] + ), + ), + ( + "website", + wagtail.blocks.StructBlock( + [ + ( + "url", + wagtail.blocks.URLBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ( + "email", + wagtail.blocks.StructBlock( + [ + ( + "address", + wagtail.blocks.EmailBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ( + "page", + wagtail.blocks.StructBlock( + [ + ( + "page", + wagtail.blocks.PageChooserBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ] + ), + ), + ] + ), + ), + ( + "newsletter_signup", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock(required=True), + ), + ] + ), + ), + ( + "person_listing", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "people", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Person + ) + ), + ), + ] + ), + ), + ( + "organisation_listing", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock()), + ( + "organisations", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Organisation + ) + ), + ), + ] + ), + ), + ( + "alert", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock()), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + ] + ), + ), + ] + ), + ), + ( + "calendar", + wagtail.blocks.StructBlock( + [ + ( + "site_area", + wagtail.blocks.PageChooserBlock( + help_text="Show all events in the site that are under this page. If blank, show all events on the site.", + required=False, + ), + ) + ] + ), + ), + ( + "accordion", + wagtail.blocks.StreamBlock( + [ + ( + "richtext", + wagtail.blocks.StructBlock( + [ + ( + "title", + wagtail.blocks.CharBlock(label="Title"), + ), + ("content", wagtail.blocks.RichTextBlock()), + ] + ), + ), + ( + "people", + wagtail.blocks.StructBlock( + [ + ( + "title", + wagtail.blocks.CharBlock(label="Title"), + ), + ( + "content", + wagtail.blocks.StructBlock( + [ + ( + "heading", + wagtail.blocks.CharBlock( + required=False + ), + ), + ( + "people", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Person + ) + ), + ), + ] + ), + ), + ] + ), + ), + ] + ), + ), + ( + "report", + wagtail.blocks.StructBlock( + [ + ("year", wagtail.blocks.CharBlock(required=False)), + ("title", wagtail.blocks.CharBlock()), + ( + "description", + wagtail.blocks.TextBlock(required=False), + ), + ( + "cover_image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "document", + wagtail.documents.blocks.DocumentChooserBlock(), + ), + ] + ), + ), + ], + blank=True, + use_json_field=None, + ), + ), + migrations.AlterField( + model_name="category", + name="display_filters", + field=models.BooleanField( + default=True, + help_text="Display filters on page when display mode is display all articles", + ), + ), + migrations.AlterField( + model_name="form", + name="thank_you_page", + field=wagtail.fields.StreamField( + [ + ( + "text", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ] + ), + ), + ( + "embed", + wagtail.blocks.StructBlock( + [ + ("embed_url", wagtail.blocks.URLBlock()), + ( + "fullscreen", + wagtail.blocks.BooleanBlock( + default=False, required=False + ), + ), + ] + ), + ), + ( + "downloads", + wagtail.blocks.StructBlock( + [ + ( + "documents", + wagtail.blocks.ListBlock( + wagtail.documents.blocks.DocumentChooserBlock() + ), + ) + ] + ), + ), + ( + "cta", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock(required=True), + ), + ] + ), + ), + ( + "form", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock( + "stopwatch.Form", required=True + ), + ), + ] + ), + ), + ( + "links", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "message", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "links", + wagtail.blocks.StreamBlock( + [ + ( + "alert", + wagtail.blocks.StructBlock( + [ + ( + "heading", + wagtail.blocks.CharBlock(), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + ] + ), + ), + ] + ), + ), + ( + "website", + wagtail.blocks.StructBlock( + [ + ( + "url", + wagtail.blocks.URLBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ( + "email", + wagtail.blocks.StructBlock( + [ + ( + "address", + wagtail.blocks.EmailBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ( + "page", + wagtail.blocks.StructBlock( + [ + ( + "page", + wagtail.blocks.PageChooserBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ] + ), + ), + ] + ), + ), + ( + "newsletter_signup", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock(required=True), + ), + ] + ), + ), + ( + "person_listing", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "people", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Person + ) + ), + ), + ] + ), + ), + ( + "organisation_listing", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock()), + ( + "organisations", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Organisation + ) + ), + ), + ] + ), + ), + ( + "alert", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock()), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + ] + ), + ), + ] + ), + ), + ( + "calendar", + wagtail.blocks.StructBlock( + [ + ( + "site_area", + wagtail.blocks.PageChooserBlock( + help_text="Show all events in the site that are under this page. If blank, show all events on the site.", + required=False, + ), + ) + ] + ), + ), + ( + "accordion", + wagtail.blocks.StreamBlock( + [ + ( + "richtext", + wagtail.blocks.StructBlock( + [ + ( + "title", + wagtail.blocks.CharBlock(label="Title"), + ), + ("content", wagtail.blocks.RichTextBlock()), + ] + ), + ), + ( + "people", + wagtail.blocks.StructBlock( + [ + ( + "title", + wagtail.blocks.CharBlock(label="Title"), + ), + ( + "content", + wagtail.blocks.StructBlock( + [ + ( + "heading", + wagtail.blocks.CharBlock( + required=False + ), + ), + ( + "people", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Person + ) + ), + ), + ] + ), + ), + ] + ), + ), + ] + ), + ), + ( + "report", + wagtail.blocks.StructBlock( + [ + ("year", wagtail.blocks.CharBlock(required=False)), + ("title", wagtail.blocks.CharBlock()), + ( + "description", + wagtail.blocks.TextBlock(required=False), + ), + ( + "cover_image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "document", + wagtail.documents.blocks.DocumentChooserBlock(), + ), + ] + ), + ), + ], + use_json_field=None, + ), + ), + migrations.AlterField( + model_name="landingpage", + name="body", + field=wagtail.fields.StreamField( + [ + ( + "text", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ] + ), + ), + ( + "embed", + wagtail.blocks.StructBlock( + [ + ("embed_url", wagtail.blocks.URLBlock()), + ( + "fullscreen", + wagtail.blocks.BooleanBlock( + default=False, required=False + ), + ), + ] + ), + ), + ( + "downloads", + wagtail.blocks.StructBlock( + [ + ( + "documents", + wagtail.blocks.ListBlock( + wagtail.documents.blocks.DocumentChooserBlock() + ), + ) + ] + ), + ), + ( + "cta", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock(required=True), + ), + ] + ), + ), + ( + "form", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock( + "stopwatch.Form", required=True + ), + ), + ] + ), + ), + ( + "links", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "message", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "links", + wagtail.blocks.StreamBlock( + [ + ( + "alert", + wagtail.blocks.StructBlock( + [ + ( + "heading", + wagtail.blocks.CharBlock(), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + ] + ), + ), + ] + ), + ), + ( + "website", + wagtail.blocks.StructBlock( + [ + ( + "url", + wagtail.blocks.URLBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ( + "email", + wagtail.blocks.StructBlock( + [ + ( + "address", + wagtail.blocks.EmailBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ( + "page", + wagtail.blocks.StructBlock( + [ + ( + "page", + wagtail.blocks.PageChooserBlock(), + ), + ( + "name", + wagtail.blocks.CharBlock( + required=False + ), + ), + ] + ), + ), + ] + ), + ), + ] + ), + ), + ( + "newsletter_signup", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "h1", + "h2", + "h3", + "h4", + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + "image", + "embed", + "blockquote", + ], + required=False, + ), + ), + ( + "target", + wagtail.blocks.PageChooserBlock(required=True), + ), + ] + ), + ), + ( + "person_listing", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock(required=False)), + ( + "people", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Person + ) + ), + ), + ] + ), + ), + ( + "organisation_listing", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock()), + ( + "organisations", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Organisation + ) + ), + ), + ] + ), + ), + ( + "alert", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock()), + ( + "content", + wagtail.blocks.RichTextBlock( + features=[ + "bold", + "italic", + "ol", + "ul", + "hr", + "link", + "document-link", + ] + ), + ), + ] + ), + ), + ( + "calendar", + wagtail.blocks.StructBlock( + [ + ( + "site_area", + wagtail.blocks.PageChooserBlock( + help_text="Show all events in the site that are under this page. If blank, show all events on the site.", + required=False, + ), + ) + ] + ), + ), + ( + "accordion", + wagtail.blocks.StreamBlock( + [ + ( + "richtext", + wagtail.blocks.StructBlock( + [ + ( + "title", + wagtail.blocks.CharBlock(label="Title"), + ), + ("content", wagtail.blocks.RichTextBlock()), + ] + ), + ), + ( + "people", + wagtail.blocks.StructBlock( + [ + ( + "title", + wagtail.blocks.CharBlock(label="Title"), + ), + ( + "content", + wagtail.blocks.StructBlock( + [ + ( + "heading", + wagtail.blocks.CharBlock( + required=False + ), + ), + ( + "people", + wagtail.blocks.ListBlock( + wagtail.snippets.blocks.SnippetChooserBlock( + stopwatch.models.core.Person + ) + ), + ), + ] + ), + ), + ] + ), + ), + ] + ), + ), + ( + "report", + wagtail.blocks.StructBlock( + [ + ("year", wagtail.blocks.CharBlock(required=False)), + ("title", wagtail.blocks.CharBlock()), + ( + "description", + wagtail.blocks.TextBlock(required=False), + ), + ( + "cover_image", + wagtail.images.blocks.ImageChooserBlock( + required=False + ), + ), + ( + "document", + wagtail.documents.blocks.DocumentChooserBlock(), + ), + ] + ), + ), + ( + "articles_list", + wagtail.blocks.StructBlock( + [ + ("heading", wagtail.blocks.CharBlock()), + ( + "site_area", + wagtail.blocks.PageChooserBlock( + page_type=["stopwatch.Category"] + ), + ), + ( + "style", + wagtail.blocks.ChoiceBlock( + choices=[("GRID", "Grid"), ("ROWS", "Rows")] + ), + ), + ] + ), + ), + ], + blank=True, + use_json_field=None, + ), + ), + ] diff --git a/stopwatch/models/components.py b/stopwatch/models/components.py index 40d4a45..ecd6596 100644 --- a/stopwatch/models/components.py +++ b/stopwatch/models/components.py @@ -205,6 +205,18 @@ class Meta: documents = ListBlock(DocumentChooserBlock()) +class ReportBlock(StructBlock): + class Meta: + icon = 'doc-full-inverse' + template = 'stopwatch/components/report.html' + + year = CharBlock(required=False) + title = CharBlock() + description = TextBlock(required=False) + cover_image = ImageChooserBlock(required=False) + document = DocumentChooserBlock() + + class CtaBlock(StructBlock): class Meta: template = 'stopwatch/components/cta.html' @@ -317,7 +329,8 @@ class Meta: ('organisation_listing', OrganisationListBlock()), ('alert', AlertBlock()), ('calendar', CalendarBlock()), - ('accordion', AccordionStreamBlock()) + ('accordion', AccordionStreamBlock()), + ('report', ReportBlock()), ) LANDING_MODULES = CONTENT_MODULES + ( diff --git a/stopwatch/templates/base.html b/stopwatch/templates/base.html index 93a2704..64e1ab7 100644 --- a/stopwatch/templates/base.html +++ b/stopwatch/templates/base.html @@ -79,9 +79,6 @@ {{settings.stopwatch.SiteSettings.tagline|richtext}}
About - Twitter - Instagram - Facebook Donate
@@ -173,9 +170,6 @@
  • About
    • -
  • - Twitter -
  • Donate @@ -224,6 +218,25 @@ {% endmainmenu %} +
    +
    +
    + + + + + + + + + + + + +
    +
    +
    +
    {{site_settings.address}}
    @@ -253,7 +266,7 @@ - + diff --git a/stopwatch/templates/stopwatch/components/report.html b/stopwatch/templates/stopwatch/components/report.html new file mode 100644 index 0000000..77d5565 --- /dev/null +++ b/stopwatch/templates/stopwatch/components/report.html @@ -0,0 +1,23 @@ +{% load wagtailimages_tags %} + +
    +
    + {% if value.cover_image %} +
    + {% image value.cover_image width-200 class="img-fluid" %} +
    + {% endif %} +
    + {% if value.year %} +

    {{ value.year }}

    + {% endif %} +

    {{ value.title }}

    + {% if value.description %} +

    {{ value.description }}

    + {% endif %} + + Download {{ value.document.file_extension|upper }} + +
    +
    +
    diff --git a/stopwatch/templates/stopwatch/includes/article_list.html b/stopwatch/templates/stopwatch/includes/article_list.html index 167367a..c099b7a 100644 --- a/stopwatch/templates/stopwatch/includes/article_list.html +++ b/stopwatch/templates/stopwatch/includes/article_list.html @@ -74,14 +74,7 @@

    {% for page in pages %}
    - {% if page.photo %} - -
    {% image page.photo width-500 %}
    -     - {% else %} -
    - {% endif %} -
    +

    {{ page.title }}

    {% if page.intro_text %}
    {{ page.intro_text|plaintext }}
    {% endif %} @@ -121,4 +114,4 @@

    {{ page.title }}

    {% endfor %}
    {% endif %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/yarn.lock b/yarn.lock index 618095d..47d8ac8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23,7 +23,7 @@ resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz" integrity sha512-BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ== -"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.14.3": +"@babel/core@^7.14.3": version "7.23.3" resolved "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz" integrity sha512-Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew== @@ -313,11 +313,6 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@popperjs/core@^2.11.8": - version "2.11.8" - resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz" - integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== - "@trysound/sax@0.2.0": version "0.2.0" resolved "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz" @@ -379,7 +374,7 @@ resolved "https://registry.npmjs.org/@vanillaes/csv/-/csv-2.1.16.tgz" integrity sha512-JHiPeC5q4Fr4Ya/tZeCjW8RIY01AHzjBckLCnJYh9JhZMmpSrze3HDI/g/QMq0iiG1+gKYgqjrKqLtACP94U7w== -"@webassemblyjs/ast@^1.11.5", "@webassemblyjs/ast@1.11.6": +"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": version "1.11.6" resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz" integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q== @@ -480,7 +475,7 @@ "@webassemblyjs/wasm-gen" "1.11.6" "@webassemblyjs/wasm-parser" "1.11.6" -"@webassemblyjs/wasm-parser@^1.11.5", "@webassemblyjs/wasm-parser@1.11.6": +"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5": version "1.11.6" resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz" integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ== @@ -540,7 +535,7 @@ acorn-import-assertions@^1.9.0: resolved "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz" integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== -acorn@^8, acorn@^8.7.1, acorn@^8.8.2: +acorn@^8.7.1, acorn@^8.8.2: version "8.11.2" resolved "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz" integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w== @@ -569,7 +564,7 @@ ajv-keywords@^5.1.0: dependencies: fast-deep-equal "^3.1.3" -ajv@^6.1.0, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1, ajv@>=5.0.0: +ajv@^6.1.0, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -579,7 +574,7 @@ ajv@^6.1.0, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1, ajv@>=5.0.0: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.8.2, ajv@^8.9.0: +ajv@^8.0.0, ajv@^8.9.0: version "8.16.0" resolved "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz" integrity sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw== @@ -652,16 +647,16 @@ arr-union@^3.1.0: resolved "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz" integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== -array-flatten@^2.1.0: - version "2.1.2" - resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz" - integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== - array-flatten@1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz" integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== +array-flatten@^2.1.0: + version "2.1.2" + resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz" + integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== + array-union@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz" @@ -771,6 +766,13 @@ binary-extensions@^2.0.0: resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== +bindings@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" + integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + dependencies: + file-uri-to-path "1.0.0" + body-parser@1.20.1: version "1.20.1" resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz" @@ -842,7 +844,7 @@ braces@~3.0.2: dependencies: fill-range "^7.0.1" -browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.9, "browserslist@>= 4.21.0": +browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.9: version "4.23.0" resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz" integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ== @@ -930,6 +932,21 @@ chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +"chokidar@>=3.0.0 <4.0.0": + version "3.5.3" + resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" + integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.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" + optionalDependencies: + fsevents "~2.3.2" + chokidar@^2.1.8: version "2.1.8" resolved "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz" @@ -949,21 +966,6 @@ chokidar@^2.1.8: optionalDependencies: fsevents "^1.2.7" -"chokidar@>=3.0.0 <4.0.0": - version "3.5.3" - resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" - integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== - dependencies: - anymatch "~3.1.2" - braces "~3.0.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" - optionalDependencies: - fsevents "~2.3.2" - chrome-trace-event@^1.0.2: version "1.0.3" resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz" @@ -1032,12 +1034,7 @@ commander@^2.20.0: resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^7.0.0: - version "7.2.0" - resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== - -commander@^7.2.0: +commander@^7.0.0, commander@^7.2.0: version "7.2.0" resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== @@ -1268,7 +1265,7 @@ csso@^4.2.0: dependencies: css-tree "^1.1.2" -debug@^2.2.0, debug@^2.3.3, debug@2.6.9: +debug@2.6.9, debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -1282,14 +1279,7 @@ debug@^3.2.7: dependencies: ms "^2.1.1" -debug@^4.1.0: - version "4.3.4" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -debug@^4.1.1: +debug@^4.1.0, debug@^4.1.1: version "4.3.4" resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -1379,16 +1369,16 @@ del@^4.1.1: pify "^4.0.1" rimraf "^2.6.3" -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" - integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== - depd@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== +depd@~1.1.2: + version "1.1.2" + resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" + integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== + destroy@1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz" @@ -1648,15 +1638,7 @@ extend-shallow@^2.0.1: dependencies: is-extendable "^0.1.0" -extend-shallow@^3.0.0: - version "3.0.2" - resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz" - integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q== - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - -extend-shallow@^3.0.2: +extend-shallow@^3.0.0, extend-shallow@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz" integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q== @@ -1715,6 +1697,11 @@ file-selector@^0.4.0: dependencies: tslib "^2.0.3" +file-uri-to-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + fill-range@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz" @@ -1811,6 +1798,19 @@ fs.realpath@^1.0.0: resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== +fsevents@^1.2.7: + version "1.2.13" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" + integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== + dependencies: + bindings "^1.5.0" + nan "^2.12.1" + +fsevents@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + function-bind@^1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz" @@ -2010,16 +2010,6 @@ http-deceiver@^1.2.7: resolved "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz" integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw== -http-errors@~1.6.2: - version "1.6.3" - resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz" - integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" - http-errors@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz" @@ -2031,6 +2021,16 @@ http-errors@2.0.0: statuses "2.0.1" toidentifier "1.0.1" +http-errors@~1.6.2: + version "1.6.3" + resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz" + integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.0" + statuses ">= 1.4.0 < 2" + http-parser-js@>=0.5.1: version "0.5.8" resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz" @@ -2104,7 +2104,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@2, inherits@2.0.4: +inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: version "2.0.4" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -2137,7 +2137,7 @@ ip@^1.1.0, ip@^1.1.5: resolved "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz" integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg== -ipaddr.js@^1.9.0, ipaddr.js@1.9.1: +ipaddr.js@1.9.1, ipaddr.js@^1.9.0: version "1.9.1" resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== @@ -2320,7 +2320,7 @@ is-wsl@^1.1.0: resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz" integrity sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw== -isarray@~1.0.0, isarray@1.0.0: +isarray@1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== @@ -2616,7 +2616,7 @@ micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -"mime-db@>= 1.43.0 < 2", mime-db@1.52.0: +mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": version "1.52.0" resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== @@ -2628,16 +2628,16 @@ mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34: dependencies: mime-db "1.52.0" -mime@^2.4.4: - version "2.6.0" - resolved "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz" - integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== - mime@1.6.0: version "1.6.0" resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== +mime@^2.4.4: + version "2.6.0" + resolved "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz" + integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== + mini-css-extract-plugin@^1.6.0: version "1.6.2" resolved "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz" @@ -2679,11 +2679,6 @@ mkdirp@^0.5.1, mkdirp@^0.5.6: dependencies: minimist "^1.2.6" -ms@^2.1.1, ms@2.1.3: - version "2.1.3" - resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - ms@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" @@ -2694,6 +2689,11 @@ ms@2.1.2: resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@2.1.3, ms@^2.1.1: + version "2.1.3" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + multicast-dns-service-types@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz" @@ -2707,7 +2707,12 @@ multicast-dns@^6.0.1: dns-packet "^1.3.1" thunky "^1.0.2" -nanoid@^3.3.6, nanoid@^3.3.7: +nan@^2.12.1: + version "2.26.2" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.26.2.tgz#2e5e25764224c737b9897790b57c3294d4dcee9c" + integrity sha512-0tTvBTYkt3tdGw22nrAy50x7gpbGCCFH3AFcyS5WiUu7Eu4vWlri1woE6qHBSfy11vksDqkiwjOnlR7WV8G1Hw== + +nanoid@^3.3.7: version "3.3.7" resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz" integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== @@ -3299,7 +3304,7 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -"postcss@^7.0.0 || ^8.0.1", postcss@^8.0.9, postcss@^8.1.0, postcss@^8.2.15, postcss@^8.2.2, postcss@^8.3.5: +postcss@^8.2.15, postcss@^8.3.5: version "8.4.38" resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz" integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A== @@ -3353,13 +3358,6 @@ punycode@^2.1.0: resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz" integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== -qs@^6.11.2: - version "6.11.2" - resolved "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz" - integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA== - dependencies: - side-channel "^1.0.4" - qs@6.11.0: version "6.11.0" resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz" @@ -3367,6 +3365,13 @@ qs@6.11.0: dependencies: side-channel "^1.0.4" +qs@^6.11.2: + version "6.11.2" + resolved "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz" + integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA== + dependencies: + side-channel "^1.0.4" + querystringify@^2.1.1: version "2.2.0" resolved "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz" @@ -3394,7 +3399,7 @@ raw-body@2.5.1: iconv-lite "0.4.24" unpipe "1.0.0" -"react-dom@^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", "react-dom@^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0", "react-dom@^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0-rc", "react-dom@^16.3.0 || ^17.0.0 || ^18.0.0", react-dom@^17.0.2: +react-dom@^17.0.2: version "17.0.2" resolved "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz" integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== @@ -3451,7 +3456,7 @@ react-window@^1.8.6: "@babel/runtime" "^7.0.0" memoize-one ">=3.1.1 <6" -"react@^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", "react@^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0", "react@^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0-rc", "react@^16.3.0 || ^17.0.0 || ^18.0.0", react@^17.0.2, "react@>= 16.8", react@17.0.2: +react@^17.0.2: version "17.0.2" resolved "https://registry.npmjs.org/react/-/react-17.0.2.tgz" integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== @@ -3621,25 +3626,15 @@ rimraf@^2.6.3: dependencies: glob "^7.1.3" -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@>=5.1.0, safe-buffer@~5.2.0, safe-buffer@5.2.1: - version "5.2.1" - resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safe-buffer@~5.1.0: +safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-buffer@5.1.2: - version "5.1.2" - resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== +safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== safe-regex@^1.1.0: version "1.1.0" @@ -3661,7 +3656,7 @@ sass-loader@^11.1.1: klona "^2.0.4" neo-async "^2.6.2" -sass@^1.3.0, sass@^1.69.5: +sass@^1.69.5: version "1.69.5" resolved "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz" integrity sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ== @@ -3737,14 +3732,7 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1: resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.3.4: - version "7.5.4" - resolved "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz" - integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== - dependencies: - lru-cache "^6.0.0" - -semver@^7.3.5: +semver@^7.3.4, semver@^7.3.5: version "7.5.4" resolved "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== @@ -3951,7 +3939,7 @@ source-list-map@^2.0.0: resolved "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -source-map-js@^1.0.2: +"source-map-js@>=0.6.2 <2.0.0": version "1.0.2" resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== @@ -3961,11 +3949,6 @@ source-map-js@^1.2.0: resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz" integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== -"source-map-js@>=0.6.2 <2.0.0": - version "1.0.2" - resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== - source-map-resolve@^0.5.0: version "0.5.3" resolved "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz" @@ -4043,15 +4026,24 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + "statuses@>= 1.4.0 < 2": version "1.5.0" resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz" integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== -statuses@2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz" - integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== +string-width@^3.0.0, string-width@^3.1.0: + version "3.1.0" + resolved "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" string_decoder@^1.1.1: version "1.3.0" @@ -4067,15 +4059,6 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -string-width@^3.0.0, string-width@^3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" @@ -4268,7 +4251,7 @@ union-value@^1.0.0: is-extendable "^0.1.1" set-value "^2.0.1" -unpipe@~1.0.0, unpipe@1.0.0: +unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== @@ -4380,7 +4363,7 @@ webpack-bundle-tracker@^1.0.0: lodash.topairs "^4.3.0" strip-ansi "^6.0.0" -webpack-cli@^4.7.0, webpack-cli@4.x.x: +webpack-cli@^4.7.0: version "4.10.0" resolved "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz" integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w== @@ -4478,7 +4461,7 @@ webpack-sources@^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@^4.0.0 || ^5.0.0", "webpack@^4.27.0 || ^5.0.0", "webpack@^4.4.0 || ^5.0.0", webpack@^5.0.0, webpack@^5.1.0, webpack@^5.37.1, webpack@>=2, "webpack@4.x.x || 5.x.x": +webpack@^5.37.1: version "5.89.0" resolved "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz" integrity sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw== @@ -4508,7 +4491,7 @@ webpack-sources@^3.2.3: watchpack "^2.4.0" webpack-sources "^3.2.3" -websocket-driver@^0.7.4, websocket-driver@>=0.5.1: +websocket-driver@>=0.5.1, websocket-driver@^0.7.4: version "0.7.4" resolved "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz" integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==