diff --git a/.storybook/preview.ts b/.storybook/preview.ts index 218d11b7161ae5cdf5ee1e6f49e208027e7bae8b..8c97f0c8ceb19dc8fb0c52100259e7aca1aa5ce0 100644 --- a/.storybook/preview.ts +++ b/.storybook/preview.ts @@ -5,7 +5,6 @@ setCompodocJson(docJson); const preview: Preview = { parameters: { - actions: { argTypesRegex: '^on[A-Z].*' }, docs: { toc: true, }, diff --git a/.vscode/settings.json b/.vscode/settings.json index 64c345aa1fb1fb2420b2b6cf9e455e9b5bdeda1c..7fd950c18be122248fe60129598b25436f68d2b3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -74,5 +74,6 @@ "xsmall", "xxsmall" ], - "svg.preview.background": "dark-transparent" + "svg.preview.background": "dark-transparent", + "conventionalCommits.scopes": ["carto"] } diff --git a/CHANGELOG.md b/CHANGELOG.md index b2dffc50b3e6961f989302d2553095e650826b4f..9b2f6cc08f4f44af4a87d877e04a81c15cc52c37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,37 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [3.0.1](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v3.0.0...v3.0.1) (2024-03-27) + + +### Features + +* **accessibility:** add link to accessibility page ([2bb680b](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/2bb680b0f238185078f1b03d325fcbe2922b364a)) + + +### Bug Fixes + +* **button:** secondaryDelete hover and active colors ([f10d794](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/f10d79435080b5fe743af0fcf7731b091a3f1381)) +* **carto:** Make the filters fit in one row ([a78a3ea](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/a78a3eaafd81edd1a4f22baeb6d28e8d9c9fab32)) +* **carto:** marker size & details width ([e3a8a34](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/e3a8a34d8ce4e69230b1571232f843cdc432c0bb)) +* **components:** Input component time should update with onChange ([7a64f71](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/7a64f71f7a287c25bacc3f9cb47feae0080cc651)) +* **deps:** update storybook to 8.0.4 ([59e806d](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/59e806df8e7d5073222d3d692f6624ea1765c523)) +* **onboarding:** hide personal offer label ([8907ecb](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/8907ecbd3f378bb25a9f8cf6184540a610d51b6f)) +* **onboarding:** on pmr page, button next disabled after return ([609a2c5](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/609a2c54b2cf37a6bb82670538bdf975539369bf)) +* **orientation:** Remove the 'C'est bientôt fini' screen ([3d7583e](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/3d7583e5215d67631c4984a2ae2cf1fc8700b452)) +* **orientation:** Update last screen if structure appointment failed ([b37c836](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/b37c83611efc1d0001ff69ae11eb5f88061b4b6b)) +* **print:** Close the structure detail panel when printing a structure ([5e4a4a8](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/5e4a4a8a07d6a4beb81e7752f9eb140eb9553cf4)) +* **print:** Remove x in header ([bbce297](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/bbce2977b0b17a23b9d17febea01e229dabd3da8)) +* **scroll:** No scroll in info windows ([2df7431](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/2df74316018c4a1da6e737e941c5de0442562c4e)) +* **ui:** change online demarch grid display to flex ([bdc52c7](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/bdc52c7a09cd9834e2a36aeb4361f6209a55dee2)) +* **ui:** fix gap in orientation's publics ([5bf28ac](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/5bf28acd2e64b67999bf5dad38b15d048c1c22c4)) +* **ui:** reduce footer height ([b5c9420](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/b5c9420d4812d76c796c8c9f2e90704b7f245611)) +* **ui:** reduce footer height for info pages ([f00e6e3](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/f00e6e33d72c2ead59b8176ad9574188c1cc6c1d)) +* **ui:** smaller more-filters cross ([031b931](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/031b931a8512b339d477b97a4809236e314d24fc)) +* **ui:** standardized modal style ([4848c36](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/4848c3692026f9c9bf50bb8023cc74d267f6a5c7)) +* **ui:** tabs font size news & profile ([6bc0eb3](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/6bc0eb3c1ae3a09469c97c76cc7550d811ba2fd8)) +* **user:** add member email lower case ([53b3f23](https://forge.grandlyon.com/web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/53b3f23349682a5b1c4936665c298c46e96ae0e9)) + ## [3.0.0](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v2.5.0...v3.0.0) (2024-03-19) diff --git a/package-lock.json b/package-lock.json index d192a4548813ea5a24bba20d5193773a66fb01a5..cbccf036395661a325600756d1c0a64f4fe411ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pamn", - "version": "3.0.0", + "version": "3.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pamn", - "version": "3.0.0", + "version": "3.0.1", "dependencies": { "@ag-grid-community/csv-export": "^29.0.0", "@angular/animations": "^17.0.7", @@ -20,7 +20,7 @@ "@angular/service-worker": "^17.0.7", "@asymmetrik/ngx-leaflet": "^17.0.0", "@ngx-translate/core": "^14.0.0", - "@storybook/addon-a11y": "^8.0.0", + "@storybook/addon-a11y": "^8.0.4", "ag-grid-angular": "^29.0.0", "ag-grid-community": "^29.0.0", "jwt-decode": "^3.1.2", @@ -46,14 +46,14 @@ "@angular/compiler-cli": "^17.0.7", "@angular/localize": "^17.0.7", "@compodoc/compodoc": "^1.1.16", - "@storybook/addon-essentials": "^8.0.0", - "@storybook/addon-interactions": "^8.0.0", - "@storybook/addon-links": "^8.0.0", - "@storybook/addon-mdx-gfm": "^8.0.0", - "@storybook/angular": "^8.0.0", - "@storybook/blocks": "^8.0.0", - "@storybook/manager-api": "^8.0.0", - "@storybook/theming": "^8.0.0", + "@storybook/addon-essentials": "^8.0.4", + "@storybook/addon-interactions": "^8.0.4", + "@storybook/addon-links": "^8.0.4", + "@storybook/addon-mdx-gfm": "^8.0.4", + "@storybook/angular": "^8.0.4", + "@storybook/blocks": "^8.0.4", + "@storybook/manager-api": "^8.0.4", + "@storybook/theming": "^8.0.4", "@types/leaflet": "^1.5.17", "@types/leaflet.locatecontrol": "^0.74.0", "@types/luxon": "^1.25.0", @@ -67,10 +67,8 @@ "http-server": "^14.1.0", "ng-packagr": "^17.0.3", "prettier": "^3.1.0", - "react": "^18.2.0", - "react-dom": "^18.2.0", "standard-version": "^9.3.2", - "storybook": "^8.0.0", + "storybook": "^8.0.4", "typescript": "~5.2.0" } }, @@ -83,6 +81,12 @@ "node": ">=0.10.0" } }, + "node_modules/@adobe/css-tools": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz", + "integrity": "sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ==", + "dev": true + }, "node_modules/@aduh95/viz.js": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/@aduh95/viz.js/-/viz.js-3.4.0.tgz", @@ -966,9 +970,9 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.23.7", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.7.tgz", - "integrity": "sha512-xCoqR/8+BoNnXOY7RVSgv6X+o7pmT5q1d+gGcRlXYkI+9B31glE4jeejhKVpA04O1AtzOt7OSQ6VYKP5FcRl9g==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.1.tgz", + "integrity": "sha512-1yJa9dX9g//V6fDebXoEfEsxkZHk3Hcbm+zLhyu6qVgYFLvmTALTeV+jNU9e5RnYtioBrGEOdoI2joMSNQ/+aA==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", @@ -976,7 +980,7 @@ "@babel/helper-function-name": "^7.23.0", "@babel/helper-member-expression-to-functions": "^7.23.0", "@babel/helper-optimise-call-expression": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.20", + "@babel/helper-replace-supers": "^7.24.1", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", "semver": "^6.3.1" @@ -1155,13 +1159,13 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz", - "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz", + "integrity": "sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==", "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-member-expression-to-functions": "^7.22.15", + "@babel/helper-member-expression-to-functions": "^7.23.0", "@babel/helper-optimise-call-expression": "^7.22.5" }, "engines": { @@ -1429,12 +1433,12 @@ } }, "node_modules/@babel/plugin-syntax-flow": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.23.3.tgz", - "integrity": "sha512-YZiAIpkJAwQXBJLIQbRFayR5c+gJ35Vcz3bg954k7cd73zqjvhacJuL9RbrzPz8qPmZdgqP6EUKwy0PCNhaaPA==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.24.1.tgz", + "integrity": "sha512-sxi2kLTI5DeW5vDtMUsk4mTPwvlUDbjOnoWayhynCwrw4QXRld4QEYwqzY8JmQXaJUtgUuCIurtSRH5sn4c7mA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -1498,12 +1502,12 @@ } }, "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz", - "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz", + "integrity": "sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -1615,12 +1619,12 @@ } }, "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz", - "integrity": "sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz", + "integrity": "sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -1892,13 +1896,13 @@ } }, "node_modules/@babel/plugin-transform-flow-strip-types": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.23.3.tgz", - "integrity": "sha512-26/pQTf9nQSNVJCrLB1IkHUKyPxR+lMrH2QDPG89+Znu9rAMbtrybdbWeE9bb7gzjmE5iXHEY+e0HUwM6Co93Q==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.24.1.tgz", + "integrity": "sha512-iIYPIWt3dUmUKKE10s3W+jsQ3icFkw0JyRVyY1B7G4yK/nngAOHLVx8xlhA6b/Jzl/Y0nis8gjqhqKtRDQqHWQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/plugin-syntax-flow": "^7.23.3" + "@babel/helper-plugin-utils": "^7.24.0", + "@babel/plugin-syntax-flow": "^7.24.1" }, "engines": { "node": ">=6.9.0" @@ -2019,13 +2023,13 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz", - "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.1.tgz", + "integrity": "sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw==", "dev": true, "dependencies": { "@babel/helper-module-transforms": "^7.23.3", - "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-plugin-utils": "^7.24.0", "@babel/helper-simple-access": "^7.22.5" }, "engines": { @@ -2401,15 +2405,15 @@ } }, "node_modules/@babel/plugin-transform-typescript": { - "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.6.tgz", - "integrity": "sha512-6cBG5mBvUu4VUD04OHKnYzbuHNP8huDsD3EDqqpIpsswTDoqHCjLoHb6+QgsV1WsT2nipRqCPgxD3LXnEO7XfA==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.1.tgz", + "integrity": "sha512-liYSESjX2fZ7JyBFkYG78nfvHlMKE6IpNdTVnxmlYUR+j5ZLsitFbaAE+eJSK2zPPkNWNw4mXL51rQ8WrvdK0w==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-create-class-features-plugin": "^7.23.6", - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/plugin-syntax-typescript": "^7.23.3" + "@babel/helper-create-class-features-plugin": "^7.24.1", + "@babel/helper-plugin-utils": "^7.24.0", + "@babel/plugin-syntax-typescript": "^7.24.1" }, "engines": { "node": ">=6.9.0" @@ -2585,14 +2589,14 @@ } }, "node_modules/@babel/preset-flow": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.24.0.tgz", - "integrity": "sha512-cum/nSi82cDaSJ21I4PgLTVlj0OXovFk6GRguJYe/IKg6y6JHLTbJhybtX4k35WT9wdeJfEVjycTixMhBHd0Dg==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.24.1.tgz", + "integrity": "sha512-sWCV2G9pcqZf+JHyv/RyqEIpFypxdCSxWIxQjpdaQxenNog7cN1pr76hg8u0Fz8Qgg0H4ETkGcJnXL8d4j0PPA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.24.0", "@babel/helper-validator-option": "^7.23.5", - "@babel/plugin-transform-flow-strip-types": "^7.23.3" + "@babel/plugin-transform-flow-strip-types": "^7.24.1" }, "engines": { "node": ">=6.9.0" @@ -2616,16 +2620,16 @@ } }, "node_modules/@babel/preset-typescript": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.23.3.tgz", - "integrity": "sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ==", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.24.1.tgz", + "integrity": "sha512-1DBaMmRDpuYQBPWD8Pf/WEwCrtgRHxsZnP4mIy9G/X+hFfbI47Q2G4t1Paakld84+qsk2fSsUPMKg71jkoOOaQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-validator-option": "^7.22.15", - "@babel/plugin-syntax-jsx": "^7.23.3", - "@babel/plugin-transform-modules-commonjs": "^7.23.3", - "@babel/plugin-transform-typescript": "^7.23.3" + "@babel/helper-plugin-utils": "^7.24.0", + "@babel/helper-validator-option": "^7.23.5", + "@babel/plugin-syntax-jsx": "^7.24.1", + "@babel/plugin-transform-modules-commonjs": "^7.24.1", + "@babel/plugin-transform-typescript": "^7.24.1" }, "engines": { "node": ">=6.9.0" @@ -5120,11 +5124,11 @@ "dev": true }, "node_modules/@storybook/addon-a11y": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-8.0.0.tgz", - "integrity": "sha512-lxvXOMYqeM6DOUvNP3e18GzPDVhcOZtLnjkJ8XQbRk2xx2qHodAEiFhiKBhfStsn6/rg0zWLRpZ1NJxjnZ0l/Q==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-8.0.4.tgz", + "integrity": "sha512-5OyZNzjNXjNUD9vBfjxFnJjMMcBFYWyI4zy5qmJcbAvBv/COiXNfNg2cr2YPNtU5WfA6nsaIESfHFGBHI3GDAg==", "dependencies": { - "@storybook/addon-highlight": "8.0.0", + "@storybook/addon-highlight": "8.0.4", "axe-core": "^4.2.0" }, "funding": { @@ -5133,12 +5137,12 @@ } }, "node_modules/@storybook/addon-actions": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-8.0.0.tgz", - "integrity": "sha512-QXfnEWZt5k35cPYsLvxq505XrCgXujc4UEkky1lBtSMI9SLzlXZg3fC/lW0c0hiu2c0+zI+y4fj5vTE9AZJdjw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-8.0.4.tgz", + "integrity": "sha512-EyCWo+8T11/TJGYNL/AXtW4yaB+q1v2E9mixbumryCLxpTl2NtaeGZ4e0dlwfIMuw/7RWgHk2uIypcIPR/UANQ==", "dev": true, "dependencies": { - "@storybook/core-events": "8.0.0", + "@storybook/core-events": "8.0.4", "@storybook/global": "^5.0.0", "@types/uuid": "^9.0.1", "dequal": "^2.0.2", @@ -5151,9 +5155,9 @@ } }, "node_modules/@storybook/addon-backgrounds": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/addon-backgrounds/-/addon-backgrounds-8.0.0.tgz", - "integrity": "sha512-hJLrtJa3paAL1DdArdqRFSPWji7s2kJlPh8mUhDpMHy0AOWrcslUanHWVmmgYpnBsYBgQcldt6eRIROtqgpSeA==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/addon-backgrounds/-/addon-backgrounds-8.0.4.tgz", + "integrity": "sha512-fef0KD2GhJx2zpicOf8iL7k2LiIsNzEbGaQpIIjoy4DMqM1hIfNCt3DGTLH7LN5O8G+NVCLS1xmQg7RLvIVSCA==", "dev": true, "dependencies": { "@storybook/global": "^5.0.0", @@ -5166,12 +5170,12 @@ } }, "node_modules/@storybook/addon-controls": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/addon-controls/-/addon-controls-8.0.0.tgz", - "integrity": "sha512-hBYJ9O6G+lN43TxNPnw78GhLirjRVN8kFJSVg2Bha87hIvS3c/zx5ZWqtiXjp4wL4/r/IFe4EvBcBQh4Mpi8uw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/addon-controls/-/addon-controls-8.0.4.tgz", + "integrity": "sha512-K5EYBTsUOTJlvIdA7p6Xj31wnV+RbZAkk56UKQvA7nJD7oDuLOq3E9u46F/uZD1vxddd9zFhf2iONfMe3KTTwQ==", "dev": true, "dependencies": { - "@storybook/blocks": "8.0.0", + "@storybook/blocks": "8.0.4", "lodash": "^4.17.21", "ts-dedent": "^2.0.0" }, @@ -5181,24 +5185,24 @@ } }, "node_modules/@storybook/addon-docs": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-8.0.0.tgz", - "integrity": "sha512-P86M4Mo3FKtMIzSc8Hao46NmrlBs4w81BVf3AWNVka5aIPdWP2pINgDDDweASPgFKMVQNWUreR5pl0DHZfaJ5g==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-8.0.4.tgz", + "integrity": "sha512-m0Y7qGAMnNPLEOEgzW/SBm8GX0xabJBaRN+aYijO6UKTln7F6oXXVve+xPC0Y4s6Gc9HZFdJY8WXZr1YSGEUVA==", "dev": true, "dependencies": { "@babel/core": "^7.12.3", "@mdx-js/react": "^3.0.0", - "@storybook/blocks": "8.0.0", - "@storybook/client-logger": "8.0.0", - "@storybook/components": "8.0.0", - "@storybook/csf-plugin": "8.0.0", - "@storybook/csf-tools": "8.0.0", + "@storybook/blocks": "8.0.4", + "@storybook/client-logger": "8.0.4", + "@storybook/components": "8.0.4", + "@storybook/csf-plugin": "8.0.4", + "@storybook/csf-tools": "8.0.4", "@storybook/global": "^5.0.0", - "@storybook/node-logger": "8.0.0", - "@storybook/preview-api": "8.0.0", - "@storybook/react-dom-shim": "8.0.0", - "@storybook/theming": "8.0.0", - "@storybook/types": "8.0.0", + "@storybook/node-logger": "8.0.4", + "@storybook/preview-api": "8.0.4", + "@storybook/react-dom-shim": "8.0.4", + "@storybook/theming": "8.0.4", + "@storybook/types": "8.0.4", "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", "fs-extra": "^11.1.0", "react": "^16.8.0 || ^17.0.0 || ^18.0.0", @@ -5213,24 +5217,24 @@ } }, "node_modules/@storybook/addon-essentials": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/addon-essentials/-/addon-essentials-8.0.0.tgz", - "integrity": "sha512-n5uNerxBj2PrL8NJhzSUL3ctsW3Wy0ySBBrrChhBaXLoAkTP+KpJlX8h55abxdMkI0i+dreS//XQ0lpw1KX4pw==", - "dev": true, - "dependencies": { - "@storybook/addon-actions": "8.0.0", - "@storybook/addon-backgrounds": "8.0.0", - "@storybook/addon-controls": "8.0.0", - "@storybook/addon-docs": "8.0.0", - "@storybook/addon-highlight": "8.0.0", - "@storybook/addon-measure": "8.0.0", - "@storybook/addon-outline": "8.0.0", - "@storybook/addon-toolbars": "8.0.0", - "@storybook/addon-viewport": "8.0.0", - "@storybook/core-common": "8.0.0", - "@storybook/manager-api": "8.0.0", - "@storybook/node-logger": "8.0.0", - "@storybook/preview-api": "8.0.0", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/addon-essentials/-/addon-essentials-8.0.4.tgz", + "integrity": "sha512-mUIqhAkSz6Qv7nRqAAyCqMLiXBWVsY/8qN7HEIoaMQgdFq38KW3rYwNdzd2JLeXNWP1bBXwfvfcFe7/eqhYJFA==", + "dev": true, + "dependencies": { + "@storybook/addon-actions": "8.0.4", + "@storybook/addon-backgrounds": "8.0.4", + "@storybook/addon-controls": "8.0.4", + "@storybook/addon-docs": "8.0.4", + "@storybook/addon-highlight": "8.0.4", + "@storybook/addon-measure": "8.0.4", + "@storybook/addon-outline": "8.0.4", + "@storybook/addon-toolbars": "8.0.4", + "@storybook/addon-viewport": "8.0.4", + "@storybook/core-common": "8.0.4", + "@storybook/manager-api": "8.0.4", + "@storybook/node-logger": "8.0.4", + "@storybook/preview-api": "8.0.4", "ts-dedent": "^2.0.0" }, "funding": { @@ -5239,9 +5243,9 @@ } }, "node_modules/@storybook/addon-highlight": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/addon-highlight/-/addon-highlight-8.0.0.tgz", - "integrity": "sha512-bSba9UTcPJBFUy5peIU8XPlKK/7lT054977oLGgVYup2u88km6pWaMNSGMWhb3xXdseTgrj96k/b+md4X+WrMg==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/addon-highlight/-/addon-highlight-8.0.4.tgz", + "integrity": "sha512-tnEiVaJlXL07v8JBox+QtRPVruoy0YovOTAOWY7fKDiKzF1I9wLaJjQF3wOsvwspHTHu00OZw2gsazgXiH4wLQ==", "dependencies": { "@storybook/global": "^5.0.0" }, @@ -5251,14 +5255,15 @@ } }, "node_modules/@storybook/addon-interactions": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/addon-interactions/-/addon-interactions-8.0.0.tgz", - "integrity": "sha512-lb6WZAeF3MIT05wSVbz2ZKDpTIoTmHW5e8hImdquNlOm8qNm4fl5BLpVrZT1YkC6v42MM8yU/DeeUw+8w7rXDg==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/addon-interactions/-/addon-interactions-8.0.4.tgz", + "integrity": "sha512-wTEOnVUbF1lNJxxocr5IKmpgnmwyO8YsQf6Baw3tTWCHAa/MaWWQYq1OA6CfFfmVGGRjv/w2GTuf1Vyq99O7mg==", "dev": true, "dependencies": { "@storybook/global": "^5.0.0", - "@storybook/types": "8.0.0", - "jest-mock": "^27.0.6", + "@storybook/instrumenter": "8.0.4", + "@storybook/test": "8.0.4", + "@storybook/types": "8.0.4", "polished": "^4.2.2", "ts-dedent": "^2.2.0" }, @@ -5268,9 +5273,9 @@ } }, "node_modules/@storybook/addon-links": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-8.0.0.tgz", - "integrity": "sha512-UjB68EJwSvRsD326KJAzYkuzhCdJmkliiitaqSJ7GUdgGgTkKC7cqH8QmRC0SK5qRi0lN59ARIKPiP5wjsEeOw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/addon-links/-/addon-links-8.0.4.tgz", + "integrity": "sha512-SzE+JPZ4mxjprZqbLHf8Hx7UA2fXfMajFjeY9c3JREKQrDoOF1e4r28nAoVsZYF+frWxQB51U4+hOqjlx06wEA==", "dev": true, "dependencies": { "@storybook/csf": "^0.1.2", @@ -5291,12 +5296,12 @@ } }, "node_modules/@storybook/addon-mdx-gfm": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/addon-mdx-gfm/-/addon-mdx-gfm-8.0.0.tgz", - "integrity": "sha512-03biea83pMy7WfiN6108jtDAtViVSYixzYHEGSkOFDjNOBecr8+5zvQncmYsBWnyH+gR4zV9W26LZjBIN/hKHw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/addon-mdx-gfm/-/addon-mdx-gfm-8.0.4.tgz", + "integrity": "sha512-YVRZ3q8RUzddAoRAsrTP5ZRgez+MhrW1izsuBrp+cbSEt/4PfVZjj9LeztzahBxiHlGjs5egP7TonMxqv6pCmA==", "dev": true, "dependencies": { - "@storybook/node-logger": "8.0.0", + "@storybook/node-logger": "8.0.4", "remark-gfm": "^4.0.0", "ts-dedent": "^2.0.0" }, @@ -5306,9 +5311,9 @@ } }, "node_modules/@storybook/addon-measure": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/addon-measure/-/addon-measure-8.0.0.tgz", - "integrity": "sha512-vSqQMxNHO++1XIyOF4HkQ/9UNADYCVCzoWG/JwOmWJ1NdfaPffN+QxLn+MYq+ex9R174nBdbjVqb2+e4MdYzPw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/addon-measure/-/addon-measure-8.0.4.tgz", + "integrity": "sha512-GZYKo2ss5Br+dfHinoK3bgTaS90z3oKKDkhv6lrFfjjU1mDYzzMJpxajQhd3apCYxHLr3MbUqMQibWu2T/q2DQ==", "dev": true, "dependencies": { "@storybook/global": "^5.0.0", @@ -5320,9 +5325,9 @@ } }, "node_modules/@storybook/addon-outline": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/addon-outline/-/addon-outline-8.0.0.tgz", - "integrity": "sha512-8/rs+4UYSQNE2J2CgeeAMJuz7UmJRN4T2Id4oESv7nfM+aUXXF1cOBw1EnofBie2ukVad9lATlsPaNx6ldoWsg==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/addon-outline/-/addon-outline-8.0.4.tgz", + "integrity": "sha512-6J9ezNDUxdA3rMCh8sUEQbUwAgkrr+M9QdiFr1t+gKrk5FKP5gwubw1sr3sF1IRB9+s/AjljcOtJAVulSfq05w==", "dev": true, "dependencies": { "@storybook/global": "^5.0.0", @@ -5334,9 +5339,9 @@ } }, "node_modules/@storybook/addon-toolbars": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/addon-toolbars/-/addon-toolbars-8.0.0.tgz", - "integrity": "sha512-+nNe52DAs42VIJxJnsg3d3BAVf+svR9lvaf3dD/HgS9vBWtp2wIumDM6b05umnVuR/dXviSpdpy+gm/cCdIQGQ==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/addon-toolbars/-/addon-toolbars-8.0.4.tgz", + "integrity": "sha512-yodRXDYog/90cNEy84kg6s7L+nxQ+egBjHBTsav1L4cJmQI/uAX8yISHHiX4I5ppNc120Jz3UdHdRxXRlo345g==", "dev": true, "funding": { "type": "opencollective", @@ -5344,9 +5349,9 @@ } }, "node_modules/@storybook/addon-viewport": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-8.0.0.tgz", - "integrity": "sha512-eqgyZszJSz6C3GXJTn8/8bmL8zqALr4dnBFg8w/RJ+gydVCk17Ow3ifYTWrEGVLXCCwd0XbCZGj9tAmfhovjTQ==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-8.0.4.tgz", + "integrity": "sha512-E5IKOsxKcOtlOYc0cWgzVJohQB+dVBWwaJcg5FlslToknfVB9M0kfQ/SQcp3KB0C9/cOmJK1Jm388InW+EjrBQ==", "dev": true, "dependencies": { "memoizerific": "^1.11.3" @@ -5357,23 +5362,23 @@ } }, "node_modules/@storybook/angular": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/angular/-/angular-8.0.0.tgz", - "integrity": "sha512-/3zhjhRuvRt47I6sJPzRhcxWKsiprSGFHsljtVdvfEQts6GmSSPxWpQz11iqNlDtny7oXhew416L1zIltRpKBg==", - "dev": true, - "dependencies": { - "@storybook/builder-webpack5": "8.0.0", - "@storybook/client-logger": "8.0.0", - "@storybook/core-common": "8.0.0", - "@storybook/core-events": "8.0.0", - "@storybook/core-server": "8.0.0", - "@storybook/core-webpack": "8.0.0", - "@storybook/docs-tools": "8.0.0", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/angular/-/angular-8.0.4.tgz", + "integrity": "sha512-JGs4LqC10HCoGPNrpHVAzsmsqUnNlbprw3asen9om1se9LBgnRnz/MzG4kVqqFeCS2AUvHLMI9Et6VYYsaZdww==", + "dev": true, + "dependencies": { + "@storybook/builder-webpack5": "8.0.4", + "@storybook/client-logger": "8.0.4", + "@storybook/core-common": "8.0.4", + "@storybook/core-events": "8.0.4", + "@storybook/core-server": "8.0.4", + "@storybook/core-webpack": "8.0.4", + "@storybook/docs-tools": "8.0.4", "@storybook/global": "^5.0.0", - "@storybook/node-logger": "8.0.0", - "@storybook/preview-api": "8.0.0", - "@storybook/telemetry": "8.0.0", - "@storybook/types": "8.0.0", + "@storybook/node-logger": "8.0.4", + "@storybook/preview-api": "8.0.4", + "@storybook/telemetry": "8.0.4", + "@storybook/types": "8.0.4", "@types/node": "^18.0.0", "@types/react": "^18.0.37", "@types/react-dom": "^18.0.11", @@ -5418,23 +5423,23 @@ } }, "node_modules/@storybook/blocks": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/blocks/-/blocks-8.0.0.tgz", - "integrity": "sha512-Sxy7pOa6B3ci/XhfKca6u97Kz6pGZV5ieQBUWRYByUZTjiOp12RVLFptexxrJHyNBA00BHJPek4fvFSJfn6nOQ==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/blocks/-/blocks-8.0.4.tgz", + "integrity": "sha512-9dRXk9zLJVPOmEWsSXm10XUmIfvS/tVgeBgFXNbusFQZXPpexIPNdRgB004pDGg9RvlY78ykpnd3yP143zaXMg==", "dev": true, "dependencies": { - "@storybook/channels": "8.0.0", - "@storybook/client-logger": "8.0.0", - "@storybook/components": "8.0.0", - "@storybook/core-events": "8.0.0", + "@storybook/channels": "8.0.4", + "@storybook/client-logger": "8.0.4", + "@storybook/components": "8.0.4", + "@storybook/core-events": "8.0.4", "@storybook/csf": "^0.1.2", - "@storybook/docs-tools": "8.0.0", + "@storybook/docs-tools": "8.0.4", "@storybook/global": "^5.0.0", "@storybook/icons": "^1.2.5", - "@storybook/manager-api": "8.0.0", - "@storybook/preview-api": "8.0.0", - "@storybook/theming": "8.0.0", - "@storybook/types": "8.0.0", + "@storybook/manager-api": "8.0.4", + "@storybook/preview-api": "8.0.4", + "@storybook/theming": "8.0.4", + "@storybook/types": "8.0.4", "@types/lodash": "^4.14.167", "color-convert": "^2.0.1", "dequal": "^2.0.2", @@ -5466,15 +5471,15 @@ } }, "node_modules/@storybook/builder-manager": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/builder-manager/-/builder-manager-8.0.0.tgz", - "integrity": "sha512-cUj1YKOvk+pemom9QXdLm+yWRovTQiV2HPfdjVftASD++Bau2hVpZKDhII0dLKg9mluojJ6Rt83F1daAyA2njQ==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/builder-manager/-/builder-manager-8.0.4.tgz", + "integrity": "sha512-BafYVxq77uuTmXdjYo5by42OyOrb6qcpWYKva3ntWK2ZhTaLJlwwqAOdahT1DVzi4VeUP6465YvsTCzIE8fuIw==", "dev": true, "dependencies": { "@fal-works/esbuild-plugin-global-externals": "^2.1.2", - "@storybook/core-common": "8.0.0", - "@storybook/manager": "8.0.0", - "@storybook/node-logger": "8.0.0", + "@storybook/core-common": "8.0.4", + "@storybook/manager": "8.0.4", + "@storybook/node-logger": "8.0.4", "@types/ejs": "^3.1.1", "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.10", "browser-assert": "^1.2.1", @@ -5492,19 +5497,19 @@ } }, "node_modules/@storybook/builder-webpack5": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/builder-webpack5/-/builder-webpack5-8.0.0.tgz", - "integrity": "sha512-Pkqeume16aXR1jkMFfafTuhFXviBZWguCqSsTCzH+fyN28k9QYfcsUUZ5LlEGz9ZKFEO2+ZIuq2Mg1iBeSzUSw==", - "dev": true, - "dependencies": { - "@storybook/channels": "8.0.0", - "@storybook/client-logger": "8.0.0", - "@storybook/core-common": "8.0.0", - "@storybook/core-events": "8.0.0", - "@storybook/core-webpack": "8.0.0", - "@storybook/node-logger": "8.0.0", - "@storybook/preview": "8.0.0", - "@storybook/preview-api": "8.0.0", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/builder-webpack5/-/builder-webpack5-8.0.4.tgz", + "integrity": "sha512-FKXIGfDjZJ7KCq6w8e3NEp2+KATsh4U24UV/K8cFjCrRIU++jDpO274D9ozdpzEmhvHOfxK/QlgalqS4G599Aw==", + "dev": true, + "dependencies": { + "@storybook/channels": "8.0.4", + "@storybook/client-logger": "8.0.4", + "@storybook/core-common": "8.0.4", + "@storybook/core-events": "8.0.4", + "@storybook/core-webpack": "8.0.4", + "@storybook/node-logger": "8.0.4", + "@storybook/preview": "8.0.4", + "@storybook/preview-api": "8.0.4", "@types/node": "^18.0.0", "@types/semver": "^7.3.4", "browser-assert": "^1.2.1", @@ -5543,13 +5548,13 @@ } }, "node_modules/@storybook/channels": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-8.0.0.tgz", - "integrity": "sha512-uykCBlSIMVodsgTFC/XAgO7JeaTJrKtDmmM6Z4liGkPS6EUvurOEu2vK6FuvojzhLHdVJ5bP+VXSJerfm7aE4Q==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-8.0.4.tgz", + "integrity": "sha512-haKV+8RbiSzLjicowUfc7h2fTClZHX/nz9SRUecf4IEZUEu2T78OgM/TzqZvL7rA3+/fKqp5iI+3PN3OA75Sdg==", "dev": true, "dependencies": { - "@storybook/client-logger": "8.0.0", - "@storybook/core-events": "8.0.0", + "@storybook/client-logger": "8.0.4", + "@storybook/core-events": "8.0.4", "@storybook/global": "^5.0.0", "telejson": "^7.2.0", "tiny-invariant": "^1.3.1" @@ -5560,22 +5565,22 @@ } }, "node_modules/@storybook/cli": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/cli/-/cli-8.0.0.tgz", - "integrity": "sha512-4W99ldBUJjrEbZlxI4rvqW8lRY+AP2+wLGRMp4nyI/XW5cp7R+OryZf4imHgecunBQyKGXVek+poDlgKPQsxsg==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/cli/-/cli-8.0.4.tgz", + "integrity": "sha512-8jb8hrulRMfyFyNXFEapxHBS51xb42ZZGfVAacXIsHOJtjOd5CnOoSUYn0aOkVl19VF/snoa9JOW7BaW/50Eqw==", "dev": true, "dependencies": { "@babel/core": "^7.23.0", "@babel/types": "^7.23.0", "@ndelangen/get-tarball": "^3.0.7", - "@storybook/codemod": "8.0.0", - "@storybook/core-common": "8.0.0", - "@storybook/core-events": "8.0.0", - "@storybook/core-server": "8.0.0", - "@storybook/csf-tools": "8.0.0", - "@storybook/node-logger": "8.0.0", - "@storybook/telemetry": "8.0.0", - "@storybook/types": "8.0.0", + "@storybook/codemod": "8.0.4", + "@storybook/core-common": "8.0.4", + "@storybook/core-events": "8.0.4", + "@storybook/core-server": "8.0.4", + "@storybook/csf-tools": "8.0.4", + "@storybook/node-logger": "8.0.4", + "@storybook/telemetry": "8.0.4", + "@storybook/types": "8.0.4", "@types/semver": "^7.3.4", "@yarnpkg/fslib": "2.10.3", "@yarnpkg/libzip": "2.3.0", @@ -5673,9 +5678,9 @@ } }, "node_modules/@storybook/client-logger": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-8.0.0.tgz", - "integrity": "sha512-olc1vUfaZNkXc7L8UoCdGmyBieHQbsaB+0vVoivYMSa1DHYtXE75RefU3lhMSGrkvIZmXMvfaIDmnyJIOB5FxA==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-8.0.4.tgz", + "integrity": "sha512-2SeEg3PT/d0l/+EAVtyj9hmMLTyTPp+bRBSzxYouBjtJPM1jrdKpFagj1o3uBRovwWm9SIVX6/ZsoRC33PEV1g==", "dev": true, "dependencies": { "@storybook/global": "^5.0.0" @@ -5686,18 +5691,18 @@ } }, "node_modules/@storybook/codemod": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/codemod/-/codemod-8.0.0.tgz", - "integrity": "sha512-rLY3M1xL+4S5dUB8XoSfDF46FxdntSsaFH4sjHZ08itVbwAAl7XqhYElVGueuobTgicJcOVTY8CJNkWcY6ETzA==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/codemod/-/codemod-8.0.4.tgz", + "integrity": "sha512-bysG46P4wjlR3RCpr/ntNAUaupWpzLcWYWti3iNtIyZ/iPrX6KtXoA9QCIwJZrlv41us6F+KEZbzLzkgWbymtQ==", "dev": true, "dependencies": { "@babel/core": "^7.23.2", "@babel/preset-env": "^7.23.2", "@babel/types": "^7.23.0", "@storybook/csf": "^0.1.2", - "@storybook/csf-tools": "8.0.0", - "@storybook/node-logger": "8.0.0", - "@storybook/types": "8.0.0", + "@storybook/csf-tools": "8.0.4", + "@storybook/node-logger": "8.0.4", + "@storybook/types": "8.0.4", "@types/cross-spawn": "^6.0.2", "cross-spawn": "^7.0.3", "globby": "^11.0.2", @@ -5713,18 +5718,18 @@ } }, "node_modules/@storybook/components": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/components/-/components-8.0.0.tgz", - "integrity": "sha512-+LmHnR2XQQ76uyWW5u+9ZBlS5sPyJWE6cbMdmkJ0PMGaZdZuF07urcg4z4/qBsDxRZDquBPu/Li5xx6OjXhVKw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/components/-/components-8.0.4.tgz", + "integrity": "sha512-i5ngl5GTOLB9nZ1cmpxTjtWct5IuH9UxzFC73a0jHMkCwN26w16IqufRVDaoQv0AvZN4pd4fNM2in/XVHA10dw==", "dev": true, "dependencies": { "@radix-ui/react-slot": "^1.0.2", - "@storybook/client-logger": "8.0.0", + "@storybook/client-logger": "8.0.4", "@storybook/csf": "^0.1.2", "@storybook/global": "^5.0.0", "@storybook/icons": "^1.2.5", - "@storybook/theming": "8.0.0", - "@storybook/types": "8.0.0", + "@storybook/theming": "8.0.4", + "@storybook/types": "8.0.4", "memoizerific": "^1.11.3", "util-deprecate": "^1.0.2" }, @@ -5738,15 +5743,15 @@ } }, "node_modules/@storybook/core-common": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/core-common/-/core-common-8.0.0.tgz", - "integrity": "sha512-fqlQYw5/PDW/oj34QwU5u0HkNLPgELfszsvLFsUcwI7uAzwb/WC2WdPvncT7qRPNcSZLXKJcA8QAqKL4t4I8bg==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/core-common/-/core-common-8.0.4.tgz", + "integrity": "sha512-dzFRLm5FxUa2EFE6Rx/KLDTJNLBIp1S2/+Q1K+rG8V+CLvewCc2Cd486rStZqSXEKI7vDnsRs/aMla+N0X/++Q==", "dev": true, "dependencies": { - "@storybook/core-events": "8.0.0", - "@storybook/csf-tools": "8.0.0", - "@storybook/node-logger": "8.0.0", - "@storybook/types": "8.0.0", + "@storybook/core-events": "8.0.4", + "@storybook/csf-tools": "8.0.4", + "@storybook/node-logger": "8.0.4", + "@storybook/types": "8.0.4", "@yarnpkg/fslib": "2.10.3", "@yarnpkg/libzip": "2.3.0", "chalk": "^4.1.0", @@ -5842,9 +5847,9 @@ } }, "node_modules/@storybook/core-events": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-8.0.0.tgz", - "integrity": "sha512-kkabj4V99gOTBW+y3HM/LTCDekglqb+lslZMamM+Ytxv1lCqCEOIR/OGfnYOyEaK4BLcx61Zp+fO30FZxtoT1w==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-8.0.4.tgz", + "integrity": "sha512-1FgLacIGi9i6/fyxw7ZJDC621RK47IMaA3keH4lc11ASRzCSwJ4YOrXjBFjfPc79EF2BuX72DDJNbhj6ynfF3g==", "dev": true, "dependencies": { "ts-dedent": "^2.0.0" @@ -5855,28 +5860,28 @@ } }, "node_modules/@storybook/core-server": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/core-server/-/core-server-8.0.0.tgz", - "integrity": "sha512-uVvS4psu/wQ+m9JTAvEvSwxjNKiCviNmNX1fv/VYRhQiAHhdb3e58NfeHd6QBffyOF80hY1RJWe3vAPcNIoZxA==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/core-server/-/core-server-8.0.4.tgz", + "integrity": "sha512-/633Pp7LPcDWXkPLSW+W9VUYUbVkdVBG6peXjuzogV0vzdM0dM9af/T0uV2NQxUhzoy6/7QdSDljE+eEOBs2Lw==", "dev": true, "dependencies": { "@aw-web-design/x-default-browser": "1.4.126", "@babel/core": "^7.23.9", "@discoveryjs/json-ext": "^0.5.3", - "@storybook/builder-manager": "8.0.0", - "@storybook/channels": "8.0.0", - "@storybook/core-common": "8.0.0", - "@storybook/core-events": "8.0.0", + "@storybook/builder-manager": "8.0.4", + "@storybook/channels": "8.0.4", + "@storybook/core-common": "8.0.4", + "@storybook/core-events": "8.0.4", "@storybook/csf": "^0.1.2", - "@storybook/csf-tools": "8.0.0", + "@storybook/csf-tools": "8.0.4", "@storybook/docs-mdx": "3.0.0", "@storybook/global": "^5.0.0", - "@storybook/manager": "8.0.0", - "@storybook/manager-api": "8.0.0", - "@storybook/node-logger": "8.0.0", - "@storybook/preview-api": "8.0.0", - "@storybook/telemetry": "8.0.0", - "@storybook/types": "8.0.0", + "@storybook/manager": "8.0.4", + "@storybook/manager-api": "8.0.4", + "@storybook/node-logger": "8.0.4", + "@storybook/preview-api": "8.0.4", + "@storybook/telemetry": "8.0.4", + "@storybook/types": "8.0.4", "@types/detect-port": "^1.3.0", "@types/node": "^18.0.0", "@types/pretty-hrtime": "^1.0.0", @@ -5962,14 +5967,14 @@ } }, "node_modules/@storybook/core-webpack": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-8.0.0.tgz", - "integrity": "sha512-JhZwPFoL92ntTdhwGSokodNZlpogs/u2OjImynfcXpnz7FqEQVJ/d3GiPwG9Wx+Ek2mUOn8XeorZI1LNTj+ihA==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-8.0.4.tgz", + "integrity": "sha512-sECeoJtT6iFWzgZaQbS1TEZvBrXIT4qb9fa0x2/I5YhCTPnprCNL1yyN90hFQTpdLco5vfQ86YnpzMRntODn7A==", "dev": true, "dependencies": { - "@storybook/core-common": "8.0.0", - "@storybook/node-logger": "8.0.0", - "@storybook/types": "8.0.0", + "@storybook/core-common": "8.0.4", + "@storybook/node-logger": "8.0.4", + "@storybook/types": "8.0.4", "@types/node": "^18.0.0", "ts-dedent": "^2.0.0" }, @@ -5988,12 +5993,12 @@ } }, "node_modules/@storybook/csf-plugin": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-8.0.0.tgz", - "integrity": "sha512-bCX3XvZ8X1dS08ung0IhugtTUOK+rWwRjWjyj5WC7fl5HYyFYQ91MC2f8EccYQaDYl9Dfvo1cw685gnk6PoLbw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-8.0.4.tgz", + "integrity": "sha512-pEgctWuS/qeKMFZJJUM2JuKwjKBt27ye+216ft7xhNqpsrmCgumJYrkU/ii2CsFJU/qr5Fu9EYw+N+vof1OalQ==", "dev": true, "dependencies": { - "@storybook/csf-tools": "8.0.0", + "@storybook/csf-tools": "8.0.4", "unplugin": "^1.3.1" }, "funding": { @@ -6002,9 +6007,9 @@ } }, "node_modules/@storybook/csf-tools": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/csf-tools/-/csf-tools-8.0.0.tgz", - "integrity": "sha512-VIMaZJiGM2NVzlgxaOyaVlH1pw/VSrJygDqOZyANh/kl4KHA+6xIqOkZC+X0+5K295dTFx2nR6S3btTjwT/Wrg==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/csf-tools/-/csf-tools-8.0.4.tgz", + "integrity": "sha512-dMSZxWnXBhmXGOZZOAJ4DKZRCYdA0HaqqZ4/eF9MLLsI+qvW4EklcpjVY6bsIzACgubRWtRZkTpxTnjExi/N1A==", "dev": true, "dependencies": { "@babel/generator": "^7.23.0", @@ -6012,7 +6017,7 @@ "@babel/traverse": "^7.23.2", "@babel/types": "^7.23.0", "@storybook/csf": "^0.1.2", - "@storybook/types": "8.0.0", + "@storybook/types": "8.0.4", "fs-extra": "^11.1.0", "recast": "^0.23.5", "ts-dedent": "^2.0.0" @@ -6029,14 +6034,14 @@ "dev": true }, "node_modules/@storybook/docs-tools": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/docs-tools/-/docs-tools-8.0.0.tgz", - "integrity": "sha512-d6slxGMosurSTPp1zOTnr7EILnm9xmUrT0xF3Vxr3Yat5/YQEe3WSADktIFyWwlqvIu7MQ8Lh+oelAb5TuxiDw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/docs-tools/-/docs-tools-8.0.4.tgz", + "integrity": "sha512-PONfG8j/AOHi79NbEkneFRZIscrShbA0sgA+62zeejH4r9+fuIkIKtLnKcAxvr8Bm6uo9aSQbISJZUcBG42WhQ==", "dev": true, "dependencies": { - "@storybook/core-common": "8.0.0", - "@storybook/preview-api": "8.0.0", - "@storybook/types": "8.0.0", + "@storybook/core-common": "8.0.4", + "@storybook/preview-api": "8.0.4", + "@storybook/types": "8.0.4", "@types/doctrine": "^0.0.3", "assert": "^2.1.0", "doctrine": "^3.0.0", @@ -6065,10 +6070,29 @@ "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, + "node_modules/@storybook/instrumenter": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/instrumenter/-/instrumenter-8.0.4.tgz", + "integrity": "sha512-lkHv1na12oMTZvuDbzufgqrtFlV1XqdXrAAg7YXZOia/oMz6Z/XMldEqwLPUCLGVodbFJofrpE67Wtw8dNTDQg==", + "dev": true, + "dependencies": { + "@storybook/channels": "8.0.4", + "@storybook/client-logger": "8.0.4", + "@storybook/core-events": "8.0.4", + "@storybook/global": "^5.0.0", + "@storybook/preview-api": "8.0.4", + "@vitest/utils": "^1.3.1", + "util": "^0.12.4" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/storybook" + } + }, "node_modules/@storybook/manager": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/manager/-/manager-8.0.0.tgz", - "integrity": "sha512-1aCHzc+A4IOdDves+mE0K9bjyyPzPAIlR7oI6kSuO416/HXXJDdN5G825OQB/VIBYc1b8cNElMdNVKQK2FQorQ==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/manager/-/manager-8.0.4.tgz", + "integrity": "sha512-M5IofDSxbIQIdAglxUtZOGKjZ1EAq1Mdbh4UolVsF1PKF6dAvBQJLVW6TiLjEbmPBtqgeYKMgrmmYiFNqVcdBQ==", "dev": true, "funding": { "type": "opencollective", @@ -6076,19 +6100,20 @@ } }, "node_modules/@storybook/manager-api": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/manager-api/-/manager-api-8.0.0.tgz", - "integrity": "sha512-vJcCc2hG78RjIyhmooqnBlVrTdIomzRqG5WO025tXFgRV1eRUkWJRqSSudcLJO6wk77ZSAtI1ihsDrjsrBFWZw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/manager-api/-/manager-api-8.0.4.tgz", + "integrity": "sha512-TudiRmWlsi8kdjwqW0DDLen76Zp4Sci/AnvTbZvZOWe8C2mruxcr6aaGwuIug6y+uxIyXDvURF6Cek5Twz4isg==", "dev": true, "dependencies": { - "@storybook/channels": "8.0.0", - "@storybook/client-logger": "8.0.0", - "@storybook/core-events": "8.0.0", + "@storybook/channels": "8.0.4", + "@storybook/client-logger": "8.0.4", + "@storybook/core-events": "8.0.4", "@storybook/csf": "^0.1.2", "@storybook/global": "^5.0.0", - "@storybook/router": "8.0.0", - "@storybook/theming": "8.0.0", - "@storybook/types": "8.0.0", + "@storybook/icons": "^1.2.5", + "@storybook/router": "8.0.4", + "@storybook/theming": "8.0.4", + "@storybook/types": "8.0.4", "dequal": "^2.0.2", "lodash": "^4.17.21", "memoizerific": "^1.11.3", @@ -6102,9 +6127,9 @@ } }, "node_modules/@storybook/node-logger": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-8.0.0.tgz", - "integrity": "sha512-C/sMNQqCIYVtJaLpe92RSkPgW3GXcWp6QeH5+glfP42kh+G9axxnEJJ996tyAnNQRzUuI+Eh+B7ytPZU1/WseQ==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-8.0.4.tgz", + "integrity": "sha512-cALLHuX53vLQsoJamGRlquh2pfhPq9copXou2JTmFT6mrCcipo77SzhBDfeeuhaGv6vUWPfmGjPBEHXWGPe4+g==", "dev": true, "funding": { "type": "opencollective", @@ -6112,9 +6137,9 @@ } }, "node_modules/@storybook/preview": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/preview/-/preview-8.0.0.tgz", - "integrity": "sha512-cFV7+6LYe1qr1HXm+oc74Z6ygAKgkjkhfGsfDhdS+UrzoFL9JF/+++RcE+xSBNVfzZjL19U1CsPEN0v0smIbkQ==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/preview/-/preview-8.0.4.tgz", + "integrity": "sha512-dJa13bIxQBfa5ZsXAeL6X/oXI6b87Fy31pvpKPkW1o+7M6MC4OvwGQBqgAd7m8yn6NuIHxrdwjEupa7l7PGb6w==", "dev": true, "funding": { "type": "opencollective", @@ -6122,17 +6147,17 @@ } }, "node_modules/@storybook/preview-api": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-8.0.0.tgz", - "integrity": "sha512-R2NBKtvHi+i1b/3PZe4u4YdJ7dlqr8YTqLn7syB/YSnKRAa7DYed+GJLu4qFJisE6IuYi+57AsdW16otRFEVvg==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-8.0.4.tgz", + "integrity": "sha512-uZCgZ/7BZkFTNudCBWx3YPFVdReMQSZJj9EfQVhQaPmfGORHGMvZMRsQXl0ONhPy7zDD4rVQxu5dSKWmIiYoWQ==", "dev": true, "dependencies": { - "@storybook/channels": "8.0.0", - "@storybook/client-logger": "8.0.0", - "@storybook/core-events": "8.0.0", + "@storybook/channels": "8.0.4", + "@storybook/client-logger": "8.0.4", + "@storybook/core-events": "8.0.4", "@storybook/csf": "^0.1.2", "@storybook/global": "^5.0.0", - "@storybook/types": "8.0.0", + "@storybook/types": "8.0.4", "@types/qs": "^6.9.5", "dequal": "^2.0.2", "lodash": "^4.17.21", @@ -6148,9 +6173,9 @@ } }, "node_modules/@storybook/react-dom-shim": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-8.0.0.tgz", - "integrity": "sha512-bpT/7XyO9T+mWJojAblnuScum/UI65UksaL1jKYySMpBuW4jTJVE1YPzN1oe9A4me8HQCPeDw4Rg+ZB91H5sKA==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-8.0.4.tgz", + "integrity": "sha512-H8bci23e+G40WsdYPuPrhAjCeeXypXuAV6mTVvLHGKH+Yb+3wiB1weaXrot/TgzPbkDNybuhTI3Qm48FPLt0bw==", "dev": true, "funding": { "type": "opencollective", @@ -6162,12 +6187,12 @@ } }, "node_modules/@storybook/router": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/router/-/router-8.0.0.tgz", - "integrity": "sha512-NPV4pb7TBOepPymHBLDmnwPcH4SnrNsD3LiHaVoaE4xaKMZBse2slWxeWM6IGb6Ynoy6pQpsHhAnt+rTjlcv9w==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/router/-/router-8.0.4.tgz", + "integrity": "sha512-hlR80QvmLBflAqMeGcgtDuSe6TJlzdizwEAkBLE1lDvFI6tvvEyAliCAXBpIDdOZTe0u/zeeJkOUXKSx33caoQ==", "dev": true, "dependencies": { - "@storybook/client-logger": "8.0.0", + "@storybook/client-logger": "8.0.4", "memoizerific": "^1.11.3", "qs": "^6.10.0" }, @@ -6177,14 +6202,14 @@ } }, "node_modules/@storybook/telemetry": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/telemetry/-/telemetry-8.0.0.tgz", - "integrity": "sha512-TpPswQYvhpFCyojWdKKOL7JMUhGqAr6Rqc/KQx4KEkHZat4K1yP7idNqpEIo/gavhlS1xVCNyp+WtzBI7d1PFw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/telemetry/-/telemetry-8.0.4.tgz", + "integrity": "sha512-Q3ITY6J46R/TrrPRIU1fs3WNs69ExpTJZ9UlB8087qOUyV90Ex33SYk3i10xVWRczxCmyC1V58Xuht6nxz7mNQ==", "dev": true, "dependencies": { - "@storybook/client-logger": "8.0.0", - "@storybook/core-common": "8.0.0", - "@storybook/csf-tools": "8.0.0", + "@storybook/client-logger": "8.0.4", + "@storybook/core-common": "8.0.4", + "@storybook/csf-tools": "8.0.4", "chalk": "^4.1.0", "detect-package-manager": "^2.0.1", "fetch-retry": "^5.0.2", @@ -6248,14 +6273,37 @@ "node": ">=8" } }, + "node_modules/@storybook/test": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/test/-/test-8.0.4.tgz", + "integrity": "sha512-/uvE8Rtu7tIcuyQBUzKq7uuDCsjmADI18BApLdwo/qthmN8ERDxRSz0Ngj2gvBMQFv99At8ESi/xh6oFGu3rWg==", + "dev": true, + "dependencies": { + "@storybook/client-logger": "8.0.4", + "@storybook/core-events": "8.0.4", + "@storybook/instrumenter": "8.0.4", + "@storybook/preview-api": "8.0.4", + "@testing-library/dom": "^9.3.4", + "@testing-library/jest-dom": "^6.4.2", + "@testing-library/user-event": "^14.5.2", + "@vitest/expect": "1.3.1", + "@vitest/spy": "^1.3.1", + "chai": "^4.4.1", + "util": "^0.12.4" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/storybook" + } + }, "node_modules/@storybook/theming": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-8.0.0.tgz", - "integrity": "sha512-Yu6ybemarPN3RBdsljtvpEVNqnqG1YxDLOmkzl1MFtJ1uA5Zd5mTMjc37iD0WDvLOk8mc1HmEqB5+fDrX0U4Vw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-8.0.4.tgz", + "integrity": "sha512-NxtTU2wMC0lj375ejoT3Npdcqwv6NeUpLaJl6EZCMXSR41ve9WG4suUNWQ63olhqKxirjzAz0IL7ggH7c3hPvA==", "dev": true, "dependencies": { "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1", - "@storybook/client-logger": "8.0.0", + "@storybook/client-logger": "8.0.4", "@storybook/global": "^5.0.0", "memoizerific": "^1.11.3" }, @@ -6277,12 +6325,12 @@ } }, "node_modules/@storybook/types": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@storybook/types/-/types-8.0.0.tgz", - "integrity": "sha512-6nJipdgoAkVFk2JpRPCm9vb/Yuak2lmdZRv9qzl8cNRttlbOESVlzbmhgxCmWV0OYUaMeYge9L8NWhJ14LKbzw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@storybook/types/-/types-8.0.4.tgz", + "integrity": "sha512-OO7QY+qZFCYkItDUBACtIV32p75O7sNziAiyS1V2Oxgo7Ln7fwZwr3mJcA1ruBed6ZcrW3c87k7Xs40T2zAWcg==", "dev": true, "dependencies": { - "@storybook/channels": "8.0.0", + "@storybook/channels": "8.0.4", "@types/express": "^4.7.0", "file-system-cache": "2.3.0" }, @@ -6517,6 +6565,231 @@ "optional": true, "peer": true }, + "node_modules/@testing-library/dom": { + "version": "9.3.4", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.4.tgz", + "integrity": "sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@types/aria-query": "^5.0.1", + "aria-query": "5.1.3", + "chalk": "^4.1.0", + "dom-accessibility-api": "^0.5.9", + "lz-string": "^1.5.0", + "pretty-format": "^27.0.2" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/@testing-library/dom/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@testing-library/dom/node_modules/aria-query": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", + "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==", + "dev": true, + "dependencies": { + "deep-equal": "^2.0.5" + } + }, + "node_modules/@testing-library/dom/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@testing-library/dom/node_modules/deep-equal": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz", + "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.5", + "es-get-iterator": "^1.1.3", + "get-intrinsic": "^1.2.2", + "is-arguments": "^1.1.1", + "is-array-buffer": "^3.0.2", + "is-date-object": "^1.0.5", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "isarray": "^2.0.5", + "object-is": "^1.1.5", + "object-keys": "^1.1.1", + "object.assign": "^4.1.4", + "regexp.prototype.flags": "^1.5.1", + "side-channel": "^1.0.4", + "which-boxed-primitive": "^1.0.2", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/@testing-library/dom/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@testing-library/dom/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@testing-library/jest-dom": { + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.4.2.tgz", + "integrity": "sha512-CzqH0AFymEMG48CpzXFriYYkOjk6ZGPCLMhW9e9jg3KMCn5OfJecF8GtGW7yGfR/IgCe3SX8BSwjdzI6BBbZLw==", + "dev": true, + "dependencies": { + "@adobe/css-tools": "^4.3.2", + "@babel/runtime": "^7.9.2", + "aria-query": "^5.0.0", + "chalk": "^3.0.0", + "css.escape": "^1.5.1", + "dom-accessibility-api": "^0.6.3", + "lodash": "^4.17.15", + "redent": "^3.0.0" + }, + "engines": { + "node": ">=14", + "npm": ">=6", + "yarn": ">=1" + }, + "peerDependencies": { + "@jest/globals": ">= 28", + "@types/bun": "latest", + "@types/jest": ">= 28", + "jest": ">= 28", + "vitest": ">= 0.32" + }, + "peerDependenciesMeta": { + "@jest/globals": { + "optional": true + }, + "@types/bun": { + "optional": true + }, + "@types/jest": { + "optional": true + }, + "jest": { + "optional": true + }, + "vitest": { + "optional": true + } + } + }, + "node_modules/@testing-library/jest-dom/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@testing-library/jest-dom/node_modules/chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@testing-library/jest-dom/node_modules/dom-accessibility-api": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.6.3.tgz", + "integrity": "sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==", + "dev": true + }, + "node_modules/@testing-library/jest-dom/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@testing-library/jest-dom/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@testing-library/user-event": { + "version": "14.5.2", + "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.5.2.tgz", + "integrity": "sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ==", + "dev": true, + "engines": { + "node": ">=12", + "npm": ">=6" + }, + "peerDependencies": { + "@testing-library/dom": ">=7.21.4" + } + }, "node_modules/@thednp/event-listener": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@thednp/event-listener/-/event-listener-2.0.4.tgz", @@ -6601,6 +6874,12 @@ "node": "^16.14.0 || >=18.0.0" } }, + "node_modules/@types/aria-query": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", + "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==", + "dev": true + }, "node_modules/@types/body-parser": { "version": "1.19.5", "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", @@ -6782,30 +7061,6 @@ "@types/node": "*" } }, - "node_modules/@types/istanbul-lib-coverage": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", - "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", - "dev": true - }, - "node_modules/@types/istanbul-lib-report": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", - "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", - "dev": true, - "dependencies": { - "@types/istanbul-lib-coverage": "*" - } - }, - "node_modules/@types/istanbul-reports": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", - "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", - "dev": true, - "dependencies": { - "@types/istanbul-lib-report": "*" - } - }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -6852,9 +7107,9 @@ } }, "node_modules/@types/mdx": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/@types/mdx/-/mdx-2.0.11.tgz", - "integrity": "sha512-HM5bwOaIQJIQbAYfax35HCKxx7a3KrK3nBtIqJgSOitivTD1y3oW9P3rxY9RkXYPUk7y/AjAohfHKmFpGE79zw==", + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/@types/mdx/-/mdx-2.0.12.tgz", + "integrity": "sha512-H9VZ9YqE+H28FQVchC83RCs5xQ2J7mAAv6qdDEaWmXEVl3OpdH+xfrSUzQ1lp7U7oSTRZ0RvW08ASPJsYBi7Cw==", "dev": true }, "node_modules/@types/mime": { @@ -7039,12 +7294,6 @@ "@types/node": "*" } }, - "node_modules/@types/yargs-parser": { - "version": "21.0.3", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", - "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==", - "dev": true - }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "6.17.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.17.0.tgz", @@ -7327,115 +7576,265 @@ "eslint": "^7.0.0 || ^8.0.0" } }, - "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": { - "version": "6.13.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.1.tgz", - "integrity": "sha512-BW0kJ7ceiKi56GbT2KKzZzN+nDxzQK2DS6x0PiSMPjciPgd/JRQGMibyaN2cPt2cAvuoH0oNvn2fwonHI+4QUQ==", + "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": { + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.1.tgz", + "integrity": "sha512-BW0kJ7ceiKi56GbT2KKzZzN+nDxzQK2DS6x0PiSMPjciPgd/JRQGMibyaN2cPt2cAvuoH0oNvn2fwonHI+4QUQ==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.13.1", + "@typescript-eslint/visitor-keys": "6.13.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": { + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.1.tgz", + "integrity": "sha512-gjeEskSmiEKKFIbnhDXUyiqVma1gRCQNbVZ1C8q7Zjcxh3WZMbzWVfGE9rHfWd1msQtPS0BVD9Jz9jded44eKg==", + "dev": true, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": { + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.1.tgz", + "integrity": "sha512-sBLQsvOC0Q7LGcUHO5qpG1HxRgePbT6wwqOiGLpR8uOJvPJbfs0mW3jPA3ujsDvfiVwVlWUDESNXv44KtINkUQ==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.13.1", + "@typescript-eslint/visitor-keys": "6.13.1", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": { + "version": "6.13.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.1.tgz", + "integrity": "sha512-NDhQUy2tg6XGNBGDRm1XybOHSia8mcXmlbKWoQP+nm1BIIMxa55shyJfZkHpEBN62KNPLrocSM2PdPcaLgDKMQ==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.13.1", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "6.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.17.0.tgz", + "integrity": "sha512-H6VwB/k3IuIeQOyYczyyKN8wH6ed8EwliaYHLxOIhyF0dYEIsN8+Bk3GE19qafeMKyZJJHP8+O1HiFhFLUNKSg==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.17.0", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, + "node_modules/@vitejs/plugin-basic-ssl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.0.1.tgz", + "integrity": "sha512-pcub+YbFtFhaGRTo1832FQHQSHvMrlb43974e2eS8EKleR3p1cDdkJFPci1UhwkEf1J9Bz+wKBSzqpKp7nNj2A==", + "dev": true, + "engines": { + "node": ">=14.6.0" + }, + "peerDependencies": { + "vite": "^3.0.0 || ^4.0.0" + } + }, + "node_modules/@vitest/expect": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.3.1.tgz", + "integrity": "sha512-xofQFwIzfdmLLlHa6ag0dPV8YsnKOCP1KdAeVVh34vSjN2dcUiXYCD9htu/9eM7t8Xln4v03U9HLxLpPlsXdZw==", + "dev": true, + "dependencies": { + "@vitest/spy": "1.3.1", + "@vitest/utils": "1.3.1", + "chai": "^4.3.10" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/expect/node_modules/@vitest/spy": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.3.1.tgz", + "integrity": "sha512-xAcW+S099ylC9VLU7eZfdT9myV67Nor9w9zhf0mGCYJSO+zM2839tOeROTdikOi/8Qeusffvxb/MyBSOja1Uig==", + "dev": true, + "dependencies": { + "tinyspy": "^2.2.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/expect/node_modules/@vitest/utils": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.3.1.tgz", + "integrity": "sha512-d3Waie/299qqRyHTm2DjADeTaNdNSVsnwHPWrs20JMpjh6eiVq7ggggweO8rc4arhf6rRkWuHKwvxGvejUXZZQ==", + "dev": true, + "dependencies": { + "diff-sequences": "^29.6.3", + "estree-walker": "^3.0.3", + "loupe": "^2.3.7", + "pretty-format": "^29.7.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/expect/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@vitest/expect/node_modules/estree-walker": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", + "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", + "dev": true, + "dependencies": { + "@types/estree": "^1.0.0" + } + }, + "node_modules/@vitest/expect/node_modules/pretty-format": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", + "dev": true, + "dependencies": { + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@vitest/expect/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true + }, + "node_modules/@vitest/spy": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.4.0.tgz", + "integrity": "sha512-Ywau/Qs1DzM/8Uc+yA77CwSegizMlcgTJuYGAi0jujOteJOUf1ujunHThYo243KG9nAyWT3L9ifPYZ5+As/+6Q==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.13.1", - "@typescript-eslint/visitor-keys": "6.13.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" + "tinyspy": "^2.2.0" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "url": "https://opencollective.com/vitest" } }, - "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": { - "version": "6.13.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.1.tgz", - "integrity": "sha512-gjeEskSmiEKKFIbnhDXUyiqVma1gRCQNbVZ1C8q7Zjcxh3WZMbzWVfGE9rHfWd1msQtPS0BVD9Jz9jded44eKg==", + "node_modules/@vitest/utils": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.4.0.tgz", + "integrity": "sha512-mx3Yd1/6e2Vt/PUC98DcqTirtfxUyAZ32uK82r8rZzbtBeBo+nqgnjx/LvqQdWsrvNtm14VmurNgcf4nqY5gJg==", "dev": true, - "engines": { - "node": "^16.0.0 || >=18.0.0" + "dependencies": { + "diff-sequences": "^29.6.3", + "estree-walker": "^3.0.3", + "loupe": "^2.3.7", + "pretty-format": "^29.7.0" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "url": "https://opencollective.com/vitest" } }, - "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": { - "version": "6.13.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.1.tgz", - "integrity": "sha512-sBLQsvOC0Q7LGcUHO5qpG1HxRgePbT6wwqOiGLpR8uOJvPJbfs0mW3jPA3ujsDvfiVwVlWUDESNXv44KtINkUQ==", + "node_modules/@vitest/utils/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, - "dependencies": { - "@typescript-eslint/types": "6.13.1", - "@typescript-eslint/visitor-keys": "6.13.1", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" - }, "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": ">=10" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": { - "version": "6.13.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.1.tgz", - "integrity": "sha512-NDhQUy2tg6XGNBGDRm1XybOHSia8mcXmlbKWoQP+nm1BIIMxa55shyJfZkHpEBN62KNPLrocSM2PdPcaLgDKMQ==", + "node_modules/@vitest/utils/node_modules/estree-walker": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", + "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.13.1", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "@types/estree": "^1.0.0" } }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.17.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.17.0.tgz", - "integrity": "sha512-H6VwB/k3IuIeQOyYczyyKN8wH6ed8EwliaYHLxOIhyF0dYEIsN8+Bk3GE19qafeMKyZJJHP8+O1HiFhFLUNKSg==", + "node_modules/@vitest/utils/node_modules/pretty-format": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.17.0", - "eslint-visitor-keys": "^3.4.1" + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" }, "engines": { - "node": "^16.0.0 || >=18.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "node_modules/@vitest/utils/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", "dev": true }, - "node_modules/@vitejs/plugin-basic-ssl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.0.1.tgz", - "integrity": "sha512-pcub+YbFtFhaGRTo1832FQHQSHvMrlb43974e2eS8EKleR3p1cDdkJFPci1UhwkEf1J9Bz+wKBSzqpKp7nNj2A==", - "dev": true, - "engines": { - "node": ">=14.6.0" - }, - "peerDependencies": { - "vite": "^3.0.0 || ^4.0.0" - } - }, "node_modules/@webassemblyjs/ast": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", @@ -8093,6 +8492,22 @@ "dequal": "^2.0.3" } }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -8142,6 +8557,15 @@ "util": "^0.12.5" } }, + "node_modules/assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "dev": true, + "engines": { + "node": "*" + } + }, "node_modules/ast-transform": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/ast-transform/-/ast-transform-0.0.0.tgz", @@ -8240,10 +8664,13 @@ } }, "node_modules/available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", "dev": true, + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, "engines": { "node": ">= 0.4" }, @@ -9312,14 +9739,19 @@ } }, "node_modules/call-bind": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", - "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dev": true, "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.1", - "set-function-length": "^1.1.1" + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -9418,6 +9850,24 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/chai": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz", + "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==", + "dev": true, + "dependencies": { + "assertion-error": "^1.1.0", + "check-error": "^1.0.3", + "deep-eql": "^4.1.3", + "get-func-name": "^2.0.2", + "loupe": "^2.3.6", + "pathval": "^1.1.1", + "type-detect": "^4.0.8" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -9448,6 +9898,18 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, + "node_modules/check-error": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", + "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", + "dev": true, + "dependencies": { + "get-func-name": "^2.0.2" + }, + "engines": { + "node": "*" + } + }, "node_modules/cheerio": { "version": "1.0.0-rc.12", "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz", @@ -9601,9 +10063,9 @@ } }, "node_modules/cli-table3": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz", - "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.4.tgz", + "integrity": "sha512-Lm3L0p+/npIQWNIiyF/nAn7T5dnOwR3xNTHXYEBFBFVPXzCVNZ5lqEC/1eo/EVfpDsQ1I+TX4ORPQgp+UI0CRw==", "dev": true, "dependencies": { "string-width": "^4.2.0" @@ -10924,6 +11386,12 @@ "url": "https://github.com/sponsors/fb55" } }, + "node_modules/css.escape": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz", + "integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==", + "dev": true + }, "node_modules/cssauron": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz", @@ -11070,6 +11538,18 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/deep-eql": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", + "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==", + "dev": true, + "dependencies": { + "type-detect": "^4.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/deep-equal": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz", @@ -11146,17 +11626,20 @@ } }, "node_modules/define-data-property": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", - "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.1", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/define-lazy-prop": { @@ -11395,6 +11878,12 @@ "node": ">=6.0.0" } }, + "node_modules/dom-accessibility-api": { + "version": "0.5.16", + "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz", + "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", + "dev": true + }, "node_modules/dom-converter": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz", @@ -12045,6 +12534,47 @@ "is-arrayish": "^0.2.1" } }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-get-iterator": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", + "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", + "has-symbols": "^1.0.3", + "is-arguments": "^1.1.1", + "is-map": "^2.0.2", + "is-set": "^2.0.2", + "is-string": "^1.0.7", + "isarray": "^2.0.5", + "stop-iteration-iterator": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/es-module-lexer": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz", @@ -13436,9 +13966,9 @@ "dev": true }, "node_modules/flow-parser": { - "version": "0.230.0", - "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.230.0.tgz", - "integrity": "sha512-ZAfKaarESYYcP/RoLdM91vX0u/1RR7jI5TJaFLnxwRlC2mp0o+Rw7ipIY7J6qpIpQYtAobWb/J6S0XPeu0gO8g==", + "version": "0.231.0", + "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.231.0.tgz", + "integrity": "sha512-WVzuqwq7ZnvBceCG0DGeTQebZE+iIU0mlk5PmJgYj9DDrt+0isGC2m1ezW9vxL4V+HERJJo9ExppOnwKH2op6Q==", "dev": true, "engines": { "node": ">=0.4.0" @@ -13833,17 +14363,30 @@ "node": "6.* || 8.* || >= 10.*" } }, + "node_modules/get-func-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", + "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", + "dev": true, + "engines": { + "node": "*" + } + }, "node_modules/get-intrinsic": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", - "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dev": true, "dependencies": { + "es-errors": "^1.3.0", "function-bind": "^1.1.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", "hasown": "^2.0.0" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -13997,18 +14540,18 @@ } }, "node_modules/giget": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/giget/-/giget-1.2.1.tgz", - "integrity": "sha512-4VG22mopWtIeHwogGSy1FViXVo0YT+m6BrqZfz0JJFwbSsePsCdOzdLIIli5BtMp7Xe8f/o2OmBpQX2NBOC24g==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/giget/-/giget-1.2.3.tgz", + "integrity": "sha512-8EHPljDvs7qKykr6uw8b+lqLiUc/vUg+KVTI0uND4s63TdsZM2Xus3mflvF0DDG9SiM4RlCkFGL+7aAjRmV7KA==", "dev": true, "dependencies": { - "citty": "^0.1.5", + "citty": "^0.1.6", "consola": "^3.2.3", - "defu": "^6.1.3", - "node-fetch-native": "^1.6.1", - "nypm": "^0.3.3", + "defu": "^6.1.4", + "node-fetch-native": "^1.6.3", + "nypm": "^0.3.8", "ohash": "^1.1.3", - "pathe": "^1.1.1", + "pathe": "^1.1.2", "tar": "^6.2.0" }, "bin": { @@ -14275,6 +14818,15 @@ "node": ">= 0.4.0" } }, + "node_modules/has-bigints": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -14285,12 +14837,12 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", - "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.2" + "es-define-property": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -14321,12 +14873,12 @@ } }, "node_modules/has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "dev": true, "dependencies": { - "has-symbols": "^1.0.2" + "has-symbols": "^1.0.3" }, "engines": { "node": ">= 0.4" @@ -15034,6 +15586,20 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, + "node_modules/internal-slot": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0", + "hasown": "^2.0.0", + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/ip": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", @@ -15077,12 +15643,40 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-array-buffer": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", "dev": true }, + "node_modules/is-bigint": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, + "dependencies": { + "has-bigints": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -15095,6 +15689,22 @@ "node": ">=8" } }, + "node_modules/is-boolean-object": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-builtin-module": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", @@ -15239,6 +15849,18 @@ "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", "dev": true }, + "node_modules/is-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", @@ -15279,6 +15901,21 @@ "lodash.isfinite": "^3.3.2" } }, + "node_modules/is-number-object": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", @@ -15346,6 +15983,33 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-set": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", + "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", @@ -15358,6 +16022,36 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-string": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-text-path": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz", @@ -15371,12 +16065,12 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", - "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", + "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", "dev": true, "dependencies": { - "which-typed-array": "^1.1.11" + "which-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" @@ -15397,6 +16091,34 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-weakmap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakset": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", + "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-what": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", @@ -15415,6 +16137,12 @@ "node": ">=8" } }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -15682,96 +16410,6 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-mock": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz", - "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==", - "dev": true, - "dependencies": { - "@jest/types": "^27.5.1", - "@types/node": "*" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/jest-mock/node_modules/@jest/types": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", - "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", - "dev": true, - "dependencies": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^16.0.0", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" - } - }, - "node_modules/jest-mock/node_modules/@types/yargs": { - "version": "16.0.9", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", - "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", - "dev": true, - "dependencies": { - "@types/yargs-parser": "*" - } - }, - "node_modules/jest-mock/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-mock/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/jest-mock/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-mock/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/jiti": { "version": "1.21.0", "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz", @@ -16562,6 +17200,15 @@ "loose-envify": "cli.js" } }, + "node_modules/loupe": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", + "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", + "dev": true, + "dependencies": { + "get-func-name": "^2.0.1" + } + }, "node_modules/lower-case": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", @@ -16594,6 +17241,15 @@ "node": "*" } }, + "node_modules/lz-string": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", + "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", + "dev": true, + "bin": { + "lz-string": "bin/bin.js" + } + }, "node_modules/macos-release": { "version": "2.5.1", "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.1.tgz", @@ -18363,9 +19019,9 @@ } }, "node_modules/node-fetch-native": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.2.tgz", - "integrity": "sha512-69mtXOFZ6hSkYiXAVB5SqaRvrbITC/NPyqv7yuu/qw0nmgPyYbIMYYNIDhNtwPrzk0ptrimrLz/hhjvm4w5Z+w==", + "version": "1.6.4", + "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.4.tgz", + "integrity": "sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==", "dev": true }, "node_modules/node-forge": { @@ -19640,6 +20296,15 @@ "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", "dev": true }, + "node_modules/pathval": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", + "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", + "dev": true, + "engines": { + "node": "*" + } + }, "node_modules/pause-stream": { "version": "0.0.11", "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", @@ -19836,6 +20501,15 @@ "lodash": "^4.17.14" } }, + "node_modules/possible-typed-array-names": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/postcss": { "version": "8.4.31", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", @@ -20062,6 +20736,32 @@ "renderkid": "^3.0.0" } }, + "node_modules/pretty-format": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", + "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^17.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, "node_modules/pretty-hrtime": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", @@ -20375,6 +21075,12 @@ "react": "^18.2.0" } }, + "node_modules/react-is": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", + "dev": true + }, "node_modules/read-package-json": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-7.0.0.tgz", @@ -21720,15 +22426,17 @@ "dev": true }, "node_modules/set-function-length": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz", - "integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", "dev": true, "dependencies": { - "define-data-property": "^1.1.1", - "get-intrinsic": "^1.2.1", + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "has-property-descriptors": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -22499,6 +23207,18 @@ "node": ">= 0.8" } }, + "node_modules/stop-iteration-iterator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", + "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", + "dev": true, + "dependencies": { + "internal-slot": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/store2": { "version": "2.14.3", "resolved": "https://registry.npmjs.org/store2/-/store2-2.14.3.tgz", @@ -22506,12 +23226,12 @@ "dev": true }, "node_modules/storybook": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/storybook/-/storybook-8.0.0.tgz", - "integrity": "sha512-ZWfFoKLsZ7kYgqcVgDeUZpN89cxzEx2Mw9afhfMNzwSnjhx9xRdzdNvK7DY1nDnfborxzBhkvwYf/oxRbifKuw==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/storybook/-/storybook-8.0.4.tgz", + "integrity": "sha512-FUr3Uc2dSAQ80jINH5fSXz7zD7Ncn08OthROjwRtHAH+jMf4wxyZ+RhF3heFy9xLot2/HXOLIWyHyzZZMtGhxg==", "dev": true, "dependencies": { - "@storybook/cli": "8.0.0" + "@storybook/cli": "8.0.4" }, "bin": { "sb": "index.js", @@ -23300,6 +24020,15 @@ "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==", "dev": true }, + "node_modules/tinyspy": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.1.tgz", + "integrity": "sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==", + "dev": true, + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/tmp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", @@ -23673,6 +24402,15 @@ "node": ">= 0.8.0" } }, + "node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/type-fest": { "version": "2.19.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", @@ -23747,9 +24485,9 @@ } }, "node_modules/ufo": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.4.0.tgz", - "integrity": "sha512-Hhy+BhRBleFjpJ2vchUNN40qgkh0366FWJGqVLYBHev0vpHTrXSA0ryT+74UiW6KWsldNurQMKGqCm1M2zBciQ==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz", + "integrity": "sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==", "dev": true }, "node_modules/uglify-js": { @@ -24002,9 +24740,9 @@ } }, "node_modules/unplugin": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.9.0.tgz", - "integrity": "sha512-14PslvMY3gNbXnQtNIRB566Q057L5Fe7f5LDEamxVi0QQVxoz5hrveBwwZLcKyHtZ09ysmipxRRj5Lv+BGz2Iw==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.10.0.tgz", + "integrity": "sha512-CuZtvvO8ua2Wl+9q2jEaqH6m3DoQ38N7pvBYQbbaeNlWGvK2l6GHiKi29aIHDPoSxdUzQ7Unevf1/ugil5X6Pg==", "dev": true, "dependencies": { "acorn": "^8.11.3", @@ -25129,17 +25867,51 @@ "node": ">= 8" } }, + "node_modules/which-boxed-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, + "dependencies": { + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-collection": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "dev": true, + "dependencies": { + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/which-typed-array": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", - "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", + "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.4", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" diff --git a/package.json b/package.json index 81f121e5d9a67f65e3b440077bde2391484a426e..5d90b52dfba556ec81aa6f981cd77034d08a5efe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pamn", - "version": "3.0.0", + "version": "3.0.1", "scripts": { "ng": "ng", "start": "ng serve --configuration=local,fr --proxy-config proxy.conf.json", @@ -30,7 +30,7 @@ "@angular/service-worker": "^17.0.7", "@asymmetrik/ngx-leaflet": "^17.0.0", "@ngx-translate/core": "^14.0.0", - "@storybook/addon-a11y": "^8.0.0", + "@storybook/addon-a11y": "^8.0.4", "ag-grid-angular": "^29.0.0", "ag-grid-community": "^29.0.0", "jwt-decode": "^3.1.2", @@ -56,14 +56,14 @@ "@angular/compiler-cli": "^17.0.7", "@angular/localize": "^17.0.7", "@compodoc/compodoc": "^1.1.16", - "@storybook/addon-essentials": "^8.0.0", - "@storybook/addon-interactions": "^8.0.0", - "@storybook/addon-links": "^8.0.0", - "@storybook/addon-mdx-gfm": "^8.0.0", - "@storybook/angular": "^8.0.0", - "@storybook/blocks": "^8.0.0", - "@storybook/manager-api": "^8.0.0", - "@storybook/theming": "^8.0.0", + "@storybook/addon-essentials": "^8.0.4", + "@storybook/addon-interactions": "^8.0.4", + "@storybook/addon-links": "^8.0.4", + "@storybook/addon-mdx-gfm": "^8.0.4", + "@storybook/angular": "^8.0.4", + "@storybook/blocks": "^8.0.4", + "@storybook/manager-api": "^8.0.4", + "@storybook/theming": "^8.0.4", "@types/leaflet": "^1.5.17", "@types/leaflet.locatecontrol": "^0.74.0", "@types/luxon": "^1.25.0", @@ -77,10 +77,8 @@ "http-server": "^14.1.0", "ng-packagr": "^17.0.3", "prettier": "^3.1.0", - "react": "^18.2.0", - "react-dom": "^18.2.0", "standard-version": "^9.3.2", - "storybook": "^8.0.0", + "storybook": "^8.0.4", "typescript": "~5.2.0" } } diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 0df90214e57bbb1e9de83caed65dfb6851511e54..5e92142b2286d826abef4f8b61c6abcb9fa7af51 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -37,10 +37,7 @@ const routes: Routes = [ { path: 'print', outlet: 'print', - children: [ - { path: 'structure', component: StructureDetailsComponent }, - { path: 'structures-search', component: StructureListSearchPrintComponent }, - ], + children: [{ path: 'structures-search', component: StructureListSearchPrintComponent }], }, { path: 'acteurs', diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html index 830f2ef4e1ccabb23897e58eede729d16261bb82..58d5ad453b5f6400b26bbe3a71dc16101f38fc62 100644 --- a/src/app/footer/footer.component.html +++ b/src/app/footer/footer.component.html @@ -4,6 +4,7 @@ <a class="clickable text-align-center" routerLink="/newsletter" i18n>Newsletter</a> <a class="clickable text-align-center" routerLink="/contact" i18n>Contact</a> <a class="clickable text-align-center" routerLink="/page/qui-sommes-nous" i18n>Qui sommes-nous ?</a> + <a class="clickable text-align-center" routerLink="/page/accessibilite" i18n>Accessibilité : en cours</a> </div> <div class="right"> diff --git a/src/app/form/footer-form/footer-form.component.html b/src/app/form/footer-form/footer-form.component.html index 1c4f56c76547c910baf3f5fc09e24f3e748a4f74..2445db10c81ad2bd88ebb67c0c3832bbe32d35ca 100644 --- a/src/app/form/footer-form/footer-form.component.html +++ b/src/app/form/footer-form/footer-form.component.html @@ -1,6 +1,6 @@ <div class="footerForm"> <app-button - *ngIf="!isLastFormStep && !isNextFormTransition && !isStructureLastPage() && !isPersonalOfferFirstPage()" + *ngIf="!isFirstPage() && !isLastPage() && !isStructureLastPage() && !isNextFormTransition()" [variant]="'secondary'" [label]="!isEditMode ? 'Précédent' : 'Annuler'" [iconName]="!isEditMode && 'arrowBack'" @@ -8,7 +8,7 @@ /> <app-button - *ngIf="!isLastFormStep && !isNextFormTransition && !isEditMode" + *ngIf="!isLastPage() && !isNextFormTransition() && !isEditMode" [variant]="'primary'" [label]="'Suivant'" [iconPosition]="'right'" diff --git a/src/app/form/footer-form/footer-form.component.scss b/src/app/form/footer-form/footer-form.component.scss index bdf40933a3a0dc43131e84a780467eee4fb9713f..7a45d92cb64bdce00882d922e4afd4d75e3b3963 100644 --- a/src/app/form/footer-form/footer-form.component.scss +++ b/src/app/form/footer-form/footer-form.component.scss @@ -6,7 +6,7 @@ display: flex; justify-content: center; gap: 1rem; - padding: 32px 0 40px 0; + padding: 16px 0 24px; border-top: 1px solid $grey-7; @media #{$tablet} { margin: 0 2%; diff --git a/src/app/form/footer-form/footer-form.component.ts b/src/app/form/footer-form/footer-form.component.ts index 13bbe79924d75728d79c52f8a915817b345783d4..f74cea5bb71f617948053df17934d94b62660fd9 100644 --- a/src/app/form/footer-form/footer-form.component.ts +++ b/src/app/form/footer-form/footer-form.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; import { Router } from '@angular/router'; import { firstValueFrom } from 'rxjs'; @@ -19,7 +19,7 @@ import { stepType } from '../step.type'; templateUrl: './footer-form.component.html', styleUrls: ['./footer-form.component.scss'], }) -export class FooterFormComponent implements OnChanges { +export class FooterFormComponent { @Input() currentForm: formType; @Input() isValid: boolean; @Input() nbPagesForm: number; @@ -37,9 +37,6 @@ export class FooterFormComponent implements OnChanges { @Output() changeCurrentStep = new EventEmitter<any>(); @Output() saveEditedStructure = new EventEmitter<any>(); - public isLastFormStep = false; - public isNextFormTransition = false; - constructor( private authService: AuthService, public utils: Utils, @@ -48,24 +45,6 @@ export class FooterFormComponent implements OnChanges { private notificationService: NotificationService, ) {} - async ngOnChanges(changes: SimpleChanges): Promise<void> { - if (changes.currentStep) { - if (this.currentStep === accountFormStep.confirmEmailSentInfo && this.currentForm === formType.account) { - this.isLastFormStep = true; - } - if ( - this.currentForm === formType.personaloffer && - this.currentStep === personalOfferFormStep.personalOfferFinishedInfo && - !this.hasOtherPersonalOffer - ) { - this.isNextFormTransition = true; - } - if (this.currentForm === formType.structure && this.currentStep === structureFormStep.noStructure) { - this.isLastFormStep = true; - } - } - } - public goToNextPage(): void { this.goNext.emit(); } @@ -211,7 +190,28 @@ export class FooterFormComponent implements OnChanges { : personalOfferFormStep.personalOfferStructureChoice; return this.currentForm === formType.personaloffer && this.currentStep === lastStep; } - public isPersonalOfferFirstPage(): boolean { - return this.currentStep === personalOfferFormStep.personalOfferBeginningInfo; + + public isFirstPage(): boolean { + return ( + (this.currentForm === formType.account && this.currentStep === accountFormStep.accountInfo) || + (this.currentForm === formType.structure && this.currentStep === structureFormStep.structureChoice) || + (this.currentForm === formType.personaloffer && + this.currentStep === personalOfferFormStep.personalOfferAccompaniment) + ); + } + + public isLastPage(): boolean { + return ( + (this.currentForm === formType.account && this.currentStep === accountFormStep.confirmEmailSentInfo) || + (this.currentForm === formType.structure && this.currentStep === structureFormStep.noStructure) + ); + } + + public isNextFormTransition(): boolean { + return ( + !this.hasOtherPersonalOffer && + this.currentForm === formType.personaloffer && + this.currentStep === personalOfferFormStep.personalOfferFinishedInfo + ); } } diff --git a/src/app/form/form-view/account-form/account-credentials/account-credentials.component.html b/src/app/form/form-view/account-form/account-credentials/account-credentials.component.html index c1e81305a45d6c1745616d6c1c550811bdcde936..a17152e6c69982902259618300987fa8a0bfc194 100644 --- a/src/app/form/form-view/account-form/account-credentials/account-credentials.component.html +++ b/src/app/form/form-view/account-form/account-credentials/account-credentials.component.html @@ -24,7 +24,7 @@ size="large" type="password" [value]="accountForm.get('password').value" - (valueChange)="accountForm.get('password').setValue($event)" + (valueChange)="accountForm.get('password').setValue($event); setValidationsForm()" /> <div class="special"> <p>Le mot de passe doit obligatoirement contenir :</p> diff --git a/src/app/form/form-view/account-form/account-form.component.ts b/src/app/form/form-view/account-form/account-form.component.ts index 7d430b390e22aea44211e869eb9a75a7391d69cc..f944c1b249714b7acedabdf786a72b151f8468ec 100644 --- a/src/app/form/form-view/account-form/account-form.component.ts +++ b/src/app/form/form-view/account-form/account-form.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; +import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; import { UntypedFormGroup } from '@angular/forms'; import { User } from '../../../models/user.model'; @@ -11,28 +11,31 @@ import { accountFormStep } from './accountFormStep.enum'; selector: 'app-account-form', templateUrl: './account-form.component.html', }) -export class AccountFormComponent implements OnChanges { +export class AccountFormComponent implements OnInit, OnChanges { @Input() nbSteps: number; @Input() currentStep: stepType; @Input() accountForm: UntypedFormGroup; @Input() isAccountMode: boolean; public pagesValidation = []; public userAcceptSavedDate = false; - public isPageValid: boolean; public profile: User; public accountFormStepEnum = accountFormStep; public formType = formType; - @Output() pageValid = new EventEmitter<any>(); - @Output() acceptNewsletter = new EventEmitter<any>(); + @Output() pageValid = new EventEmitter<boolean>(); + @Output() acceptNewsletter = new EventEmitter<boolean>(); constructor(private profileService: ProfileService) {} + + ngOnInit(): void { + this.setValidationsForm(); + } + ngOnChanges(changes: SimpleChanges): void { - if (changes.currentStep) { - if (this.currentStep === accountFormStep.accountNewsletter) { - this.pageValid.emit(); - } + if (changes.currentStep && this.pagesValidation.length > 0) { + this.updatePageValid(); } } + public setValidationsForm(): void { this.pagesValidation[accountFormStep.accountInfo] = { valid: @@ -46,6 +49,12 @@ export class AccountFormComponent implements OnChanges { this.accountForm.get('password').valid && this.accountForm.get('confirmPassword').valid, }; + this.pagesValidation[accountFormStep.accountNewsletter] = { + valid: true, + }; + this.pagesValidation[accountFormStep.confirmEmailSentInfo] = { + valid: true, + }; this.updatePageValid(); } @@ -61,17 +70,9 @@ export class AccountFormComponent implements OnChanges { } } - /** - * Update valid page or return page validity of the given index - * @param {number} [index] - Page index - */ - private updatePageValid(index?: number): boolean { - if (index) { - return this.pagesValidation[index].valid; - } - this.isPageValid = this.pagesValidation[this.currentStep].valid; - if (this.isPageValid) this.pageValid.emit(); - return this.isPageValid; + private updatePageValid(): void { + const isPageValid = this.pagesValidation[this.currentStep].valid; + this.pageValid.emit(isPageValid); } public acceptReceiveNewsletter(accept: boolean): void { this.acceptNewsletter.emit(accept); diff --git a/src/app/form/form-view/form-view.component.html b/src/app/form/form-view/form-view.component.html index 509253eb83a8fb72c6d616f4728ea5b7d19169a3..4b92517b4b06dc7d6204922485af368002596050 100644 --- a/src/app/form/form-view/form-view.component.html +++ b/src/app/form/form-view/form-view.component.html @@ -1,6 +1,6 @@ <div class="formView"> <app-modal - [title]="'Attention'" + [title]="'ATTENTION'" [opened]="showConfirmationModal" [validateLabel]="'Quitter'" [cancelLabel]="'Annuler'" @@ -13,7 +13,7 @@ <app-progress-bar *ngIf="!isEditMode" [formType]="formType[routeParam]" - [currentPage]="currentPage - 1" + [currentPage]="displayedCurrentPage()" [nbSteps]="nbSteps" /> <div class="page"> @@ -44,7 +44,6 @@ [currentStep]="currentPage" [isEditMode]="isEditMode" (goNext)="nextPage()" - (isNotExistingStructure)="nextPage()" (pageValid)="validatePage($event)" (updateHoursForm)="updateHours($event)" (setEditStep)="setCurrentStep($event)" diff --git a/src/app/form/form-view/form-view.component.ts b/src/app/form/form-view/form-view.component.ts index 3ad06f4ae72ba6c3421deda2d410c87574e1b33b..fd71532bec513c49b336d141c10fcc3eff2da56f 100644 --- a/src/app/form/form-view/form-view.component.ts +++ b/src/app/form/form-view/form-view.component.ts @@ -54,7 +54,7 @@ export class FormViewComponent implements OnInit, AfterViewInit { public hasOtherPersonalOffer = false; // Page and progress var - public pagesValidation = []; + public previousSteps = 0; public nbSteps: number; // Condition form @@ -135,10 +135,10 @@ export class FormViewComponent implements OnInit, AfterViewInit { } private initPage(): void { - const profileFormSteps = Object.keys(profileFormStep).length / 2; + const profileFormSteps = Object.keys(profileFormStep).length / 2 - 1; + const structureFormSteps = Object.keys(structureFormStep).length / 2 - 1; const personalOfferFormSteps = Object.keys(personalOfferFormStep).length / 2 - 1; - const structureFormSteps = Object.keys(structureFormStep).length / 2; - const totalFormSteps = profileFormSteps + personalOfferFormSteps + structureFormSteps; + const totalFormSteps = profileFormSteps + structureFormSteps + personalOfferFormSteps; if (formType[this.routeParam] === formType.account) { this.nbSteps = 3; this.currentPage = accountFormStep.accountInfo; @@ -168,8 +168,7 @@ export class FormViewComponent implements OnInit, AfterViewInit { } if (formType[this.routeParam] === formType.structure) { if (!this.isEditMode) { - const PAGE_WITHOUT_COUNT_INCREMENT = 2; - this.nbSteps = structureFormSteps - PAGE_WITHOUT_COUNT_INCREMENT; + this.nbSteps = structureFormSteps; this.currentPage = structureFormStep.structureChoice; this.currentFormType = formType.structure; this.structure = new Structure(); @@ -177,17 +176,25 @@ export class FormViewComponent implements OnInit, AfterViewInit { this.currentForm = this.structureForm; // Init hours form this.hoursForm = this.formUtils.createHoursForm(this.structure); + // Two pages don't increment the counter when coming from the carto + if (this.previousSteps === 0) { + this.nbSteps = structureFormSteps - 2; + } } } if (formType[this.routeParam] === formType.personaloffer) { - this.nbSteps = totalFormSteps; - this.currentPage = personalOfferFormStep.personalOfferBeginningInfo; + this.nbSteps = personalOfferFormSteps; + this.currentPage = personalOfferFormStep.personalOfferAccompaniment; this.currentFormType = formType.personaloffer; this.createPersonalOfferForm(new PersonalOffer()); this.currentForm = this.personalOfferForm; } } + public displayedCurrentPage(): number { + return this.previousSteps + this.currentPage - 1; + } + public updateHours(form: UntypedFormGroup): void { this.hoursForm = form; } @@ -310,6 +317,7 @@ export class FormViewComponent implements OnInit, AfterViewInit { if (type.formStep === structureFormStep.mailSentInfo) { const user = await this.profileService.getProfile(); if (user.job?.hasPersonalOffer) { + this.previousSteps = 0; this.router.navigateByUrl('form/personaloffer'); } else { this.router.navigateByUrl('/'); @@ -365,6 +373,7 @@ export class FormViewComponent implements OnInit, AfterViewInit { if (this.profile.job?.hasPersonalOffer) { this.structureService.getStructure(this.profile.structuresLink[0]).subscribe((structure) => { this.structure = new Structure(structure); + this.previousSteps = 0; this.router.navigateByUrl('form/personaloffer'); }); } else { @@ -395,6 +404,7 @@ export class FormViewComponent implements OnInit, AfterViewInit { this.structureService.createStructure(newStructure, this.profile).subscribe((struct) => { if (user.job?.hasPersonalOffer) { this.structure = struct; + this.previousSteps = 0; this.router.navigateByUrl('form/personaloffer'); } else { this.router.navigateByUrl(`acteurs?id=${struct._id}`); diff --git a/src/app/form/form-view/global-components/information-step/information-step.component.html b/src/app/form/form-view/global-components/information-step/information-step.component.html index 97b2f8232edf765ccc369e1a4905c6659113035b..7dd1b5176502db8014c72736cf3a1349bb8e2816 100644 --- a/src/app/form/form-view/global-components/information-step/information-step.component.html +++ b/src/app/form/form-view/global-components/information-step/information-step.component.html @@ -4,9 +4,9 @@ <div class="information-step no-max-width"> <img src="../../assets/form/emailVerification.svg" alt="" /> <h3>Un email vous a été envoyé afin de finaliser votre inscription</h3> - <div class="btnContainer"> - <app-button [variant]="'primary'" [wide]="true" [label]="'Terminer'" (click)="goToHome()" /> - </div> + </div> + <div class="btnContainer"> + <app-button [variant]="'primary'" [wide]="true" [label]="'Terminer'" (click)="goToHome()" /> </div> </ng-container> @@ -15,11 +15,11 @@ <div class="information-step"> <img src="../../assets/form/profileSkip.svg" alt="" /> <h3>Pour compléter votre profil, nous aimerions vous poser quelques questions</h3> - <div class="btnContainer"> - <div class="btnGroup"> - <app-button [label]="'Plus tard'" [variant]="'secondary'" (click)="goToHome()" /> - <app-button [label]="'C\'est parti !'" [variant]="'primary'" (click)="goToNextPage()" /> - </div> + </div> + <div class="btnContainer"> + <div class="btnGroup"> + <app-button [label]="'Plus tard'" [variant]="'secondary'" (click)="goToHome()" /> + <app-button [label]="'C\'est parti !'" [variant]="'primary'" (click)="goToNextPage()" /> </div> </div> </ng-container> @@ -75,31 +75,22 @@ La cartographie ne référence que les structures qui disposent d'un lieu d'accueil pour accompagner, former ou donner accès au numérique </p> - <div class="btnContainer"> - <app-button [variant]="'primary'" [wide]="true" [label]="'J\'ai compris'" (click)="goBackProfile()" /> - </div> </div> - </ng-container> - - <!-- After the creation of a structure --> - <ng-container - *ngIf="formType === formTypeEnum.personaloffer && step === personalOfferFormStep.personalOfferBeginningInfo" - > - <div class="information-step no-max-width"> - <img src="../../assets/form/formTime.svg" alt="" /> - <h3>C’est bientôt fini !</h3> - <p>Il ne reste plus qu’à renseigner votre offre de services personnelle</p> + <div class="btnContainer"> + <app-button [variant]="'primary'" [wide]="true" [label]="'J\'ai compris'" (click)="goBackProfile()" /> </div> </ng-container> + + <!-- End of the creation of a structure (after the personal offer) --> <ng-container *ngIf="formType === formTypeEnum.personaloffer && step === personalOfferFormStep.personalOfferFinishedInfo" > <div class="information-step no-max-width"> <img src="../../assets/form/profileUpdated.svg" alt="" /> <h3>Merci, les informations de votre profil ont été mises à jour</h3> - <div class="btnContainer"> - <app-button [variant]="'primary'" [wide]="true" [label]="'Voir mon compte'" (click)="goBackProfile()" /> - </div> + </div> + <div class="btnContainer"> + <app-button [variant]="'primary'" [wide]="true" [label]="'Voir mon compte'" (click)="goBackProfile()" /> </div> </ng-container> </div> diff --git a/src/app/form/form-view/global-components/information-step/information-step.component.scss b/src/app/form/form-view/global-components/information-step/information-step.component.scss index 1c9e149efb74ceb1ab27dc43edac3b8decd025fb..80ab003c8796420bff199042acf8d260a53b76a7 100644 --- a/src/app/form/form-view/global-components/information-step/information-step.component.scss +++ b/src/app/form/form-view/global-components/information-step/information-step.component.scss @@ -4,7 +4,10 @@ .information-step-container { display: flex; + flex-direction: column; + justify-content: space-between; height: 100%; + .information-step { display: flex; flex-direction: column; @@ -28,30 +31,6 @@ text-align: center; } - .btnContainer { - width: 100vw; - max-width: calc(100vw - 96px - 96px); - left: calc(-50vw + 50%); - display: flex; - place-content: center; - border-top: solid 1px $grey-7; - padding: 32px 0 40px; - margin: 0 96px; - overflow-x: hidden; - position: fixed; - bottom: 0; - background-color: $grey-10; - scrollbar-gutter: stable; - @media #{$tablet} { - max-width: calc(100vw - 4%); - margin: 0 2%; - } - } - .btnGroup { - display: flex; - gap: 32px; - } - .list { display: flex; flex-direction: column; @@ -80,6 +59,25 @@ } } } + + .btnContainer { + position: sticky; + bottom: 0; + background: $white; + width: 100%; + .btnGroup { + display: flex; + gap: 32px; + justify-content: center; + } + app-button { + display: flex; + justify-content: center; + gap: 2rem; + padding: 16px 0 24px; + border-top: 1px solid $grey-7; + } + } } .no-margin-top { diff --git a/src/app/form/form-view/global-components/progress-bar/progress-bar.component.ts b/src/app/form/form-view/global-components/progress-bar/progress-bar.component.ts index 088e78892c779a9dcc762b03c2d6d44953741f63..d53599f70898c130b5e9e2cc9db2b4da1e0c4a10 100644 --- a/src/app/form/form-view/global-components/progress-bar/progress-bar.component.ts +++ b/src/app/form/form-view/global-components/progress-bar/progress-bar.component.ts @@ -1,7 +1,5 @@ import { Component, Input, OnChanges, SimpleChanges } from '@angular/core'; import { formType } from '../../formType.enum'; -import { profileFormStep } from '../../profile-form/profileFormStep.enum'; -import { structureFormStep } from '../../structure-form/structureFormStep.enum'; @Component({ selector: 'app-progress-bar', @@ -16,28 +14,10 @@ export class ProgressBarComponent implements OnChanges { @Input({ required: true }) nbSteps: number; public progressStatus: number; public formTypeEnum = formType; - // When working with numeric enums, divide the result by 2, because a reverse mapping is generated. - public profileFormSteps = Object.keys(profileFormStep).length / 2; - public structureFormSteps = Object.keys(structureFormStep).length / 2; ngOnChanges(changes: SimpleChanges): void { if (changes.currentPage) { - switch (this.formType) { - case formType.profile: { - this.progressStatus = ((this.currentPage + 1) / this.nbSteps) * 100; - break; - } - case formType.structure: { - this.progressStatus = ((this.currentPage + this.profileFormSteps + 1) / this.nbSteps) * 100; - break; - } - case formType.personaloffer: - this.progressStatus = - ((this.currentPage + this.structureFormSteps + this.profileFormSteps + 1) / this.nbSteps) * 100; - break; - default: - this.progressStatus = ((this.currentPage + 1) / this.nbSteps) * 100; - } + this.progressStatus = ((this.currentPage + 1) / this.nbSteps) * 100; } } } diff --git a/src/app/form/form-view/personal-offer-form/personal-offer-form.component.html b/src/app/form/form-view/personal-offer-form/personal-offer-form.component.html index 9b97b739491adc8841e7379dacc1216bccb1eeca..a05624f3d497b591926a7a7a3406bedb366bf8ea 100644 --- a/src/app/form/form-view/personal-offer-form/personal-offer-form.component.html +++ b/src/app/form/form-view/personal-offer-form/personal-offer-form.component.html @@ -1,9 +1,3 @@ -<ng-container *ngIf="currentStep === personalOfferFormStep.personalOfferBeginningInfo"> - <app-information-step - [step]="personalOfferFormStep.personalOfferBeginningInfo" - [formType]="formTypeEnum.personaloffer" - /> -</ng-container> <ng-container *ngIf="currentStep === personalOfferFormStep.personalOfferAccompaniment"> <app-personal-offer-accompaniment *ngIf="onlineProcedures" diff --git a/src/app/form/form-view/personal-offer-form/personal-offer-form.component.ts b/src/app/form/form-view/personal-offer-form/personal-offer-form.component.ts index 42f6d88a79b41e7d5523e6c6a28f52c12072a55f..9ee1a9381a22c55ba051b174abf5f5f512ae99ab 100644 --- a/src/app/form/form-view/personal-offer-form/personal-offer-form.component.ts +++ b/src/app/form/form-view/personal-offer-form/personal-offer-form.component.ts @@ -38,7 +38,6 @@ export class PersonalOfferFormComponent implements OnChanges, OnInit { ngOnChanges(changes: SimpleChanges): void { if (changes.currentStep) { if ( - this.currentStep === personalOfferFormStep.personalOfferBeginningInfo || this.currentStep === personalOfferFormStep.personalOfferAccompaniment || this.currentStep === personalOfferFormStep.personalOfferTrainingType ) { diff --git a/src/app/form/form-view/personal-offer-form/personalOfferFormStep.enum.ts b/src/app/form/form-view/personal-offer-form/personalOfferFormStep.enum.ts index 0e48fe3db173489e99eb3a20cf4f73369982cbd8..460ca81727f6c2014d9d63f695fcefe155bec814 100644 --- a/src/app/form/form-view/personal-offer-form/personalOfferFormStep.enum.ts +++ b/src/app/form/form-view/personal-offer-form/personalOfferFormStep.enum.ts @@ -1,5 +1,4 @@ export enum personalOfferFormStep { - personalOfferBeginningInfo, personalOfferAccompaniment, personalOfferTrainingType, personalOfferStructureChoice, diff --git a/src/app/form/form-view/structure-form/structure-form.component.html b/src/app/form/form-view/structure-form/structure-form.component.html index 9fca0f3002c74f87d46b57ed53aed8d551cf09ad..788108ec92533ffd924d4f2b8d180ec70eb91b8a 100644 --- a/src/app/form/form-view/structure-form/structure-form.component.html +++ b/src/app/form/form-view/structure-form/structure-form.component.html @@ -75,7 +75,8 @@ <app-structure-pmr [isEditMode]="isEditMode" [structureForm]="structureForm" - [title]="'La structure est-elle accessible pour les personnes à mobilité réduite ?'" + [title]="'La structure est-elle accessible pour les personnes à mobilité réduite ?'" + (validateForm)="setValidationsForm()" (radioChange)="onRadioChange($event)" /> </div> diff --git a/src/app/form/form-view/structure-form/structure-form.component.ts b/src/app/form/form-view/structure-form/structure-form.component.ts index 619e22de4f0ec276f6aad5bc388136ef07f66eea..bd54e12d0d5fa7344a6ec7dca78551c54ec138d6 100644 --- a/src/app/form/form-view/structure-form/structure-form.component.ts +++ b/src/app/form/form-view/structure-form/structure-form.component.ts @@ -27,7 +27,7 @@ export class StructureFormComponent implements OnChanges, OnInit { @Input() isEditMode: boolean; @Output() pageValid = new EventEmitter<any>(); @Output() updateHoursForm = new EventEmitter<any>(); - @Output() isNotExistingStructure = new EventEmitter<any>(); + @Output() goNext = new EventEmitter<any>(); @Output() setEditStep = new EventEmitter<any>(); public structureFormStep = structureFormStep; public formTypeEnum = formType; @@ -323,6 +323,6 @@ export class StructureFormComponent implements OnChanges, OnInit { public goToCreateStructure(structureName = ''): void { this.structureForm.patchValue({ _id: null, structureName }); - this.isNotExistingStructure.emit(); + this.goNext.emit(); } } diff --git a/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html b/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html index 4330d8c1e72694ed24cdcf3ef48c97c028050ec5..361dca07f5eff3190e7df729e8cca05c4c3bfcc4 100644 --- a/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html +++ b/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html @@ -10,67 +10,66 @@ </h3> <p>{{ isMandatoryFields ? '' : 'Facultatif - ' }}Plusieurs choix possibles</p> </div> - <div class="formGroup"> - <p *ngIf="isEditMode && !structureForm.get('categories').get('age').valid" class="missing-information"> - <app-svg-icon class="validationIcon" [iconClass]="'icon-26'" [folder]="'form'" [icon]="'notValidate'" /> - <span>Il faut renseigner au moins un champ</span> - </p> - <ng-container *ngIf="!isMandatoryFields"> - <div *ngIf="languageAndIlliteracy" class="title" style="gap: 12px"> - <h4>Langue et illettrisme</h4> - <div class="tagList"> - <app-tag-item - *ngFor="let choice of languageAndIlliteracy.modules" - [iconName]="isInArray(choice.id, 'languageAndIlliteracy') ? 'tag-checked' : 'tag-unchecked'" - [label]="choice.name" - [color]="isInArray(choice.id, 'languageAndIlliteracy') ? 'green' : 'white'" - [clickable]="true" - (action)="updateChoicePublic(choice.id, 'languageAndIlliteracy')" - /> - </div> + + <p *ngIf="isEditMode && !structureForm.get('categories').get('age').valid" class="missing-information"> + <app-svg-icon class="validationIcon" [iconClass]="'icon-26'" [folder]="'form'" [icon]="'notValidate'" /> + <span>Il faut renseigner au moins un champ</span> + </p> + <ng-container *ngIf="!isMandatoryFields"> + <div *ngIf="languageAndIlliteracy" class="title" style="gap: 12px"> + <h4>Langue et illettrisme</h4> + <div class="tagList"> + <app-tag-item + *ngFor="let choice of languageAndIlliteracy.modules" + [iconName]="isInArray(choice.id, 'languageAndIlliteracy') ? 'tag-checked' : 'tag-unchecked'" + [label]="choice.name" + [color]="isInArray(choice.id, 'languageAndIlliteracy') ? 'green' : 'white'" + [clickable]="true" + (action)="updateChoicePublic(choice.id, 'languageAndIlliteracy')" + /> </div> - <div *ngIf="handicaps" class="title" style="gap: 12px"> - <h4>Handicaps</h4> - <div class="tagList"> - <app-tag-item - *ngFor="let choice of handicaps.modules" - [iconName]="isInArray(choice.id, 'handicaps') ? 'tag-checked' : 'tag-unchecked'" - [label]="choice.name" - [color]="isInArray(choice.id, 'handicaps') ? 'green' : 'white'" - [clickable]="true" - (action)="updateChoicePublic(choice.id, 'handicaps')" - /> - </div> + </div> + <div *ngIf="handicaps" class="title" style="gap: 12px"> + <h4>Handicaps</h4> + <div class="tagList"> + <app-tag-item + *ngFor="let choice of handicaps.modules" + [iconName]="isInArray(choice.id, 'handicaps') ? 'tag-checked' : 'tag-unchecked'" + [label]="choice.name" + [color]="isInArray(choice.id, 'handicaps') ? 'green' : 'white'" + [clickable]="true" + (action)="updateChoicePublic(choice.id, 'handicaps')" + /> </div> - <div *ngIf="genre" class="title" style="gap: 12px"> - <h4>Genre</h4> - <div class="tagList"> - <app-tag-item - *ngFor="let choice of genre.modules" - [iconName]="isInArray(choice.id, 'genre') ? 'tag-checked' : 'tag-unchecked'" - [label]="choice.name" - [color]="isInArray(choice.id, 'genre') ? 'green' : 'white'" - [clickable]="true" - (action)="updateChoicePublic(choice.id, 'genre')" - /> - </div> + </div> + <div *ngIf="genre" class="title" style="gap: 12px"> + <h4>Genre</h4> + <div class="tagList"> + <app-tag-item + *ngFor="let choice of genre.modules" + [iconName]="isInArray(choice.id, 'genre') ? 'tag-checked' : 'tag-unchecked'" + [label]="choice.name" + [color]="isInArray(choice.id, 'genre') ? 'green' : 'white'" + [clickable]="true" + (action)="updateChoicePublic(choice.id, 'genre')" + /> </div> - </ng-container> + </div> + </ng-container> - <ng-container *ngIf="isMandatoryFields"> - <div *ngIf="age" class="title" style="gap: 12px"> - <h4>Âge</h4> - <div class="tagList"> - <app-tag-item - *ngFor="let choice of age.modules" - [iconName]="isInArray(choice.id, 'age') ? 'tag-checked' : 'tag-unchecked'" - [label]="choice.name" - [color]="isInArray(choice.id, 'age') ? 'green' : 'white'" - [clickable]="true" - (action)="updateChoicePublic(choice.id, 'age')" - /> - </div> + <ng-container *ngIf="isMandatoryFields"> + <div *ngIf="age" class="title" style="gap: 12px"> + <h4>Âge</h4> + <div class="tagList"> + <app-tag-item + *ngFor="let choice of age.modules" + [iconName]="isInArray(choice.id, 'age') ? 'tag-checked' : 'tag-unchecked'" + [label]="choice.name" + [color]="isInArray(choice.id, 'age') ? 'green' : 'white'" + [clickable]="true" + (action)="updateChoicePublic(choice.id, 'age')" + /> </div> - </ng-container> - </div> + </div> + </ng-container> </form> diff --git a/src/app/form/form-view/structure-form/structure-training-type/structure-training-type.component.html b/src/app/form/form-view/structure-form/structure-training-type/structure-training-type.component.html index 31d57dd5b8a532a1ff667893b1f3e4ba24cadf55..36afc980719fade30890f675ccc8149efb385681 100644 --- a/src/app/form/form-view/structure-form/structure-training-type/structure-training-type.component.html +++ b/src/app/form/form-view/structure-form/structure-training-type/structure-training-type.component.html @@ -3,7 +3,9 @@ <div class="title"> <h3>La structure propose-t-elle un accompagnement aux usages numérique ?</h3> <p>Facultatif - Plusieurs choix possibles</p> - <p class="info">L'offre des accompagnants numériques est éditable sur le profil de l'accompagnant numérique</p> + <p *ngIf="isEditMode" class="info"> + L'offre des accompagnants numériques est éditable sur le profil de l'accompagnant numérique + </p> </div> <app-training-type-picker [baseSkills]="structureForm.get('categories').get('baseSkills').value" diff --git a/src/app/form/orientation-form-view/global-components/navigation/navigation.component.scss b/src/app/form/orientation-form-view/global-components/navigation/navigation.component.scss index 6be85e259273c7e37c4fdaf7f05444d14bf904b9..6710a369ac94ced8a22465d2535a16f67cdeaf8b 100644 --- a/src/app/form/orientation-form-view/global-components/navigation/navigation.component.scss +++ b/src/app/form/orientation-form-view/global-components/navigation/navigation.component.scss @@ -4,8 +4,7 @@ display: flex; justify-content: center; gap: 2rem; - padding-top: 2rem; - padding-bottom: 40px; + padding: 16px 0 24px; border-top: 1px solid $grey-7; width: 100%; @media print { diff --git a/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.html b/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.html index 9a7899abfa90c7146270eb20ccb5d495005b68cf..8b843e7ae17f1d831813a39ae66276ef71fe7aba 100644 --- a/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.html +++ b/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.html @@ -65,33 +65,17 @@ /> </form> -<div *ngIf="owners?.length === 0 || (structures?.length === 0 && structuresListReady)" class="noResult"> - <img src="../../../../../../assets/img/joinRefused.svg" alt="" /> - <span *ngIf="isBaseskills" class="info"> - <h2> - Cette structure ne propose pas d’accompagnements pour - <span [ngPlural]="this.form.get('onlineDemarcheType')?.value.length" - ><ng-template ngPluralCase="1">votre besoin</ng-template - ><ng-template ngPluralCase="other">l'ensemble de ces besoins</ng-template> - </span> - : - </h2> - <span *ngFor="let item of this.form.get('onlineDemarcheType')?.value; last as isLast" - >{{ item.text }}<span *ngIf="!isLast">, </span> +<!-- This specific structure doesn't match --> +<div *ngIf="owners?.length === 0 || (structures?.length === 0 && structuresListReady)" class="container"> + <img src="../../../../../../assets/form/structureNegatif.svg" alt="" /> + <h2> + Cette structure ne propose pas d'accompagnements pour + <span [ngPlural]="this.form.get('onlineDemarcheType')?.value.length" + ><ng-template ngPluralCase="1">cette démarche</ng-template + ><ng-template ngPluralCase="other">l'ensemble de ces démarches</ng-template> </span> - </span> - <span *ngIf="isOnlineProcedures" class="info"> - <h2> - Cette structure ne propose pas d’accompagnements pour - <span [ngPlural]="this.form.get('onlineDemarcheType')?.value.length" - ><ng-template ngPluralCase="1">cette démarche</ng-template - ><ng-template ngPluralCase="other">l'ensemble de ces démarches</ng-template> - </span> - en ligne : - </h2> - <span *ngFor="let item of this.form.get('onlineDemarcheType')?.value; last as isLast" - >{{ item.text }}<span *ngIf="!isLast">, </span> - </span> - </span> + en ligne : + </h2> + <b>{{ getFormattedNeeds() }}</b> <p>Merci de renouveler votre recherche avec des critères différents ou accédez à la cartographie</p> </div> diff --git a/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.scss b/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.scss index 0439f61de268ba4996309dd4240e883237688aa6..9a28f1d116bb108493f8d2bfcd809dd12c5a203d 100644 --- a/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.scss +++ b/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.scss @@ -31,3 +31,22 @@ section { gap: 24px; } } + +.container { + display: flex; + flex-direction: column; + align-items: center; + text-align: center; + justify-content: center; + height: 90%; + h2 { + margin-top: 2rem; + margin-bottom: 0.5rem; + max-width: 600px; + } + p { + text-align: center; + margin-top: 2rem; + max-width: 600px; + } +} diff --git a/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.ts b/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.ts index 543e9f72f2437dc38e804f66dfad67c42fc1db0d..eebc5c9b6685dbd7bd1abd2fab4cf86ae8c290c7 100644 --- a/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.ts +++ b/src/app/form/orientation-form-view/online-demarch/appointment/make-appointment/make-appointment.component.ts @@ -150,4 +150,11 @@ export class MakeAppointmentComponent implements OnInit { this.selectedStructureRDV.emit(structure); this.checkValidation.emit(structure); } + + public getFormattedNeeds(): string { + return this.form + .get('onlineDemarcheType') + ?.value.map((n) => n.text) + .join(', '); + } } diff --git a/src/app/form/orientation-form-view/orientation-form-view.component.html b/src/app/form/orientation-form-view/orientation-form-view.component.html index e14fa97bf0e98f4a0555c3635d2b8da37a6131f9..80acf42d1198052407c7249ffad5000ec79ae607 100644 --- a/src/app/form/orientation-form-view/orientation-form-view.component.html +++ b/src/app/form/orientation-form-view/orientation-form-view.component.html @@ -61,7 +61,7 @@ /> <app-modal [opened]="showConfirmationModal" - [title]="'Attention'" + [title]="'ATTENTION'" [validateLabel]="'Quitter'" [cancelLabel]="'Annuler'" (closed)="hasRedirectionAccepted($event ? true : false)" diff --git a/src/app/map/services/map.service.ts b/src/app/map/services/map.service.ts index 64014df9f7082ba01f0f4410d42d6bfcbb6bccc4..d96d1c1dea49974ecb6eeb12fa4db57f199f8f06 100644 --- a/src/app/map/services/map.service.ts +++ b/src/app/map/services/map.service.ts @@ -71,7 +71,6 @@ export class MapService { private getAddedToListMarkerIcon(markerType: MarkerType): DivIcon { switch (markerType) { case MarkerType.conseillerFrance: - // return markerIconFranceServiceAddedToList; return markerIconAddedToList; case MarkerType.user: return userLocationIcon; diff --git a/src/app/map/services/marker.ts b/src/app/map/services/marker.ts index 7fff26a5a8346151a4615c971776223e06899e05..8eed6ea666976ab1ce17f4d2662393ab8416f433 100644 --- a/src/app/map/services/marker.ts +++ b/src/app/map/services/marker.ts @@ -2,15 +2,15 @@ import { divIcon } from 'leaflet'; export const markerIcon = divIcon({ className: null, - html: '<svg width="16" height="16" fill="#4C4D53"><use xlink:href="assets/ico/sprite.svg#map-marker"></use></svg>', - iconAnchor: [24, 48], - popupAnchor: [0, -48], + html: '<svg width="16" height="16"><use xlink:href="assets/ico/sprite.svg#map-marker"></use></svg>', + iconAnchor: [8, 8], + popupAnchor: [0, -24], }); export const markerIconHover = divIcon({ className: 'on-top-marker', html: '<svg width="16" height="16"><use xlink:href="assets/ico/sprite.svg#map-markerHover"></use></svg>', - iconAnchor: [24, 48], - popupAnchor: [0, -48], + iconAnchor: [8, 8], + popupAnchor: [0, -24], }); export const markerIconActive = divIcon({ className: 'on-top-marker', @@ -28,41 +28,11 @@ export const markerIconAddedToList = divIcon({ }); export const userLocationIcon = divIcon({ className: null, - html: '<svg width="34" height="34"><use xlink:href="assets/ico/sprite.svg#user-location"></use></svg>', - iconSize: [34, 34], - iconAnchor: [17, 0], + html: '<svg width="34" height="44"><use xlink:href="assets/ico/sprite.svg#user-location"></use></svg>', + iconAnchor: [17, 40], }); export const markerIconMdm = divIcon({ className: null, - html: '<svg width="19" height="24" fill="#D4C4A9" class="mdm"><use xlink:href="assets/ico/sprite.svg#mdm"></use></svg>', - iconSize: [19, 24], - iconAnchor: [9, 0], -}); -export const markerIconFranceService = divIcon({ - className: null, - html: '<svg width="48" height="48" fill="#ED3939" class="france-service"><use xlink:href="assets/ico/sprite.svg#conseillerFranceService"></use></svg>', - iconSize: [48, 48], - iconAnchor: [24, 48], - popupAnchor: [0, -48], -}); -export const markerIconFranceServiceActive = divIcon({ - className: null, - html: '<svg width="48" height="48"><use xlink:href="assets/ico/sprite.svg#conseillerFranceServiceSelected"></use></svg>', - iconSize: [48, 48], - iconAnchor: [24, 48], - popupAnchor: [0, -48], -}); -export const markerIconFranceServiceHover = divIcon({ - className: null, - html: '<svg width="48" height="48"><use xlink:href="assets/ico/sprite.svg#conseillerFranceServiceHover"></use></svg>', - iconSize: [48, 48], - iconAnchor: [24, 48], - popupAnchor: [0, -48], -}); -export const markerIconFranceServiceAddedToList = divIcon({ - className: null, - html: '<svg width="48" height="48"><use xlink:href="assets/ico/sprite.svg#conseillerFranceServiceAdded"></use></svg>', - iconSize: [48, 48], - iconAnchor: [24, 48], - popupAnchor: [0, -48], + html: '<svg width="14" height="14" class="mdm"><use xlink:href="assets/ico/sprite.svg#mdm"></use></svg>', + iconAnchor: [7, 7], }); diff --git a/src/app/post/components/post-header/post-header.component.html b/src/app/post/components/post-header/post-header.component.html index c5495657048aace912c5a1b8f32989d578d8f847..153e928fba9097b8a05c596b2fd523273dc85dbf 100644 --- a/src/app/post/components/post-header/post-header.component.html +++ b/src/app/post/components/post-header/post-header.component.html @@ -18,12 +18,5 @@ {{ tag.name }} </span> </nav> - <app-button - class="publish-button hide-on-mobile" - [variant]="'primaryBlack'" - [label]="'Publier'" - [iconName]="'plus'" - (action)="togglePublishNews()" - /> </div> </div> diff --git a/src/app/post/components/post-header/post-header.component.scss b/src/app/post/components/post-header/post-header.component.scss index 486ea9c16fc75205f9fe29fd0972b441c0d6646a..ec582e639d17319af21b847a688e63b6d7e103a2 100644 --- a/src/app/post/components/post-header/post-header.component.scss +++ b/src/app/post/components/post-header/post-header.component.scss @@ -28,7 +28,7 @@ header { .tag { cursor: pointer; user-select: none; - @include font-regular-14; + @include font-regular-16; box-sizing: border-box; padding: 0 16px; height: 60px; @@ -37,7 +37,7 @@ header { border-bottom: 3px solid transparent; transition: all 0.3s ease-in-out; &.active { - @include font-bold-14; + @include font-bold-16; border-color: $grey-1; } &:hover { diff --git a/src/app/post/components/post-header/post-header.component.ts b/src/app/post/components/post-header/post-header.component.ts index 90c4d3f1fc8e0bac648843d38616c2dd7de7141d..a1977f30e39cfc8513db8bfa510e737a09da552a 100644 --- a/src/app/post/components/post-header/post-header.component.ts +++ b/src/app/post/components/post-header/post-header.component.ts @@ -90,8 +90,4 @@ export class PostHeaderComponent implements OnInit { } return this.mainActiveTag.slug === this.tagEnum.etudes ? this.mainActiveTag.name : this.mainActiveTag.slug; } - - public togglePublishNews(): void { - this.router.navigate(['publish'], { relativeTo: this.route }); - } } diff --git a/src/app/post/components/post-publish/post-publish.component.html b/src/app/post/components/post-publish/post-publish.component.html deleted file mode 100644 index 895815e83db937397fce75282412442586608383..0000000000000000000000000000000000000000 --- a/src/app/post/components/post-publish/post-publish.component.html +++ /dev/null @@ -1,36 +0,0 @@ -<div class="section-container no-padding news"> - <div class="container"> - <div class="goBack"> - <app-button - [label]="'Retour'" - [variant]="'tertiary'" - [size]="'large'" - [iconFolder]="'ico'" - [iconName]="'arrowBack'" - (action)="backToPosts()" - /> - </div> - - <img src="../../../../assets/post/publishLogo.svg" alt="" /> - <h2>Publier votre actualité</h2> - <div class="informations"> - <p>Vous pouvez nous envoyer votre actualité en distinguant ces 4 éléments :</p> - <ul> - <li>le titre</li> - <li>le texte</li> - <li>l’auteur</li> - <li>l’image <span class="optional">(facultatif)</span></li> - </ul> - <p>Si votre actualité existe déjà sur un autre site, envoyez-nous simplement son adresse URL</p> - </div> - <div> - <app-button - routerLink="'mailto:inclusionnumerique@grandlyon.com?subject=Nouvelle actualité à intégrer&body=' + bodyMail" - [label]="'Envoyer votre actu par mail'" - [variant]="'primary'" - [wide]="true" - (action)="backToPosts()" - /> - </div> - </div> -</div> diff --git a/src/app/post/components/post-publish/post-publish.component.scss b/src/app/post/components/post-publish/post-publish.component.scss deleted file mode 100644 index 0d5c32f86afadf3fbc47264b1bb274e09224c55d..0000000000000000000000000000000000000000 --- a/src/app/post/components/post-publish/post-publish.component.scss +++ /dev/null @@ -1,52 +0,0 @@ -@import 'color'; -@import 'typography'; -@import 'layout'; - -.goBack { - display: flex; - width: 100%; - justify-content: flex-start; -} - -.container { - display: flex; - flex-direction: column; - align-items: center; - gap: 1rem; - padding-block: 32px; -} - -h2 { - @include font-bold-24; -} - -.image { - width: 100%; - text-align: center; - svg { - max-width: 200px; - height: 200px; - } -} -.informations { - @include font-regular-18; - display: flex; - flex-direction: column; - gap: 8px; - - ul { - margin: 0; - padding-left: 24px; - li::marker { - color: $red; - } - } - - p:last-child { - margin-top: 16px; - } - - span.optional { - color: $grey-3; - } -} diff --git a/src/app/post/components/post-publish/post-publish.component.ts b/src/app/post/components/post-publish/post-publish.component.ts deleted file mode 100644 index 65354cf3eb766eb7ed6bafcd1d3207fcba22a1c4..0000000000000000000000000000000000000000 --- a/src/app/post/components/post-publish/post-publish.component.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Component } from '@angular/core'; -import { Router } from '@angular/router'; - -@Component({ - selector: 'app-post-publish', - templateUrl: './post-publish.component.html', - styleUrls: ['./post-publish.component.scss'], -}) -export class PostPublishComponent { - constructor(private router: Router) {} - public bodyMail = - "Bonjour,%0D Je souhaite ajouter cette publication sur Rés'in :%0D- Titre :%0D- Texte :%0D- Auteur :%0D- Image : à joindre en pièce jointe"; - - public backToPosts(): void { - this.router.navigateByUrl('/news'); - } -} diff --git a/src/app/post/post-routing.module.ts b/src/app/post/post-routing.module.ts index 75eae7cad093f042fc4a7919d8e6159299c81d79..c95c0ba7cbea2c96e03ae08ecea77819b367b348 100644 --- a/src/app/post/post-routing.module.ts +++ b/src/app/post/post-routing.module.ts @@ -2,7 +2,6 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { PostDetailsComponent } from './components/post-details/post-details.component'; import { PostListComponent } from './components/post-list/post-list.component'; -import { PostPublishComponent } from './components/post-publish/post-publish.component'; import { NewsComponent } from './news.component'; import { TagResolver } from './resolvers/tags.resolver'; @@ -22,10 +21,6 @@ const routes: Routes = [ path: 'details/:id', component: PostDetailsComponent, }, - { - path: 'publish', - component: PostPublishComponent, - }, ], }, ]; diff --git a/src/app/post/post.module.ts b/src/app/post/post.module.ts index 4cace1f05ab210bbe2c7bc55c8e7eee1058f3981..9c18fafb9036258b1a18a0ad853cb12a837293c5 100644 --- a/src/app/post/post.module.ts +++ b/src/app/post/post.module.ts @@ -5,7 +5,6 @@ import { PostCardComponent } from './components/post-card/post-card.component'; import { PostDetailsComponent } from './components/post-details/post-details.component'; import { PostHeaderComponent } from './components/post-header/post-header.component'; import { PostListComponent } from './components/post-list/post-list.component'; -import { PostPublishComponent } from './components/post-publish/post-publish.component'; import { NewsComponent } from './news.component'; import { PostRoutingModule } from './post-routing.module'; import { TagResolver } from './resolvers/tags.resolver'; @@ -17,7 +16,6 @@ import { TagResolver } from './resolvers/tags.resolver'; PostListComponent, PostDetailsComponent, PostCardComponent, - PostPublishComponent, ], imports: [CommonModule, PostRoutingModule, SharedModule], providers: [TagResolver], diff --git a/src/app/profile/edit/edit.component.html b/src/app/profile/edit/edit.component.html index 047f3b01ec120e1775d954337ceec96c0d535bec..d996a8b6ed78d52e14384db214baf834fb2c554d 100644 --- a/src/app/profile/edit/edit.component.html +++ b/src/app/profile/edit/edit.component.html @@ -162,7 +162,7 @@ </div> <app-input *ngIf="isUnexistingJob()" - label="Quelle fonction occupez-vous ?" + label="Quelle fonction occupez-vous ?" (valueChange)="updateNewJob($event)" /> @@ -192,21 +192,16 @@ </div> <!-- No information on appointment option, should pick one --> - <app-modal - [title]="'Attention !'" - [opened]="showConfirmationModal" - [validateLabel]="'OK'" - (closed)="closeExitModal()" - > + <app-modal [title]="'ATTENTION'" [opened]="showConfirmationModal" [validateLabel]="'OK'" (closed)="closeExitModal()"> <p class="modalContent emphasized"> - Veuillez indiquer si vous souhaitez proposer la fonctionnalité 'être rappelé' dans l'onglet 'Employeur et - fonction'. + Veuillez indiquer si vous souhaitez proposer la fonctionnalité 'Demander un rendez-vous' dans l'onglet 'Employeur + et fonction'. </p> </app-modal> <!-- Some modifications are pending, confirm leaving --> <app-modal - [title]="'Attention !'" + [title]="'ATTENTION'" [opened]="pendingChangesModal" [validateLabel]="'Continuer'" (closed)="$event ? goBack() : closePendingChangesModal()" diff --git a/src/app/profile/edit/edit.component.scss b/src/app/profile/edit/edit.component.scss index 30457f59ec2a9fe7d14864a237456ab64f74e64a..aa7dd26920e347ae350499c4fa109ad9a83e86db 100644 --- a/src/app/profile/edit/edit.component.scss +++ b/src/app/profile/edit/edit.component.scss @@ -61,7 +61,7 @@ .tab { cursor: pointer; user-select: none; - @include font-regular-14; + @include font-regular-16; box-sizing: border-box; padding: 0 16px; height: 60px; diff --git a/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.ts b/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.ts index 3b100b3a309ca76afc8929c3432370904c0ea56d..fbedc806a4f85e1be6e37f465ce91ae31b3ff3a3 100644 --- a/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.ts +++ b/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.ts @@ -47,7 +47,7 @@ export class StructureAddMemberModalComponent { return; } const user = new TempUser(); - user.email = this.email; + user.email = this.email.toLowerCase(); try { const res = await lastValueFrom(this.structureService.addOwnerToStructure(user, this.structure.structure._id)); diff --git a/src/app/profile/structures-management/structures-management.component.html b/src/app/profile/structures-management/structures-management.component.html index 8b28347aa8220e4aa8f6c769b051e5a27d548aba..6798265871aac43d464d0dd124d8da8d60a26802 100644 --- a/src/app/profile/structures-management/structures-management.component.html +++ b/src/app/profile/structures-management/structures-management.component.html @@ -70,7 +70,7 @@ [opened]="leaveModalOpened" [validateLabel]="'Oui'" [cancelLabel]="'Non'" - [title]="'Souhaitez-vous quitter cette structure ?'" + [title]="'Souhaitez-vous quitter cette structure ?'" (closed)="leaveStructure(selectedStructure, $event)" /> diff --git a/src/app/shared/components/button/button.component.scss b/src/app/shared/components/button/button.component.scss index 9d640518b8dfd82eaeb7f752ca9730d31e97bdc9..a6b042dc2981832e0fd90574478dc4a8e135cc60 100644 --- a/src/app/shared/components/button/button.component.scss +++ b/src/app/shared/components/button/button.component.scss @@ -152,7 +152,7 @@ button { color: $red; border-color: $red; &:hover { - background-color: $grey-3; + background-color: $grey-7; } &:disabled { background-color: $white; @@ -160,7 +160,7 @@ button { border-color: $grey-5; } &:active { - background-color: $grey-3; + background-color: $grey-8; } } diff --git a/src/app/shared/components/hour-picker/hour-picker.component.html b/src/app/shared/components/hour-picker/hour-picker.component.html index 6149db74b7431ec0f8bc7b67cac8fa746e5cc39c..b52deadd1dd4f0a8e33ddefa7f6ddb1d6d839181 100644 --- a/src/app/shared/components/hour-picker/hour-picker.component.html +++ b/src/app/shared/components/hour-picker/hour-picker.component.html @@ -18,7 +18,7 @@ [type]="'time'" [label]="'De :'" [size]="'large'" - [status]="getStatus(hour)" + [status]="getStatus(hour.start)" [statusText]="getStatusText(hour)" [(value)]="hour.start" (valueChange)="submitForm()" @@ -30,7 +30,7 @@ [type]="'time'" [label]="'Jusqu’à :'" [size]="'large'" - [status]="getStatus(hour)" + [status]="getStatus(hour.start, hour.end)" [statusText]="getStatusText(hour)" [(value)]="hour.end" (valueChange)="submitForm()" diff --git a/src/app/shared/components/hour-picker/hour-picker.component.ts b/src/app/shared/components/hour-picker/hour-picker.component.ts index 28df27406cc133601fa037268ca86596d621b27a..88616a331e1dbd872051891a579326ebb774a7cf 100644 --- a/src/app/shared/components/hour-picker/hour-picker.component.ts +++ b/src/app/shared/components/hour-picker/hour-picker.component.ts @@ -1,4 +1,4 @@ -import { Component, EventEmitter, Input, OnChanges, OnDestroy, Output } from '@angular/core'; +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { AbstractControl, UntypedFormArray, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms'; import { Day, Time, WeekDayEnum } from '../../../models/week.model'; import { CheckHours } from '../../validator/form'; @@ -8,7 +8,6 @@ interface DayHour { hours: { start: string; end: string; - error: string; }[]; open: boolean; } @@ -18,7 +17,7 @@ interface DayHour { templateUrl: './hour-picker.component.html', styleUrls: ['./hour-picker.component.scss'], }) -export class HourPickerComponent implements OnChanges, OnDestroy { +export class HourPickerComponent implements OnInit { @Input() structureInput: UntypedFormGroup; @Output() updateFormError = new EventEmitter<any>(); @@ -27,92 +26,38 @@ export class HourPickerComponent implements OnChanges, OnDestroy { public structure = { hours: this.initHoursDefault(), }; - public structureHoursDefault: DayHour[] = this.initHoursDefault(); - ngOnChanges(): void { + ngOnInit(): void { this.formatHoursForEdition(); } - ngOnDestroy(): void { - this.formatHoursForSave(); - } - public getStructureControl(nameControl: string): AbstractControl { return this.structureInput.get(nameControl); } private initHoursDefault(): DayHour[] { - return [ - { - name: WeekDayEnum.monday, - hours: [{ start: '', end: '', error: 'incomplete' }], - open: false, - }, - { - name: WeekDayEnum.tuesday, - hours: [{ start: '', end: '', error: 'incomplete' }], - open: false, - }, - { - name: WeekDayEnum.wednesday, - hours: [{ start: '', end: '', error: 'incomplete' }], - open: false, - }, - { - name: WeekDayEnum.thursday, - hours: [{ start: '', end: '', error: 'incomplete' }], - open: false, - }, - { - name: WeekDayEnum.friday, - hours: [{ start: '', end: '', error: 'incomplete' }], - open: false, - }, - { - name: WeekDayEnum.saturday, - hours: [{ start: '', end: '', error: 'incomplete' }], + const defaultHours: DayHour[] = []; + for (const day of Object.values(WeekDayEnum)) { + defaultHours.push({ + name: day, + hours: [{ start: '', end: '' }], open: false, - }, - { - name: WeekDayEnum.sunday, - hours: [{ start: '', end: '', error: 'incomplete' }], - open: false, - }, - ]; + }); + } + return defaultHours; } /** Convert data from to component structure */ private parseFormToHours(day: Day, key: string): void { - this.structureHoursDefault.forEach((element) => { + this.structure.hours.forEach((element) => { if (element.name.toLowerCase() === key) { element.open = day.open; - element.hours = day.time.map((hour) => { - if (hour.opening && hour.closing) { - return { - start: hour.opening, - end: hour.closing, - error: null, - }; - } else { - if (hour.opening) { - return { - start: hour.opening, - end: '', - error: 'incomplete', - }; - } else { - return { - start: '', - end: hour.closing, - error: 'incomplete', - }; - } - } - }); + element.hours = day.time.map((hour) => ({ + start: hour.opening ?? '', + end: hour.closing ?? '', + })); } }); - this.checkHoursValid(); - this.structure.hours = this.structureHoursDefault; } private parseToDay(data: DayHour): Day { @@ -155,31 +100,13 @@ export class HourPickerComponent implements OnChanges, OnDestroy { } } - /** - * Formater les horaires pour l'enregistrement en base : - * supprimer les données inutiles - */ - public formatHoursForSave(): void { - if (!this.structure.hours) { - return; - } - - this.structure.hours = this.structure.hours.filter((day) => day.open === true); - - for (const day of this.structure.hours) { - delete day.open; - - for (const hour of day.hours) { - delete hour.error; - } - } - } - public toggleOpenDay(day: DayHour, checked: boolean): void { day.open = checked; if (!checked) { day.hours = []; + } else { + this.addHours(day); } this.submitForm(); } @@ -193,7 +120,6 @@ export class HourPickerComponent implements OnChanges, OnDestroy { day.hours.push({ start: '', end: '', - error: 'incomplete', }); this.submitForm(); } @@ -208,30 +134,15 @@ export class HourPickerComponent implements OnChanges, OnDestroy { /** Vérifier que le format des horaires est correct */ public checkHoursValid(): boolean { - let error = false; for (const day of this.structure.hours) { - if (day.open) { - // Init if no data - if (day.hours.length === 0) { - this.addHours(day); - } - for (const hour of day.hours) { - if (hour.start === '' || hour.end === '') { - hour.error = 'incomplete'; - error = true; - } else if (hour.end <= hour.start) { - hour.error = 'wrong'; - error = true; - } else { - hour.error = null; - } + if (!day.open) continue; + for (const hour of day.hours) { + if (this.getStatus(hour.start, hour.end) !== 'success') { + return false; } } } - // Émettre l'erreur à ajouter au formulaire pour autoriser - // ou empêcher de passer à l'étape suivante - - return !error; + return true; } public submitForm(): void { @@ -256,19 +167,14 @@ export class HourPickerComponent implements OnChanges, OnDestroy { }); } - getStatus(hour: { start: string; end: string; error: string }): 'error' | 'success' | null { - if (hour.error === 'wrong' || hour.error === 'incomplete') { - return 'error'; - } else if (hour.error === null) { - return 'success'; + getStatus(start: string, end?: string): 'error' | 'success' { + if (end === undefined) { + return start !== '' ? 'success' : 'error'; } + return end && end > start ? 'success' : 'error'; } - getStatusText(hour: { start: string; end: string; error: string }): 'Horaire invalide' | 'Horaire valide' { - if (hour.error === 'wrong' || hour.error === 'incomplete') { - return 'Horaire invalide'; - } else if (hour.error === null) { - return 'Horaire valide'; - } + getStatusText(hour: { start: string; end: string }): string { + return 'Horaire ' + (this.getStatus(hour.start, hour.end) === 'error' ? 'invalide' : 'valide'); } } diff --git a/src/app/shared/components/modal/modal.component.scss b/src/app/shared/components/modal/modal.component.scss index bae1cdb00e5580c8ca61e39a917bd242e9e804a7..b0cf2d3575b54bb66f84037672a98a91ca383965 100644 --- a/src/app/shared/components/modal/modal.component.scss +++ b/src/app/shared/components/modal/modal.component.scss @@ -50,7 +50,7 @@ ::ng-deep .modalContent { display: flex; flex-direction: column; - @include font-bold-18; + @include font-regular-18; gap: 8px; } ::ng-deep .emphasized { diff --git a/src/app/shared/components/print-header/print-header.component.html b/src/app/shared/components/print-header/print-header.component.html index 60777ce78249b736f7e3c6f1b6cc120eb0cfae0b..5787b2ca68bbf1a5a3894534bf752dc12b9e3ef2 100644 --- a/src/app/shared/components/print-header/print-header.component.html +++ b/src/app/shared/components/print-header/print-header.component.html @@ -3,8 +3,6 @@ <div *ngIf="!isOnlineMediationRecap" class="inline"> <div class="logos"> <img src="../../../../assets/logos/metropoleGrandLyon-red.svg" alt="logo métropole" class="mgl" /> - <app-svg-icon class="hide-on-print" [iconClass]="'icon-12'" [folder]="'ico'" [icon]="'cross'" /> - <div class="show-on-print verticalLine"></div> <img src="../../../../assets/logos/resin.svg" alt="logo resin" class="resin" /> </div> <div class="right">resin.grandlyon.com</div> diff --git a/src/app/shared/components/print-header/print-header.component.scss b/src/app/shared/components/print-header/print-header.component.scss index 66d7ed61721c22c66b00dd3ea99dc2f6853a451c..3e1f09d188d856d421510d57bf9313ec19f58400 100644 --- a/src/app/shared/components/print-header/print-header.component.scss +++ b/src/app/shared/components/print-header/print-header.component.scss @@ -33,11 +33,6 @@ height: 30px; } - .verticalLine { - border-left: 1px solid $grey-1; - height: 100%; - } - .mgl { height: 100%; } diff --git a/src/app/shared/components/structure-pmr/structure-pmr.component.html b/src/app/shared/components/structure-pmr/structure-pmr.component.html index 1af3acf298e0126a9989508f67f8a8feb9728590..af41b77d1431ce35d57e1139a82ab7544975eaa8 100644 --- a/src/app/shared/components/structure-pmr/structure-pmr.component.html +++ b/src/app/shared/components/structure-pmr/structure-pmr.component.html @@ -1,7 +1,7 @@ <form class="orientationForm" [formGroup]="structureForm"> <app-go-back *ngIf="isEditMode" (action)="goBack()" /> <div class="title"> - <h3>{{ title ? title : 'La personne a-t-elle besoin d’un accès mobilité réduite ?' }}</h3> + <h3>{{ title ? title : 'La personne a-t-elle besoin d’un accès mobilité réduite ?' }}</h3> <p>Un seul choix possible</p> </div> <p *ngIf="isEditMode && !structureForm.get('pmrAccess').valid" class="missing-information"> diff --git a/src/app/shared/service/print.service.ts b/src/app/shared/service/print.service.ts index 115614975ab825878c8f0f1c6a8205bdad81a8d2..04c750dfcaa19edbafe1d150921ba03dfb9ccc64 100644 --- a/src/app/shared/service/print.service.ts +++ b/src/app/shared/service/print.service.ts @@ -6,27 +6,11 @@ import { Structure } from '../../models/structure.model'; providedIn: 'root', }) export class PrintService { - public isPrinting = false; - public structure: Structure; public structures: Structure[]; constructor(private router: Router) {} - public printDocument(documentName: string, structure: Structure): void { - this.isPrinting = true; - this.structure = structure; - this.router.navigate([ - '/', - { - outlets: { - print: ['print', documentName], - }, - }, - ]); - } - public printDocuments(documentName: string, structures: Structure[]): void { - this.isPrinting = true; this.structures = structures; this.router.navigate([ '/', @@ -41,7 +25,6 @@ export class PrintService { public onDataReady(): void { setTimeout(() => { window.print(); - this.isPrinting = false; this.router.navigate([{ outlets: { print: null } }]); }, 1500); } diff --git a/src/app/structure-list/components/more-filters/more-filters.component.html b/src/app/structure-list/components/more-filters/more-filters.component.html index 16adea4953bfbe386b66f0abbc1d72f12c385f99..9773311159828762928acb60c919d19918cd8479 100644 --- a/src/app/structure-list/components/more-filters/more-filters.component.html +++ b/src/app/structure-list/components/more-filters/more-filters.component.html @@ -3,9 +3,15 @@ <!-- Header for "Other filters" modal --> <div *ngIf="getModalType() === 'moreFilters'" class="moreFiltersHeader"> <h3>Plus de filtres</h3> - <div class="closeIcon" tabindex="0" (click)="closeModal()" (keyup.enter)="closeModal()"> - <app-svg-icon [iconClass]="'icon-40'" [iconColor]="'grey-1'" [icon]="'cross'" [folder]="'ico'" /> - </div> + <app-svg-icon + tabindex="0" + [iconClass]="'icon-24 hover'" + [iconColor]="'grey-1'" + [icon]="'cross'" + [folder]="'ico'" + (click)="closeModal()" + (keyup.enter)="closeModal()" + /> </div> <!-- Filter with single category --> <div *ngIf="categories.length === 1" class="modalContent"> diff --git a/src/app/structure-list/components/more-filters/more-filters.component.scss b/src/app/structure-list/components/more-filters/more-filters.component.scss index 3a803384987200ef6ecc56763e149b37163f7588..f16dc5a5895f3fb674b7d3ac96495e055212e220 100644 --- a/src/app/structure-list/components/more-filters/more-filters.component.scss +++ b/src/app/structure-list/components/more-filters/more-filters.component.scss @@ -41,15 +41,13 @@ flex-direction: column; background: rgba(0, 0, 0, 0.8); .moreFiltersHeader { - position: relative; - @include font-bold-18; - text-align: center; - padding: 16px 16px 0px 16px; - .closeIcon { - cursor: pointer; - position: absolute; - top: 4px; - right: 4px; + display: flex; + align-items: center; + padding: 16px 16px 0px 40px; + h3 { + @include font-bold-18; + width: 100%; + text-align: center; } } .filterModalContainer { diff --git a/src/app/structure-list/components/structure-details/structure-details.component.html b/src/app/structure-list/components/structure-details/structure-details.component.html index 1e989e87586270ec8ea3084ad7a32aa28cba3bed..e6ba1b6ccd517f4d272a547598ea3680cbb83f14 100644 --- a/src/app/structure-list/components/structure-details/structure-details.component.html +++ b/src/app/structure-list/components/structure-details/structure-details.component.html @@ -21,7 +21,7 @@ [clickable]="false" /> </div> - <app-svg-icon [folder]="'ico'" [icon]="'cross'" [iconColor]="'grey-1'" (click)="close()" /> + <app-svg-icon tabindex="0" [folder]="'ico'" [icon]="'cross'" [iconColor]="'grey-1'" (click)="close()" (keyup.enter)="close()" /> </section> <section *ngIf="showButtons" class="actions hide-on-print"> diff --git a/src/app/structure-list/components/structure-details/structure-details.component.scss b/src/app/structure-list/components/structure-details/structure-details.component.scss index f31d1b982707d5a329e8aa9256e2597b1057d002..cfce32bef4be2202c0e7edb69f5bd0b18b121e72 100644 --- a/src/app/structure-list/components/structure-details/structure-details.component.scss +++ b/src/app/structure-list/components/structure-details/structure-details.component.scss @@ -15,7 +15,9 @@ position: fixed; z-index: $structure-details-z-index; height: 100%; - width: 100%; + @media #{$tablet} { + width: 100%; + } h1 { @include font-bold-24; @@ -39,7 +41,7 @@ box-shadow: 0px 12px 24px 0px rgba(0, 0, 0, 0.1); background-color: $white; - @media (max-width: 600px) { + @media #{$tablet} { width: 100%; } } @@ -84,7 +86,7 @@ section.actions { justify-content: space-around; overflow-y: auto; - @media (max-width: 600px) { + @media #{$tablet} { flex-wrap: wrap; row-gap: 16px; } @@ -149,12 +151,9 @@ section .members { section.onlineDemarch { .wrapper { - display: grid; - grid-template-columns: 1fr 1fr; - gap: 8px; - @media #{$large-phone} { - grid-template-columns: 1fr; - } + display: flex; + gap: 12px; + flex-wrap: wrap; } .otherDescription { margin-top: 12px; diff --git a/src/app/structure-list/components/structure-details/structure-details.component.ts b/src/app/structure-list/components/structure-details/structure-details.component.ts index a4e6336b06200187c90bb459ed954fc6611c76fc..bf023d60945a34bc772f8839cfe527cbe9da87ec 100644 --- a/src/app/structure-list/components/structure-details/structure-details.component.ts +++ b/src/app/structure-list/components/structure-details/structure-details.component.ts @@ -1,5 +1,4 @@ import { animate, style, transition, trigger } from '@angular/animations'; -import { Location } from '@angular/common'; import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import * as _ from 'lodash'; @@ -12,7 +11,6 @@ import { AuthService } from '../../../services/auth.service'; import { StructureService } from '../../../services/structure.service'; import { TclService } from '../../../services/tcl.service'; import { UserService } from '../../../services/user.service'; -import { PrintService } from '../../../shared/service/print.service'; import { FreeWorkshop } from '../../../structure/enums/freeWorkshop.enum'; import { Utils } from '../../../utils/utils'; import { AccessModality } from '../../enum/access-modality.enum'; @@ -60,35 +58,26 @@ export class StructureDetailsComponent implements OnInit { public FreeWorkshop = FreeWorkshop; constructor( - private printService: PrintService, private searchService: SearchService, private structureService: StructureService, private tclService: TclService, public profileService: ProfileService, private authService: AuthService, private route: ActivatedRoute, - private location: Location, private router: Router, private utils: Utils, private usersService: UserService, - ) { - this.route.url.subscribe((url) => { - if (url.length > 0 && url[0].path === 'structure') { - this.structure = new Structure(this.printService.structure); - this.printMode = true; - this.initForm(); - } - }); - } + ) {} async ngOnInit(): Promise<void> { this.route.queryParams.subscribe((queryParams) => { if (queryParams.id) { this.structureService.getStructure(queryParams.id).subscribe((structure) => { this.structure = new Structure(structure); + this.isLoading = true; this.initForm(); }); - } else if (!this.printMode) { + } else { this.structure = null; } this.showButtons = !history.state.isOrientation; @@ -114,9 +103,6 @@ export class StructureDetailsComponent implements OnInit { this.searchService.getCategories().subscribe((categories) => { this.categories = categories; this.setServiceCategories(); - if (this.printMode) { - this.printService.onDataReady(); - } this.isLoading = false; }); } @@ -141,28 +127,13 @@ export class StructureDetailsComponent implements OnInit { } public close(): void { - if (this.router.url.startsWith('/acteurs')) { - this.router.navigateByUrl('/acteurs'); - return; - } - this.route.url.subscribe((urls) => { - if (urls.length > 0 && urls[0].path !== 'orientation') { - this.router.navigate(['/acteurs'], { - relativeTo: this.route, - queryParams: { - id: null, - }, - queryParamsHandling: 'merge', - }); - } else { - this.isLoading = true; - this.location.back(); - } - }); + this.router.navigate([]); } public print(): void { - this.printService.printDocument('structure', this.structure); + setTimeout(() => { + window.print(); + }, 1500); } public toggleDeleteModal(): void { diff --git a/src/app/structure/structure-join/structure-join.component.scss b/src/app/structure/structure-join/structure-join.component.scss index 7d9ae067526aef44392890f244d96c11c8e04eac..647ee21b362d239e61c4feeb5dca2b64f43ae3af 100644 --- a/src/app/structure/structure-join/structure-join.component.scss +++ b/src/app/structure/structure-join/structure-join.component.scss @@ -11,6 +11,7 @@ flex-direction: column; align-items: center; padding: 16px 0px 0px; + width: 100%; /* Inside auto layout */ flex: none; @@ -46,22 +47,16 @@ } .btnContainer { - width: 100vw; - max-width: calc(100vw - 96px - 96px); - left: calc(-50vw + 50%); - display: flex; - place-content: center; - border-top: solid 1px $grey-7; - padding: 32px 0 40px; - margin: 0 96px; - overflow-x: hidden; - position: fixed; + position: sticky; bottom: 0; - background-color: $grey-10; - scrollbar-gutter: stable; - @media #{$tablet} { - max-width: calc(100vw - 4%); - margin: 0 2%; + background: $white; + width: 100%; + app-button { + display: flex; + justify-content: center; + gap: 2rem; + padding: 16px 0 24px; + border-top: 1px solid $grey-7; } } diff --git a/src/assets/ico/sprite.svg b/src/assets/ico/sprite.svg index b8962b1dcab30138d500fce62a0f761335380296..fef3c111b454c032e7133e71081110bbd0ad587b 100644 --- a/src/assets/ico/sprite.svg +++ b/src/assets/ico/sprite.svg @@ -33,66 +33,19 @@ <symbol id="mdm" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg"> <path - d="M12.543 6.41671C12.7063 6.41671 12.8346 6.28838 12.8346 6.12504V5.40171C12.8346 5.30838 12.788 5.21504 12.7121 5.16254L7.3338 1.40004C7.13547 1.26004 6.86714 1.26004 6.66297 1.40004L1.29047 5.16254C1.21464 5.21504 1.16797 5.30838 1.16797 5.40171V6.12504C1.16797 6.28838 1.2963 6.41671 1.45964 6.41671H2.33464V11.6667H1.7513C1.43047 11.6667 1.16797 11.9292 1.16797 12.25C1.16797 12.5709 1.43047 12.8334 1.7513 12.8334H12.2513C12.5721 12.8334 12.8346 12.5709 12.8346 12.25C12.8346 11.9292 12.5721 11.6667 12.2513 11.6667H11.668V6.41671H12.543ZM9.33464 9.91671C9.33464 10.2375 9.07214 10.5 8.7513 10.5C8.43047 10.5 8.16797 10.2375 8.16797 9.91671V8.16671L7.48547 9.18754C7.25214 9.53171 6.74464 9.53171 6.51714 9.18754L5.83464 8.16671V9.91671C5.83464 10.2375 5.57214 10.5 5.2513 10.5C4.93047 10.5 4.66797 10.2375 4.66797 9.91671V7.17504C4.66797 6.75504 5.0063 6.41671 5.4263 6.41671C5.67714 6.41671 5.9163 6.54504 6.0563 6.75504L7.0013 8.16671L7.94047 6.75504C8.0863 6.54504 8.31964 6.41671 8.5763 6.41671C8.9963 6.41671 9.33464 6.75504 9.33464 7.17504V9.91671Z" - fill="#DA3635" /> - </symbol> - - <symbol id="user-location" viewBox="0 0 34 34" fill="none" xmlns="http://www.w3.org/2000/svg"> - <circle cx="17" cy="17" r="16.5" fill="#ED3939" fill-opacity="0.15" stroke="white" /> - <circle cx="17" cy="17" r="6" fill="#ED3939" /> - <path opacity="0.35" - d="M19.625 12.9167C18.1502 12.2215 16.7083 12.0417 15.25 12.9167C16.4166 12.9167 18.7694 14.3782 19.3737 15.1918C20.5 16.7084 20.6016 19.0553 20.2083 19.3334C20.4541 19.4724 21.5026 18.3063 21.6666 17C21.8306 15.6948 21.0998 13.6119 19.625 12.9167Z" - fill="white" /> - </symbol> - - <symbol id="conseillerFranceService" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"> - <path d="M24.1752 4.3111L12 11.3612V25.4094L23.5247 45.3111H24.8255L36.3503 25.4094V11.3612L24.1752 4.3111Z" /> - <path fill-rule="evenodd" clip-rule="evenodd" - d="M24.1752 2L38.3503 10.2083V25.9467L25.9785 47.3111H22.3718L10 25.9467V10.2082L24.1752 2ZM12 25.4094V11.3612L24.1752 4.31111L36.3503 11.3612V25.4094L24.8255 45.3111H23.5247L12 25.4094Z" - fill="white" /> - <path - d="M27.661 16.3823H32.2657V13.7028L24.175 9.02002L16.0582 13.7028V23.0682L24.175 27.725L32.2657 23.0682V20.3887H27.661V16.3823Z" - fill="white" /> - <path d="M27.661 20.3886V16.3823L24.1749 14.3531L20.6889 16.3823V20.3886L24.1749 22.3918L27.661 20.3886Z" - fill="#000091" /> - </symbol> - - <symbol id="conseillerFranceServiceSelected" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"> - <path d="M24.1752 4.3111L12 11.3612V25.4094L23.5247 45.3111H24.8255L36.3503 25.4094V11.3612L24.1752 4.3111Z" - fill="white" /> - <path fill-rule="evenodd" clip-rule="evenodd" - d="M24.1752 2L38.3503 10.2083V25.9467L25.9785 47.3111H22.3718L10 25.9467V10.2082L24.1752 2ZM12 25.4094V11.3612L24.1752 4.31111L36.3503 11.3612V25.4094L24.8255 45.3111H23.5247L12 25.4094Z" - fill="#ED3939" /> - <path - d="M27.661 16.3823H32.2657V13.7028L24.175 9.02002L16.0582 13.7028V23.0682L24.175 27.725L32.2657 23.0682V20.3887H27.661V16.3823Z" - fill="#ED3939" /> - <path d="M27.661 20.3886V16.3823L24.1749 14.3531L20.6889 16.3823V20.3886L24.1749 22.3918L27.661 20.3886Z" - fill="#3B3BE7" /> - </symbol> - - <symbol id="conseillerFranceServiceAdded" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"> - <path d="M24.1752 4.3111L12 11.3612V25.4094L23.5247 45.3111H24.8255L36.3503 25.4094V11.3612L24.1752 4.3111Z" - fill="#47C562" /> - <path fill-rule="evenodd" clip-rule="evenodd" - d="M24.1752 2L38.3503 10.2083V25.9467L25.9785 47.3111H22.3718L10 25.9467V10.2082L24.1752 2ZM12 25.4094V11.3612L24.1752 4.31111L36.3503 11.3612V25.4094L24.8255 45.3111H23.5247L12 25.4094Z" - fill="white" /> - <path d="M32.5 23.5746V13.9001L24.25 9L16 13.9001V23.5746L24.25 28.4118L32.5 23.5746Z" fill="white" /> + d="M12.8333 6.41666V5.24999L7 1.16666L1.16667 5.24999V6.41666H2.33334V11.6667H1.16667V12.8333H12.8333V11.6667H11.6667V6.41666H12.8333ZM10.5 11.6667H3.50001V5.24999H10.5V11.6667Z" + fill="#696969" /> <path - d="M30.6177 15.3789C29.9985 14.8285 29.0504 14.8843 28.5 15.5035L23.452 21.1104L20.4396 18.507C19.7939 17.988 18.8497 18.0909 18.3308 18.7366C17.8119 19.3824 17.9147 20.3266 18.5605 20.8455L22.6853 24.3429C23.3085 24.8436 24.2149 24.7677 24.746 24.1702L30.7422 17.4966C31.2926 16.8774 31.2368 15.9293 30.6177 15.3789Z" - fill="#47C562" /> + d="M5.83334 8.16666L7.00001 9.91666L8.16667 8.16666V10.5H9.33334V6.41666H8.16667L7.00001 8.16666L5.83334 6.41666H4.66667V10.5H5.83334V8.16666Z" + fill="#696969" /> </symbol> - <symbol id="conseillerFranceServiceHover" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"> - <path d="M24.1752 4.3111L12 11.3612V25.4094L23.5247 45.3111H24.8255L36.3503 25.4094V11.3612L24.1752 4.3111Z" - fill="#A00000" /> - <path fill-rule="evenodd" clip-rule="evenodd" - d="M24.1752 2L38.3503 10.2083V25.9467L25.9785 47.3111H22.3718L10 25.9467V10.2082L24.1752 2ZM12 25.4094V11.3612L24.1752 4.31111L36.3503 11.3612V25.4094L24.8255 45.3111H23.5247L12 25.4094Z" - fill="white" /> + <symbol id="user-location" viewBox="0 0 34 44" fill="none" xmlns="http://www.w3.org/2000/svg"> + <ellipse cx="17" cy="39" rx="17" ry="5" fill="#333333" fill-opacity="0.25" /> <path - d="M27.661 16.3823H32.2657V13.7028L24.175 9.02002L16.0582 13.7028V23.0682L24.175 27.725L32.2657 23.0682V20.3887H27.661V16.3823Z" - fill="white" fill-opacity="0.8" /> - <path d="M27.661 20.3886V16.3823L24.1749 14.3531L20.6889 16.3823V20.3886L24.1749 22.3918L27.661 20.3886Z" - fill="#010176" /> + d="M16.7837 36.7307L17.4904 37.3909L18.1739 36.7067C19.8607 35.0181 21.5177 33.5089 23.0886 32.0784C23.1471 32.025 23.2056 31.9718 23.264 31.9186C28.4811 27.1684 32.9328 23.1151 32.9328 16.4815C32.9328 7.93228 26.0092 1 17.4664 1C8.92355 1 2 7.93228 2 16.4815C2 19.9604 2.90658 22.5499 4.66826 25.0002C6.37177 27.3696 8.87867 29.6061 12.0062 32.3963L12.0831 32.4649C13.5072 33.7354 15.073 35.1324 16.7837 36.7307ZM22.1271 16.4815C22.1271 19.0598 20.0395 21.1481 17.4664 21.1481C14.8933 21.1481 12.8056 19.0598 12.8056 16.4815C12.8056 13.9032 14.8933 11.8148 17.4664 11.8148C20.0395 11.8148 22.1271 13.9032 22.1271 16.4815Z" + fill="#333333" stroke="white" stroke-width="2" /> + <circle cx="17.5323" cy="16.5113" r="5.39024" fill="white" /> </symbol> <symbol id="address" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg"> diff --git a/src/assets/post/publishLogo.svg b/src/assets/post/publishLogo.svg deleted file mode 100644 index ad671b9fb5acbebf01172a37d076b0066a91f47a..0000000000000000000000000000000000000000 --- a/src/assets/post/publishLogo.svg +++ /dev/null @@ -1,123 +0,0 @@ -<svg width="200" height="200" viewBox="0 0 200 200" fill="none" xmlns="http://www.w3.org/2000/svg"> - <path - d="M22 102.5H48.5L99 106.5H180.75C183.097 106.5 185 104.597 185 102.25C185 99.9028 183.097 98 180.75 98H176.5C175.119 98 174 96.8807 174 95.5C174 94.1193 175.119 93 176.5 93H184.75C190.687 93 195.5 88.1871 195.5 82.25V78.5C195.5 74.3579 192.142 71 188 71C183.858 71 180.5 67.6421 180.5 63.5V61C180.5 57.9624 178.038 55.5 175 55.5C171.962 55.5 169.5 53.0376 169.5 50V46.25C169.5 41.1414 173.641 37 178.75 37H186.25C189.426 37 192 34.4256 192 31.25C192 28.0744 189.426 25.5 186.25 25.5H170.5C167.186 25.5 164.5 22.8137 164.5 19.5C164.5 16.1863 161.814 13.5 158.5 13.5H150.312C147.137 13.5 144.562 10.9256 144.562 7.75C144.562 4.57436 141.988 2 138.812 2H90.5C87.3244 2 84.75 4.57436 84.75 7.75C84.75 10.9256 82.1756 13.5 79 13.5H67.75C65.9551 13.5 64.5 12.0449 64.5 10.25C64.5 8.45507 63.0449 7 61.25 7H24.25C22.4551 7 21 8.45507 21 10.25C21 12.0449 19.5449 13.5 17.75 13.5H11C7.68629 13.5 5 16.1863 5 19.5C5 22.8137 7.68629 25.5 11 25.5H16C20.1421 25.5 23.5 28.8579 23.5 33V35C23.5 38.0376 21.0376 40.5 18 40.5C14.9624 40.5 12.5 42.9624 12.5 46V47C12.5 50.5899 15.4101 53.5 19 53.5H25C29.1421 53.5 32.5 56.8579 32.5 61C32.5 65.1421 29.1421 68.5 25 68.5H18.75C11.1561 68.5 5 74.6561 5 82.25V85.5C5 94.8888 12.6112 102.5 22 102.5Z" - fill="#FFDDDD" /> - <path fill-rule="evenodd" clip-rule="evenodd" - d="M149.554 44.806C149.539 44.806 149.525 44.806 149.51 44.806C149.496 44.806 149.481 44.806 149.467 44.806H135.821C135.799 44.8062 135.776 44.8063 135.754 44.8063C135.732 44.8063 135.709 44.8062 135.687 44.806H135.403V44.7973C131.865 44.6148 129.052 41.6883 129.052 38.1048C129.052 34.4036 132.053 31.4033 135.754 31.4033C135.872 31.4033 135.99 31.4063 136.107 31.4124L136.107 31.403C136.107 24.0007 142.108 18 149.51 18C154.631 18 159.081 20.8714 161.337 25.0918C161.624 25.0668 161.914 25.054 162.208 25.054C167.662 25.054 172.083 29.4756 172.083 34.9299C172.083 35.171 172.075 35.4101 172.058 35.6469C174.437 35.8148 176.316 37.7984 176.316 40.2206C176.316 42.753 174.263 44.8059 171.73 44.8059C171.612 44.8059 171.495 44.8014 171.38 44.7927V44.806H149.554Z" - fill="white" /> - <path fill-rule="evenodd" clip-rule="evenodd" - d="M24 46.9825C23.8347 46.9941 23.668 47 23.5 47C19.3579 47 16 43.4183 16 39C16 34.5817 19.3579 31 23.5 31C25.2006 31 26.769 31.6037 28.0271 32.6212C28.4631 25.575 34.1046 20 41 20C42.7774 20 44.4714 20.3704 46.0145 21.0409C48.7381 17.9455 52.6804 16 57.0658 16C65.2847 16 71.9474 22.8335 71.9474 31.2632C71.9474 32.6076 71.7779 33.9114 71.4596 35.1534C73.542 36.0488 75.0002 38.1187 75.0002 40.5292C75.0002 43.7595 72.3815 46.3782 69.1512 46.3782C69.1006 46.3782 69.0502 46.3775 69 46.3763V47H41H24V46.9825Z" - fill="white" /> - <rect width="109.134" height="109.134" transform="matrix(0.866025 0.5 -0.866025 0.5 99.7188 90.8662)" - fill="#A0C7F0" /> - <path - d="M99.7216 74.0342L194.231 126.054L194.234 128.601L99.7216 183.168L5.20884 128.601L5.20904 126.053L99.7216 74.0342Z" - fill="#4277AF" /> - <rect width="109.134" height="109.134" transform="matrix(0.866025 0.5 -0.866025 0.5 99.7188 71.4873)" - fill="url(#paint0_linear_14622_27034)" /> - <rect width="96.8723" height="64.765" rx="3" transform="matrix(0.866025 0.5 -0.866025 0.5 82.9138 86.6905)" - fill="#769FCB" /> - <path - d="M35.9131 112.14C34.6549 111.417 34.0345 110.46 34.0345 109.512L34 115.036C34 115.984 34.6205 116.94 35.8786 117.664L108.939 159.848L108.973 154.324L35.9131 112.14Z" - fill="#4277AF" /> - <path - d="M158.681 129.161C158.681 129.377 158.638 129.601 158.569 129.816C158.56 129.842 158.56 129.86 158.552 129.885C158.483 130.084 158.379 130.282 158.25 130.48C158.224 130.514 158.207 130.549 158.181 130.583C158.043 130.773 157.871 130.963 157.673 131.144C157.543 131.264 157.38 131.368 157.225 131.48C157.095 131.574 156.983 131.669 156.828 131.755L117.988 154.325C117.609 154.549 117.178 154.721 116.739 154.877C116.584 154.928 116.42 154.98 116.256 155.023C116.049 155.083 115.834 155.135 115.619 155.178C115.36 155.23 115.11 155.282 114.843 155.307C114.783 155.316 114.714 155.325 114.653 155.333C114.3 155.368 113.938 155.394 113.585 155.394C113.525 155.394 113.473 155.394 113.412 155.394C113.059 155.394 112.706 155.368 112.353 155.333C112.301 155.325 112.249 155.325 112.197 155.316C111.853 155.273 111.508 155.213 111.172 155.144C111.112 155.126 111.051 155.118 110.991 155.101C110.689 155.023 110.388 154.937 110.103 154.833C110.052 154.816 110 154.799 109.948 154.782C109.604 154.652 109.276 154.497 108.974 154.325L108.94 159.849C109.224 160.013 109.535 160.159 109.853 160.288C109.871 160.297 109.888 160.297 109.905 160.306C109.957 160.323 110.009 160.34 110.06 160.357C110.241 160.426 110.431 160.495 110.62 160.547C110.724 160.581 110.836 160.599 110.939 160.624C111 160.642 111.06 160.659 111.12 160.668C111.172 160.676 111.224 160.693 111.284 160.711C111.491 160.754 111.706 160.788 111.913 160.823C111.991 160.831 112.068 160.84 112.146 160.849C112.197 160.857 112.249 160.857 112.301 160.866C112.378 160.874 112.456 160.883 112.534 160.892C112.74 160.909 112.956 160.917 113.163 160.926C113.232 160.926 113.3 160.926 113.361 160.926C113.421 160.926 113.473 160.926 113.533 160.926C113.628 160.926 113.723 160.926 113.818 160.926C114.059 160.917 114.291 160.9 114.524 160.883C114.55 160.883 114.576 160.874 114.602 160.874C114.662 160.866 114.731 160.857 114.791 160.849C114.972 160.823 115.153 160.805 115.334 160.771C115.412 160.754 115.489 160.728 115.567 160.711C115.782 160.668 115.998 160.607 116.205 160.556C116.317 160.521 116.437 160.504 116.541 160.469C116.592 160.452 116.635 160.426 116.679 160.409C117.118 160.254 117.549 160.082 117.928 159.858L156.768 137.288C156.794 137.271 156.82 137.253 156.845 137.245C156.966 137.176 157.052 137.09 157.164 137.012C157.319 136.9 157.483 136.797 157.612 136.676C157.621 136.667 157.647 136.659 157.655 136.642C157.802 136.504 157.94 136.366 158.052 136.219C158.078 136.185 158.095 136.15 158.121 136.116C158.147 136.081 158.164 136.047 158.19 136.013C158.233 135.952 158.276 135.9 158.31 135.84C158.379 135.72 158.431 135.599 158.483 135.478C158.491 135.461 158.491 135.444 158.5 135.427C158.509 135.401 158.509 135.383 158.517 135.358C158.543 135.28 158.569 135.202 158.586 135.125C158.612 135.004 158.621 134.884 158.629 134.763C158.629 134.746 158.629 134.728 158.629 134.711L158.681 129.161Z" - fill="#A0C7F1" /> - <path - d="M156.793 126.532C159.292 127.971 159.301 130.307 156.819 131.746L117.979 154.315C115.506 155.755 111.473 155.755 108.974 154.315L35.9137 112.141C33.4146 110.702 33.4146 108.358 35.8879 106.927L74.7275 84.3488C77.2094 82.9097 81.2339 82.9097 83.733 84.3488L156.793 126.532Z" - fill="#EDF7FF" /> - <path d="M77.4526 83.4275L96.3597 120.397L158.553 129.885V128.412L96.8251 119.337L78.0042 83.2723L77.4526 83.4275Z" - fill="#A0C7F1" /> - <path - d="M40.7609 114.21C40.6575 114.167 40.5627 114.124 40.4679 114.081C40.3731 114.038 40.2783 114.003 40.1835 113.952C40.0801 113.9 39.9939 113.84 39.8905 113.788C39.8216 113.745 39.744 113.71 39.6751 113.667C39.5803 113.607 39.4941 113.538 39.4079 113.469C39.3562 113.426 39.2959 113.391 39.2442 113.348C39.158 113.279 39.0891 113.202 39.0201 113.124C38.977 113.081 38.9339 113.047 38.8909 113.004C38.8391 112.943 38.7961 112.874 38.7444 112.814C38.7013 112.754 38.6496 112.702 38.6065 112.642C38.5634 112.581 38.5375 112.521 38.5117 112.452C38.4772 112.392 38.4341 112.323 38.4083 112.263C38.3049 112.004 38.2445 111.745 38.2445 111.478L38.2273 116.899C38.2273 117.097 38.2704 117.304 38.3307 117.502C38.3479 117.562 38.3652 117.623 38.391 117.683C38.4083 117.717 38.4341 117.761 38.4514 117.795C38.4944 117.881 38.5375 117.976 38.5892 118.062C38.6151 118.097 38.6409 118.131 38.6668 118.157C38.7271 118.243 38.7961 118.338 38.8736 118.424C38.9253 118.484 38.9856 118.536 39.046 118.588C39.1063 118.648 39.158 118.709 39.2269 118.769C39.2873 118.821 39.3648 118.872 39.4338 118.924C39.5113 118.976 39.5803 119.036 39.6578 119.088C39.7268 119.131 39.8043 119.165 39.8733 119.208C39.9681 119.269 40.0629 119.32 40.1663 119.372C40.2524 119.415 40.3559 119.458 40.4506 119.501C40.5454 119.544 40.6402 119.588 40.7436 119.631L120.672 151.025L120.689 145.604L40.7609 114.21Z" - fill="#4277AF" /> - <path - d="M157.032 119.743C157.023 119.777 157.014 119.812 157.006 119.838C156.971 119.95 156.928 120.07 156.876 120.182C156.859 120.217 156.851 120.243 156.833 120.277C156.756 120.415 156.67 120.544 156.566 120.682C156.532 120.725 156.489 120.768 156.446 120.811C156.351 120.923 156.247 121.036 156.127 121.139L128.559 144.751C128.352 144.924 128.119 145.087 127.869 145.225C127.809 145.26 127.74 145.294 127.68 145.329C127.49 145.432 127.292 145.518 127.085 145.604C126.999 145.639 126.913 145.673 126.827 145.699C126.663 145.759 126.499 145.803 126.327 145.846C126.146 145.897 125.956 145.949 125.767 145.984C125.534 146.027 125.301 146.07 125.06 146.104C125.008 146.113 124.957 146.121 124.905 146.13C124.586 146.165 124.267 146.182 123.948 146.182C123.897 146.182 123.845 146.182 123.802 146.182C123.483 146.182 123.164 146.165 122.854 146.13C122.811 146.121 122.768 146.121 122.716 146.113C122.406 146.078 122.096 146.018 121.794 145.949C121.734 145.932 121.682 145.923 121.622 145.906C121.303 145.828 120.993 145.734 120.7 145.613L120.682 151.033C120.906 151.12 121.13 151.197 121.363 151.266C121.441 151.292 121.527 151.301 121.604 151.326C121.665 151.344 121.716 151.352 121.777 151.37C121.837 151.387 121.897 151.404 121.966 151.413C122.147 151.447 122.337 151.482 122.527 151.507C122.587 151.516 122.639 151.516 122.699 151.525C122.742 151.533 122.785 151.533 122.837 151.542C122.914 151.551 122.992 151.559 123.078 151.568C123.259 151.585 123.449 151.594 123.63 151.594C123.681 151.594 123.733 151.594 123.785 151.594C123.836 151.594 123.888 151.594 123.931 151.594C124.026 151.594 124.112 151.594 124.207 151.594C124.414 151.585 124.629 151.576 124.836 151.551C124.853 151.551 124.871 151.542 124.896 151.542C124.948 151.533 125 151.525 125.052 151.516C125.224 151.499 125.396 151.473 125.569 151.447C125.638 151.439 125.689 151.413 125.758 151.404C125.948 151.361 126.137 151.318 126.318 151.266C126.422 151.24 126.525 151.223 126.629 151.189C126.697 151.171 126.758 151.137 126.818 151.111C126.904 151.077 126.99 151.051 127.077 151.016C127.283 150.93 127.482 150.844 127.671 150.74C127.732 150.706 127.801 150.68 127.861 150.637C127.887 150.62 127.913 150.611 127.938 150.594C128.162 150.465 128.361 150.318 128.55 150.154L156.118 126.542C156.153 126.508 156.187 126.482 156.222 126.447C156.308 126.37 156.368 126.292 156.437 126.215C156.471 126.172 156.523 126.129 156.558 126.085C156.566 126.077 156.575 126.068 156.583 126.06C156.67 125.948 156.747 125.836 156.808 125.723C156.816 125.706 156.816 125.698 156.825 125.68C156.842 125.646 156.851 125.62 156.868 125.586C156.894 125.525 156.928 125.465 156.954 125.405C156.971 125.353 156.98 125.301 156.997 125.25C157.006 125.215 157.014 125.189 157.023 125.155C157.032 125.137 157.04 125.112 157.04 125.094C157.066 124.982 157.075 124.879 157.075 124.767C157.075 124.75 157.075 124.732 157.075 124.715L157.092 119.295C157.083 119.45 157.066 119.596 157.032 119.743Z" - fill="#A0C7F1" /> - <path - d="M154.592 116.572C157.185 117.589 157.866 119.631 156.117 121.131L128.549 144.743C126.791 146.242 123.275 146.63 120.69 145.613L40.7612 114.211C38.1673 113.194 37.4778 111.16 39.2358 109.652L66.8037 86.0395C68.553 84.5401 72.0776 84.1523 74.6629 85.1692L154.592 116.572Z" - fill="#EDF7FF" /> - <path - d="M66.8057 86.048L99.6647 113.452L156.834 120.269L157.093 119.303L99.6647 112.116L67.3658 85.643L66.8057 86.048Z" - fill="#A0C7F1" /> - <path - d="M67.8948 51.5913C67.8948 51.5913 67.8083 47.5699 74.1985 49.9544C80.5808 52.3389 137.683 86.7688 137.683 86.7688C137.683 86.7688 135.173 96.4171 134.37 96.3935C133.575 96.3699 93.0464 98.6914 93.0464 98.6914L67.8948 51.5913Z" - fill="#823332" /> - <path - d="M75.2245 49.294C75.1931 49.2783 75.1616 49.2547 75.1301 49.2389C75.075 49.2075 75.0121 49.176 74.957 49.1524C74.894 49.1209 74.8389 49.0973 74.776 49.0737C74.7681 49.0737 74.7602 49.0658 74.7524 49.0658C74.7445 49.0658 74.7366 49.0579 74.7287 49.0579C74.6815 49.0422 74.6422 49.0265 74.595 49.0107C74.532 48.9871 74.469 48.9714 74.4061 48.9556C74.3589 48.9399 74.3117 48.932 74.2723 48.9242C74.2644 48.9242 74.2566 48.9163 74.2408 48.9163C74.233 48.9163 74.2172 48.9084 74.2093 48.9084C74.1385 48.8927 74.0756 48.8848 74.0047 48.8769C73.926 48.8691 73.8552 48.8612 73.7765 48.8533H73.7686C73.7608 48.8533 73.7529 48.8533 73.7529 48.8533C73.6821 48.8533 73.6034 48.8455 73.5326 48.8455C73.446 48.8455 73.3673 48.8533 73.2807 48.8612L69.3223 49.2862C69.4797 49.2704 69.6292 49.2626 69.7866 49.2783C69.7944 49.2783 69.8023 49.2783 69.8102 49.2783C69.9676 49.2862 70.125 49.3098 70.2824 49.3413C70.2902 49.3413 70.306 49.3491 70.3138 49.3491C70.4634 49.3806 70.6208 49.4278 70.7703 49.4908C70.7782 49.4908 70.786 49.4986 70.7939 49.4986C70.9513 49.5616 71.1166 49.6403 71.274 49.7269L133.736 85.7858L137.694 85.3609L75.2245 49.294Z" - fill="#FF5D5C" /> - <path - d="M140.22 90.1994C140.22 90.1916 140.22 90.1916 140.22 90.1837V90.1758C140.22 90.0735 140.212 89.9633 140.204 89.861C140.197 89.7273 140.181 89.6013 140.165 89.4676C140.157 89.3967 140.142 89.3338 140.126 89.2629C140.118 89.2157 140.11 89.1685 140.102 89.1213C140.094 89.0583 140.086 89.0032 140.071 88.9403C140.039 88.7908 139.984 88.6491 139.945 88.4996C139.913 88.3894 139.89 88.2792 139.85 88.169C139.772 87.9487 139.677 87.7362 139.583 87.5316C139.551 87.4608 139.528 87.3899 139.488 87.327C139.48 87.3191 139.48 87.3113 139.48 87.3034C139.394 87.146 139.307 86.9886 139.213 86.8469C139.15 86.7525 139.079 86.6581 139.016 86.5636L139.008 86.5558L139 86.5479C138.937 86.4692 138.874 86.3826 138.812 86.3118C138.756 86.241 138.693 86.178 138.631 86.1151C138.575 86.0521 138.512 85.997 138.457 85.9419C138.442 85.9262 138.426 85.9183 138.41 85.9026C138.402 85.8947 138.394 85.8947 138.394 85.8868C138.355 85.8554 138.324 85.816 138.284 85.7845C138.229 85.7373 138.174 85.6901 138.119 85.6507C138.064 85.6114 138.009 85.5642 137.946 85.5248C137.891 85.4855 137.836 85.4461 137.773 85.4147C137.749 85.3989 137.718 85.3832 137.694 85.3674L133.736 85.7924C133.987 85.9341 134.224 86.1072 134.436 86.3118C134.444 86.3197 134.452 86.3197 134.452 86.3275C134.672 86.5243 134.869 86.7446 135.05 86.9886L135.058 86.9965C135.239 87.2326 135.396 87.4923 135.538 87.7677C135.569 87.8306 135.593 87.9093 135.632 87.9723C135.727 88.1769 135.821 88.3894 135.9 88.6097C135.939 88.7199 135.963 88.8301 135.994 88.9403C136.049 89.1449 136.112 89.3495 136.152 89.562C136.159 89.6092 136.167 89.6564 136.175 89.7036C136.222 90.0027 136.262 90.3096 136.27 90.6165C136.27 90.6244 136.27 90.6244 136.27 90.6323C136.277 90.9628 136.262 91.2933 136.222 91.616C136.222 91.6238 136.222 91.6317 136.222 91.6475C136.183 91.978 136.112 92.3085 136.018 92.6233L124.072 132.94C124.009 133.16 123.93 133.365 123.851 133.561C123.851 133.569 123.843 133.577 123.843 133.585C123.765 133.774 123.67 133.955 123.568 134.12C123.56 134.136 123.552 134.152 123.536 134.167C123.442 134.325 123.348 134.466 123.237 134.6C123.222 134.624 123.198 134.647 123.182 134.671C123.072 134.805 122.954 134.939 122.836 135.057C122.757 135.128 122.679 135.19 122.592 135.261C122.529 135.309 122.474 135.364 122.403 135.411C122.317 135.474 122.222 135.521 122.128 135.576C122.065 135.608 122.002 135.655 121.939 135.686C121.837 135.734 121.726 135.773 121.624 135.812C121.569 135.836 121.514 135.859 121.451 135.875C121.286 135.922 121.113 135.954 120.939 135.977L124.898 135.552C125.071 135.537 125.244 135.497 125.409 135.45C125.465 135.434 125.527 135.403 125.583 135.387C125.693 135.348 125.795 135.316 125.897 135.261C125.96 135.23 126.023 135.19 126.086 135.151C126.181 135.096 126.267 135.049 126.362 134.986C126.425 134.939 126.488 134.884 126.551 134.836C126.629 134.773 126.716 134.71 126.795 134.632L126.802 134.624C126.897 134.529 126.991 134.435 127.078 134.333C127.101 134.309 127.125 134.278 127.141 134.246C127.157 134.223 127.172 134.199 127.196 134.175C127.219 134.144 127.251 134.112 127.275 134.073C127.33 133.994 127.385 133.916 127.432 133.837C127.456 133.805 127.471 133.774 127.487 133.735C127.495 133.719 127.503 133.703 127.519 133.687C127.534 133.664 127.55 133.632 127.566 133.609C127.605 133.538 127.644 133.467 127.676 133.396C127.707 133.325 127.747 133.255 127.778 133.176C127.778 133.168 127.786 133.16 127.786 133.152C127.786 133.144 127.794 133.137 127.794 133.129C127.818 133.074 127.841 133.018 127.865 132.963C127.896 132.893 127.92 132.822 127.943 132.743C127.967 132.672 127.991 132.593 128.014 132.523C128.014 132.515 128.014 132.515 128.014 132.507L139.961 92.1905C139.984 92.1196 140 92.0488 140.016 91.978C140.031 91.8993 140.055 91.8285 140.071 91.7498C140.086 91.6711 140.102 91.5924 140.118 91.5215C140.134 91.4428 140.142 91.3641 140.157 91.2854C140.157 91.2618 140.165 91.2382 140.165 91.2146C140.165 91.2067 140.165 91.1989 140.165 91.191C140.173 91.1438 140.181 91.0966 140.181 91.0494C140.189 90.9628 140.197 90.8762 140.204 90.7897C140.212 90.6952 140.212 90.6087 140.212 90.5142C140.22 90.3962 140.22 90.2939 140.22 90.1994Z" - fill="#FF5D5C" /> - <path d="M110.081 117.626L59.0538 89.8621L58.7783 89.2404L109.805 117.005L110.081 117.626Z" fill="#767676" /> - <mask id="path-20-inside-1_14622_27034" fill="white"> - <path - d="M130.927 87.6656C131.186 86.8629 131.43 86.0681 131.659 85.2654C131.674 85.2103 131.69 85.1631 131.706 85.108C131.926 84.3367 132.131 83.5655 132.327 82.7943C132.359 82.6526 132.398 82.5188 132.438 82.3772C132.634 81.5981 132.815 80.8269 132.981 80.0478C133.012 79.8904 133.051 79.7408 133.083 79.5834C133.256 78.7965 133.414 78.0095 133.563 77.2304C133.571 77.1989 133.571 77.1753 133.579 77.1438C133.72 76.3805 133.854 75.625 133.972 74.8695C133.996 74.7278 134.019 74.5862 134.043 74.4445C134.161 73.7048 134.271 72.9729 134.366 72.2489C134.389 72.1072 134.405 71.9656 134.421 71.8239C134.523 71.0763 134.61 70.3444 134.696 69.6204C136.609 52.6612 134.366 38.118 134.342 37.9685L83.2993 10.212C83.3229 10.3537 85.5657 24.9048 83.6534 41.864C83.5747 42.588 83.4803 43.3277 83.378 44.0675C83.3622 44.2091 83.3386 44.3508 83.3229 44.4924C83.2206 45.2165 83.1183 45.9483 83.0002 46.6881C82.9766 46.8297 82.953 46.9714 82.9294 47.1131C82.8035 47.8607 82.6776 48.6162 82.5359 49.3874C82.528 49.4189 82.528 49.4425 82.5202 49.474C82.3706 50.2531 82.2132 51.0322 82.0401 51.827C82.0086 51.9844 81.9771 52.1339 81.9378 52.2913C81.7647 53.0625 81.5837 53.8416 81.3948 54.6129C81.3633 54.7545 81.324 54.8962 81.2846 55.03C81.0879 55.8012 80.8833 56.5724 80.6629 57.3437C80.6472 57.3988 80.6314 57.446 80.6157 57.5011C80.3875 58.2959 80.1435 59.0986 79.8838 59.8934C79.8287 60.0508 79.7815 60.2161 79.7264 60.3735C79.4667 61.1605 79.1991 61.9396 78.9158 62.7265C78.8529 62.8997 78.7899 63.0728 78.727 63.2381C78.5538 63.7103 78.365 64.1824 78.184 64.6546C78.1053 64.8592 78.0187 65.0638 77.94 65.2685C77.7354 65.7721 77.515 66.2836 77.2947 66.7873C77.2317 66.9211 77.1766 67.0627 77.1215 67.1965C76.8382 67.8261 76.5471 68.4478 76.248 69.0695C76.1693 69.2269 76.0906 69.3764 76.0119 69.5338C75.7758 70.006 75.5319 70.4782 75.2879 70.9504C75.162 71.1943 75.0282 71.4383 74.8944 71.6744C74.7764 71.8869 74.6583 72.1072 74.5403 72.3197C74.3829 72.603 74.2176 72.8863 74.0524 73.1696C73.9264 73.3742 73.8084 73.5867 73.6825 73.7913C73.5094 74.0746 73.3283 74.3658 73.1552 74.6491C73.0293 74.8459 72.9034 75.0426 72.7775 75.2394C72.5807 75.5384 72.384 75.8296 72.1872 76.1286C72.0692 76.3096 71.9511 76.4828 71.8252 76.6638C71.7465 76.7739 71.6678 76.8763 71.5891 76.9864C71.1799 77.5609 70.7628 78.1197 70.33 78.6784C70.2198 78.8279 70.1018 78.9775 69.9837 79.1191C69.4879 79.7408 68.9843 80.3547 68.4491 80.9606C68.3468 81.0708 68.2445 81.181 68.1422 81.299C67.7251 81.7633 67.2923 82.2277 66.8516 82.6762C66.7021 82.8258 66.5604 82.9753 66.4109 83.1248C65.8679 83.6678 65.3091 84.2029 64.7346 84.7302C64.7189 84.746 64.6953 84.7617 64.6795 84.7774C64.0972 85.3047 63.4834 85.8084 62.8616 86.312C62.6964 86.4458 62.5311 86.5717 62.3659 86.7055C61.7205 87.2092 61.0674 87.6971 60.3906 88.1693C60.3827 88.1771 60.3669 88.185 60.3591 88.1929C59.8397 88.5549 59.3045 88.909 58.7537 89.2474L109.781 117.004C110.324 116.665 110.859 116.311 111.386 115.949C111.386 115.949 111.394 115.949 111.394 115.941C111.402 115.934 111.41 115.926 111.418 115.926C112.094 115.454 112.748 114.966 113.393 114.47C113.558 114.344 113.724 114.21 113.889 114.076C114.51 113.581 115.116 113.069 115.707 112.542C115.722 112.526 115.738 112.518 115.754 112.502L115.762 112.495C116.336 111.975 116.895 111.44 117.438 110.889C117.588 110.74 117.737 110.59 117.879 110.441C118.319 109.984 118.752 109.528 119.169 109.063C119.24 108.985 119.319 108.906 119.398 108.819C119.421 108.788 119.445 108.756 119.476 108.725C120.004 108.127 120.515 107.513 121.011 106.883C121.129 106.734 121.239 106.592 121.357 106.443C121.79 105.884 122.207 105.325 122.608 104.751C122.663 104.68 122.719 104.609 122.766 104.538C122.789 104.499 122.813 104.46 122.845 104.428C122.97 104.255 123.081 104.074 123.207 103.893C123.403 103.602 123.608 103.303 123.797 103.004C123.923 102.807 124.049 102.602 124.174 102.406C124.355 102.122 124.529 101.839 124.702 101.556C124.828 101.351 124.954 101.139 125.072 100.934C125.237 100.651 125.402 100.367 125.56 100.084C125.678 99.8715 125.796 99.659 125.914 99.4466C125.992 99.3049 126.071 99.1632 126.15 99.0137C126.205 98.9114 126.252 98.8091 126.307 98.7147C126.551 98.2504 126.795 97.7782 127.031 97.306C127.11 97.1486 127.189 96.9991 127.267 96.8417C127.566 96.22 127.857 95.5983 128.141 94.9687C128.204 94.8349 128.259 94.6933 128.322 94.5595C128.542 94.0558 128.755 93.5521 128.959 93.0485C129.046 92.8439 129.125 92.6393 129.211 92.4347C129.4 91.9625 129.581 91.4903 129.754 91.0181C129.801 90.8922 129.849 90.7741 129.896 90.6482C129.911 90.601 129.927 90.5538 129.943 90.4987C130.226 89.7196 130.494 88.9326 130.754 88.1457C130.824 87.9883 130.872 87.823 130.927 87.6656Z" /> - </mask> - <path - d="M130.927 87.6656C131.186 86.8629 131.43 86.0681 131.659 85.2654C131.674 85.2103 131.69 85.1631 131.706 85.108C131.926 84.3367 132.131 83.5655 132.327 82.7943C132.359 82.6526 132.398 82.5188 132.438 82.3772C132.634 81.5981 132.815 80.8269 132.981 80.0478C133.012 79.8904 133.051 79.7408 133.083 79.5834C133.256 78.7965 133.414 78.0095 133.563 77.2304C133.571 77.1989 133.571 77.1753 133.579 77.1438C133.72 76.3805 133.854 75.625 133.972 74.8695C133.996 74.7278 134.019 74.5862 134.043 74.4445C134.161 73.7048 134.271 72.9729 134.366 72.2489C134.389 72.1072 134.405 71.9656 134.421 71.8239C134.523 71.0763 134.61 70.3444 134.696 69.6204C136.609 52.6612 134.366 38.118 134.342 37.9685L83.2993 10.212C83.3229 10.3537 85.5657 24.9048 83.6534 41.864C83.5747 42.588 83.4803 43.3277 83.378 44.0675C83.3622 44.2091 83.3386 44.3508 83.3229 44.4924C83.2206 45.2165 83.1183 45.9483 83.0002 46.6881C82.9766 46.8297 82.953 46.9714 82.9294 47.1131C82.8035 47.8607 82.6776 48.6162 82.5359 49.3874C82.528 49.4189 82.528 49.4425 82.5202 49.474C82.3706 50.2531 82.2132 51.0322 82.0401 51.827C82.0086 51.9844 81.9771 52.1339 81.9378 52.2913C81.7647 53.0625 81.5837 53.8416 81.3948 54.6129C81.3633 54.7545 81.324 54.8962 81.2846 55.03C81.0879 55.8012 80.8833 56.5724 80.6629 57.3437C80.6472 57.3988 80.6314 57.446 80.6157 57.5011C80.3875 58.2959 80.1435 59.0986 79.8838 59.8934C79.8287 60.0508 79.7815 60.2161 79.7264 60.3735C79.4667 61.1605 79.1991 61.9396 78.9158 62.7265C78.8529 62.8997 78.7899 63.0728 78.727 63.2381C78.5538 63.7103 78.365 64.1824 78.184 64.6546C78.1053 64.8592 78.0187 65.0638 77.94 65.2685C77.7354 65.7721 77.515 66.2836 77.2947 66.7873C77.2317 66.9211 77.1766 67.0627 77.1215 67.1965C76.8382 67.8261 76.5471 68.4478 76.248 69.0695C76.1693 69.2269 76.0906 69.3764 76.0119 69.5338C75.7758 70.006 75.5319 70.4782 75.2879 70.9504C75.162 71.1943 75.0282 71.4383 74.8944 71.6744C74.7764 71.8869 74.6583 72.1072 74.5403 72.3197C74.3829 72.603 74.2176 72.8863 74.0524 73.1696C73.9264 73.3742 73.8084 73.5867 73.6825 73.7913C73.5094 74.0746 73.3283 74.3658 73.1552 74.6491C73.0293 74.8459 72.9034 75.0426 72.7775 75.2394C72.5807 75.5384 72.384 75.8296 72.1872 76.1286C72.0692 76.3096 71.9511 76.4828 71.8252 76.6638C71.7465 76.7739 71.6678 76.8763 71.5891 76.9864C71.1799 77.5609 70.7628 78.1197 70.33 78.6784C70.2198 78.8279 70.1018 78.9775 69.9837 79.1191C69.4879 79.7408 68.9843 80.3547 68.4491 80.9606C68.3468 81.0708 68.2445 81.181 68.1422 81.299C67.7251 81.7633 67.2923 82.2277 66.8516 82.6762C66.7021 82.8258 66.5604 82.9753 66.4109 83.1248C65.8679 83.6678 65.3091 84.2029 64.7346 84.7302C64.7189 84.746 64.6953 84.7617 64.6795 84.7774C64.0972 85.3047 63.4834 85.8084 62.8616 86.312C62.6964 86.4458 62.5311 86.5717 62.3659 86.7055C61.7205 87.2092 61.0674 87.6971 60.3906 88.1693C60.3827 88.1771 60.3669 88.185 60.3591 88.1929C59.8397 88.5549 59.3045 88.909 58.7537 89.2474L109.781 117.004C110.324 116.665 110.859 116.311 111.386 115.949C111.386 115.949 111.394 115.949 111.394 115.941C111.402 115.934 111.41 115.926 111.418 115.926C112.094 115.454 112.748 114.966 113.393 114.47C113.558 114.344 113.724 114.21 113.889 114.076C114.51 113.581 115.116 113.069 115.707 112.542C115.722 112.526 115.738 112.518 115.754 112.502L115.762 112.495C116.336 111.975 116.895 111.44 117.438 110.889C117.588 110.74 117.737 110.59 117.879 110.441C118.319 109.984 118.752 109.528 119.169 109.063C119.24 108.985 119.319 108.906 119.398 108.819C119.421 108.788 119.445 108.756 119.476 108.725C120.004 108.127 120.515 107.513 121.011 106.883C121.129 106.734 121.239 106.592 121.357 106.443C121.79 105.884 122.207 105.325 122.608 104.751C122.663 104.68 122.719 104.609 122.766 104.538C122.789 104.499 122.813 104.46 122.845 104.428C122.97 104.255 123.081 104.074 123.207 103.893C123.403 103.602 123.608 103.303 123.797 103.004C123.923 102.807 124.049 102.602 124.174 102.406C124.355 102.122 124.529 101.839 124.702 101.556C124.828 101.351 124.954 101.139 125.072 100.934C125.237 100.651 125.402 100.367 125.56 100.084C125.678 99.8715 125.796 99.659 125.914 99.4466C125.992 99.3049 126.071 99.1632 126.15 99.0137C126.205 98.9114 126.252 98.8091 126.307 98.7147C126.551 98.2504 126.795 97.7782 127.031 97.306C127.11 97.1486 127.189 96.9991 127.267 96.8417C127.566 96.22 127.857 95.5983 128.141 94.9687C128.204 94.8349 128.259 94.6933 128.322 94.5595C128.542 94.0558 128.755 93.5521 128.959 93.0485C129.046 92.8439 129.125 92.6393 129.211 92.4347C129.4 91.9625 129.581 91.4903 129.754 91.0181C129.801 90.8922 129.849 90.7741 129.896 90.6482C129.911 90.601 129.927 90.5538 129.943 90.4987C130.226 89.7196 130.494 88.9326 130.754 88.1457C130.824 87.9883 130.872 87.823 130.927 87.6656Z" - fill="white" stroke="#A0C7F1" stroke-width="2" mask="url(#path-20-inside-1_14622_27034)" /> - <path d="M134.335 37.9768L83.3 10.2125L83.9611 10L134.988 37.7564L134.335 37.9768Z" fill="#769FCB" /> - <path - d="M134.988 37.7563C135.012 37.898 137.27 52.5593 135.35 69.6129C133.564 85.3995 127.74 106.545 110.081 117.618L109.805 116.996C127.181 106.113 132.926 85.2264 134.681 69.6208C136.594 52.6616 134.351 38.1184 134.327 37.9688L134.988 37.7563Z" - fill="#769FCB" /> - <path - d="M115.258 36.5116C115.573 36.6926 115.817 37.1254 115.817 37.4796V38.1249C115.817 38.479 115.565 38.6207 115.25 38.4397L89.5714 23.6132C89.2645 23.44 89.0127 22.9993 89.0127 22.6531V22.0077C89.0127 21.6536 89.2645 21.512 89.5714 21.6851L115.258 36.5116Z" - fill="#5B5B5B" /> - <path - d="M125.803 54.6995C125.977 54.8018 126.118 55.0457 126.118 55.2425C126.118 55.4471 125.977 55.5258 125.803 55.4235L88.4696 33.8763C88.2964 33.774 88.1548 33.53 88.1548 33.3332C88.1548 33.1286 88.2964 33.0499 88.4696 33.1522L125.803 54.6995Z" - fill="#5B5B5B" /> - <path - d="M109.999 51.1355C110.172 51.2379 110.314 51.4818 110.314 51.6786C110.314 51.8832 110.172 51.9619 109.999 51.8596L87.7435 39.0162C87.5704 38.9139 87.4287 38.6699 87.4287 38.4732C87.4287 38.2686 87.5704 38.1899 87.7435 38.2922L109.999 51.1355Z" - fill="#5B5B5B" /> - <path - d="M111.901 56.5013C112.075 56.6036 112.216 56.8476 112.216 57.0443C112.216 57.2489 112.075 57.3276 111.901 57.2253L87.411 43.0835C87.2378 42.9812 87.0962 42.7372 87.0962 42.5405C87.0962 42.3358 87.2378 42.2572 87.411 42.3595L111.901 56.5013Z" - fill="#5B5B5B" /> - <path - d="M101.185 54.4087C101.359 54.511 101.5 54.755 101.5 54.9517C101.5 55.1563 101.359 55.235 101.185 55.1327L86.6659 46.7515C86.4927 46.6492 86.3511 46.4052 86.3511 46.2085C86.3511 46.0039 86.4927 45.9252 86.6659 46.0275L101.185 54.4087Z" - fill="#5B5B5B" /> - <path - d="M121.864 77.5216C122.037 77.6239 122.179 77.8679 122.179 78.0646C122.179 78.2692 122.037 78.3479 121.864 78.2456L84.5301 56.6984C84.357 56.5961 84.2153 56.3521 84.2153 56.1554C84.2153 55.9508 84.357 55.8721 84.5301 55.9744L121.864 77.5216Z" - fill="#5B5B5B" /> - <path - d="M105.276 72.3833C105.449 72.4857 105.591 72.7296 105.591 72.9264C105.591 73.131 105.449 73.2097 105.276 73.1074L83.0208 60.264C82.8477 60.1617 82.7061 59.9177 82.7061 59.721C82.7061 59.5164 82.8477 59.4377 83.0208 59.54L105.276 72.3833Z" - fill="#5B5B5B" /> - <path - d="M106.398 77.7499C106.571 77.8522 106.713 78.0962 106.713 78.2929C106.713 78.4975 106.571 78.5762 106.398 78.4739L81.9078 64.3321C81.7347 64.2298 81.593 63.9858 81.593 63.7891C81.593 63.5844 81.7347 63.5057 81.9078 63.6081L106.398 77.7499Z" - fill="#5B5B5B" /> - <path - d="M95.6673 75.656C95.8405 75.7583 95.9821 76.0022 95.9821 76.199C95.9821 76.4036 95.8405 76.4823 95.6673 76.38L81.1556 67.9987C80.9825 67.8964 80.8408 67.6525 80.8408 67.4557C80.8408 67.259 80.9903 67.1724 81.1556 67.2747L95.6673 75.656Z" - fill="#5B5B5B" /> - <path - d="M133.726 85.7774L95.1333 92.6082L70.2808 49.3328C68.5494 48.955 66.8496 50.1197 66.2043 52.2996L54.2581 92.6161C53.4868 95.2131 54.502 98.2666 56.5324 99.4391L118.994 135.498C121.025 136.671 123.299 135.514 124.062 132.917L136.009 92.6004C136.78 90.0034 135.757 86.9499 133.726 85.7774Z" - fill="#DA3635" /> - <path - d="M142.676 68.3538C143.069 68.3236 143.402 68.2177 143.689 68.0514L146.956 66.1613C146.668 66.3276 146.336 66.4334 145.942 66.4788L142.676 68.3538Z" - fill="#FF5D5C" /> - <path - d="M149.753 70.1376L153.019 68.2475C153.835 67.7636 154.501 66.8412 154.849 65.2383L151.582 67.1285C151.25 68.7313 150.584 69.6537 149.753 70.1376Z" - fill="#FF5D5C" /> - <path - d="M167.474 51.5539L146.184 39.2604C145.654 38.958 145.186 38.9277 144.838 39.1243L141.572 41.0145C141.92 40.8179 142.388 40.8481 142.918 41.1505L164.208 53.4441C165.252 54.0489 166.083 55.5005 166.083 56.6951L166.038 73.2982C166.038 73.8879 165.826 74.3113 165.493 74.5079L168.76 72.6177C169.092 72.4211 169.304 71.9977 169.304 71.408L169.349 54.805C169.364 53.6104 168.518 52.1436 167.474 51.5539Z" - fill="#FF5D5C" /> - <mask id="path-36-inside-2_14622_27034" fill="white"> - <path - d="M164.211 53.4437C165.254 54.0485 166.086 55.5002 166.086 56.6947L166.041 73.2978C166.041 74.4924 165.194 74.9762 164.151 74.3714L151.585 67.1132C150.496 72.2091 146.187 70.4853 143.994 69.2151C143.193 68.7614 142.709 68.3834 142.678 68.3532C144.901 68.1566 145.31 65.6011 145.249 63.4539L142.875 62.0779C141.832 61.473 141 60.0214 141 58.8268L141.045 42.2238C141.045 41.0292 141.892 40.5453 142.936 41.1502L164.211 53.4437Z" /> - </mask> - <path - d="M164.211 53.4437C165.254 54.0485 166.086 55.5002 166.086 56.6947L166.041 73.2978C166.041 74.4924 165.194 74.9762 164.151 74.3714L151.585 67.1132C150.496 72.2091 146.187 70.4853 143.994 69.2151C143.193 68.7614 142.709 68.3834 142.678 68.3532C144.901 68.1566 145.31 65.6011 145.249 63.4539L142.875 62.0779C141.832 61.473 141 60.0214 141 58.8268L141.045 42.2238C141.045 41.0292 141.892 40.5453 142.936 41.1502L164.211 53.4437Z" - fill="white" /> - <path - d="M164.211 53.4437L164.462 53.0111L164.461 53.0108L164.211 53.4437ZM166.086 56.6947L166.586 56.6961V56.6947H166.086ZM166.041 73.2978L165.541 73.2964V73.2978H166.041ZM164.151 74.3714L164.401 73.9388L164.401 73.9384L164.151 74.3714ZM151.585 67.1132L151.835 66.6803L151.24 66.3364L151.096 67.0088L151.585 67.1132ZM143.994 69.2151L144.245 68.7824L144.24 68.7799L143.994 69.2151ZM142.678 68.3532L142.634 67.8551L141.568 67.9494L142.325 68.7067L142.678 68.3532ZM145.249 63.4539L145.749 63.4398L145.741 63.1611L145.5 63.0213L145.249 63.4539ZM142.875 62.0779L142.624 62.5105L142.624 62.5105L142.875 62.0779ZM141 58.8268L140.5 58.8255V58.8268H141ZM141.045 42.2238L141.545 42.2251V42.2238H141.045ZM142.936 41.1502L142.685 41.5827L142.685 41.5831L142.936 41.1502ZM163.96 53.8763C164.389 54.1246 164.801 54.5661 165.106 55.0975C165.412 55.629 165.586 56.2051 165.586 56.6947H166.586C166.586 55.9898 166.344 55.2428 165.973 54.5986C165.602 53.9544 165.077 53.3676 164.462 53.0111L163.96 53.8763ZM165.586 56.6934L165.541 73.2964L166.541 73.2992L166.586 56.6961L165.586 56.6934ZM165.541 73.2978C165.541 73.7882 165.371 74 165.24 74.0748C165.107 74.1504 164.833 74.1889 164.401 73.9388L163.9 74.804C164.512 75.1588 165.183 75.2577 165.734 74.9439C166.287 74.6294 166.541 74.002 166.541 73.2978H165.541ZM164.401 73.9384L151.835 66.6803L151.335 67.5462L163.9 74.8044L164.401 73.9384ZM151.096 67.0088C150.838 68.2138 150.404 68.9547 149.912 69.3993C149.426 69.8395 148.838 70.031 148.187 70.0517C146.849 70.0942 145.328 69.4098 144.245 68.7824L143.743 69.6477C144.853 70.2905 146.583 71.1031 148.219 71.0512C149.056 71.0246 149.887 70.7709 150.583 70.1408C151.275 69.5151 151.787 68.5606 152.074 67.2177L151.096 67.0088ZM144.24 68.7799C143.854 68.5611 143.545 68.3611 143.331 68.2136C143.224 68.1399 143.141 68.0797 143.085 68.0374C143.012 67.9828 143.009 67.9768 143.032 67.9996L142.325 68.7067C142.363 68.7447 142.432 68.7973 142.483 68.8363C142.551 68.8875 142.645 68.9558 142.763 69.0371C142.999 69.1996 143.333 69.4154 143.748 69.6502L144.24 68.7799ZM142.722 68.8512C144.074 68.7317 144.864 67.8733 145.284 66.8206C145.695 65.7937 145.78 64.5366 145.749 63.4398L144.749 63.468C144.779 64.5184 144.69 65.6126 144.356 66.4495C144.032 67.2605 143.506 67.778 142.634 67.8551L142.722 68.8512ZM145.5 63.0213L143.126 61.6453L142.624 62.5105L144.998 63.8865L145.5 63.0213ZM143.126 61.6453C142.697 61.397 142.285 60.9555 141.98 60.4241C141.674 59.8925 141.5 59.3165 141.5 58.8268H140.5C140.5 59.5318 140.742 60.2788 141.113 60.9229C141.484 61.5672 142.009 62.1539 142.624 62.5105L143.126 61.6453ZM141.5 58.8282L141.545 42.2251L140.545 42.2224L140.5 58.8255L141.5 58.8282ZM141.545 42.2238C141.545 41.7334 141.715 41.5216 141.846 41.4468C141.979 41.3711 142.253 41.3327 142.685 41.5827L143.186 40.7176C142.574 40.3628 141.903 40.2639 141.352 40.5776C140.799 40.8922 140.545 41.5196 140.545 42.2238H141.545ZM142.685 41.5831L163.961 53.8766L164.461 53.0108L143.186 40.7173L142.685 41.5831Z" - fill="#FF5D5C" mask="url(#path-36-inside-2_14622_27034)" /> - <path - d="M158.844 58.8272C158.844 57.1336 157.65 55.0772 156.183 54.2304C154.852 53.4592 153.748 53.9431 153.552 55.304C153.355 53.7314 152.251 51.9622 150.921 51.191C149.454 50.3442 148.259 51.0247 148.259 52.7031C148.259 53.4592 148.501 54.2909 148.909 55.062L153.521 63.4241L158.118 60.5057C158.557 60.2184 158.844 59.6438 158.844 58.8272Z" - fill="#DA3635" /> - <defs> - <linearGradient id="paint0_linear_14622_27034" x1="86.6776" y1="54.5845" x2="23.1101" y2="137.189" - gradientUnits="userSpaceOnUse"> - <stop stop-color="white" /> - <stop offset="1" stop-color="#D9EDFF" /> - </linearGradient> - </defs> -</svg> \ No newline at end of file diff --git a/src/assets/scss/_search.scss b/src/assets/scss/_search.scss index 47fc9b99ebb8c1eeee3eebfde45c35d3164758b6..b51de14cf840b2268e5e3f3c9dda79a7f2147b16 100644 --- a/src/assets/scss/_search.scss +++ b/src/assets/scss/_search.scss @@ -3,7 +3,7 @@ @import 'typography'; @import 'z-index'; -@media #{$large-tablet} { +@media #{$tablet} { .isntPhoneContent { display: none !important; } @@ -17,7 +17,6 @@ gap: 8px; .filters { display: flex; - flex-wrap: wrap; gap: 8px; } }