diff --git a/.gitignore b/.gitignore index 7d8447e19..ace1a3b2c 100644 --- a/.gitignore +++ b/.gitignore @@ -31,8 +31,8 @@ .byebug_history # Ignore master key for decrypting credentials and more. -/config/master.key -/config/google_api*.json +master.key +google_api*.json /public/packs /public/packs-test yarn-debug.log* @@ -48,3 +48,5 @@ yarn-debug.log* /.run/* /app/assets/builds/* !/app/assets/builds/.keep + +/config/master.key diff --git a/.tool-versions b/.tool-versions index 0eb457d09..991de462c 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ ruby 3.3.1 -yarn 1.22.19 +yarn 1.22.22 nodejs 20.12.2 diff --git a/app/assets/images/white-label-logo.png b/app/assets/images/white-label-logo.png index 52168c59d..1e0bb5e6c 100644 Binary files a/app/assets/images/white-label-logo.png and b/app/assets/images/white-label-logo.png differ diff --git a/app/assets/stylesheets/_bootstrap-customizations.scss b/app/assets/stylesheets/_bootstrap-customizations.scss index 4684ac900..e3fc21d5c 100644 --- a/app/assets/stylesheets/_bootstrap-customizations.scss +++ b/app/assets/stylesheets/_bootstrap-customizations.scss @@ -39,8 +39,15 @@ body { header { position: relative; z-index: 10; - background: $palette-black url("top-line-bg.jpg") top center; - background-size: 100% auto; + + .whitelabel-header-container { + background: var(--Linear, linear-gradient(180deg, $palette-white 2.04%, $alert-bg 97.59%)); + padding: 10px 15px 50px; + + a { + color: $custom-16; + } + } &.white-bg { background: $palette-white; @@ -232,6 +239,11 @@ a { font-weight: 300; color: $text-muted; + .data-probe { + border-bottom: 1px solid $custom-17; + padding-bottom: 15px; + } + a { padding: 0 2px; font-size: 12px; @@ -1427,66 +1439,6 @@ Service detail text-align: center; } - .badge-right { - padding: 8px; - text-transform: uppercase; - position: absolute; - display: flex; - font-size: 9px; - background: $custom-8; - line-height: 1; - top: 15px; - color: $custom-9; - font-weight: 700; - align-items: center; - right: 15px; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - - .ordertype { - width: 10px; - height: 17px; - display: inline-block; - background-size: 10px auto; - margin-right: 5px; - } - - // scss-lint:disable all - &.order_required, - &.style_order_required { - .ordertype { - background-image: url("restricted.svg"); - } - } - - &.style_open_access, - &.open_access, - &.fully_open_access, - &.various { - background: $custom-6 !important; - color: $custom-7 !important; - - .ordertype { - background-image: url("open-access.svg"); - } - } - - &.badge-success, - &.badge-warning, - &.badge-error { - color: $white; - } - - &.other { - .ordertype { - background-image: url("restricted.svg"); - } - } - - // scss-lint:enable all - } - .card-body { padding: 0.8rem 1rem; font-size: 13px; @@ -3201,13 +3153,17 @@ label[data-multicheckbox].small { } .service-box { - border: 1px solid $palette-gray-10; + border: 1px solid $custom-17; -webkit-border-radius: 8px; -moz-border-radius: 8px; border-radius: 8px; overflow: hidden; position: relative; + &:hover { + border: 1px solid $landing-01; + } + &.horizontal { background: $palette-lightblue2; @@ -3217,19 +3173,15 @@ label[data-multicheckbox].small { } .horizontal-badge { - position: absolute; - top: 0; - right: 0; width: auto; - background: $badge-blue; - color: $navbar-light-active-color; - font-size: 0.8em; + background: $alert-bg; + color: $custom-12; + font-size: 9px; text-transform: uppercase; line-height: 12px; padding: 9px 17px; text-align: center; - border-bottom-left-radius: 5px; - font-weight: 400; + font-weight: 700; } .horizontal-badge-new { @@ -3351,70 +3303,48 @@ label[data-multicheckbox].small { } } } + .info-icons { + position: absolute; + top: 24px; + right: 24px; + display: flex; - .badge { - font-size: 0.8em; - line-height: 12px; - padding: 7px 14px; - //text-transform: uppercase; - border-bottom: 2px solid $palette-solid-10; - text-align: center; - color: $palette-gray-70; - margin-bottom: 30px; - font-weight: 400; - width: 100%; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - - .ordertype { - width: 11px; - height: 11px; - display: inline-block; - background-size: 11px auto; - margin-right: 5px; - - &.open_access { - background-image: url("catalog_icon.svg"); - } + .badge { + float: right; + top: auto; + right: auto; + position: relative; + margin-left: 8px; - &.orderable { - background-image: url("internal_ordering_icon.svg"); + &.badge-success, + &.badge-warning, + &.badge-error { + color: $white; } - &.external { - background-image: url("external_ordering_icon.svg"); + &.badge-draft { + background: $palette-solid-50; + color: $white; } - &.various { - background-image: url("catalog_icon.svg"); + &.badge-blue { + background: $badge-blue; + color: $navbar-light-active-color; } } + } - &.badge-success, - &.badge-warning, - &.badge-error { - color: $white; - } - - &.badge-draft { - background: $palette-solid-50; - color: $white; - } + .right-extra-info { + padding: 80px 0 20px; - &.badge-blue { - background: $badge-blue; - color: $navbar-light-active-color; + .service-logo { + min-width: 120px; + max-height: 90px; + height: auto; } } - .service-logo { - min-width: 120px; - height: auto; - } - .media-body { - border-right: 1px solid $palette-gray-10; position: relative; &.backoffice { @@ -3466,8 +3396,13 @@ label[data-multicheckbox].small { } h2 { - font-weight: 400; - margin-bottom: 0.35rem; + font-weight: 600; + font-size: 18px; + margin-bottom: 0; + + a { + color: $landing-02; + } } .abbreviation { @@ -3490,8 +3425,7 @@ label[data-multicheckbox].small { display: inline; float: left; color: $palette-solid-100; - padding-right: 0; - width: 105px; + padding-right: 5px; margin-bottom: 0; font-weight: 300; } @@ -3502,8 +3436,13 @@ label[data-multicheckbox].small { max-width: 82%; margin-bottom: 0; + p { + margin: 0; + } + a { font-weight: 300; + text-decoration: underline; } } } @@ -3592,7 +3531,7 @@ label[data-multicheckbox].small { } .category-separator { - border-top: 5px solid $palette-gray-5; + border-top: 1px solid $custom-17; margin: 0 0 1.4rem; } @@ -3611,6 +3550,14 @@ label[data-multicheckbox].small { } .categories-list { + a { + color: $landing-02; + + &:hover { + color: $custom-12; + } + } + li { font-size: 16px; margin-bottom: 6px; @@ -6989,43 +6936,6 @@ abbr[title] { } } } - - .browse { - width: 637px; - color: $landing-01; - margin: 12px auto 0; - - .browse-label { - font-size: 14px; - text-align: left; - padding-right: 10px; - } - - .solutions-box { - align-items: center; - grid-gap: 16px; - gap: 10px; - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: flex-start; - - a { - font-size: 13px; - color: $palette-white; - border: 1px solid $palette-white; - padding: 1px 8px; - border-radius: 16px; - - &:hover { - background: RGB(255, 255, 255, 0.3); - -webkit-box-shadow: 0 0 18px 0 rgba(0, 0, 0, 1); - -moz-box-shadow: 0 0 18px 0 rgba(0, 0, 0, 1); - box-shadow: 0 0 18px 0 rgba(0, 0, 0, 1); - } - } - } - } } .research-activity { @@ -7799,8 +7709,8 @@ abbr[title] { .eosc-common { &.white-label { .container { - padding-left: 30px !important; - padding-right: 30px !important; + padding-left: 45px !important; + padding-right: 45px !important; ul { li { @@ -7814,8 +7724,8 @@ abbr[title] { .left-links { .header-logo-whitelabel { - width: 262px; - height: 60px; + width: 160px; + height: 57px; background: url("white-label-logo.png") center no-repeat; display: block; } @@ -8331,4 +8241,138 @@ footer { } } } + +.browse { + width: 637px; + color: $landing-01; + margin: 12px auto 0; + + &.whitelabel { + margin: 12px 0 0; + } + + .browse-label { + font-size: 14px; + text-align: left; + padding-right: 10px; + } + + .solutions-box { + align-items: center; + grid-gap: 16px; + gap: 10px; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: flex-start; + + a { + font-size: 13px; + color: $palette-white; + border: 1px solid $palette-white; + padding: 1px 8px; + border-radius: 16px; + + &:hover { + background: RGB(255, 255, 255, 0.3); + -webkit-box-shadow: 0 0 18px 0 rgba(0, 0, 0, 1); + -moz-box-shadow: 0 0 18px 0 rgba(0, 0, 0, 1); + box-shadow: 0 0 18px 0 rgba(0, 0, 0, 1); + } + } + } +} // scss-lint:enable all + +.searchbar { + &.whitelabel { + justify-content: center; + margin: 0; + + .searchbar__input { + width: 80%; + } + + .searchbar__select { + border-top: 1px solid $landing-01; + border-bottom: 1px solid $landing-01; + } + + input { + border-radius: 8px 0 0 8px; + padding: 12px 25px 12px 10px; + border: 1px solid $landing-01; + border-right: 0; + } + + button { + border-radius: 0 8px 8px 0; + border: 1px solid $landing-01; + border-left: 0; + + svg { + font-size: 20px; + } + } + } +} + +.badge-right { + padding: 8px; + text-transform: uppercase; + position: absolute; + display: flex; + font-size: 9px; + background: $custom-8; + line-height: 1; + top: 15px; + color: $custom-9; + font-weight: 700; + align-items: center; + right: 15px; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + + .ordertype { + width: 10px; + height: 17px; + display: inline-block; + background-size: 10px auto; + margin-right: 5px; + } + + // scss-lint:disable all + &.order_required, + &.style_order_required { + .ordertype { + background-image: url("restricted.svg"); + } + } + + &.style_open_access, + &.open_access, + &.fully_open_access, + &.various { + background: $custom-6 !important; + color: $custom-7 !important; + + .ordertype { + background-image: url("open-access.svg"); + } + } + + &.badge-success, + &.badge-warning, + &.badge-error { + color: $white; + } + + &.other { + .ordertype { + background-image: url("restricted.svg"); + } + } + + // scss-lint:enable all +} diff --git a/app/assets/stylesheets/_ref_mobile.scss b/app/assets/stylesheets/_ref_mobile.scss index 5e71cafd4..1f0cfd12e 100644 --- a/app/assets/stylesheets/_ref_mobile.scss +++ b/app/assets/stylesheets/_ref_mobile.scss @@ -223,6 +223,26 @@ } @media (max-width: 768px) { + .browse { + width: 100%; + + &.whitelabel { + display: flex; + flex-direction: column; + font-size: 12px; + + .browse-label { + margin-bottom: 7px; + } + } + } + + header { + .whitelabel-header-container { + padding: 10px 15px 0; + } + } + h1 { font-size: 1.5rem; } @@ -253,6 +273,11 @@ } .service-box { + .info-icons { + top: 15px; + right: 15px; + } + h2 { font-size: 1rem; } @@ -292,6 +317,8 @@ order: 1; position: relative; width: 100%; + padding: 50px 0 20px; + text-align: center; .service-logo { margin-top: 10px; diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml index 1a28af320..d33ae21dd 100644 --- a/app/views/layouts/_navbar.html.haml +++ b/app/views/layouts/_navbar.html.haml @@ -68,58 +68,54 @@ %a{ href: external_search_url(include_query: true) } Go to Search - else - .container + .whitelabel-header-container %section.header - .logo - = link_to root_path do - = image_tag "eosc-logo-mono.png", class: "eosc-hub-logo-main" - .logo-bg + .col-md-6.col-sm-12.mx-auto + = render "services/search", categories: categories, query_params: query_params - = render "services/search", categories: categories, query_params: query_params + - if whitelabel + .menu.dropdown + - if user_signed_in? + %a#dropdown-menu-button.dropdown-toggle{ "aria-expanded" => "false", + "aria-haspopup" => "true", + "data-e2e" => "my-eosc-button", + "data-toggle" => "dropdown", + type: "button" } - - if whitelabel - .menu.dropdown - - if user_signed_in? - %a#dropdown-menu-button.dropdown-toggle{ "aria-expanded" => "false", - "aria-haspopup" => "true", - "data-e2e" => "my-eosc-button", - "data-toggle" => "dropdown", - type: "button" } - - .menu__label My EOSC Marketplace - .dropdown-menu - %ul - %li - %a.dropdown-item.dropdown-projects{ href: "/projects" } - = _("My projects") - %li - %a.dropdown-item.dropdown-profile{ href: "/favourites", "data-e2e": "favourites" } - = _("Favourite services") - %li - %a.dropdown-item.dropdown-profile{ href: "/profile", "data-e2e": "profile" } - = _("Profile") - %li - %a.dropdown-item.dropdown-profile{ href: "/api_docs", "data-e2e": "marketplace-api" } - = _("Marketplace API") - - if show_administrative_sections? - .border-top - - if policy([:backoffice, :backoffice]).show? + .menu__label My EOSC Marketplace + .dropdown-menu + %ul %li - %a.dropdown-item.dropdown-profile{ href: backoffice_path, "data-e2e": "backoffice" } - = _("Backoffice") - - if policy([:admin, :admin]).show? + %a.dropdown-item.dropdown-projects{ href: "/projects" } + = _("My projects") %li - %a.dropdown-item.dropdown-profile{ href: admin_path } - = _("Admin") - - if policy([:executive, :executive]).show? + %a.dropdown-item.dropdown-profile{ href: "/favourites", "data-e2e": "favourites" } + = _("Favourite services") %li - %a.dropdown-item.dropdown-profile{ href: executive_path } - = _("Executive") - - else - = link_to user_checkin_omniauth_authorize_path, class: "menu__label menu__label--unauth" do - = _("My EOSC Marketplace") + %a.dropdown-item.dropdown-profile{ href: "/profile", "data-e2e": "profile" } + = _("Profile") + %li + %a.dropdown-item.dropdown-profile{ href: "/api_docs", "data-e2e": "marketplace-api" } + = _("Marketplace API") + - if show_administrative_sections? + .border-top + - if policy([:backoffice, :backoffice]).show? + %li + %a.dropdown-item.dropdown-profile{ href: backoffice_path, "data-e2e": "backoffice" } + = _("Backoffice") + - if policy([:admin, :admin]).show? + %li + %a.dropdown-item.dropdown-profile{ href: admin_path } + = _("Admin") + - if policy([:executive, :executive]).show? + %li + %a.dropdown-item.dropdown-profile{ href: executive_path } + = _("Executive") + - else + = link_to user_checkin_omniauth_authorize_path, class: "menu__label menu__label--unauth" do + = _("My EOSC Marketplace") - .menu__hamburger{ onclick: "openNav()" } - %span - %span - %span + .menu__hamburger{ onclick: "openNav()" } + %span + %span + %span diff --git a/app/views/services/_active_filters.html.haml b/app/views/services/_active_filters.html.haml index 18fcb652b..bc9afdf4c 100644 --- a/app/views/services/_active_filters.html.haml +++ b/app/views/services/_active_filters.html.haml @@ -8,7 +8,7 @@ = category&.name || "EOSC Services and Data Sources" .col-md-12.mb-1 - if category && params[:q].blank? - %p.text-muted.mb-4.ml-1= category.description + %p.text-muted= category.description - if active_filters.present? .col-md-12.mb-3 %p.mb-1 diff --git a/app/views/services/_search.html.haml b/app/views/services/_search.html.haml index 4f5d8a15a..b3c2b9699 100644 --- a/app/views/services/_search.html.haml +++ b/app/views/services/_search.html.haml @@ -6,7 +6,7 @@ "data-search-services-path": services_path, "data-search-categories-path": "/services/c", "data-shepherd-tour-target": "overview_8", - class: "searchbar" do + class: "searchbar whitelabel" do = hidden_field_tag "object_id", nil, "data-autocomplete-target": "hidden" = hidden_field_tag "type", nil, "data-autocomplete-target": "type", "data-search-target": "type" = hidden_field_tag "anchor", nil, "data-autocomplete-target": "anchor" @@ -40,3 +40,11 @@ .input-group-append %button#query-submit.input-group-text.bg-white{ "data-e2e": "query-submit-btn" } %i.fas.fa-search + +.browse.d-flex.whitelabel + .browse-label + Popular keywords: + .popular-box + %a{ href: "#" } nanotechnology + %a{ href: "#" } cloud computing + %a{ href: "#" } storage diff --git a/app/views/services/_service_details.html.haml b/app/views/services/_service_details.html.haml index 8830ec129..7bfad5bb7 100644 --- a/app/views/services/_service_details.html.haml +++ b/app/views/services/_service_details.html.haml @@ -1,14 +1,19 @@ - shepherd_target = local_assigns[:tour_overview_9_target] ? "overview_9" : nil .media.mb-3.service-box{ "data-shepherd-tour-target": shepherd_target, class: ("horizontal" if service.horizontal) } + .info-icons + %span.badge.horizontal-badge.fa-pull-right.badge-right Horizontal service + + .badge.access-information.fa-pull-right.badge-right.style_order_required{ class: service.order_type } + %i.ordertype.order_required + = service.order_type.humanize + .media-body.pt-4{ class: ("backoffice" if request.fullpath.include?("backoffice")) } .pl-4.pr-4.mb-3 - %h2.mb-3{ "data-probe" => "", "data-service-id" => service.id, "data-e2e" => "service-id" } + %h2{ "data-probe" => "", "data-service-id" => service.id, "data-e2e" => "service-id" } = yield - - if service.horizontal - %span.badge.badge-blue Horizontal service .abbreviation.list = service.abbreviation - %p.mb-3= highlighted_for(:tagline, service, highlights) + %p.mb-2= highlighted_for(:tagline, service, highlights) = render "components/presentable/header_component/categorization", service: service, highlights: highlights = yield_content!(:comparison_checkbox) if content_for(:comparison_checkbox) = yield_content!(:favourite_checkbox) if content_for(:favourite_checkbox) @@ -23,9 +28,5 @@ = render "services/offers_box", service_offers: service_offers, service: service .right-extra-info - .text-center.badge.text-uppercase - %i{ class: "ordertype #{order_type(service)}" } - -# TODO: refactor dynamic translation - = t("offers.type.#{order_type(service)}") .service-logo = presentable_logo(service, "align-center mx-4 service-logo", "120x120") diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc index 6972448fa..f4cb53929 100644 --- a/config/credentials.yml.enc +++ b/config/credentials.yml.enc @@ -1 +1 @@ -HI1GI3YbcZpeWa/g+ETq3kO9N2SMdGYizUSx8VHXWODvDDpnySu5wPN9GrXWKLAtejqJYXRDAdUoLFCTUjEf/OLGmlSIQXIbR3CdU3NexJrYEx9Ja7FR3qD+S+u/jFFpwUjlLXRNq9bWnK12Jk2RG1vznOoRaTTLO+m/ALwTIvJ0TAJQNxO8p7aN91RW6G4CZ8qTltO/X3XxvsfMumYhH3PKJmqm8yLA+iqQauyYoZRTFHav6pWgCgfZYzynYXhQQSS6YPSoz/4lXpDbwjGEF+konzsPqEtBtoT0kgdh++Ba3yvFGcKn5RzocoU/izfpOzdpooTE9Yf0Qs7WD78DQ4UoJciUGOmhOwJUTYzuRUq+LNL2EjKh0ZwmSkf5hXoRxEA7wRLZJ1VKsL1kikpFuDyNapIUGpGW5LIuvOyRC0JpfG1hAPmCkW9R0MKYIAziK1G4hW1mzmDLesxGxf08NXov8Xj0/L/seWAToqqrgvibrJ50RIlJW7PhN2B2tK1PUdknHIqWRm4whNpiwTzHmRXBihszYQ4HXry+GADgOro5A5ntnwTj03KUq9Csd+Wtm/ZuB6qvfsLQxIdl0lXd7WNhVHZ7D5yP3FXFBOEhUZ0/dxGHiEnVT0h8D796y3SgHryNL1gG2LgV6StTm0XOlJCP9K3M0qdVZG5/Hg5SekRS+yaFxTPJnubPbx3qz3u7l0UZD4twyGZ3qbJtYWMJmUMgSl8E7H40smuH+XXwK1c3ZPMY4Ka5b29YFqZ5RY3N0xyShDGFBnHXGqgy3pozi3zHAFLIv4BpLtYyqVCgcAqiHQMPSMM24JydSETcTqEzTF35RIAHNYwJanwxQ3jCzM6VvEYMbvr/9LxE+kdq8rZo8yuT31uMGmkZzRD/lBhicDK/cp6w1idnWApOLeKkxbTlrRFagYl0GJzKckPOznkNSjzpRoTc/N0c2QILhRnFxnkBVxjw8jcVw64h4TfUxAGLMkim0KlytbXYQr2NVqD62MkLppub12EXr9GBqCey6UysZfXeAYwacfIK21/QLmkOEcp/nOZdkA/jU2xLNHIQDNjs2xMIdxM2YQAoESQTpFQqalcEqGNtFklkdB2GqP797KiSlsdkmM4zFfInfWxPN4xREh9BnyUmW9mRj8ExTVS0UNgxvA45aT0HP/OE6UlcYIhusqkapQsFGliXMemWnAtXm4Axjx5Y/ThMRxWVCEWkrnBt+MzapaUq1LpZ3ezEpPbl5FMUJF7HAsaXAN4sc1wM2x0iZa98Qg6y7XuYp9qfLUmnr2oEvWb3/g3ATN8Hxx6CMvGfSKlhiZtj4Xyj9QFF2PzdKHEj+DWoTJ7xS7+RU1NHp+bgd3iZkJOVJcA+Eo1ibL8vnC3Pgw7XJzLz1DQrh5YgEkd2H9OmK8/HNdAm5LNo5Zk9FeEx0W9gOzX/ZTvUocdTenOJ/SO27dBUAiIj9NoEmAd5vyObUUIjYfleC2TbIQnLM6OSZDTa7ljdTRnzd1vPUr7fNNvLlfdiQmmjBXudNzuDmNLv7rv6t6og6dO4NKrrDdgekkLLGZGFq4hmNftDQ3GlJ47DT7zv2K90qyjoF8y/qClIVwepgNx4Ji5uXMB4AE90m+1//mH5rJvaZBhIdWWBE6WjEAs4CtCwVVmkYmGKZi6XI8ytGjDkuj8eowifAAhYmbYWBZvic3fQKU5Qn48P22MfUEA5OTJBsbA98BnIsYkHSPxpGIA6hxsS3C0HRNBtq8SQI9aldLL3bMKKntqEzpMCqRNS2+Cm2i2SVWuSU8s8huRjtgDIPUeT7cVJ0ds0wmYjTJXtxmpHHOvyP8obUEhmYbACkA/nEq3bdejTD+Sh0DOSrL5LH7hjO9N3X7hetGuULotV7PkXkEpPuaNKrxiws9De0gp6Nw1RgmA7JVfzeWusLS9gjEgUnpFTTrsfDEqM4XOkEi92CyuN/ArGcsKU8n141LROx67iv3NqGZD9DezmW53NyPCPDe1n2EQ8SBeOkG+LhfnUMI5JhXLrc9z7hV5Dv/ECE3THMwgwaAwCFZcaOekoKrL0SbMVlePqhI1IeKdoowBO3Hf6YoJFgmcnOYoqibGeyV5k5/EK/mi2ZsRfn659VhC6Mip68bg0QefyMle3zjGUIrKxt4FDeQV6jOAuFPQVnuahsLfgHN7S6RHP/+XKjzZ96qy4UPvAA8LU8IkTkPm/v2Qtp+oLQRakwle0sA3w/bdoRAdN0rwQdul4g/QwiEkPH+ka1/lEtQFj2wnCrYZfUUrjBTYPFqYrnOswGjyOZmbQ6tjSHmuC9lP8TM/uen98yf3Nqi25AA4LslfgiGchR4N9gPqbzgpTvtdJDqm92qcDf2fi1sXzlQ0g40rYoA6AcjvmAs5ElbFOIJEguc/tQziiMORt014Z84eqgj/4TdkT/TjfECLqX4+cnvi5fZ8ozEKRoeEeGpjT7CXwMoG223YqQPd5nj9KgkVfnCD50WXg8Y5SVdi0+bw/zDpxyz8GQWukan1TO2NR5Sais0iI1M9xPWHpnB+aZ/PziSVq+wkbQpGzmzbO6GvK1JOEngBTaKvWrRtFFJiKxLniRZYgUn5WKtZshm7DBDqe/gPwwBAYH6hUQuB13dgA72vfnaw0JoFJuZTqS7H78l1xefydxqbWXIH5g/Uu7k6LIgtyqlHgITWiTJJR3gN7bZHaIIK36EnT61617kE5xGCJ8goyBZwE2IGjXkX1RsyHa/b8kcbiFPvHEV8hUfCC99+qlyyilcdMgoxypep4dkIKasNnWRrs14O5RmVixXtn23lH5pdoUWHpbEk0l7pjvyGweL0zNUG19hA+HQ3gvlwl07fSetlHi+r5lqfo7oN9+aW1W/KgRS6fi9bT331hra3ATpdDaw52VWwoTjgE1p4Fmvh41kv0aPID0WkLtreTFEsd0IlyaDIMcbyID9Kkr0Q1lbbDeanseTEo1H4FTjlSmpwUvmQ63YfEH48sVRlGUW1w6/OuirUTZT/2ttWWKYXnEGntnB9dL/FY9Y4tTFU3aJZXg2shMj8pMbCt90ecAbd4LmslBa4aja2uIdLT+5rTctT73IF+o4Q9ndEZyMZT/LSBKI/IPw+n2OCTveas4CSZyMCk7buIPbrt2Adm3/zipijx37aivxPoDYhPm0hd7XOIIQggaooe4IrhpBsh+N4kRj9SZXj3aoMcMP74laHIOGXgELTBQ28hKiaPBaelOk9UKaiHoTz1JkYfxoc3xBGsaZB6n18pDwcFoSWTjRTREDbx9LWxL/AYtUIEwdGuZrtWifyWK6GKpLhsV0df5k/KmkZlfNNhogA899B+mgaSdccI3cSE2sJezCM0j0wBpE6GrPGOISe6GyDiF6HBYSgQQwIeK9KhMj2R2eVa2KE/7hP5AqnW3kTGqQeLusMjcnKJ4oBPCuSFFVEC4E6HGlB4NmMDmxb6rvHJ05ySyJqGRe0lhJ+rexSlTTOvzIZqCG0T5+8U5Ca+Cdp3+m34bbXiyTRSLxHDKvf6mfEZ+EYqG1IJ7SqAD/ZO1PwkRk3LRxB+FyTz1j4xoR9HaUMLkuzDemjqarGzndyAlLIypi5F/JhdlwJ9fZRwL/YWWHCwZYnmCn7ryeKnPQW13ECIEEymopfCuIa5r1sbrqB6TL79FhOjRGLqVBYgnYmswy5lFTtNKDSZpz0IGrBLM7nDFd1FdLTD2wX/iNvz+PxSoe2lDy5FXir7mZsxRUib3vG8h11APfN1Ka1Uu0jdA505dexJfg2cuEtOC9kCywKWIRg6EytNhHsnPRGs950UvpddWyjBnQQRSjbSZMvGpptuwIQvuHTKSOkGC03DPxiv9VPlCxkVQ3lb2tix8pjOr3R2Nlil9urZySoAaAiyFX/+1mh7VhL+eI1ECYJLxw5ZUMcRHV8yloJmjB6aOvt7jfVcSNraMRz1P+qceXjdMWJ8F2cG9IzC/eHYD0oP+GttxBGvhXUxFooTyIZx/n6Amb5QV+G3QDDTEjDVI7NDu6Dz+K0XizCZURH8BhInU8OAhn40k1HEK6Oe+P6gd6WmJXKpr/Y1kfH/hXHrwaoXX8koRs1YpZS9XVdrbDjSZjgi7K4lGP6AEErQhHShj90MUaDcB4tb6A5nFxFycPNEvp+P/Hra1X9GDj7ZMn9b0Ik+61QJjWr0lg8tBhVaLgYoDi+cGf9Zc2CQL0gRRz16BHJGbv+rHO6N1lb5DdhwrG/EaP5SuyjeZfMWZtPlB+2lKlmvCt1B9o0ZC1wq1Zo7PZVJiG3BHGeeEuQGhiWYev5CI5hRyzkwRtUSJY2Iw+3R9lKNOeYURP9snUmedOM/rH5gSgMrEhkFRlnHK8w6avmhDKCBj6y5mNaZXstsLc6nsDqQ2XIjpeFXUJhEl0aCs+pHx7tRALuHRdbXe/kzOKtVQ7M7J1/DQl7Disb9S5nvG4wUvpaka+7SzZ6PqJhs3lObEAY2dcBon6zrnjULGPCzSimrt+sEnJMTt9hKIieHKl5Lrn5ShC1LYtigT33+a0SQKkuMRtVS+oo9/c9KyFxvTUhaeXEcQ0tHT3PDUdn0BMhhatckV+o+XTeqikQ22ST0BvYu8qgIEsjWkjWKe9GIsFk67EqQggaS+40W/IiQwT8rj7wWmGKRrw0wtXzgwHP9zn0tJ8P6jwVOQxLRlbHqilzkIZ3ojOw/6Nv+6pwT5C+W1iO/wN7Y85yN6E6BzaKCIYND72fp7/57D5oriSA5UUyyPpZgHf6Fi+jwuPV3vLK8HVZQ0bxggDLOJ5AhuI2whEnqORn5wT7vapv1mWVprU5vygnAptJZ4663/tTSrkhlOUlegrDaLvX0RihJvfHYAKSXzGM+UYxKwjHNT+pQH2UUMUhbcmoUjPeq0E9DxVIsAeF3yf9WipQv8e9IINJKQnNH+sQVDirLgAz3zFuBMbfsXhR7JMfI8mJS8R9pumJV/O2DIqQ73xjPzLW5XJiPExes+/ekyja1oAC5SqdXx3rZy5FUW2PyC/9QaZ7JxmU+nH/wdxU1E4jvjDCHJZV7HTcrsQ/RB9cZzratfQ5rmEPug04f3NXJP8hmGWR8do7soP+EnySEmfI1fHXdckK4I8bDQjk+LGMpJibzeS/P/ZJehW8IwQCokPHi9+w1DZ51JlWyPgLDDZ0DUJZJQmrcbviYbseGvYf2993iuzq5MNM1f7dUjt2G45Pd+PEpFxu9CHZzX61BkMO5b5DQuQ45VNYBjKtvkNlSwQPTOC6pdIb4eOkSZJwhFEn/BqM/OYVYP18Ca+MLL5AoYYgmjgJGUcbnbyk/zhSp5Vrmu1J1L+LpT84mz+7BHTQRxfJyxxRmLqZjmW8PsK1eVRBgWkg9yRED0vgM04LZkH8x10T0NunCZoyCZTi3uDN9ydpcOf8Lek7MeAKtY2tdGAs+PWudG5pl99Fr0YrEC+PEsn5wBNEgtmR5PD7gDFpRSvYLrYZn4mqwkp6TYT8emtYmYmAz+9n3YrQ4A+JzooTPsJoxWfOX0IL5td7G+3VjGKKp9K2LiyCJ88HoVwPL0zaiCQu7OXN+PgCBRJ3fZZxOic7QDBDheEzpG2XFM36N8Vcx9VR9Y1ZpcP5bs86TKzVwb+IrLVxZB/ostUwyTqDIepWczKRThHZFonca08efr6/ZwcAvzNd/vz0WK6wI08s6RGYeAb9FG42N3rJ5Uk/E/i4KHdPfoyGvogbnaga7sd9k8ZulwjvZgy82zJOCl/OZe1xC3zvzcZJI+OtMBWI0B2zIoJYINRWwQy33YcTuv+Nfy2JTYps1llyprWa72J9vxFGXtJ6R6i9evLeQmihrze9OITtUh4tag4MYaXBGoJmTZ0fSSxypGYhUD02l19iFiP42QcAsDnGAQTyvV9sjJy9IsQPD32thXqlE/06cErK9incr7LYrx4lijUYcWe8q1cOJIDe10BPW+u/rOFm3CycDS4PTgBSBsGf93UNVaBlbFdbPxTtqC+Wa4OiiXRytB3md4QS3sdMIqlY3B1fZDrrp/OBzEo0+cin5OAyLe1BwhfYLuT+YmWX+J9qPzRMU1BlrFNlcsxPXM8qaFlIN7b4r5t6qYqW9GKI+5GAAortNYlFCAn+4gjxCoEr9UKzunMqLrc0Wtkm76KpD4gSamnLFHTEo6nZVzN0fBALQ/Hbr4MZautX6TEBDQ0xzN+UHRxOkybjaWZhmK9I1GEselYg/EqM42hPlkWFmQRxOG614ynToXKPNQrr1WOMuK/EUXjztMmMCjkwaOwTMkdQ34KFBwf/VmSquAjhn3IsAGI1qmmFGFGs9hLAdLw2R5Rwk0LLNNAO3AYuVKwtg2Bvq2TDf50qAKovwcXvukY3HpCGgPGATkKJbGlHde7HbFgJ9V28sn4QCrT0nHKRrv9a8ktiIVht/cYtRFtxf5OU7xIixFMRhDNQ3VbaO5mr601BEviA2/gyOVfVuBaLfTW8LzR51RLpHIPNpH/UxmzIYUxxK9pmEenibBEX26zMVj4aPiHaLnqUPxPTC+3ZBPeoPFBQGJlYBHEFx8qHz4KG8eg+Ob4vUDfK6QHTtUf14owjgLBmHgmKOErB6Ms7didSqhhWMdzkK44wOiAmh8me2MTw1EI/tBYeDv8WGAJltEIoOAjszKeZUyPLKKgA8lXKV+aZJ8u9VShytqRp4uT62T2+uZnF/IIfphe9c39DV6ufE3NQEfgn4KMdy0TtZeQW/GPcDR/vbmcUGLHRrATN8FvvTeOOM+/mxzqNY+ECS00oTEMG/UJNRTU4KTmbKssa9hU/oXGYfpYFNr/l9Fujh6T4hpupJxr3av3UqL405z5iU57NV2zU67dieavEJtuZFV30uHIsiaLJGSGZ8IZwJ5vZBU0MgmBGpvxUTNUlLZQKKEnpk7bK3eKDmFTU0Y/wdEGidmnxEHSP8Nqt0px9bskPzJcjj0GQSGPiowhaypKHkygQTuiGdIxvn5ejG4QOhBTglhW+PM5m1YxCsCbhZ/QdicTAx7XslLNHzEz9qkTFeBoBTHbrtG9+GmS7elF0f/gWHBjk6LLKNkC06PXVYyZmZGrv+rUrrVGrQ8yjbNo84+sx2ZAHNUopn1FOnezqb2m5VJmVAjYzGCk13hTMjjQ43vlNZGbTJP0etuIfjeoCPcRPLNneEYx4gdfIX3Mbn32i1UjWmZ6oRMl1euFTKj2+AUyAZS1EmnCsfYn5y4OtF0ZxLrfdYneX/T9FESskrCsMMUfFsZc2S3w5I+PjtdOYnUmHxFcUB1sgyUOdXyuNq+T+nU48xbF83ueThQlW9WGmksN8QXz0=--vSWHEN10GGISrO6C--4HlBIiif+PI+oJyQt45HNA== \ No newline at end of file +Pmst7xZCiO9GBF/zlMQXFqW0ctOjr+5AbUIrrs6ra22+TyL3FVLDjyn/PxRSkBk/4yBPkM5UNAerIiMjr93fihcHLWtu25B2eywe5YZoUxzJSDtsykaLQy/Vt7rDJfN1woX5E/TuoKC6WfctdqFIuILMgB1eHSLlmPn24uHJ4Y5k4/GGuyrON9MJgOWXsIHEtlRMURhITUdPCyjSuLCwz5M4VOGcHybvHNRTBKfOIRW3pd0yIhSpJ2iYou2LomU1blrweXgMn+vx+VeNTWwuR8ZCFPHFWTiMHjMS6GdxvewXXn72RJMJrT2bWWsc/U1AmhXuCRDDR0HKkY3ucjJ/KhUwoFu3JZz0A6J6x9Skqx2Hfgg35r6Jv1fDdgpTzcCbDSt8jcgZUXrdGOxznnIJbnOytIQ/pUIpoeY8GTgLTci8CZPHq733syCaZZnr7i50u+Ji4nqjMXoi6jex95bAKjGtmRzwhGzHVie9IiTnuwEn3++vj7xftYY3t3r+FHZnIZOhp1RfUXRMPci+FA9Di5jx+wEVyjtVDy3fD1rbGP5KVlNK2wCnpPdmLGOuyrfa+sdZrbFN9vBUcihsgEx0CD8hY9Lanks2az7WhGWvP4mOyl7qnoxFkemI9lTznDd/ST3GkqYMvqDqgSaY6WcWFzcVcu/1CzgFVTEFZKKSEKnfhpu6aZrXwaTg7NKCldYBRtOIp2fFCOTyC5tUQpFttm9pS1JPDseL+evLXR9YhlIBW2xtTwikVBm7x3dVHVMllpFC+LhbmSZ9a1Dh5YxZb+Zq1MeAh6bQ4GyUT4hyoOtcclvuTViRH0r7End70GSOLsJEkHlTQuhZEcMvoWT2SLjVU1VbffHMo5dd8zOdwEnitzV1XJMtMOytMJsmv5uacMWYnQOS7bdWyqSJOToAYOmOjUFzxwUUJVcHaUiU7l2QJJllJdK/FQ1BgQtkVAfzNI/anT+2jdc8XAkXmO3f80sLV+W90C8m08Eq1GltZQVYOj8dnZh3ZyIRgeL7tiJnVp54Ph8XRG6HcpJu58Bm9N/0TYASLo+5il6Lzg9ISnyFQ8uKsv0pKyMeO7LyBGlbyt7WSeFlY0NjqE2WidwgwFv3h8j2O2R/r9wjtjiYmdyPzlPSas008q3fNPy9JKCtrTUWbb1KRwCLAz6Iuvjey9dQq0uWyBTkjbSfbjkKBDB9ODusbTT5M9k7gbVFrmInJWC5qs7Rptncf/OZ56Vf7ypojdgFtgkh4rrsQmP3+fVUhEb8tx8/PiTnm9vTwqktEpR50U395z9ZLDNx7DN/FLj3bcFi3N1eA7/3y8uOwtWmM/J+i+t+fPAOrKE/Up5c3sN+0GhqQPOj8VzzVvhczo3Q6DiAiKv/uJhz/xSifswUcPXA8feqGcx3NH+nCaVwbXb8ocTWLrfUIIC1IQi2IDhFNpZ9RGt327DB949LRv+Dg7facBNKvaQaSlVBcdNy+XFoQpSOWgqtVy3kS6x5hZy9VUktRkKJrWH38buW+8IvisYhnjPiyWBqzAQ4fqPYiVwAjQ5yv5bQa6pEIyhu4D5wjqnXRL6s/XNXhpiC1d6nbVSoOzlbh7Mt8ZEICapML+nFJOjKbFI0O5NTtSv3+0ewVUOzkRBfHRyewkHjQeWV18FDfKuiof1WnUUe3eKnDCfz8nhFEJvEjvxqRL23JDlimXMpLhpYJJt3iO6wgTUuJMi8zKNQcJkUdBJxGcToZanjRrYj4dT0H7swuJ094Ux/t+mfhOhQ0RD033REBivu5+zKhwkkqsUSAqgVMDR3lIZj+V4ijImqJ629dNqI2B/4612+bT4UtPEsdjfN9TgjTzjDPAsfYnuSWrLOOhJkOAl3tg33lh5j53VzFsuIXK0apnTMLQRkGGCgWakwfmX8jZD4HAnIGKp5P12hzVszMDKCUkcNc53XeVjw0xliYJQX6idBlhBOUlCR43Q2pBgVL88c/3KYJAGblG23ixsCBKW0DmWSzFlgxZxUH6lU9fFwOvg3dIfuEljq7EVs5WJY8zpli6m9lkt8OG8g+GUxGgbBAFvAWn8S14O43ZeV17FEolZd4yQdeL6q83iuGEpnS1hM7IL1Jy4txDoP5gRffkdXWsBm1ZkJEl0QVh37QJ/RdksLl8q5fD5yHR/EAOayDyD8FeM3K+8jKcO7Eb2O8S98FhQpNnQd9dfWjQFA3tRiMu3W4Ub9tAFKf7JasgxVZbd0c5XlX5Aq/UInAAvFjp3rCigHonVS7ly3Cd8hJL+JqN0c5eR0OxhFbAtDc/mZsBboeISBmbKaIg+xgX0jZuzwtuWFQmBKCHjZI3aIxrHRmW79kPMIYomYTqbj+hk0bshMi6xsrJ0oH2aKOp6yqx5q4jRwppvOokSilRcwfQzrl1q+I03+IcrQg5rYVUN9z971BpxemfPE7RQbtFIaUImc4DtxYd8e2Do9U/ZYcBpa7iQ9il3jnv7vGClyT5fv3OqJSwqo5dd83cOk1UYHdnIc4oCPdErH+7c42k+A1Igivqn9RAcMvjYiW8+bN0RQkBtjvAVLgxRTRk4zGcMSY5vomg9Wrjg+Hf0Ets0Kl/mcXA6wPfNf3WBWeYURkvW1Fd3cGsaeHhvSreFvVWuzgoAdON03J7zjxUnVKnJUyb1akbaM1jf9zu6OQrqurIVUokQqKhmvIK19xik24cj1KgOwfxsRAvdwoeIOLhGfg16k6PBNnG6bAsyhE3XPvR/9+ZbGL1xspFbdWs1Gj44JrJC26RMh+wLXM22eLHCevZ4mQYppbmnihsVPd1ahdvmwGCwkeC/kc2in9aPXOsIKPjXiyumkdSWWzYlG/nKB1NDSnbxBrBFeMKtGesV2Bon8UXYEn1xhMT0ipNL9/8YHVpZL/Hz3uWm8Qa+kIeS40R27JuaKx0ZeGgGD7odgpsLvswdw5ALoz7g55X4vcBr6OxkfhlAYOdE49b/u2ig81uAV4+Ames8jXu9vhjiYXSubdyB8sLmJ7GrS3XlbQDuWMFXdxdctbXEdiD+qmNx8AS94ZhWJCrPulol9QGZLc0BT4TWL2oDPwUCac0X2GU++dhmXCt6Vxf4eq3rBp76SVlN7mJiqoWnCvnk3MBpTtqK2+XC7YVZRGD5qFBX/D04581g0ERd6KVguaB2FRkcQtAcKE2yBxsmGZ2ynrfiGMjIQJbMbLtHuwHEYzczbk4ia2qVO5ChPp0ThaEG1I6pdkos6riCEFfDXMSjD90LBF5WECRb24aXllxpwr7+GzwE2jfZCRbkYdy4dL4ju1sJd2UEx/xMweMSwwtR0dPbWnnGoDKpi7TUkleJRzhkQT+NPFoR4YQjCllXhU0ub00Pp4+Uj1rBd59ccURubg9ykEjRn0mjzFnF4G1l5x9NZCjISnXPqWghzThNjL9pcH3P3H7ftJY5Kx7/SJCD2E1gni9NKysu3x8UjTuKsmjpFw+93w8EoZWYcqyj16JpcUYdEc2n4I2wxCrZZhA6DZE5RpWz8G950VGnzAX4tGFmrlqmwahBEAigtF/kdSy89w9x6ZYZCz2zL7M7P950Xo2fdS0bfSjrqxsBG0ZsbbdaAHgfpZNql3zMqRq6n0XNVYc6Hqe2Hwt0Y6rncgGUafxiyE2QCFHpr5kg/4X6MXwnqyrP9KTaNgABs+q5lIVgNTIJN1MAUVZzz/gLnJXsNOJtO5aInK3m9X8F26iVLH6UFf1y32o0+qpLBbfBP/v+o8ih3wWgO8pVth3G/BbCFTohuz5lIqWWDjecMtuW47T2/Zt/vO9kYmCz6W+kM9g+VTjo/X7iWbmdDz/JOlIC4hNyKBcd4WkOBoNnryYcJtzUtrDvWP0Cn5UyCBYGk4ggwXfCukj0Z1bxQIp/o5OCwbGholgPsuXqZ77NKlUHfRuwnG6GX+a653rXPK6niF8Mnq7BcR6MaQVRNeI8B30JwCfH+IFw7HzidvuMBUEqV6lSqFfURX+YA3IHmzvj4bfM8HUwNWwKGCRprAMUB4SLeO0An+Ws6xmhGdM2bsi5Pr+vlBlVnGvuvN0xRyjxr+HN/zu4j8y70NwnzpZDVAHPrjHpWrpCU/4RXb80sh5XuylSSn5Ge+2X6hrdAgRVNzmWHIRQkk7MxrC9Do+o6iw1iYnRoBSbXs/VSMgRbkA2D/GtFfO1FZ9Unl4VOIrUeSv+8/H8psBBkNdGylrLbwSmmMTMkca2WcBCAa6RXUXQYB+84wKxo2iA2WlOIlSZnwDrl6zhHzeobuuJLYGKywQaqQcABIIHPLf0s3rLVN42EKgkIc/DKwGC4UCY3SIx2CvVETyFR5vcsmdvTBSMyDgzjgIduRTFAhuvaCqrLRIA15PkgNiWA0qA2OLWLqxVh8MECl7aquUCvM4OFZXeYq8GTK1DTCbdfdZsCBJJvfNlv6Lbs9lHhplsuEtt44TAT3pnsVjAmLbD5GF7JXblapV3Kse7NRTSPG2YRV/1SguWjrNQaypGQ4j7ZCP7wI+0gOAmZzIM35aQfUbbu8csRYY+zv0iPWidnvznag/WgLMZiqKKcxFjz2RU1zVPnJVKf8OU/auPeP6V5rShHWSWGp3XVnTVa31uTY6GjjmI1IRCBZtH2mqNDiSKgnIUhD14TNGDZjToqtDRRCVuMM022bVVZosd1KSnCqWovwo/ySj7ukcCJDpo0O/z/YGuAmK8npGHhf2ccWkSzOzFcIzZz2rL0aKCMFgzujnosWrBynR8tNj1/xQRfffcn8lI+yqAl1BLm3/Cy4Iq2x0rq6RPtpSBliGgREM41lqdqXIgsyvBr082w0JbO6Fddady/LoANrGIiY0SdMdfkOsLMyWWIaWGIkUf+ILFXwQH3/8fDVx6eYt4E3crByQgsJnV9bsmXUtX6nxf9LGRkI0oYjcQqCmygKkj7oIWvCuXnF2tCzUAsnq0QUHH6Ou5b+S8t7PcmFaAiJuZJlKvziu58/McidW6immUtLBWD5iCf+3Dx/HRAnCTSUL3ygLjAQdz8dvExBG/iOpjPOtmZDCVnnFysIl7lE49cD/gby7LVSUGx0+iABeeKZHF0RD//fy7AATfpR8yrWkhJyUr9L1TOwOq6alVBMtMQyKA+LAnV/Ypxr5YaFZ4n0wSU9M2WJ55E9jR+kA3Q25IyCgXxQ64rGLmKLWj1bhs/UjlOYJELIPdcUimtOzVAcgZVRPN5wZGswewPEhp4mquXXv5CTgZS4BtxV542HIkCSO0LFo+JiQvMdahYQyvXFtYRtSQZ3A/7BjWK1GsUuALOCbIHLIMyrk+zPYevi4HWIBt2C9Vv3djI44SdkNyBgJhco0/BgSFpq4mbPLOEFWSdw5FKq2abdN/pLJti772oPv7DWKHoKXaR4OBbhooDvG0NOsAiukIF4GmN6eewjG9KaBIV6jXSulSjd/U9kAmICfUmULe+Jj+gRGD/Ch1cOuzH2M7ogw3O30hUmRBmNPFnh8RqC9mKppDCShHkRCrLfYP5iv2FdZ750l+HDj+BHvZbgRNS1MvwGqogdUEb0AmRU+ejUW7OXLySOra1ObgC5fMdahNotr8viu+I6wFYvJdT9aVQSE6eYQDdI8/9L3rh7GUUNLJeswWeX0ReSfEYiXxKkrhvNRHchxgeYiB83MLnNxzBPAqTK1yz4/QDDCaGRz0fiaHsAQP43GvFyMijmB+eIUDG+ct/3n/YtM9wxk5PyzCyhcELXP1EdDAX/dF14rUAU8gD7uYdypGRSu0CyoB5pUCkFRA8ml3PEsLgW03Y5OD6ryemSUlu3oZccLPmtk3A7+/xT8tI7N4uIfcrxthabTmEj/ajnVZ5Ufocqv8WBGMRL5T2W/cEPbRcUfvmCoEgdvsx9FGyATDjMaQlOIB2yOvErW3//gCuLSmz9JPW3i5qP8K97V1Xe3X5RJh014F1sJusE4R0pk/6+qh3kN7WdxeaelpSNgyMCyGEVoUh07xJgo8Xwa7rqf5h7Tb/uwDdXh2h+YtW/LeCDdV8MBaR/F7RNUzzOyJgyhZ908I7+MqhGiSpNsNynlymiPIgZyxVZYS94cwxcxY5Z6lY8WGryLmADr6GfLhBy1UWwG21YGbENyQS0Z/jXFAvMAEROiMuryPcwFE22SAmAkyVH7u9rQtxWRrRbo6+BqJI4xe+aQpgX4V13Ok/kRNXwR2GXzNDTjJEsYDU5QRynKaIKzAIF8lAdiQL6y3ZAX4XnjTWFyx5igpvu5YqO0LjuIhOq0dqpXPAETLDXqL4WMutVxx2hZu8FSNa5zek2i9+u6+ERaYCFRYdveID0nJLgiVfAUkLAXVL2GtoGWgAImhbqPjIkmbdzYb/OvE75nbw1dpcu26a/6A8L2XuSUpZ2/4s9OC/oZ9fRwd0XWYgzdHnUnN8X51QqQN0jx31W+hrCbdGA7nyVx2D20scYCx9OEHHYDoxqrptvIYK91ojDWuSaJpHETFclqU9sOjZqJuC6eRC5HGt3wvpThH7+yf9XWDBXdPDUXIWbo75LXNu1BihvzR8to0fRm6c4yd1CfTs6xh2ZIuHo0kZmUz5XBwZAzo8uYdIHu+xtp7cb/tzHJwpcpP1qD/PhP3eLvSTeV4qTGWzNMv/EBlWpsP1p/0yoGZGIyeBrpbP1nInnjnnWhy14sfG3UkBxn36sX3K3P96goKSMs2GQR/vLW/cSZKYpe7zZOlxTmF5tXaGUXM94wxIeTDeWA0TJ3L9eYNADPKJl2f0T3i1EV48lM9Mvghy9RvIiKDTjH9TP93pYbjGxxyZdtDQwNW7wLgCK9ERUR+aDtemt42Zf75xqE9EX4SJC0qAfIy7imMYkDMWaN9qG0par2wOj1vxbEkKFUvdQkO93WoQLCIBlXlMz5APM8uFtBrBMlMPuBuvm6K93qqSc7QLjonOJ0uvpp+JrIqnrCWA0InDeKIZfccH66iT144/ZwxuuYmJCkdvna3jf0X+86eMOmzC0jA9byaS+qj5DRjwzbjW3FheGcZkIsrIIDb9Duqx4/NZTlXD6hiyQfOpg+gaQmgpnTrFaxUnf84wHn+VM/VpOpa/G5QXP2P3Stwcdsukr47mVrgz1vKLm1Jc6UaYV64iVr71xuY5DSTAXPF1w/aDMuSkHM8pbGj1/ODKPSTJZPg6O1j3EOHEJOZcrux32q10rPUP+DqLM1mOMdRg+CgLsQUemgnAaFZ7JBFgshxrt/u1r3iqQKN7g1Z/8maLx+jF0V5KqGdBula82a6Q5cTgVh4pNxKbWWL8OPG1x54zOAcg8L2ESxgqwyfpQMUjWi/X8e5J+7DXdoWL0ChhAD/hdlA8VUou--Pl87yoQTHkbUqfAr--jSOaPFISCc3GK9fKIt6WDA== \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index c590b0144..1abe23b4d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -34,120 +34,120 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@esbuild/aix-ppc64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz#a70f4ac11c6a1dfc18b8bbb13284155d933b9537" - integrity sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g== - -"@esbuild/android-arm64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz#db1c9202a5bc92ea04c7b6840f1bbe09ebf9e6b9" - integrity sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg== - -"@esbuild/android-arm@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.2.tgz#3b488c49aee9d491c2c8f98a909b785870d6e995" - integrity sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w== - -"@esbuild/android-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.2.tgz#3b1628029e5576249d2b2d766696e50768449f98" - integrity sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg== - -"@esbuild/darwin-arm64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz#6e8517a045ddd86ae30c6608c8475ebc0c4000bb" - integrity sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA== - -"@esbuild/darwin-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz#90ed098e1f9dd8a9381695b207e1cff45540a0d0" - integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA== - -"@esbuild/freebsd-arm64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz#d71502d1ee89a1130327e890364666c760a2a911" - integrity sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw== - -"@esbuild/freebsd-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz#aa5ea58d9c1dd9af688b8b6f63ef0d3d60cea53c" - integrity sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw== - -"@esbuild/linux-arm64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz#055b63725df678379b0f6db9d0fa85463755b2e5" - integrity sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A== - -"@esbuild/linux-arm@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz#76b3b98cb1f87936fbc37f073efabad49dcd889c" - integrity sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg== - -"@esbuild/linux-ia32@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz#c0e5e787c285264e5dfc7a79f04b8b4eefdad7fa" - integrity sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig== - -"@esbuild/linux-loong64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz#a6184e62bd7cdc63e0c0448b83801001653219c5" - integrity sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ== - -"@esbuild/linux-mips64el@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz#d08e39ce86f45ef8fc88549d29c62b8acf5649aa" - integrity sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA== - -"@esbuild/linux-ppc64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz#8d252f0b7756ffd6d1cbde5ea67ff8fd20437f20" - integrity sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg== - -"@esbuild/linux-riscv64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz#19f6dcdb14409dae607f66ca1181dd4e9db81300" - integrity sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg== - -"@esbuild/linux-s390x@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz#3c830c90f1a5d7dd1473d5595ea4ebb920988685" - integrity sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ== - -"@esbuild/linux-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz#86eca35203afc0d9de0694c64ec0ab0a378f6fff" - integrity sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw== - -"@esbuild/netbsd-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz#e771c8eb0e0f6e1877ffd4220036b98aed5915e6" - integrity sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ== - -"@esbuild/openbsd-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz#9a795ae4b4e37e674f0f4d716f3e226dd7c39baf" - integrity sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ== - -"@esbuild/sunos-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz#7df23b61a497b8ac189def6e25a95673caedb03f" - integrity sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w== - -"@esbuild/win32-arm64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz#f1ae5abf9ca052ae11c1bc806fb4c0f519bacf90" - integrity sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ== - -"@esbuild/win32-ia32@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz#241fe62c34d8e8461cd708277813e1d0ba55ce23" - integrity sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ== - -"@esbuild/win32-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz#9c907b21e30a52db959ba4f80bb01a0cc403d5cc" - integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ== +"@esbuild/aix-ppc64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f" + integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ== + +"@esbuild/android-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052" + integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A== + +"@esbuild/android-arm@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28" + integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg== + +"@esbuild/android-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e" + integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA== + +"@esbuild/darwin-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a" + integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ== + +"@esbuild/darwin-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22" + integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw== + +"@esbuild/freebsd-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e" + integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g== + +"@esbuild/freebsd-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261" + integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ== + +"@esbuild/linux-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b" + integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q== + +"@esbuild/linux-arm@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9" + integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA== + +"@esbuild/linux-ia32@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2" + integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg== + +"@esbuild/linux-loong64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df" + integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg== + +"@esbuild/linux-mips64el@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe" + integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg== + +"@esbuild/linux-ppc64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4" + integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w== + +"@esbuild/linux-riscv64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc" + integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA== + +"@esbuild/linux-s390x@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de" + integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A== + +"@esbuild/linux-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0" + integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ== + +"@esbuild/netbsd-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047" + integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg== + +"@esbuild/openbsd-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70" + integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow== + +"@esbuild/sunos-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b" + integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg== + +"@esbuild/win32-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d" + integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A== + +"@esbuild/win32-ia32@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b" + integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA== + +"@esbuild/win32-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c" + integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw== "@fortawesome/fontawesome-common-types@6.5.2": version "6.5.2" @@ -299,9 +299,9 @@ integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== "@types/node@*": - version "20.14.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.2.tgz#a5f4d2bcb4b6a87bffcaa717718c5a0f208f4a18" - integrity sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q== + version "20.14.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.5.tgz#fe35e3022ebe58b8f201580eb24e1fcfc0f2487d" + integrity sha512-aoRR+fJkZT2l0aGOJhuA8frnCSoNX6W7U2mpNq63+BxBIj5BQFt8rHy627kijCmm63ijdSdwvGgpUsU6MBsZZA== dependencies: undici-types "~5.26.4" @@ -451,15 +451,15 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -acorn-import-assertions@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" - integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== +acorn-import-attributes@^1.9.5: + version "1.9.5" + resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef" + integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ== acorn@^8.7.1, acorn@^8.8.2: - version "8.11.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" - integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== + version "8.12.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.0.tgz#1627bfa2e058148036133b8d9b51a700663c294c" + integrity sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw== ajv-formats@^2.1.1: version "2.1.1" @@ -550,24 +550,24 @@ braces@~3.0.2: fill-range "^7.1.1" browserslist@^4.21.10: - version "4.23.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab" - integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ== + version "4.23.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.1.tgz#ce4af0534b3d37db5c1a4ca98b9080f985041e96" + integrity sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw== dependencies: - caniuse-lite "^1.0.30001587" - electron-to-chromium "^1.4.668" + caniuse-lite "^1.0.30001629" + electron-to-chromium "^1.4.796" node-releases "^2.0.14" - update-browserslist-db "^1.0.13" + update-browserslist-db "^1.0.16" buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== -caniuse-lite@^1.0.30001587: - version "1.0.30001629" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001629.tgz#907a36f4669031bd8a1a8dbc2fa08b29e0db297e" - integrity sha512-c3dl911slnQhmxUIT4HhYzT7wnBK/XYpGnYLOj4nJBaRiw52Ibe7YxlDaAeRECvA786zCuExhxIUJ2K7nHMrBw== +caniuse-lite@^1.0.30001629: + version "1.0.30001636" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz#b15f52d2bdb95fad32c2f53c0b68032b85188a78" + integrity sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg== chalk@^4.1.2: version "4.1.2" @@ -693,17 +693,17 @@ desandro-matches-selector@^2.0.0: resolved "https://registry.yarnpkg.com/desandro-matches-selector/-/desandro-matches-selector-2.0.2.tgz#717beed4dc13e7d8f3762f707a6d58a6774218e1" integrity sha512-+1q0nXhdzg1IpIJdMKalUwvvskeKnYyEe3shPRwedNcWtnhEKT3ZxvFjzywHDeGcKViIxTCAoOYQWP1qD7VNyg== -electron-to-chromium@^1.4.668: - version "1.4.791" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.791.tgz#ba84e037cbf4df4eb23061076426e78e6122e389" - integrity sha512-6FlqP0NSWvxFf1v+gHu+LCn5wjr1pmkj5nPr7BsxPnj41EDR4EWhK/KmQN0ytHUqgTR1lkpHRYxvHBLZFQtkKw== +electron-to-chromium@^1.4.796: + version "1.4.806" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.806.tgz#2cb046631cbabceb26fc72be68d273fa183e36bc" + integrity sha512-nkoEX2QIB8kwCOtvtgwhXWy2IHVcOLQZu9Qo36uaGB835mdX/h8uLRlosL6QIhLVUnAiicXRW00PwaPZC74Nrg== emojis-list@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== -enhanced-resolve@^5.16.0: +enhanced-resolve@^5.17.0: version "5.17.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz#d037603789dd9555b89aaec7eb78845c49089bc5" integrity sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA== @@ -722,43 +722,43 @@ es-module-lexer@^1.2.1: integrity sha512-i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg== esbuild-loader@^4.0.3: - version "4.1.0" - resolved "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-4.1.0.tgz#06bddf224320c279fafbe4981feb1a0175b593e4" - integrity sha512-543TtIvqbqouEMlOHg4xKoDQkmdImlwIpyAIgpUtDPvMuklU/c2k+Qt2O3VeDBgAwozxmlEbjOzV+F8CZ0g+Bw== + version "4.2.0" + resolved "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-4.2.0.tgz#4aa4967e8721fddfc629695bb3c25ebec010066d" + integrity sha512-BhwHchuDknxIa69AqOPeZh2fIFqj2AzZKC1E3RBRvXSuyk5drsqMrwsgYZJufX41yrauLYjDM3KBmruoGl1NWQ== dependencies: - esbuild "^0.20.0" + esbuild "^0.21.0" get-tsconfig "^4.7.0" loader-utils "^2.0.4" webpack-sources "^1.4.3" -esbuild@^0.20.0: - version "0.20.2" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.2.tgz#9d6b2386561766ee6b5a55196c6d766d28c87ea1" - integrity sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g== +esbuild@^0.21.0: + version "0.21.5" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d" + integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw== optionalDependencies: - "@esbuild/aix-ppc64" "0.20.2" - "@esbuild/android-arm" "0.20.2" - "@esbuild/android-arm64" "0.20.2" - "@esbuild/android-x64" "0.20.2" - "@esbuild/darwin-arm64" "0.20.2" - "@esbuild/darwin-x64" "0.20.2" - "@esbuild/freebsd-arm64" "0.20.2" - "@esbuild/freebsd-x64" "0.20.2" - "@esbuild/linux-arm" "0.20.2" - "@esbuild/linux-arm64" "0.20.2" - "@esbuild/linux-ia32" "0.20.2" - "@esbuild/linux-loong64" "0.20.2" - "@esbuild/linux-mips64el" "0.20.2" - "@esbuild/linux-ppc64" "0.20.2" - "@esbuild/linux-riscv64" "0.20.2" - "@esbuild/linux-s390x" "0.20.2" - "@esbuild/linux-x64" "0.20.2" - "@esbuild/netbsd-x64" "0.20.2" - "@esbuild/openbsd-x64" "0.20.2" - "@esbuild/sunos-x64" "0.20.2" - "@esbuild/win32-arm64" "0.20.2" - "@esbuild/win32-ia32" "0.20.2" - "@esbuild/win32-x64" "0.20.2" + "@esbuild/aix-ppc64" "0.21.5" + "@esbuild/android-arm" "0.21.5" + "@esbuild/android-arm64" "0.21.5" + "@esbuild/android-x64" "0.21.5" + "@esbuild/darwin-arm64" "0.21.5" + "@esbuild/darwin-x64" "0.21.5" + "@esbuild/freebsd-arm64" "0.21.5" + "@esbuild/freebsd-x64" "0.21.5" + "@esbuild/linux-arm" "0.21.5" + "@esbuild/linux-arm64" "0.21.5" + "@esbuild/linux-ia32" "0.21.5" + "@esbuild/linux-loong64" "0.21.5" + "@esbuild/linux-mips64el" "0.21.5" + "@esbuild/linux-ppc64" "0.21.5" + "@esbuild/linux-riscv64" "0.21.5" + "@esbuild/linux-s390x" "0.21.5" + "@esbuild/linux-x64" "0.21.5" + "@esbuild/netbsd-x64" "0.21.5" + "@esbuild/openbsd-x64" "0.21.5" + "@esbuild/sunos-x64" "0.21.5" + "@esbuild/win32-arm64" "0.21.5" + "@esbuild/win32-ia32" "0.21.5" + "@esbuild/win32-x64" "0.21.5" escalade@^3.1.2: version "3.1.2" @@ -1337,9 +1337,9 @@ sass-loader@^14.2: neo-async "^2.6.2" sass@^1.77: - version "1.77.4" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.4.tgz#92059c7bfc56b827c56eb116778d157ec017a5cd" - integrity sha512-vcF3Ckow6g939GMA4PeU7b2K/9FALXk2KF9J87txdHzXbUF9XRQRwSxcAs/fGaTnJeBFd7UoV22j3lzMLdM0Pw== + version "1.77.6" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.6.tgz#898845c1348078c2e6d1b64f9ee06b3f8bd489e4" + integrity sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -1478,9 +1478,9 @@ terser-webpack-plugin@^5.3.10: terser "^5.26.0" terser@^5.26.0: - version "5.31.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.31.0.tgz#06eef86f17007dbad4593f11a574c7f5eb02c6a1" - integrity sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg== + version "5.31.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.31.1.tgz#735de3c987dd671e95190e6b98cfe2f07f3cf0d4" + integrity sha512-37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -1504,7 +1504,7 @@ undici-types@~5.26.4: resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== -update-browserslist-db@^1.0.13: +update-browserslist-db@^1.0.16: version "1.0.16" resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz#f6d489ed90fb2f07d67784eb3f53d7891f736356" integrity sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ== @@ -1599,9 +1599,9 @@ webpack-sources@^3.2.3: integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== webpack@^5.91.0: - version "5.91.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.91.0.tgz#ffa92c1c618d18c878f06892bbdc3373c71a01d9" - integrity sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw== + version "5.92.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.92.0.tgz#cc114c71e6851d220b1feaae90159ed52c876bdf" + integrity sha512-Bsw2X39MYIgxouNATyVpCNVWBCuUwDgWtN78g6lSdPJRLaQ/PUVm/oXcaRAyY/sMFoKFQrsPeqvTizWtq7QPCA== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.5" @@ -1609,10 +1609,10 @@ webpack@^5.91.0: "@webassemblyjs/wasm-edit" "^1.12.1" "@webassemblyjs/wasm-parser" "^1.12.1" acorn "^8.7.1" - acorn-import-assertions "^1.9.0" + acorn-import-attributes "^1.9.5" browserslist "^4.21.10" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.16.0" + enhanced-resolve "^5.17.0" es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0"