From 6f330f042392c00cba14cdbc1e4a6ce5617a7bfe Mon Sep 17 00:00:00 2001 From: Remko Date: Mon, 18 Dec 2023 11:57:23 +0100 Subject: [PATCH 1/3] added Zutphen theme --- pwa/package-lock.json | 8 ++++---- pwa/package.json | 2 +- pwa/src/services/getConfig.ts | 5 +++++ pwa/src/styling/index.css | 1 + pwa/static/configFiles/zutphen.json | 14 ++++++++++++++ 5 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 pwa/static/configFiles/zutphen.json diff --git a/pwa/package-lock.json b/pwa/package-lock.json index 4ac09021..76f8a2ce 100644 --- a/pwa/package-lock.json +++ b/pwa/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "dependencies": { "@conduction/components": "2.2.36", - "@conduction/theme": "1.0.56", + "@conduction/theme": "1.1.1", "@fortawesome/fontawesome-svg-core": "^6.5.0", "@fortawesome/free-brands-svg-icons": "6.5.0", "@fortawesome/free-regular-svg-icons": "6.5.0", @@ -2156,9 +2156,9 @@ } }, "node_modules/@conduction/theme": { - "version": "1.0.56", - "resolved": "https://registry.npmjs.org/@conduction/theme/-/theme-1.0.56.tgz", - "integrity": "sha512-h1nIUMkQdnSeD0zBfepLH4Jb27tI7/lLev07RBpWmVkwei2DGeUwG3bfEJ2HChTPu5EyfItHu/37UnqRE7ADNg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@conduction/theme/-/theme-1.1.1.tgz", + "integrity": "sha512-H4YGWybK8HABGqpb8sOhIEmLxtDKddEqEzNpifuMt67R844Atac17P7xtVFZoisMbDnEIyXxBIBGzwRM2Qriqw==", "dependencies": { "@nl-design-system-unstable/rotterdam-design-tokens": "^1.0.0-alpha.100" } diff --git a/pwa/package.json b/pwa/package.json index 0337d0d8..c61c15f6 100644 --- a/pwa/package.json +++ b/pwa/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "@conduction/components": "2.2.36", - "@conduction/theme": "1.0.56", + "@conduction/theme": "1.1.1", "@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/services/getConfig.ts b/pwa/src/services/getConfig.ts index 64df321e..5a8ab445 100644 --- a/pwa/src/services/getConfig.ts +++ b/pwa/src/services/getConfig.ts @@ -17,6 +17,7 @@ import Waddinxveen from "./../../static/configFiles/waddinxveen.json"; import RijssenHolten from "./../../static/configFiles/rijssen-holten.json"; import HoekscheWaard from "./../../static/configFiles/hoeksche-waard.json"; import Texel from "./../../static/configFiles/texel.json"; +import Zutphen from "./../../static/configFiles/zutphen.json"; import { TGroupedSelectOption } from "@conduction/components/lib/components/formFields/select/select"; export const getConfig = (themeOrDomainName: string): Record | undefined => { @@ -42,6 +43,9 @@ export const getConfig = (themeOrDomainName: string): Record | unde case "open.xxllnc.nl": case "xxllnc-theme": return Xxllnc; + case "open.zutphen.nl": + case "zutphen-theme": + return Zutphen; case "koophulpje.nl": case "open-webconcept-theme": // case "localhost": // development purposes @@ -100,6 +104,7 @@ export const availableThemes: TGroupedSelectOption[] = [ { label: "Texel", value: "texel" }, { label: "Tubbergen", value: "tubbergen-theme" }, { label: "Waddinxveen", value: "waddinxveen" }, + { label: "Zutphen", value: "zutphen-theme" }, ], }, { diff --git a/pwa/src/styling/index.css b/pwa/src/styling/index.css index 06490b45..f60bfb71 100644 --- a/pwa/src/styling/index.css +++ b/pwa/src/styling/index.css @@ -14,6 +14,7 @@ @import "../../node_modules/@conduction/theme/municipalities/open-webconcept-design-tokens/dist/index.css"; @import "../../node_modules/@conduction/theme/municipalities/dimpact-design-tokens/dist/index.css"; @import "../../node_modules/@conduction/theme/municipalities/commonground-design-tokens/dist/index.css"; +@import "../../node_modules/@conduction/theme/municipalities/zutphen-design-tokens/dist/index.css"; /* Design Tokens maintained by Frameless */ @import "../../node_modules/@utrecht/design-tokens/dist/theme.css"; diff --git a/pwa/static/configFiles/zutphen.json b/pwa/static/configFiles/zutphen.json new file mode 100644 index 00000000..c28feb4c --- /dev/null +++ b/pwa/static/configFiles/zutphen.json @@ -0,0 +1,14 @@ +{ + "GATSBY_SHOW_THEME_SWITCHER": "false", + "GATSBY_API_BASE_URL": "https://api.common-gateway.commonground.nu/api", + "GATSBY_NL_DESIGN_THEME_CLASSNAME": "zutphen-theme", + "GATSBY_FAVICON_URL": "https://zutphen.nl/themes/zutphen/favicon.ico", + "GATSBY_ORGANISATION_NAME": "Gemeente Zutphen", + "GATSBY_JUMBOTRON_IMAGE_URL": "https://zutphen.nl/sites/default/files/2023-10/Bult-05020-pano-WebsiteKlein.jpg", + "GATSBY_FOOTER_LOGO_HREF": "https://zutphen.nl/", + "GATSBY_FOOTER_CONTENT": "https://raw.githubusercontent.com/ConductionNL/woo-website-template/main/docs/FooterContent.json", + "GATSBY_FOOTER_CONTENT_HEADER": "", + "GATSBY_OIDN_NUMBER": "", + "GATSBY_SHOW_CATEGORY": "true", + "GATSBY_SHOW_ORGANIZATION": "true" +} From 70faafc4bcac71060fa39e2759b39af2ae789c11 Mon Sep 17 00:00:00 2001 From: Remko Date: Mon, 18 Dec 2023 12:01:13 +0100 Subject: [PATCH 2/3] updated conduction/component package --- pwa/package-lock.json | 10 +++++----- pwa/package.json | 2 +- pwa/src/hooks/useEnvironment.ts | 2 +- .../templateParts/footer/FooterTemplate.module.css | 11 +++++++++++ .../TableResultsTemplate.module.css | 2 ++ 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/pwa/package-lock.json b/pwa/package-lock.json index 76f8a2ce..e42355b6 100644 --- a/pwa/package-lock.json +++ b/pwa/package-lock.json @@ -8,7 +8,7 @@ "name": "product-website-template", "version": "1.0.0", "dependencies": { - "@conduction/components": "2.2.36", + "@conduction/components": "2.2.41", "@conduction/theme": "1.1.1", "@fortawesome/fontawesome-svg-core": "^6.5.0", "@fortawesome/free-brands-svg-icons": "6.5.0", @@ -2136,9 +2136,9 @@ } }, "node_modules/@conduction/components": { - "version": "2.2.36", - "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.36.tgz", - "integrity": "sha512-9HBZYUbwW8gdZv0ufBS6ZDmjqA/Kk5XrpyoyhizAAmXmZFFHtFrUc8EliV4+OcrOZlJ9pEvVTKXqg3JT/6MBuQ==", + "version": "2.2.41", + "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.41.tgz", + "integrity": "sha512-S6jfnwvgmBfljYezEJ97xZgeDALzSPY95PY25wg0tv3xt1ikVxNqWqQTijAGZitxyycTqd/500HvBOJlPkFosA==", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.4.2", "@fortawesome/free-solid-svg-icons": "^6.4.2", @@ -2152,7 +2152,7 @@ "react-paginate": "^8.2.0", "react-select": "5.8.0", "react-tabs": "^6.0.2", - "react-tooltip": "^5.23.0" + "react-tooltip": "^5.24.0" } }, "node_modules/@conduction/theme": { diff --git a/pwa/package.json b/pwa/package.json index c61c15f6..23a2ce90 100644 --- a/pwa/package.json +++ b/pwa/package.json @@ -22,7 +22,7 @@ "prepare": "cd .. && husky install" }, "dependencies": { - "@conduction/components": "2.2.36", + "@conduction/components": "2.2.41", "@conduction/theme": "1.1.1", "@fortawesome/fontawesome-svg-core": "^6.5.0", "@fortawesome/free-brands-svg-icons": "6.5.0", diff --git a/pwa/src/hooks/useEnvironment.ts b/pwa/src/hooks/useEnvironment.ts index c83a981a..753445d3 100644 --- a/pwa/src/hooks/useEnvironment.ts +++ b/pwa/src/hooks/useEnvironment.ts @@ -73,7 +73,7 @@ export const useEnvironment = () => { const themeSwitcherMiddleware = () => { switch (window.location.hostname) { case "koophulpje.nl": - // case "localhost": // development purposes + case "localhost": // development purposes window.sessionStorage.setItem("SHOW_THEME_SWITCHER", "true"); break; } diff --git a/pwa/src/templates/templateParts/footer/FooterTemplate.module.css b/pwa/src/templates/templateParts/footer/FooterTemplate.module.css index de6400f1..c99477d2 100644 --- a/pwa/src/templates/templateParts/footer/FooterTemplate.module.css +++ b/pwa/src/templates/templateParts/footer/FooterTemplate.module.css @@ -7,6 +7,17 @@ padding-inline-end: var(--utrecht-page-margin-inline-end); } +.container > * { + font-size: var( + --utrecht-page-footer-font-size, + var(--utrecht-document-font-size) + ); + font-family: var( + --utrecht-page-footer-font-family, + var(--utrecht-document-font-family) + ); +} + .footer { display: flex; align-items: center; diff --git a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.module.css b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.module.css index 3f6ae2b3..a92e9c28 100644 --- a/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.module.css +++ b/pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.module.css @@ -23,6 +23,8 @@ .tableBody { border: var(--utrecht-table-body-border); + border-block-end: var(--utrecht-table-body-border-block-end-width) solid + var(--utrecht-table-body-border-block-end-color); } .tableBody .tableRow:nth-child(odd) { From a3faa8b09fb573c7d245d7a8e3251e063aebbdea Mon Sep 17 00:00:00 2001 From: Remko Date: Mon, 18 Dec 2023 12:02:20 +0100 Subject: [PATCH 3/3] cleanup --- pwa/src/hooks/useEnvironment.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pwa/src/hooks/useEnvironment.ts b/pwa/src/hooks/useEnvironment.ts index 753445d3..c83a981a 100644 --- a/pwa/src/hooks/useEnvironment.ts +++ b/pwa/src/hooks/useEnvironment.ts @@ -73,7 +73,7 @@ export const useEnvironment = () => { const themeSwitcherMiddleware = () => { switch (window.location.hostname) { case "koophulpje.nl": - case "localhost": // development purposes + // case "localhost": // development purposes window.sessionStorage.setItem("SHOW_THEME_SWITCHER", "true"); break; }