diff --git a/pwa/package-lock.json b/pwa/package-lock.json index adadce5..6b183c9 100644 --- a/pwa/package-lock.json +++ b/pwa/package-lock.json @@ -8,8 +8,8 @@ "name": "product-website-template", "version": "1.0.0", "dependencies": { - "@conduction/components": "2.2.47", - "@conduction/theme": "1.1.22", + "@conduction/components": "2.2.48", + "@conduction/theme": "1.1.25", "@fortawesome/fontawesome-svg-core": "^6.5.0", "@fortawesome/free-brands-svg-icons": "6.5.0", "@fortawesome/free-regular-svg-icons": "^6.5.0", @@ -2136,29 +2136,87 @@ } }, "node_modules/@conduction/components": { - "version": "2.2.47", - "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.47.tgz", - "integrity": "sha512-CYZzS29ZLl2KfqW8ZboXhsiX6+h0aM1Q2Cj65vJ/NflFDBvguQ9w7JC6ouCYGGS+YuNEGlAEFQzHjkqWnWcqoQ==", + "version": "2.2.48", + "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.48.tgz", + "integrity": "sha512-1Ig4LaKWBolX8ZPVFOUWWYrikrBFEJ4/iLY0dbkOY+1SdqwicZCNszhLtMxF5Cu4ujgwoxijiSMCIZsNVxuWfA==", "dependencies": { - "@fortawesome/fontawesome-svg-core": "^6.4.2", - "@fortawesome/free-solid-svg-icons": "^6.4.2", + "@fortawesome/fontawesome-svg-core": "^6.5.1", + "@fortawesome/free-solid-svg-icons": "^6.5.1", "@fortawesome/react-fontawesome": "^0.2.0", - "@utrecht/component-library-react": "2.0.0", - "clsx": "^2.0.0", - "gatsby": "^5.12.9", + "@utrecht/component-library-react": "3.0.0", + "clsx": "^2.1.0", + "gatsby": "^5.13.3", "react": "^18.2.0", - "react-datepicker": "^4.23.0", - "react-hook-form": "7.48.2", + "react-datepicker": "^6.3.0", + "react-hook-form": "7.51.0", "react-paginate": "^8.2.0", "react-select": "5.8.0", "react-tabs": "^6.0.2", - "react-tooltip": "^5.24.0" + "react-tooltip": "^5.26.3" + } + }, + "node_modules/@conduction/components/node_modules/@utrecht/component-library-react": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@utrecht/component-library-react/-/component-library-react-3.0.0.tgz", + "integrity": "sha512-7ftpjtQ6ygIMqlB+pWQZAT7psFo1oXkbBSlbVw/uMV5OABRDX5t3V2lN/UDTPjdMRtcj8ZBYl19zPcfkV+Gc5w==", + "dependencies": { + "clsx": "1.2.1", + "lodash.chunk": "4.2.0" + }, + "peerDependencies": { + "date-fns": "^2.30.0", + "react": "18", + "react-dom": "18", + "react-vega": "^7.6.0", + "vega": "^5.25.0" + }, + "peerDependenciesMeta": { + "date-fns": { + "optional": true + }, + "react-vega": { + "optional": true + }, + "vega": { + "optional": true + } + } + }, + "node_modules/@conduction/components/node_modules/@utrecht/component-library-react/node_modules/clsx": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", + "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/@conduction/components/node_modules/clsx": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.0.tgz", + "integrity": "sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/@conduction/components/node_modules/react-hook-form": { + "version": "7.51.0", + "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.51.0.tgz", + "integrity": "sha512-BggOy5j58RdhdMzzRUHGOYhSz1oeylFAv6jUSG86OvCIvlAvS7KvnRY7yoAf2pfEiPN7BesnR0xx73nEk3qIiw==", + "engines": { + "node": ">=12.22.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/react-hook-form" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17 || ^18" } }, "node_modules/@conduction/theme": { - "version": "1.1.22", - "resolved": "https://registry.npmjs.org/@conduction/theme/-/theme-1.1.22.tgz", - "integrity": "sha512-3WgssudeUFDOK7ORoJ7huPn7HcgN9GLxUy/w7l/CPL0N0jrZmnQYvVOjWW5+7jq+txrpNGCNstLirXAT3S8Vtg==", + "version": "1.1.25", + "resolved": "https://registry.npmjs.org/@conduction/theme/-/theme-1.1.25.tgz", + "integrity": "sha512-PjY6A6Qj0fQbNS8SvWL45KM2fZ3H8MmaAhkp8OOxCjq3nZvTVSMoPmxZyR0ok1k59vcdxySN25vuXWQam9KgJQ==", "hasInstallScript": true, "dependencies": { "@nl-design-system-unstable/rotterdam-design-tokens": "^1.0.0-alpha.100", @@ -2325,13 +2383,50 @@ } }, "node_modules/@floating-ui/dom": { - "version": "1.5.3", - "license": "MIT", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.3.tgz", + "integrity": "sha512-RnDthu3mzPlQ31Ss/BTwQ1zjzIhr3lk1gZB1OC56h/1vEtaXkESrOqL5fQVMfXpwGtRwX+YsZBdyHtJMQnkArw==", "dependencies": { - "@floating-ui/core": "^1.4.2", - "@floating-ui/utils": "^0.1.3" + "@floating-ui/core": "^1.0.0", + "@floating-ui/utils": "^0.2.0" } }, + "node_modules/@floating-ui/dom/node_modules/@floating-ui/utils": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz", + "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==" + }, + "node_modules/@floating-ui/react": { + "version": "0.26.9", + "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.9.tgz", + "integrity": "sha512-p86wynZJVEkEq2BBjY/8p2g3biQ6TlgT4o/3KgFKyTWoJLU1GZ8wpctwRqtkEl2tseYA+kw7dBAIDFcednfI5w==", + "dependencies": { + "@floating-ui/react-dom": "^2.0.8", + "@floating-ui/utils": "^0.2.1", + "tabbable": "^6.0.1" + }, + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" + } + }, + "node_modules/@floating-ui/react-dom": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.8.tgz", + "integrity": "sha512-HOdqOt3R3OGeTKidaLvJKcgg75S6tibQ3Tif4eyd91QnIJWr0NLvoXFpJA/j8HqkFSL68GDca9AuyWEHlhyClw==", + "dependencies": { + "@floating-ui/dom": "^1.6.1" + }, + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" + } + }, + "node_modules/@floating-ui/react/node_modules/@floating-ui/utils": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz", + "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==" + }, "node_modules/@floating-ui/utils": { "version": "0.1.6", "license": "MIT" @@ -2353,16 +2448,26 @@ } }, "node_modules/@fortawesome/fontawesome-svg-core": { - "version": "6.5.0", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.1.tgz", + "integrity": "sha512-MfRCYlQPXoLlpem+egxjfkEuP9UQswTrlCOsknus/NcMoblTH2g0jPrapbcIb04KGA7E2GZxbAccGZfWoYgsrQ==", "hasInstallScript": true, - "license": "MIT", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.5.0" + "@fortawesome/fontawesome-common-types": "6.5.1" }, "engines": { "node": ">=6" } }, + "node_modules/@fortawesome/fontawesome-svg-core/node_modules/@fortawesome/fontawesome-common-types": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.1.tgz", + "integrity": "sha512-GkWzv+L6d2bI5f/Vk6ikJ9xtl7dfXtoRu3YGE6nq0p/FFqA1ebMOAWg3XgRyb0I6LYyYkiAo+3/KrwuBp8xG7A==", + "hasInstallScript": true, + "engines": { + "node": ">=6" + } + }, "node_modules/@fortawesome/free-brands-svg-icons": { "version": "6.5.0", "hasInstallScript": true, @@ -2386,16 +2491,26 @@ } }, "node_modules/@fortawesome/free-solid-svg-icons": { - "version": "6.5.0", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.5.1.tgz", + "integrity": "sha512-S1PPfU3mIJa59biTtXJz1oI0+KAXW6bkAb31XKhxdxtuXDiUIFsih4JR1v5BbxY7hVHsD1RKq+jRkVRaf773NQ==", "hasInstallScript": true, - "license": "(CC-BY-4.0 AND MIT)", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.5.0" + "@fortawesome/fontawesome-common-types": "6.5.1" }, "engines": { "node": ">=6" } }, + "node_modules/@fortawesome/free-solid-svg-icons/node_modules/@fortawesome/fontawesome-common-types": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.1.tgz", + "integrity": "sha512-GkWzv+L6d2bI5f/Vk6ikJ9xtl7dfXtoRu3YGE6nq0p/FFqA1ebMOAWg3XgRyb0I6LYyYkiAo+3/KrwuBp8xG7A==", + "hasInstallScript": true, + "engines": { + "node": ">=6" + } + }, "node_modules/@fortawesome/react-fontawesome": { "version": "0.2.0", "license": "MIT", @@ -3989,14 +4104,6 @@ "node": ">=12" } }, - "node_modules/@popperjs/core": { - "version": "2.11.8", - "license": "MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/@sideway/address": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz", @@ -5992,8 +6099,9 @@ "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==" }, "node_modules/classnames": { - "version": "2.3.2", - "license": "MIT" + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", + "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==" }, "node_modules/cli-boxes": { "version": "2.2.1", @@ -7561,12 +7669,14 @@ } }, "node_modules/es5-ext": { - "version": "0.10.62", + "version": "0.10.64", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz", + "integrity": "sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==", "hasInstallScript": true, - "license": "ISC", "dependencies": { "es6-iterator": "^2.0.3", "es6-symbol": "^3.1.3", + "esniff": "^2.0.1", "next-tick": "^1.1.0" }, "engines": { @@ -7970,6 +8080,25 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/esniff": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz", + "integrity": "sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==", + "dependencies": { + "d": "^1.0.1", + "es5-ext": "^0.10.62", + "event-emitter": "^0.3.5", + "type": "^2.7.2" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esniff/node_modules/type": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", + "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==" + }, "node_modules/espree": { "version": "9.6.1", "license": "BSD-2-Clause", @@ -14175,21 +14304,30 @@ } }, "node_modules/react-datepicker": { - "version": "4.24.0", - "license": "MIT", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-6.4.0.tgz", + "integrity": "sha512-TXvxJVCOKZVqJGsZgf1fvzqhuSySaGR84OGyppn46BVsvlyOizfBzOnwDMxi+1erIThlVhYyIK7+1Tb5fieXgg==", "dependencies": { - "@popperjs/core": "^2.11.8", + "@floating-ui/react": "^0.26.2", "classnames": "^2.2.6", - "date-fns": "^2.30.0", + "date-fns": "^3.3.1", "prop-types": "^15.7.2", - "react-onclickoutside": "^6.13.0", - "react-popper": "^2.3.0" + "react-onclickoutside": "^6.13.0" }, "peerDependencies": { "react": "^16.9.0 || ^17 || ^18", "react-dom": "^16.9.0 || ^17 || ^18" } }, + "node_modules/react-datepicker/node_modules/date-fns": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz", + "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/kossnocorp" + } + }, "node_modules/react-dev-utils": { "version": "12.0.1", "license": "MIT", @@ -14351,7 +14489,8 @@ }, "node_modules/react-onclickoutside": { "version": "6.13.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.13.0.tgz", + "integrity": "sha512-ty8So6tcUpIb+ZE+1HAhbLROvAIJYyJe/1vRrrcmW+jLsaM+/powDRqxzo6hSh9CuRZGSL1Q8mvcF5WRD93a0A==", "funding": { "type": "individual", "url": "https://github.com/Pomax/react-onclickoutside/blob/master/FUNDING.md" @@ -14371,19 +14510,6 @@ "react": "^16 || ^17 || ^18" } }, - "node_modules/react-popper": { - "version": "2.3.0", - "license": "MIT", - "dependencies": { - "react-fast-compare": "^3.0.1", - "warning": "^4.0.2" - }, - "peerDependencies": { - "@popperjs/core": "^2.0.0", - "react": "^16.8.0 || ^17 || ^18", - "react-dom": "^16.8.0 || ^17 || ^18" - } - }, "node_modules/react-property": { "version": "2.0.2", "license": "MIT" @@ -14483,10 +14609,11 @@ } }, "node_modules/react-tooltip": { - "version": "5.24.0", - "license": "MIT", + "version": "5.26.3", + "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-5.26.3.tgz", + "integrity": "sha512-MpYAws8CEHUd/RC4GaDCdoceph/T4KHM5vS5Dbk8FOmLMvvIht2ymP2htWdrke7K6lqPO8rz8+bnwWUIXeDlzg==", "dependencies": { - "@floating-ui/dom": "^1.0.0", + "@floating-ui/dom": "^1.6.1", "classnames": "^2.3.0" }, "peerDependencies": { @@ -16095,6 +16222,11 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/tabbable": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz", + "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==" + }, "node_modules/table": { "version": "6.8.1", "license": "BSD-3-Clause", @@ -16834,13 +16966,6 @@ "node": ">=0.10.0" } }, - "node_modules/warning": { - "version": "4.0.3", - "license": "MIT", - "dependencies": { - "loose-envify": "^1.0.0" - } - }, "node_modules/watchpack": { "version": "2.4.0", "license": "MIT", diff --git a/pwa/package.json b/pwa/package.json index f7ec065..00166d9 100644 --- a/pwa/package.json +++ b/pwa/package.json @@ -23,8 +23,8 @@ "prepare": "cd .. && husky install" }, "dependencies": { - "@conduction/components": "2.2.47", - "@conduction/theme": "1.1.22", + "@conduction/components": "2.2.48", + "@conduction/theme": "1.1.25", "@fortawesome/fontawesome-svg-core": "^6.5.0", "@fortawesome/free-brands-svg-icons": "6.5.0", "@fortawesome/free-regular-svg-icons": "^6.5.0", diff --git a/pwa/src/Content.module.css b/pwa/src/Content.module.css index a18cef4..34edf1f 100644 --- a/pwa/src/Content.module.css +++ b/pwa/src/Content.module.css @@ -4,6 +4,10 @@ .header { z-index: 2; + border-block-start: var(--utrecht-page-header-border-block-start); + border-block-end: var(--utrecht-page-header-border-block-end); + border-inline-start: var(--utrecht-page-header-border-inline-start); + border-inline-end: var(--utrecht-page-header-border-inline-end); } .pageContent { diff --git a/pwa/src/styling/index.css b/pwa/src/styling/index.css index ed3611f..2fd60b1 100644 --- a/pwa/src/styling/index.css +++ b/pwa/src/styling/index.css @@ -19,6 +19,7 @@ @import "../../node_modules/@conduction/theme/municipalities/gouda-design-tokens/dist/index.css"; @import "../../node_modules/@conduction/theme/municipalities/zuiddrecht-design-tokens/dist/index.css"; @import "../../node_modules/@conduction/theme/municipalities/sloterburg-design-tokens/dist/index.css"; +@import "../../node_modules/@conduction/theme/municipalities/roosendaal-design-tokens/dist/index.css"; /* Design Tokens maintained by Frameless */ @import "../../node_modules/@utrecht/design-tokens/dist/theme.css"; diff --git a/pwa/src/templates/templateParts/footer/FooterTemplate.module.css b/pwa/src/templates/templateParts/footer/FooterTemplate.module.css index 32865ad..2f1c5a7 100644 --- a/pwa/src/templates/templateParts/footer/FooterTemplate.module.css +++ b/pwa/src/templates/templateParts/footer/FooterTemplate.module.css @@ -105,6 +105,10 @@ .dynamicSectionTitle { margin-block-end: 18px !important; color: var(--utrecht-page-footer-heading-color, inherit) !important; + font-family: var( + --utrecht-page-footer-heading-font-family, + inherit + ) !important; } .dynamicSectionContent {