From 8a5e0eddd4f033aa9168d93a8dde555c74e66d6e Mon Sep 17 00:00:00 2001 From: Remko Date: Mon, 18 Dec 2023 13:38:03 +0100 Subject: [PATCH 1/9] added Zutphen theme --- pwa/package-lock.json | 8 ++--- pwa/package.json | 2 +- .../ApplicationCard.module.css | 1 + .../categoryCard/CategoryCard.module.css | 1 + .../componentCard/ComponentCard.module.css | 1 + .../OrganizationCard.module.css | 1 + pwa/src/services/getConfig.ts | 19 +++++++--- pwa/src/styling/index.css | 1 + .../ComponentsDetailTemplate.tsx | 28 +++++++-------- .../footer/FooterTemplate.module.css | 7 +++- .../header/HeaderTemplate.module.css | 2 ++ .../table/TableResultTemplate.module.css | 1 + .../ThemeSwitcherTopBar.tsx | 2 +- pwa/static/.env.development | 2 +- pwa/static/configFiles/zutphen.json | 35 +++++++++++++++++++ 15 files changed, 84 insertions(+), 27 deletions(-) create mode 100644 pwa/static/configFiles/zutphen.json diff --git a/pwa/package-lock.json b/pwa/package-lock.json index b6cca98cb..3a59352d3 100644 --- a/pwa/package-lock.json +++ b/pwa/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "dependencies": { "@conduction/components": "2.2.41", - "@conduction/theme": "1.0.61", + "@conduction/theme": "1.1.1", "@fortawesome/fontawesome-svg-core": "^6.4.2", "@fortawesome/free-brands-svg-icons": "6.4.2", "@fortawesome/free-regular-svg-icons": "6.4.2", @@ -2215,9 +2215,9 @@ } }, "node_modules/@conduction/theme": { - "version": "1.0.61", - "resolved": "https://registry.npmjs.org/@conduction/theme/-/theme-1.0.61.tgz", - "integrity": "sha512-Qnp85U3bm5e0jToN+3AKCpziEmbz2V+YwNqfw0p/Kcq0pJI2FDX8TH+VEYHP0wfYtb0uSBoN22qytQlNaDdS8w==", + "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 afce25311..bca70a7f1 100644 --- a/pwa/package.json +++ b/pwa/package.json @@ -24,7 +24,7 @@ }, "dependencies": { "@conduction/components": "2.2.41", - "@conduction/theme": "1.0.61", + "@conduction/theme": "1.1.1", "@fortawesome/fontawesome-svg-core": "^6.4.2", "@fortawesome/free-brands-svg-icons": "6.4.2", "@fortawesome/free-regular-svg-icons": "6.4.2", diff --git a/pwa/src/components/applicationCard/ApplicationCard.module.css b/pwa/src/components/applicationCard/ApplicationCard.module.css index 3d2152161..6c923fe75 100644 --- a/pwa/src/components/applicationCard/ApplicationCard.module.css +++ b/pwa/src/components/applicationCard/ApplicationCard.module.css @@ -16,6 +16,7 @@ } .description { + color: var(--conduction-card-wrapper-color) !important; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; diff --git a/pwa/src/components/categoryCard/CategoryCard.module.css b/pwa/src/components/categoryCard/CategoryCard.module.css index 44f55fbd5..d75f7324b 100644 --- a/pwa/src/components/categoryCard/CategoryCard.module.css +++ b/pwa/src/components/categoryCard/CategoryCard.module.css @@ -21,6 +21,7 @@ } .description { + color: var(--conduction-card-wrapper-color) !important; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; diff --git a/pwa/src/components/componentCard/ComponentCard.module.css b/pwa/src/components/componentCard/ComponentCard.module.css index 5f629716e..0ae1f9ffa 100644 --- a/pwa/src/components/componentCard/ComponentCard.module.css +++ b/pwa/src/components/componentCard/ComponentCard.module.css @@ -16,6 +16,7 @@ } .description { + color: var(--conduction-card-wrapper-color) !important; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; diff --git a/pwa/src/components/organizationCard/OrganizationCard.module.css b/pwa/src/components/organizationCard/OrganizationCard.module.css index 28fc37601..e0f94030a 100644 --- a/pwa/src/components/organizationCard/OrganizationCard.module.css +++ b/pwa/src/components/organizationCard/OrganizationCard.module.css @@ -28,6 +28,7 @@ } .description { + color: var(--conduction-card-wrapper-color) !important; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; diff --git a/pwa/src/services/getConfig.ts b/pwa/src/services/getConfig.ts index f60b48357..7321198fc 100644 --- a/pwa/src/services/getConfig.ts +++ b/pwa/src/services/getConfig.ts @@ -9,6 +9,7 @@ import Leiden from "./../../static/configFiles/leiden.json"; import Dimpact from "./../../static/configFiles/dimpact.json"; import OpenWebconcept from "./../../static/configFiles/open-webconcept.json"; import OpenCatalogi from "./../../static/configFiles/opencatalogi.json"; +import Zutphen from "./../../static/configFiles/zutphen.json"; export const getConfig = (themeOrDomainName: string): Record | undefined => { switch (themeOrDomainName) { @@ -33,6 +34,8 @@ export const getConfig = (themeOrDomainName: string): Record | unde return Dimpact; case "open-webconcept-theme": return OpenWebconcept; + case "zutphen-theme": + return Zutphen; default: return CommonGround; @@ -41,17 +44,23 @@ export const getConfig = (themeOrDomainName: string): Record | unde export const availableThemes: TGroupedSelectOption[] = [ { - label: "Alle overheidsorganisaties", + label: "Alle organisaties", options: [ { label: "OpenCatalogi", value: "opencatalogi-theme" }, { label: "Common Ground", value: "commonground-theme" }, { label: "Conduction", value: "conduction-theme" }, - { label: "Rotterdam", value: "rotterdam-theme" }, + { label: "OpenWebconcept", value: "open-webconcept-theme" }, + { label: "Dimpact", value: "dimpact-theme" }, + ], + }, + { + label: "Gemeenten", + options: [ { label: "Epe", value: "epe-theme" }, - { label: "Noordwijk", value: "noordwijk-theme" }, { label: "Leiden", value: "leiden-theme" }, - { label: "Dimpact", value: "dimpact-theme" }, - { label: "OpenWebconcept", value: "open-webconcept-theme" }, + { label: "Noordwijk", value: "noordwijk-theme" }, + { label: "Rotterdam", value: "rotterdam-theme" }, + { label: "Zutphen", value: "zutphen-theme" }, ], }, ]; diff --git a/pwa/src/styling/index.css b/pwa/src/styling/index.css index 688538be0..7090235cd 100644 --- a/pwa/src/styling/index.css +++ b/pwa/src/styling/index.css @@ -20,6 +20,7 @@ @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/opencatalogi-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/@nl-design-system-unstable/rotterdam-design-tokens/dist/index.css"; diff --git a/pwa/src/templates/componentDetail/ComponentsDetailTemplate.tsx b/pwa/src/templates/componentDetail/ComponentsDetailTemplate.tsx index ffc744fc9..bf943c9cc 100644 --- a/pwa/src/templates/componentDetail/ComponentsDetailTemplate.tsx +++ b/pwa/src/templates/componentDetail/ComponentsDetailTemplate.tsx @@ -551,51 +551,51 @@ export const ComponentsDetailTemplate: React.FC =

Meer informatie

- + {gemma?.applicatiefunctie && ( - - Applicatiefunctie + + Applicatiefunctie: {gemma.applicatiefunctie} )} {gemma?.bedrijfsfuncties && ( - - Bedrijfsfuncties + + Bedrijfsfuncties: {gemma.bedrijfsfuncties.join(", ")} )} {gemma?.bedrijfsservices && ( - - Bedrijfsservices + + Bedrijfsservices: {gemma.bedrijfsservices.join(", ")} )} {gemma?.model && ( - - Model + + Model: {gemma.model} )} {gemma?.referentieComponenten?.length > 0 && ( - - Referentie componenten + + Referentie componenten: {gemma.referentieComponenten.join(", ")} )} {legal?.license && ( - - Licentie + + Licentie: {legal.license} )} {_getComponent.data.embedded?.nl?.upl?.length > 0 && ( - + {t("Products")} {_getComponent.data.embedded?.nl?.upl.map((product: string, idx: number) => ( diff --git a/pwa/src/templates/templateParts/footer/FooterTemplate.module.css b/pwa/src/templates/templateParts/footer/FooterTemplate.module.css index 5dfe23d52..37bb3ccf0 100644 --- a/pwa/src/templates/templateParts/footer/FooterTemplate.module.css +++ b/pwa/src/templates/templateParts/footer/FooterTemplate.module.css @@ -7,6 +7,11 @@ 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; @@ -115,7 +120,7 @@ .contentGrid { grid-template-columns: repeat(3, minmax(0, 1fr)); } - + .logoAndConduction { margin-top: 38px; display: flex; diff --git a/pwa/src/templates/templateParts/header/HeaderTemplate.module.css b/pwa/src/templates/templateParts/header/HeaderTemplate.module.css index 86fb468cb..705e975da 100644 --- a/pwa/src/templates/templateParts/header/HeaderTemplate.module.css +++ b/pwa/src/templates/templateParts/header/HeaderTemplate.module.css @@ -1,9 +1,11 @@ .headerTopBar { display: none; } + .headerMiddleBar { background-color: var(--conduction-primary-top-nav-background-color, inherit); box-shadow: 0px 10px 13px -14px #000000; + margin-block-end: 20px; } .secondaryNavContainer { diff --git a/pwa/src/templates/templateParts/resultsTemplates/table/TableResultTemplate.module.css b/pwa/src/templates/templateParts/resultsTemplates/table/TableResultTemplate.module.css index 46fae5df0..13cb96cb2 100644 --- a/pwa/src/templates/templateParts/resultsTemplates/table/TableResultTemplate.module.css +++ b/pwa/src/templates/templateParts/resultsTemplates/table/TableResultTemplate.module.css @@ -22,6 +22,7 @@ .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) { diff --git a/pwa/src/templates/templateParts/themeSwitcherTopBar/ThemeSwitcherTopBar.tsx b/pwa/src/templates/templateParts/themeSwitcherTopBar/ThemeSwitcherTopBar.tsx index 9fa5ee871..c0fb30d57 100644 --- a/pwa/src/templates/templateParts/themeSwitcherTopBar/ThemeSwitcherTopBar.tsx +++ b/pwa/src/templates/templateParts/themeSwitcherTopBar/ThemeSwitcherTopBar.tsx @@ -46,7 +46,7 @@ export const ThemeSwitcherTopBar: React.FC = () => { return (
- Open Catalogi organisatie switcher + OpenCatalogi organisatie switcher Verander van overheidsorganisatie om andere catalogi te bekijken
diff --git a/pwa/static/.env.development b/pwa/static/.env.development index b68c2e133..0ed7f99cb 100644 --- a/pwa/static/.env.development +++ b/pwa/static/.env.development @@ -17,7 +17,7 @@ GATSBY_PAGE_TITLE= # Header -GATSBY_HEADER_LOGO_URL=https://www.rotterdam.nl/images/logo-base.svg +GATSBY_HEADER_LOGO_URL=https://dev.opencatalogi.nl/static/logo_OpenCatalogi-8b1b0a001c3f37dae4d3f69b5964ec72.png GATSBY_HEADER_SHOW_LOGIN="false" GATSBY_HEADER_CONTENT=https://raw.githubusercontent.com/OpenCatalogi/web-app/main/pwa/src/templates/templateParts/header/HeaderContent.json diff --git a/pwa/static/configFiles/zutphen.json b/pwa/static/configFiles/zutphen.json new file mode 100644 index 000000000..86183a786 --- /dev/null +++ b/pwa/static/configFiles/zutphen.json @@ -0,0 +1,35 @@ +{ + "GATSBY_SHOW_THEME_SWITCHER": "false", + + "GATSBY_GITHUB_REPOSITORY_NAME": "web-app", + "GATSBY_USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX": "false", + + "GATSBY_API_URL": "https://api.opencatalogi.nl/api", + "GATSBY_BASE_URL": "https://api.opencatalogi.nl", + + "GATSBY_NL_DESIGN_THEME_CLASSNAME": "zutphen-theme", + + "GATSBY_FAVICON_URL": "https://zutphen.nl/themes/zutphen/favicon.ico", + + "GATSBY_PAGE_TITLE": "Zutphen's Catalogi", + + "GATSBY_HEADER_LOGO_URL": "", + "GATSBY_HEADER_SHOW_LOGIN": "false", + "GATSBY_HEADER_CONTENT": "https://raw.githubusercontent.com/OpenCatalogi/web-app/main/pwa/src/templates/templateParts/header/HeaderContent.json", + + "GATSBY_JUMBOTRON_TITLE": "", + "GATSBY_JUMBOTRON_SUBTITLE": "", + "GATSBY_JUMBOTRON_IMAGE_PLACEMENT": "false", + "GATSBY_JUMBOTRON_IMAGE_URL": "", + "GATSBY_JUMBOTRON_DESCRIPTION": "", + "GATSBY_JUMBOTRON_ISCARD": "false", + "GATSBY_JUMBOTRON_SEARCHFORM": "true", + "GATSBY_JUMBOTRON_CONTAINER": "true", + + "GATSBY_FOOTER_SHOW_CREATOR": "false", + "GATSBY_FOOTER_LOGO_URL": "false", + "GATSBY_FOOTER_CONTENT": "https://raw.githubusercontent.com/OpenCatalogi/web-app/25995205e1dbb043822d1c58c5c23f8e6f77ff7e/pwa/src/templates/templateParts/footer/FooterContent.json", + "GATSBY_FOOTER_CONTENT_HEADER": "heading-2", + + "GATSBY_OPTIONAL_START_PAGE": "" +} From 8926764224c668bc01f1992f75070ae2acd6bb3d Mon Sep 17 00:00:00 2001 From: Remko Date: Tue, 19 Dec 2023 14:58:50 +0100 Subject: [PATCH 2/9] updated search query --- pwa/src/hooks/useEnvironment.ts | 2 + pwa/static/configFiles/common-ground.json | 1 + pwa/static/configFiles/conduction.json | 1 + pwa/static/configFiles/dimpact.json | 1 + pwa/static/configFiles/epe.json | 70 ++++++++++----------- pwa/static/configFiles/leiden.json | 1 + pwa/static/configFiles/noordwijk.json | 1 + pwa/static/configFiles/open-webconcept.json | 1 + pwa/static/configFiles/opencatalogi.json | 1 + pwa/static/configFiles/rotterdam.json | 1 + pwa/static/configFiles/zutphen.json | 1 + 11 files changed, 46 insertions(+), 35 deletions(-) diff --git a/pwa/src/hooks/useEnvironment.ts b/pwa/src/hooks/useEnvironment.ts index 45c029789..bea389afc 100644 --- a/pwa/src/hooks/useEnvironment.ts +++ b/pwa/src/hooks/useEnvironment.ts @@ -32,6 +32,7 @@ export const useEnvironment = () => { window.sessionStorage.setItem("API_URL", process.env.GATSBY_API_URL ?? ""); window.sessionStorage.setItem("BASE_URL", process.env.GATSBY_BASE_URL ?? ""); window.sessionStorage.setItem("NL_DESIGN_THEME_CLASSNAME", process.env.GATSBY_NL_DESIGN_THEME_CLASSNAME ?? ""); + window.sessionStorage.setItem("GITHUB_ORGANIZATION_URL", process.env.GATSBY_GITHUB_ORGANIZATION_URL ?? ""); window.sessionStorage.setItem("FAVICON_URL", process.env.GATSBY_FAVICON_URL ?? ""); window.sessionStorage.setItem("PAGE_TITLE", process.env.GATSBY_PAGE_TITLE ?? ""); window.sessionStorage.setItem("HEADER_LOGO_URL", process.env.GATSBY_HEADER_LOGO_URL ?? ""); @@ -68,6 +69,7 @@ export const useEnvironment = () => { window.sessionStorage.setItem("API_URL", config.GATSBY_API_URL ?? ""); window.sessionStorage.setItem("BASE_URL", config.GATSBY_BASE_URL ?? ""); window.sessionStorage.setItem("NL_DESIGN_THEME_CLASSNAME", config.GATSBY_NL_DESIGN_THEME_CLASSNAME ?? ""); + window.sessionStorage.setItem("GITHUB_ORGANIZATION_URL", config.GATSBY_GITHUB_ORGANIZATION_URL ?? ""); window.sessionStorage.setItem("FAVICON_URL", config.GATSBY_FAVICON_URL ?? ""); window.sessionStorage.setItem("PAGE_TITLE", config.GATSBY_PAGE_TITLE ?? ""); window.sessionStorage.setItem("HEADER_LOGO_URL", config.GATSBY_HEADER_LOGO_URL ?? ""); diff --git a/pwa/static/configFiles/common-ground.json b/pwa/static/configFiles/common-ground.json index 458fe3f3d..ecf193d1a 100644 --- a/pwa/static/configFiles/common-ground.json +++ b/pwa/static/configFiles/common-ground.json @@ -9,6 +9,7 @@ "GATSBY_NL_DESIGN_THEME_CLASSNAME": "commonground-theme", + "GATSBY_GITHUB_ORGANIZATION_URL": "", "GATSBY_FAVICON_URL": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAALQAAAC0CAYAAAA9zQYyAAAgy0lEQVR4nO2deZwdV3Xnv+dW1dt6l1qbJWuxZEm2MXgHY8AQfzCBkBCIPzgeSNhhhmRC+MxMgBAHAiTDhPCBmUwYYIAJBAgTMBgwYQ2bwYBXjI1kSZYsS9bSWnrv1++9qrp3/rhVr1ubpe5Xr5ea+/18nlrd77169ap+dercc8+5R6LvXHJQFAWjcTgWLaLAaBo+sEJ5olDzvUsORwsIxNpoHwh1ZArGzPceORyzRwSA0AdEBJnf3XE4WkMEjEGco+HIFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7QjlzhBO3IFU7Qjlzhz/cOZI8kP+T0TxuT/mdO9mahkh4G+2P6sTLN3850CBcyi1zQApLeZAwYDSayP4mTs2bs6xB7hkQBHog37b0k78mfyA1gjDQFrMSgFChlQEzz0Jz4BsAIxghagzb2BSIgYljIOl98ghYFCJgYdN0+jAbxwSuD35U8KqBKiArAaIxuQFyDeAKicfvQdbsd8UAV7EM87MWRntnFhzFWhCLgKw2BBs/YrxMrwoZiou4z0fCoR4pGpIi1EHiGgh9T9A2VQkxHMcYPNJ4XW9HHArEQxVbsSsyCs+KLRNCJZTURRGOgI/A7oeMCpHMrdF8CHRuR8mooLLXPeaWTt2DFG9cgGoX6MUztAIzvhrHtmPGdMLkfwhF7cfhlkICm5V8EpJbU9zReEIMRqhM+ew+XefRImT1HSzwxVOTYRMDYpEctUkSxECcWXAko0QQelANNVylmSWfI6p4G6/trbFw2ybqlNXo6G/YCiYQ4VOgFJG6JvnNJXSkKZiEao9Qax5P2EfQhvZdD//XIkmdA5yZrVZ+U9Iud5WjrOozvxgzdDcfuxAzfD43joALwO2jeFRYgsRY8ZVCFGEQ4NlTk/n1d/OKxbrYfKjMwWqAWWovticHzDJ7QFKGA/XqpX51Y+FjbbaeCL/qGpZ0Rm5ZPcsXaMa5eP8b6/kl7B2gowkjNm7BFQGsaC1PQqZCjcWuVO7ciq34bWfki6LjgxNee4PvKtJHM6Y7qtC95gkshJ/rTANX9mKP/hjn0NRh50IrZ70ruFAtD2FoLShlUMcaEHvfu7ebb2/q4b28XR8d9BCj6msAz1mcm8afB3njOsF2Z9h/B+s1gRR7FQj0SYi10lTQXrazyvK3DPPvCYfp66xAKYejNubAXqKDF+rBx1VrM3iuRtX+IrPjNaS5E6gKk4s3qqE3zm0WYimgazLE7Yd9nMcd+CDqEoDt57fy4Ium58koxUd3j+48s4fZf9rPtYJlYC+VCTOBNiTDLc2stuhVrrIXJUBHHwsqekBsuGuZ3nnaM1curTYvtqbkR1sITtCgr1HAEurYiF7wZWfWSKctpYk5rSdtGcuGIN/Wnwbsxez5iha0K4FXsHWQOibUQFOwg7c4dS/jsz5bz60MVfM9QCeLkxMqcDWdVEvloRIpqQ9FXiXnhpYPcfPUA/X114prX9M/bycIStPh2sKeKyPrXIxvelPitJFGIxAWZL9JBYXIxmUN3YHZ9ECZ2Q6F3TiIiTatcjtk/UOGjP1rNnbu68ZSNSBgj6Hk8h4INBUaxMF73WNkd8sprj/DSy4+AGMKG11ZrvUAEnVjcxiD0XoW6+D3Qc6l9Kg2nLSSMTq4rBeEwZucHMPs/Z8OFqtA231prwfdt6O0r963gE3euZHRS0VWyd635FPLJpMJOLfbTN4zzluc/wboVE0RVv+nLZ/658y7odHAVjSNrX41s/XNQxYVhkc/GtIvNHPo6ZttfQjwGXkfmoo61EBRjxqoBH/z2Wr67vZfOYoTvGWK9cI+RJFGUsZpHd0nzJzcc4ManHSOuqbYMFudX0KLs4Mpo5OK/Qtb8vv270XPoI7fKNB97fCf6gTdDda91lTISdayFoBzx2OEO3v3VDTx6tEhvJcp8oNdOPGUIY6Fa9/iDZxzlTb/xBFEomScRpYKee/WIB3EdVAF1xSesmE2MjS4sFjFDMyJjIujcjLrq01BcDrpGFjlfsRaCSsQv9/Twln/exOODBfoqEbFePGKGNEYOPZWIT921nI99fw1+QTcngbJmbhUkys7U+Z2oK/8R+p9tBSEeC9rFeDLEt9+hvBp5yvvtLGaLXyUV888fWcKf3XYB1VDRUYyJFrCL8WQYY8cB/Z0hn/n5Mn6ybQl+KWqLyzR3gk7dDK+EuvKT0Ht5IuZFMvv+ZIgPJkb6n4MsvxHC0VkPaFM3495dfdz61fUYYygscH/5XEiTpIq+5lN3raRe8/G87OP4cyRoSTLhNOqyj0DPZfkR8wkYZM3NWBM9c79AayEoRezY38Wtt68HbF7FQopitII2UC5odh0tcd9jPaiCzvxCnRtBi4JwDLnkr2HpdfkUcxqZ6b0MSivt3WgGvocxghfEHB0ucetXN1CPIfBMbsQ8Ha3h3n2dbfEy2y9o8aFxHNnwBmT1TfkUM9A8O0EPFJdZQZ9jfMoAiCHWir++Yz2HR33KQfsGTvOJMTaR6tBwEWKbzJQl7VWWKDsD2HcNsvltp04lZ8pJOcwn5GOc5vl0/zI3EzLj72i04FciPv7d87l7bydLOsK2DQDTZCNJsusMJ0ZNpudqwFRxQJayE8F+vzbcfdoo6MRvVkXUJf/VpmGmSUWZMi0e/KQWUc7w/PRkp1ZuWEllTFxLcqo9ziW+prXglyLu39XL5+9ZRk+lPWJWgp2CjhT1JKHfU9atmUpkgigSIm1TR22BgKHga3xlMskTETFoLfRVQvA0JvTJMvOkfYIWz7oam98BXVvaMJU9Xcie/f/YNszwAzD2CEwewEQjoG2OMF4JCXqhuBI61iOdm6HzQhs7bu7XaRKSznl3knKm6l6oHbIX8FlOlAHE09RqPn//g9U25TLT05smBRkmGh5aCyu6Q7auqrJ15STrltTo7wgpBRqVWM3JhmJo0ufwSIHHB4s8dqzE/qEiQxNWKqUgpuCbliZ3tIGLVlancrAzvH7bI2hRttSp+ynI+tdlPwOYbk88qA1gDt6GOfxNmNgF0URy3/SwtYPpewzGxM38aaMCKCxFOrfA0uuQ5TdA5+YpMc94nw2g7H5E41BYctYZQ62FoBLz+R+tYsdAiSWVKFPr7CnDRN3G+K9cO84LLx3kqnWj9HU1pkqyTr71C6DMVKAm9BgYLfDrQx38bHc39z/eycBoQMHXlJMJknMVtgBRLPR1RFy3aQRCydyHbs/Ut3gQDqMu/ziseEG21jndVlTF7P24TQ6qHbb50qrECUWzp+7Y9A3ZSRBda+Y4S981yJpbYMWNyUvOUdTpPtUOo+/6LVtdk9YmnuktBpRvODJS5PWf2UI9Ai8jtzL1j8dqHk9bU+VV1x3m6ReMgKchVM2awCkP7ERFT9eCpwzKM+DbmPHx4RI/3tXLHQ8uYcfhMuWCpuCfW/gt8AxHxwLe8KwBXnfD/kyTldqXyyHKWsm+q1DXfCG5FWdknVPhDN6N3nYrjP0a/O6kDEvPovZvWpGAie1+Y+wgdtNbkKXXTfvc0w0gTfKcnS3U974ajv80KQB4cuuczgb+j2+u4//e209vJZuZMyUQxoI2wquuHeAV1x7G82Piumdr/9TMq7abRbdgs/4KmkbN51sPLeWffraCw2M+3aUzp7AqsRl4x8cDrr1gjPfftBvvNAsotEIbBe1BOIK64n/D8udnZ52T7Zh9n8U88lf2b83stox2Pt3PaBwwyLrXI1vedqIbcrooSuM45qE/wxz9HgS9ZxWztc6ageESr//MFsL4nCN8T4oSQy1SdBY0f/HifVyzZYh40sMkpVpZkIrbUwZVijg+XOKD31rLD3b2UC7YivHUjTDGRklqkVAPPZ63dYR3vGgvHYUYHUumWXdtErQCPQmdW1HXfiW7HI1UzLv/HrPzb22sV7y25R/b/dbQGLbFuBf8B2TJM0+pJKdxHHP4W5i9H4fq43a/zmGfUuv8qe+v4ZM/XZGJdVYC9UjoKcf87U172LR6nEbVx29jUn2shSCwOdlf++Uybn+gn32DBeqRaq6GUgo0G/rr/O5lx3jRU4+BgThjMUO7BC0eNAaRi96DrH9NNtY5FfPeT2G23wqF/hMtZTsRr2mt6dhoIyOFfrtPtQOYsUegdgBU2Yr9HC8wEcNk6POGz2zh8KhPwTctZdDZ+j4IFHzo5t1sXjNmxey1/xilUQqvGBPVfB49UubAcIlq3aOjFHF+X52Ny6qoonV7miWbGZMKOsMoh4AJobgMWfnC5E8t+s5JCM0c/T7mkfdCsGTuxAxWoGkpWPVxzPgumlUr4tlBaNCX5Kmcm5ht8lHMPTu72DdYoKscoVv2nQ31yOcvX7KXzeePEk4EcyJmmBJnOGnvBlvXjLN17dhUlEQLOlREk8kAsM2Tn9kJOs3XWHG9zWVoOVSXRPbrA5iH3wFeMRm+z3Gldfp5qmhLraaeSJzEmbk9Niws/HhX79TvLeApw3DV5xXXHOVZTzlOOBHgzZGYT94PA8QNhZk2ZS9imoPCuSDbOLTRsOw3oLlAWivbAkQwO95vJyoKS5jrCutTdqhFn91gowSjowUefKKDUqBbss4iUAsVG5fVec2zDhHX1JwJ50ykM5Lz9vmZbclEUOhFljwdTlkBcKbbSqz74N2YQ19NKqvnU8zZoLWAr9l2qIOjYwGBp1u67FWyfMCrrx2gXAnRsVqsZRKZkY2g00qUjo1QOR8yKqfSj300+7nR+UbBg090EOnWBkdKoFr3uOS8KtdvHSSut3eZgMVCRhZaQIdI96U0k5JmS2qdRx+G4z+BoLN94bk5RomBUPHIgF0YxrSQHipii09ffOkgXjHOYGCZDzL0oY1dBTSL7QDm4O12CtkrA4tf0AbwPMNY1efAUIGCZ2btbgjQiBXLu0OetWkE08jWd9bJhEjWpEsbtJOMBG3AKyIdG5PfWzgY4oFu2PXkvPLcRzXahDGAZzg8WmSo6tuowCzPrYihVvd41sZRenvqRHWVyVJbdnrb4BeS9aSzJhZMaFNX2zV4zUDQSR6E1wWlVcmfZnl0U3djfKdNw1RF5izm3GaMEVCGw6N2Jq2zGM26IiVNPrpi7TioxHVp0fKlednEil0HO3n0SJnhqk9W6/V3FiM29Ne4aNUEfjkirnltmWDJxkKbCArLoNDX6obsvyO/siuQzmD2bVEgcGS00Eyen+21qrVQLmg2r6hCLM3lbmeLNuCXI+7f08un71rBtoMVJkOV7fofAkXPsL6/zu9ffYQbLz2GTj4jS2G3LmgRm0Qf9EybeGhxD8d3tL6NBcpQtbVUABGbU9xbiVnV3bCCbmF72gh+MeaLP1vF//zheWAMlYKmp5x9mNQY2HuswLu/vo6HnujkrTfus0mSZHe2M7LQGvE6mZrvnO3uJe+bPJBtQcBCwcBY3W/57EUa+ioRnSUb3ZithdNa8MsR33pgOR/63mp6KiFKklX72xQ1KQWGSiHkX+5dSjnQvPn5+4jqXst3mZQMVJOIOM1EaynLJlmutjF01gT5xUbqYtRC1dJBF2xNXk8pQvnxrA+3MeAFmiODZT7yw1V0liKE9gk5RRtb6tXfFfKFe/t5YE8PfjHOrMI9GzNoDKgMK1J0LZ8WmmwWjdFYS0cLFS7aCBJovvGrpRyb8CnMyxoghi/dt4xmj4wMWECqMVM/T+wK6TgNrQ6kPGXQdY979nZRTIpe5xKthVKg+fWhCoMjxWSiqfXtZiDoZJgaN+yvsz7SyfvET0qq2p9qOJekM/iBav06FaDRwpjNYLPfxiZ9jowF+C3ExFvZB0/ZusdDIwXwTCYhwowstMLE1eT/rexUUmd2jpUfi5FKMWpR0Lb8abTmY6JZTqgYQAz1SBHGKrMB2UwR7AC3FrYeR09pXdAGmiskNUU425FKMitYPo9mk6A8IdBTilsy0allG6z6VBu2fdqMNyeAEToKMaUgGZDN46HO8nLKyOWwhbFEY61vDqDjwtaiJQuYpR1hS/6vMXY1o6EJnyOjya16hodKsHV9HZWI1b0NwhZj2QuJjATtQzRiO69CC2K0h1V6nmbLm3I0KhQBNCzvDhOfdfYS8pRhoqHYdaScCHrm29LG5mZff+EIYZz9gi/zRXb50FEVU92f/GHWWTf2Z/dFUF5tW1fkxHYIBrSwsrtOpaCJM9DP/fvsZNZsjpBSBl1X3HjpcTYvrzGek3zq7PKhTWSTilreTgxeBVn6TLskQl7i0QImFpZ1hfR3hkQtlPKnIa8H9ncyPhbg+TOvfBFAa0W5GPH2F+6jHBiqDYWvbA3gYjUj2aklTcq3v7S+vVUvATn7goeLBcFOKRdLEeuX1mnEs1+W0WB7eB8cLnD3Y93ILGsTlRiiusfWNWP83ct3s7o3ZHAisO2OF+lhz2im0C6ba0a3WTdBFLN3O+yUt/RdDb1XJosv5sNKGyPgGS5eVW0pByPdllKGOx5a2tLC4UoZoprPJWvG+Ngf7OA/3nCQrSsnKQc2cJ6MaqY9ZuvkzA3ZJfirIkzut5lyPU+lpbzAZD0OteGN6Ptfx+K9AZ6IiIFYeNqacUpBa7Nz2kBHIea+fR3cs7uHqzcPEU76s/KDlTJEDY+OIOaW6w5yy9UDHB0rUK2rUw59mp33iR+s5gc7uukqxQuqoVG263LEVczxnyA9T6UlVyFd73n5DUj/czHHfnTOy2wtZJSAiRQbl1c5v6/O/qFCi6smWVv5f+5ayRUbRpEWBnVKDLERdFJNs6y7fvrJDiNQiunMMKEoS7JctBlUAXP0B2RV9Q2CbHkneJXcTLREsVCoRFy9fsxm3rUQLtMGOooxDz5R4cv3LreVIK2s8wFNCx9HQhyqUx6NUNkyqgUoZsh0XQ5thTfyEIxup+Xq77QXeNdm258lTFNK5wuh2S2g+Zj54RMBYuH6zSNJUlBre6W10FmK+cRPV/Lo/m6CjBpaipzl0fIntIdsR1vJyv3m4O3JH1o8W8kKo7LuVciaV0D9aNLqYY4Rz67bFw5DY3DqEU3QFPo5osSgQ8VF542zdeUkk6HXUoGrwS6U3ojgvXesY3SiQNDiikyLmWwFbTT4HZiBbySNc1qIdqSIshUxl7wPWfGCuRV1aoEbQ7Z9xeqbkM1vR7beimx4E/ReAboB0cw6x8Za8IoxL3rKIGGUTU1gpaDZc7zAu26/gEas8P3/P0WdcTwsiXZU92EOfoWW3Q6w2xABVUAu+wdkxW9C7Qht7w8uvi3U1RGy6a2oa7+OXPpBZOMfIRveiGz9C9TTv4i6+nPI0uckLtG5HU6lDKaueN5FQ6xb2qAeqZbzm2MtdJdi7nm8g3fetpFq5OEXFlYEYi7IPsCb+NJm32esILKw0s0yrzJy+ceQ9a+1t3wTknkTz9TSNo5BxybUVZ9BLnzrVBOg6Q8M9F2FXPVpZMObp92Vzv5toljR0dngpZcdY7KRTQPKWAs95YifP9bBW//5Qp4YLBNUIrQh04hE1n0Ls6QNMxZJfeH4Lsy+z5ONlYamqEUhF78Xeep/B78nSYhKEqRm/XXU1IURDlsX54I/Rj3jy7DkminxnjwoTKfqjUa2vB1Z8++mehSe7ROTipEXP+0YF/TXk4jHLHd/GrEWussxOwZK/NHnLuQ7v1yGX9D4hdgKu4U+g9rY7YtnCNTsV35qJ+2ZgjMa/C7M3o9B/UhitbIStd2+rH4Z6tqvIuteDdieiOgaZ4xGnPI3b0p4etK+38TIyt9BPf1LyJa3J+FCzZO6N5K2jtPI1ndCZd3Ufpzlm8SxUK6EvOaZA4nbkY1EYi1UCjHVhvC+O9by51/axLYnuvCLGr8c2fIrM1Xdrc2pj/S5WEvTF/cDTakjZLIaMDBPlS5noz1t3SDJkR5CVt+MXPoBMm+8OX17E3swB27DHP03mHjMujqQXEgnt3lLaxaTWLlXgcoGpP/ZyKqXQPfF07Y/g9bJaeuMPf8Ls+NvzqlPISSLvASGt39xEz/d00l3hjNvaZvj8bpHwYdnXDDKjRcPcdn5Y3R3hFO9Ck937mXaTwNx3Wfv8RJ3PtrD937dx+HRgKDFVhpKYKKh+OBNu7lq0whR3Z+169W+LlgnfEqyqv8Vn7CNLdvZTRZsv8Gx7ZjRh2B8NzSO2gUfjbaRkWYbiW670lNlHdK5yXaUPaHTFTOPMZtkOaTR7ehfvOycE6u0Ebwg5uDxMm/87GbC2FakZHk+lNic6YmGvUBX9jTYvGKSC5dNsqq3QU8pIki+fqwhNnYCaKzuMzjh88RQkd1HSzx+vMR4XVEKdMt9Yex+ZS/o9javNwa8AmbbrXY6vNiPdT2y8nRkapocY0Xb89Rk6n2m+5rMRM52hjPtd1g+z/ZdCYfOSdRKbB7F6hVV/vi5B3nfv55vu2JlOIhLB4SdRXvHGJzw+fHObn7wSI/tGq2sJbfGeKpZvTZTKTmBZyj6mt5K1FJb5HbTXkFjrEWsHcQ8/Dbkyk8mRygpgc6K6d1jzfR76Ok+4+QzkU59ZXTnkGDGi0x6yhBN+rzw8qP8+mAHX/7lkszbJMOUsAPPUPB0M1R4JnFODyWmTTUXehiw/XmZJoagF3PkO5gd/605+9ce5KQBoDrN43TT1xmepHgiaQU3swtExBCHij95/n6uWjvBSM1rW4/BtHnmkw0KTxkYLlCLfDJzk2hsIigsxez5iI1PJ62Ec0Xq9ow9YiMmymcmVloAo4XAi3n3Sx5j/ZJGbsqi5pK5y5w3GoIezPZ3YQ7clkNRWzfKHLit+f+ZosQQhx5Luhq8/6Y9rOyOmHCinhFzWAqSnBSvA/Pwf8Ec+GIi6gx7dc8XJrLf5diPMYe/AUHXrN0qpWxZ1OolVf7u5Y9yXk/IWBvdj7wxx7VNieXyKrbZ+95PnBouW2ykYh7djv7Vf7KuRqvhLGWI6j5rlk7y4Vt2sXVFjaE29+3OC/NQrJeIOujEbH8PZtu7aLaiWFQVKSaJq/swdC/63j+0a5Ok6/K1SGqpl3fX+dAtu7hh6wiDEwECmUyR55V5qj5NAp2FPszjn8Lc8wqY2DsVU17o1roZs/YwB29H3/sqm0KacZMjpQxR6FEJYt7z0j28+XmHaMSKydAuN7AQda1kfi+4eSynTixcYSlm6BfoX/we5ol/mQqvLUTfOr3YxIN4ErP9rzC/+lM7/vOKbbnDKDHoWIhD4ZXPPsCHb36UjctqDFZ9tGHBDBjtBI1hom4vuHMRtcGK389w8nj+1wcwEfjdtsD24f+Mue+1MLrtlGy2+d1HPeUWiYJjd6J//nt2DBB0A6qt+5iWPYVVn0vXjvIPr9jJv7/+MAUfhqt2bsybJ4ud1iFGMRwfD7jhohGu2zjGWF2d9WIzBsqBZllHCHr265ScsD9tzeWY2a4kuR8j4Hcg591k854r65LnzZSo5uLUpXHl6TOIo9swj30Uc/hf7e9+55yHHrURPDFIKebA0QpfuHs539vex+ikolLQFHyNMdL2nOW0iWYUC+N1jxVdEa+8doCXXTPA8eEir/3HLVQbiuAMnQE8ZZOmLltT5cO37ERHra1TMjfJSbMhnUkMR23Z06rfRtbcfFKXWk1zBfE0h6IlTpoyP2Ea3MDgLzD7v4A5+l07Cxj0JE/Nz53DYPOagyAG3/D4QAdfe7CfH+3o4fBIgKcMpUDjJ80ztZHmsGW2pIWxInY9kXoo1CPF0o6IFzxliJdffYRlfTXCqk9QirhrxxLe/uUNlAsxvjLNPGzBjg1iLUzUPT788t1cuWm4pcSkdP8WpqBTxLPWLxoDrwPpuwZW/hbS/xworTz19bPyX8+QjGQ0jO3AHPsh5sh3YORhMA3wu9o8dT8zjLE5Fn7BCntouMhPd/fw4529bD9UabaQK3iawDM2CWmaaKbOeWoQzClWcvo0eSMSIi0UA8OG/hrP3TzC8y8eZGX/JDQUYWTdjLS71jcfWM4Hvr2GSEMp0HY9PSPUIsET4U9vOMDvXj1AVPNa7iy78AUNNAVnYpsjYWIoLLfZdEuuRXovh46NrTf8DEehdgAz9ggMP4AZecCmn0ZjNtHIr9D05xcgqegCX0NBQ6Q4NFTkV0908uD+TnYeKTMwGjBW84i0NDPoUot74rasJU31oBSUfE1fJWbtkhpPWV3lynVjtiNsKYJQESbri0y/GLSxnWkffrybf/rZSnYOlGnEQqWg2bKiysuvPspT141m1tZ5kQh6GqnvrMMkxzmypV6Ffiifj1TWQnkNFFdYgXsVkELSRjieel80nixHcAxqhzG1g1A7bH+Pq5AsmIMq0WwtN9+D0nMkFbYSg+cb8O1+x3Wfo2MBB4eLHBopcGSswOBEwHhdaERW5CrxiYtBTDkwdJcilnRELO9usKqnwcruhi0K8HWzZ7d936lWPUWndw9gcKTIZOjRVYro7rT9eKKkA0EWLD5BN5nmNxttha0b9ucJyfnqNGmlqe9tpl4nfpL870/znRePiM9EKm6wK/6LZ8DTJxbwJL41zZYUSWrv9GGJAbRALMSxzcJLB4TngjY2euF5BpQBLUSx/YAsF1mfmwT/tmA4IYFXfPADTh0YPlld0em2ZxasSzEbRMBLBGMAHQkm8k88dImIkyorUiWfbNwkscLTt3mupKKNY3tR0Jx4aY8FXYSCPpmTBO44LWl94RlrfZv/O/NrWv38uWD+J1YcjgxxgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR65wgnbkCidoR67wAWMMxpj53hWHo2WMDwTKF8EJ2rGYEYhDE/jAgI5Nwej53iOHY/aIdZ4b/w8myviBwn627wAAAABJRU5ErkJggg==", "GATSBY_PAGE_TITLE": "Common Ground's Catalogi", diff --git a/pwa/static/configFiles/conduction.json b/pwa/static/configFiles/conduction.json index a83887a85..3ada1d195 100644 --- a/pwa/static/configFiles/conduction.json +++ b/pwa/static/configFiles/conduction.json @@ -9,6 +9,7 @@ "GATSBY_NL_DESIGN_THEME_CLASSNAME": "conduction-theme", + "GATSBY_GITHUB_ORGANIZATION_URL": "https://github.com/ConductionNL", "GATSBY_FAVICON_URL": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAACqVBMVEX////+/v/2+P/p7//q8P/3+f/+///5+//n7v++0P6Jqf2OrP3E0/76/P/8/f/t8v/M2v6Sr/1hjPxNffxOfvxljvyYtP3R3v7w9P/9/v/z9v/Y4/6iu/1rk/xQgPxGePxJe/xIevxSgfxwl/2owP3c5f709//i6v6yx/53nP1Wg/xHefxciPx6nv12m/xZhvxJevxYhfx9oP24zP7k7P/4+v/6+//C0/6Gp/1Vg/x3nf2zyP7e5/6tw/1zmf1TgvxLe/xfivyMq/3I1/7r8f/7/P/9/f/v8//Q3P6Wsv1kjvzx9f/2+f/U4P6ct/1nkPxokfydt/2swv1vlv1HePxMfPxijPzs8f/1+P/l7P/H1v5Ke/xUgvx0mf21yf7y9v/h6f5wlvxIefyCpP3n7f/r8P+NrP1jjfzu8//k6/+5y/58oP1WhPxLfPxEdvyju/3V4P5PfvxFd/xFePxSgPxvlfynvv3b5f7a5P6Xs/1xl/1difzO2/75+v/q7/+wxf5Pf/yDpP3L2f5ah/zA0f5pkfyLqv1Qf/zE1f7y9f+1yf1DdvxRgPyKqv3J1/7m7f/C0v6sw/1mkPzS3v5slP1pkv1Ed/xcifzk6/7J2P7Z4/66zf1gi/yRrv3F1f6HqP1jjvzU3/6Epv1YhvxgivxymP23y/7E1P6qwf1Tgfx4nf1Xhfzf6P5zmPyxxv7T3v6atf1mj/yjvP1rlPzj6/6Fpv3B0v7o7v+Usf2btv3l7f+7zv5/ov2Qrv2kvP1slPyVsf3P3P7u8v/19//K2P6Prf3f6P/N2/6TsP1ijfxMffxulfylvv3a5f7X4f6fuf1pkvxNfvxlj/yZtf2/0f6Dpf16n/2sw/51m/3F1P7g6P5Ug/xXhPy2yf7j6v/W4f5tlf2mvv2Vsv1ioRD2AAACTklEQVQ4y2NgoC5gZGJmYWXEKc3GzsHJxc3DzItDno9fQFBIWERUTFyCD4u0pJS0jKycvIKivJKyiqqaJLrlrOoamlraCjq6evoGioZGxiamKE4xYza30FHQtrSytlG1tbPXdnB0cnZxhUu7uXt4egnLy8nKSHv7sEr4+vmLyIsEBPp6w+yRCApWCgkNExQIj4iMEmBmYolycozWjomNi4f6LiExSV4/mTMlItU5Ld3f0yMjIjMrO0c+NzsS6kAbr7yYfBs1iYLAgMKi4pLSsnIpqYrKEu0qdYSC6prauvrYGHn5BmF5bcPGJlYfzmYUBY4Fai3+isUNrYJt6e36jU2sph06aAo6uwy7e3r7mPsneE4sV5PEqqBo0mRTRkbW8E4+BgasCoqnJMDDBruCqaqMDAyM7Hy4FEybHpdiyjpj5iwJPiwKpGZXT0uaM3ce5/wFdkGZfBgKFrL6LlqcVNy+REe4WGTpMinT5agKmlskImxWVK2UnzZNO2dVXIpZuMZqhII1/tOi165LUHNfv2Fju9KUTbM6pWxWbDbQttsC9VLK1hxtA52t27ZH1M3bsbOGP2LX7j36iorNe+tgyaV83345eeH0AwcPHXbhZwo/cnROrraS8opj8CTDd+j4iZOn5HtOnznbKXHu/IUG+YuXLk9GTrpsZtuvXG02SFp97brKDUvt6Gqumyy86FnmVv2N29rROZYGSXd0794zxcw+bp33z19oKCruefCwAiPVQ4Br+JGj6RsfHczgw5n3avudBbab4c29prVolgMAwXbN77JRtJ0AAAAASUVORK5CYII=", "GATSBY_PAGE_TITLE": "Conduction's Catalogi", diff --git a/pwa/static/configFiles/dimpact.json b/pwa/static/configFiles/dimpact.json index 3fa06d982..c701041b4 100644 --- a/pwa/static/configFiles/dimpact.json +++ b/pwa/static/configFiles/dimpact.json @@ -9,6 +9,7 @@ "GATSBY_NL_DESIGN_THEME_CLASSNAME": "dimpact-theme", + "GATSBY_GITHUB_ORGANIZATION_URL": "", "GATSBY_FAVICON_URL": "https://openwebconcept.nl/wp-content/uploads/2019/07/cropped-Favicon-32x32.png", "GATSBY_PAGE_TITLE": "Leiden's Catalogi", diff --git a/pwa/static/configFiles/epe.json b/pwa/static/configFiles/epe.json index e26e81bff..d047d5107 100644 --- a/pwa/static/configFiles/epe.json +++ b/pwa/static/configFiles/epe.json @@ -1,36 +1,36 @@ { - "GATSBY_SHOW_THEME_SWITCHER": "false", - - "GATSBY_GITHUB_REPOSITORY_NAME": "web-app", - "GATSBY_USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX": "false", - - "GATSBY_API_URL": "https://api.opencatalogi.nl/api", - "GATSBY_BASE_URL": "https://api.opencatalogi.nl", - - "GATSBY_NL_DESIGN_THEME_CLASSNAME": "epe-theme", - - "GATSBY_FAVICON_URL": "https://www.epe.nl/sites/default/themes/custom/toptasks_sub_theme/favicon/favicon-32x32.png", - - "GATSBY_PAGE_TITLE": "Epe's Catalogi", - - "GATSBY_HEADER_LOGO_URL": "", - "GATSBY_HEADER_SHOW_LOGIN": "false", - "GATSBY_HEADER_CONTENT": "https://raw.githubusercontent.com/OpenCatalogi/web-app/main/pwa/src/templates/templateParts/header/HeaderContent.json", - - "GATSBY_JUMBOTRON_TITLE": "", - "GATSBY_JUMBOTRON_SUBTITLE": "", - "GATSBY_JUMBOTRON_IMAGE_PLACEMENT": "false", - "GATSBY_JUMBOTRON_IMAGE_URL": "", - "GATSBY_JUMBOTRON_DESCRIPTION": "", - "GATSBY_JUMBOTRON_ISCARD": "false", - "GATSBY_JUMBOTRON_SEARCHFORM": "true", - "GATSBY_JUMBOTRON_CONTAINER": "true", - - "GATSBY_FOOTER_SHOW_CREATOR": "false", - "GATSBY_FOOTER_LOGO_URL": "false", - "GATSBY_FOOTER_CONTENT": "https://raw.githubusercontent.com/OpenCatalogi/web-app/25995205e1dbb043822d1c58c5c23f8e6f77ff7e/pwa/src/templates/templateParts/footer/FooterContent.json", - "GATSBY_FOOTER_CONTENT_HEADER": "heading-3", - - "GATSBY_OPTIONAL_START_PAGE": "" - } - \ No newline at end of file + "GATSBY_SHOW_THEME_SWITCHER": "false", + + "GATSBY_GITHUB_REPOSITORY_NAME": "web-app", + "GATSBY_USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX": "false", + + "GATSBY_API_URL": "https://api.opencatalogi.nl/api", + "GATSBY_BASE_URL": "https://api.opencatalogi.nl", + + "GATSBY_NL_DESIGN_THEME_CLASSNAME": "epe-theme", + + "GATSBY_GITHUB_ORGANIZATION_URL": "", + "GATSBY_FAVICON_URL": "https://www.epe.nl/sites/default/themes/custom/toptasks_sub_theme/favicon/favicon-32x32.png", + + "GATSBY_PAGE_TITLE": "Epe's Catalogi", + + "GATSBY_HEADER_LOGO_URL": "", + "GATSBY_HEADER_SHOW_LOGIN": "false", + "GATSBY_HEADER_CONTENT": "https://raw.githubusercontent.com/OpenCatalogi/web-app/main/pwa/src/templates/templateParts/header/HeaderContent.json", + + "GATSBY_JUMBOTRON_TITLE": "", + "GATSBY_JUMBOTRON_SUBTITLE": "", + "GATSBY_JUMBOTRON_IMAGE_PLACEMENT": "false", + "GATSBY_JUMBOTRON_IMAGE_URL": "", + "GATSBY_JUMBOTRON_DESCRIPTION": "", + "GATSBY_JUMBOTRON_ISCARD": "false", + "GATSBY_JUMBOTRON_SEARCHFORM": "true", + "GATSBY_JUMBOTRON_CONTAINER": "true", + + "GATSBY_FOOTER_SHOW_CREATOR": "false", + "GATSBY_FOOTER_LOGO_URL": "false", + "GATSBY_FOOTER_CONTENT": "https://raw.githubusercontent.com/OpenCatalogi/web-app/25995205e1dbb043822d1c58c5c23f8e6f77ff7e/pwa/src/templates/templateParts/footer/FooterContent.json", + "GATSBY_FOOTER_CONTENT_HEADER": "heading-3", + + "GATSBY_OPTIONAL_START_PAGE": "" +} diff --git a/pwa/static/configFiles/leiden.json b/pwa/static/configFiles/leiden.json index 5eaf69f3a..deeca6045 100644 --- a/pwa/static/configFiles/leiden.json +++ b/pwa/static/configFiles/leiden.json @@ -9,6 +9,7 @@ "GATSBY_NL_DESIGN_THEME_CLASSNAME": "leiden-theme", + "GATSBY_GITHUB_ORGANIZATION_URL": "", "GATSBY_FAVICON_URL": "https://gemeente.leiden.nl/typo3conf/ext/leiden_template/Resources/Public/Images/favicon/favicon-96x96.png", "GATSBY_PAGE_TITLE": "Leiden's Catalogi", diff --git a/pwa/static/configFiles/noordwijk.json b/pwa/static/configFiles/noordwijk.json index 26cc2cf32..c32e43b04 100644 --- a/pwa/static/configFiles/noordwijk.json +++ b/pwa/static/configFiles/noordwijk.json @@ -9,6 +9,7 @@ "GATSBY_NL_DESIGN_THEME_CLASSNAME": "noordwijk-theme", + "GATSBY_GITHUB_ORGANIZATION_URL": "", "GATSBY_FAVICON_URL": "https://www.noordwijk.nl/wp-content/uploads/2023/02/cropped-favicon-32x32.png", "GATSBY_PAGE_TITLE": "Noordwijk's Catalogi", diff --git a/pwa/static/configFiles/open-webconcept.json b/pwa/static/configFiles/open-webconcept.json index 996c0c1e3..bb5846b21 100644 --- a/pwa/static/configFiles/open-webconcept.json +++ b/pwa/static/configFiles/open-webconcept.json @@ -9,6 +9,7 @@ "GATSBY_NL_DESIGN_THEME_CLASSNAME": "open-webconcept-theme", + "GATSBY_GITHUB_ORGANIZATION_URL": "", "GATSBY_FAVICON_URL": "https://openwebconcept.nl/wp-content/uploads/2019/07/cropped-Favicon-32x32.png", "GATSBY_PAGE_TITLE": "Open-Webconcept's Catalogi", diff --git a/pwa/static/configFiles/opencatalogi.json b/pwa/static/configFiles/opencatalogi.json index 384f2532c..49fda7607 100644 --- a/pwa/static/configFiles/opencatalogi.json +++ b/pwa/static/configFiles/opencatalogi.json @@ -9,6 +9,7 @@ "GATSBY_NL_DESIGN_THEME_CLASSNAME": "opencatalogi-theme", + "GATSBY_GITHUB_ORGANIZATION_URL": "", "GATSBY_FAVICON_URL": "https://dev.opencatalogi.nl/static/logo_OpenCatalogi-8b1b0a001c3f37dae4d3f69b5964ec72.png", "GATSBY_PAGE_TITLE": "OpenCatalogi", diff --git a/pwa/static/configFiles/rotterdam.json b/pwa/static/configFiles/rotterdam.json index 39c3537af..b23151c22 100644 --- a/pwa/static/configFiles/rotterdam.json +++ b/pwa/static/configFiles/rotterdam.json @@ -9,6 +9,7 @@ "GATSBY_NL_DESIGN_THEME_CLASSNAME": "rotterdam-theme", + "GATSBY_GITHUB_ORGANIZATION_URL": "", "GATSBY_FAVICON_URL": "https://www.rotterdam.nl/favicon.ico?v=2", "GATSBY_PAGE_TITLE": "Rotterdam's Catalogi", diff --git a/pwa/static/configFiles/zutphen.json b/pwa/static/configFiles/zutphen.json index 86183a786..803f25f4e 100644 --- a/pwa/static/configFiles/zutphen.json +++ b/pwa/static/configFiles/zutphen.json @@ -9,6 +9,7 @@ "GATSBY_NL_DESIGN_THEME_CLASSNAME": "zutphen-theme", + "GATSBY_GITHUB_ORGANIZATION_URL": "", "GATSBY_FAVICON_URL": "https://zutphen.nl/themes/zutphen/favicon.ico", "GATSBY_PAGE_TITLE": "Zutphen's Catalogi", From 05f5c13258ab78239d72d72fff81fed2ebc461f9 Mon Sep 17 00:00:00 2001 From: Remko Date: Tue, 19 Dec 2023 15:34:09 +0100 Subject: [PATCH 3/9] bugfixes --- .../ComponentsDetailTemplate.tsx | 2 +- .../OrganizationDetailTemplate.tsx | 112 +++++++++--------- .../table/TableResultTemplate.tsx | 4 +- 3 files changed, 58 insertions(+), 60 deletions(-) diff --git a/pwa/src/templates/componentDetail/ComponentsDetailTemplate.tsx b/pwa/src/templates/componentDetail/ComponentsDetailTemplate.tsx index bf943c9cc..e2fb839fb 100644 --- a/pwa/src/templates/componentDetail/ComponentsDetailTemplate.tsx +++ b/pwa/src/templates/componentDetail/ComponentsDetailTemplate.tsx @@ -389,7 +389,7 @@ export const ComponentsDetailTemplate: React.FC =
- {_getComponent.data.embedded?.dependsOn?.embedded.open && ( + {_getComponent.data.embedded?.dependsOn?.embedded?.open && ( {/* */}
- {_getOrganization.data?.embedded?.owns.map( - (component: any) => - - )} + {_getOrganization.data?.embedded?.owns?.map((component: any) => ( + + ))}
@@ -187,25 +185,24 @@ export const OrganizationDetailTemplate: React.FC {/* */}
- {_getOrganization.data?.embedded?.supports.map( - (component: any) => - - )} + {_getOrganization.data?.embedded?.supports?.map((component: any) => ( + + ))}
@@ -213,25 +210,24 @@ export const OrganizationDetailTemplate: React.FC {/* */}
- {_getOrganization.data?.embedded?.uses.map( - (component: any) => - - )} + {_getOrganization.data?.embedded?.uses?.map((component: any) => ( + + ))}
diff --git a/pwa/src/templates/templateParts/resultsTemplates/table/TableResultTemplate.tsx b/pwa/src/templates/templateParts/resultsTemplates/table/TableResultTemplate.tsx index d724e22ee..b900feb91 100644 --- a/pwa/src/templates/templateParts/resultsTemplates/table/TableResultTemplate.tsx +++ b/pwa/src/templates/templateParts/resultsTemplates/table/TableResultTemplate.tsx @@ -58,7 +58,9 @@ export const TableResultTemplate: React.FC = ({ compon onClick={() => navigate(`/${getResultsUrl(component._self?.schema.ref)}/${component.id}`)} > - {component.name} + + {component.name} + {t(_.upperFirst(getTypeFromSchemaRef(component._self?.schema.ref)))} From e559528024f8e83ca7530d483f3b7129b14cb505 Mon Sep 17 00:00:00 2001 From: Remko Date: Tue, 19 Dec 2023 15:37:46 +0100 Subject: [PATCH 4/9] updated download card --- pwa/package.json | 4 ++-- .../templates/templateParts/download/DownloadTemplate.tsx | 7 ++++++- pwa/src/translations/en.ts | 1 + pwa/src/translations/nl.ts | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pwa/package.json b/pwa/package.json index bca70a7f1..8d3aa9a08 100644 --- a/pwa/package.json +++ b/pwa/package.json @@ -23,8 +23,8 @@ "prepare": "cd .. && husky install" }, "dependencies": { - "@conduction/components": "2.2.41", - "@conduction/theme": "1.1.1", + "@conduction/components": "2.2.43", + "@conduction/theme": "1.1.4", "@fortawesome/fontawesome-svg-core": "^6.4.2", "@fortawesome/free-brands-svg-icons": "6.4.2", "@fortawesome/free-regular-svg-icons": "6.4.2", diff --git a/pwa/src/templates/templateParts/download/DownloadTemplate.tsx b/pwa/src/templates/templateParts/download/DownloadTemplate.tsx index 11493869f..04be030ea 100644 --- a/pwa/src/templates/templateParts/download/DownloadTemplate.tsx +++ b/pwa/src/templates/templateParts/download/DownloadTemplate.tsx @@ -29,9 +29,14 @@ export const DownloadTemplate: React.FC = ({ downloads, b const NotificationPopUp = _NotificationPopUp.NotificationPopUp; + const getSize = (size: number): string => { + if (size < 0) return t("Unknown size"); + return `${size / 1000}kB`; + }; + const convertedDownloads: TDownloadableItem[] = downloads.map((download: any) => ({ label: download.naam, - size: download.grootte, + size: getSize(download.grootte), type: download.type, downloadLink: download.url, })); diff --git a/pwa/src/translations/en.ts b/pwa/src/translations/en.ts index 6bfe367fd..f8ef808f3 100644 --- a/pwa/src/translations/en.ts +++ b/pwa/src/translations/en.ts @@ -148,4 +148,5 @@ export const en = { "Results per page": "Results per page", "Select result limit": "Select result limit", "Type of support": "Type of support", + "Unknown size": "Unknown size", }; diff --git a/pwa/src/translations/nl.ts b/pwa/src/translations/nl.ts index faff87ac6..305221de1 100644 --- a/pwa/src/translations/nl.ts +++ b/pwa/src/translations/nl.ts @@ -150,4 +150,5 @@ export const nl = { "Select result limit": "Selecteer resultaten limiet", "Business function": "Bedrijfsfunctie", "Type of support": "Type ondersteuning", + "Unknown size": "Onbekende grootte", }; From a30b46c972973076ee31e1c27b134cd32d82b390 Mon Sep 17 00:00:00 2001 From: Remko Date: Tue, 19 Dec 2023 17:16:08 +0100 Subject: [PATCH 5/9] added sloterburg theme --- pwa/package-lock.json | 16 +++--- .../ApplicationCard.module.css | 4 ++ .../categoryCard/CategoryCard.module.css | 4 ++ .../componentCard/ComponentCard.module.css | 4 ++ .../OrganizationCard.module.css | 4 ++ .../tableBody/getTableBody.module.css | 7 +++ .../tableHeader/getTableHeader.module.css | 9 ++- pwa/src/layout/Head.tsx | 2 +- pwa/src/styling/index.css | 1 + .../ComponentsDetailTemplate.module.css | 12 ++++ ...ableOrganizationDisplayTemplate.module.css | 57 +++++++++++++++++++ .../TableOrganizationDisplayTemplate.tsx | 6 +- .../ratingOverview/RatingOverview.module.css | 57 ++++++++++++++++++- .../ratingOverview/RatingOverview.tsx | 8 +-- .../table/TableResultTemplate.module.css | 12 ++++ 15 files changed, 182 insertions(+), 21 deletions(-) diff --git a/pwa/package-lock.json b/pwa/package-lock.json index 3a59352d3..00344969e 100644 --- a/pwa/package-lock.json +++ b/pwa/package-lock.json @@ -8,8 +8,8 @@ "name": "skeleton-pip", "version": "1.0.0", "dependencies": { - "@conduction/components": "2.2.41", - "@conduction/theme": "1.1.1", + "@conduction/components": "2.2.43", + "@conduction/theme": "1.1.4", "@fortawesome/fontawesome-svg-core": "^6.4.2", "@fortawesome/free-brands-svg-icons": "6.4.2", "@fortawesome/free-regular-svg-icons": "6.4.2", @@ -2195,9 +2195,9 @@ } }, "node_modules/@conduction/components": { - "version": "2.2.41", - "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.41.tgz", - "integrity": "sha512-S6jfnwvgmBfljYezEJ97xZgeDALzSPY95PY25wg0tv3xt1ikVxNqWqQTijAGZitxyycTqd/500HvBOJlPkFosA==", + "version": "2.2.43", + "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.43.tgz", + "integrity": "sha512-pPmgeLFTEO4zMN5mnetpQnUrlLm9fxNxlalJklhzITtWJP/3SY4tVgfgQCFHo3+EFzqDqUufIcDf7AEI2Jev8A==", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.4.2", "@fortawesome/free-solid-svg-icons": "^6.4.2", @@ -2215,9 +2215,9 @@ } }, "node_modules/@conduction/theme": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@conduction/theme/-/theme-1.1.1.tgz", - "integrity": "sha512-H4YGWybK8HABGqpb8sOhIEmLxtDKddEqEzNpifuMt67R844Atac17P7xtVFZoisMbDnEIyXxBIBGzwRM2Qriqw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@conduction/theme/-/theme-1.1.4.tgz", + "integrity": "sha512-gzEgU3EKG6aduaBwmVuLlhU62SLswCTcjWq7Hd/gz7MbeW7Bap7Yex56QlAv36LNQemgW7blbbKX/XmM/hlJCg==", "dependencies": { "@nl-design-system-unstable/rotterdam-design-tokens": "^1.0.0-alpha.100" } diff --git a/pwa/src/components/applicationCard/ApplicationCard.module.css b/pwa/src/components/applicationCard/ApplicationCard.module.css index 6c923fe75..cc67dd8da 100644 --- a/pwa/src/components/applicationCard/ApplicationCard.module.css +++ b/pwa/src/components/applicationCard/ApplicationCard.module.css @@ -36,3 +36,7 @@ .tags > *:not(:last-child) { margin-inline-end: var(--web-app-size-xs); } + +.container:hover .description { + color: var(--conduction-card-wrapper-hover-color, var(--conduction-card-wrapper-color)) !important; +} diff --git a/pwa/src/components/categoryCard/CategoryCard.module.css b/pwa/src/components/categoryCard/CategoryCard.module.css index d75f7324b..4a22b2e10 100644 --- a/pwa/src/components/categoryCard/CategoryCard.module.css +++ b/pwa/src/components/categoryCard/CategoryCard.module.css @@ -28,3 +28,7 @@ overflow: hidden; text-overflow: ellipsis; } + +.container:hover .description { + color: var(--conduction-card-wrapper-hover-color, var(--conduction-card-wrapper-color)) !important; +} diff --git a/pwa/src/components/componentCard/ComponentCard.module.css b/pwa/src/components/componentCard/ComponentCard.module.css index 0ae1f9ffa..0cf184104 100644 --- a/pwa/src/components/componentCard/ComponentCard.module.css +++ b/pwa/src/components/componentCard/ComponentCard.module.css @@ -24,6 +24,10 @@ text-overflow: ellipsis; } +.container:hover .description { + color: var(--conduction-card-wrapper-hover-color, var(--conduction-card-wrapper-color)) !important; +} + .layerTags { display: flex; margin-block-end: var(--web-app-size-xs); diff --git a/pwa/src/components/organizationCard/OrganizationCard.module.css b/pwa/src/components/organizationCard/OrganizationCard.module.css index e0f94030a..5c164f137 100644 --- a/pwa/src/components/organizationCard/OrganizationCard.module.css +++ b/pwa/src/components/organizationCard/OrganizationCard.module.css @@ -36,6 +36,10 @@ text-overflow: ellipsis; } +.container:hover .description { + color: var(--conduction-card-wrapper-hover-color, var(--conduction-card-wrapper-color)) !important; +} + .tagsContainer { display: flex; flex-wrap: wrap; diff --git a/pwa/src/hooks/htmlParser/tableBody/getTableBody.module.css b/pwa/src/hooks/htmlParser/tableBody/getTableBody.module.css index 5c148afdd..a17655608 100644 --- a/pwa/src/hooks/htmlParser/tableBody/getTableBody.module.css +++ b/pwa/src/hooks/htmlParser/tableBody/getTableBody.module.css @@ -1,3 +1,10 @@ .tableBody { border: var(--utrecht-table-body-border); } + +.tableBody > tr > td { + border-inline-end-width: var(--utrecht-table-cell-border-inline-end-width); + border-inline-end-style: var(--utrecht-table-cell-border-inline-end-style); + border-inline-end-color: var(--utrecht-table-cell-border-inline-end-color); +} + \ No newline at end of file diff --git a/pwa/src/hooks/htmlParser/tableHeader/getTableHeader.module.css b/pwa/src/hooks/htmlParser/tableHeader/getTableHeader.module.css index 59ceaddf4..e4267668e 100644 --- a/pwa/src/hooks/htmlParser/tableHeader/getTableHeader.module.css +++ b/pwa/src/hooks/htmlParser/tableHeader/getTableHeader.module.css @@ -3,8 +3,7 @@ } .tableHeader > * { - border-block-end: var(--utrecht-table-header-border-block-end-width) solid - var(--utrecht-table-header-border-block-end-color); + border-block-end: var(--utrecht-table-header-border-block-end-width) solid var(--utrecht-table-header-border-block-end-color); } .tableHeader > tr:nth-child(odd) { @@ -26,3 +25,9 @@ background-color: inherit; color: inherit; } + +.tableHeader > tr > th { + border-inline-end-width: var(--utrecht-table-header-cell-border-inline-end-width); + border-inline-end-style: var(--utrecht-table-header-cell-border-inline-end-style); + border-inline-end-color: var(--utrecht-table-header-cell-border-inline-end-color); +} diff --git a/pwa/src/layout/Head.tsx b/pwa/src/layout/Head.tsx index 5bd7a4bb5..4df6de90f 100644 --- a/pwa/src/layout/Head.tsx +++ b/pwa/src/layout/Head.tsx @@ -14,7 +14,7 @@ export const Head: React.FC = () => { ); diff --git a/pwa/src/styling/index.css b/pwa/src/styling/index.css index 7090235cd..7454c9ee8 100644 --- a/pwa/src/styling/index.css +++ b/pwa/src/styling/index.css @@ -21,6 +21,7 @@ @import "../../node_modules/@conduction/theme/municipalities/commonground-design-tokens/dist/index.css"; @import "../../node_modules/@conduction/theme/municipalities/opencatalogi-design-tokens/dist/index.css"; @import "../../node_modules/@conduction/theme/municipalities/zutphen-design-tokens/dist/index.css"; +@import "../../node_modules/@conduction/theme/municipalities/sloterburg-design-tokens/dist/index.css"; /* Design Tokens maintained by Frameless */ @import "../../node_modules/@nl-design-system-unstable/rotterdam-design-tokens/dist/index.css"; diff --git a/pwa/src/templates/componentDetail/ComponentsDetailTemplate.module.css b/pwa/src/templates/componentDetail/ComponentsDetailTemplate.module.css index 415306bac..0de3a3015 100644 --- a/pwa/src/templates/componentDetail/ComponentsDetailTemplate.module.css +++ b/pwa/src/templates/componentDetail/ComponentsDetailTemplate.module.css @@ -187,6 +187,12 @@ font-family: var(--utrecht-table-header-font-family); } +.tableHeader > tr > th { + border-inline-end-width: var(--utrecht-table-header-cell-border-inline-end-width); + border-inline-end-style: var(--utrecht-table-header-cell-border-inline-end-style); + border-inline-end-color: var(--utrecht-table-header-cell-border-inline-end-color); +} + .tableRow > * { vertical-align: middle !important; } @@ -200,6 +206,12 @@ border: var(--utrecht-table-body-border); } +.tableBody > tr > td { + border-inline-end-width: var(--utrecht-table-cell-border-inline-end-width); + border-inline-end-style: var(--utrecht-table-cell-border-inline-end-style); + border-inline-end-color: var(--utrecht-table-cell-border-inline-end-color); +} + .tableBody .tableRow:nth-child(odd) { background-color: var(--utrecht-table-row-alternate-odd-background-color); color: var(--utrecht-table-row-alternate-odd-color); diff --git a/pwa/src/templates/templateParts/OrganizationDisplayTemplates/table/TableOrganizationDisplayTemplate.module.css b/pwa/src/templates/templateParts/OrganizationDisplayTemplates/table/TableOrganizationDisplayTemplate.module.css index a0ec4b04a..e2c6ff1be 100644 --- a/pwa/src/templates/templateParts/OrganizationDisplayTemplates/table/TableOrganizationDisplayTemplate.module.css +++ b/pwa/src/templates/templateParts/OrganizationDisplayTemplates/table/TableOrganizationDisplayTemplate.module.css @@ -32,3 +32,60 @@ display: flex; justify-content: space-evenly; } + +.table { + background-color: var(--utrecht-table-background-color); + border-collapse: var(--utrecht-table-border-collapse); +} + +.tableHeader > * { + border-block-end: var(--utrecht-table-header-border-block-end-width) solid var(--utrecht-table-header-border-block-end-color); +} + +.tableHeader { + font-family: var(--utrecht-table-header-font-family); +} + +.tableHeader > tr > th { + border-inline-end-width: var(--utrecht-table-header-cell-border-inline-end-width); + border-inline-end-style: var(--utrecht-table-header-cell-border-inline-end-style); + border-inline-end-color: var(--utrecht-table-header-cell-border-inline-end-color); +} + +.tableRow > * { + vertical-align: middle !important; +} + +.tableRow:hover { + cursor: pointer; + background-color: var(--utrecht-table-row-hover-background-color); +} + +.tableBody { + border: var(--utrecht-table-body-border); +} + +.tableBody > tr > td { + border-inline-end-width: var(--utrecht-table-cell-border-inline-end-width); + border-inline-end-style: var(--utrecht-table-cell-border-inline-end-style); + border-inline-end-color: var(--utrecht-table-cell-border-inline-end-color); +} + +.tableBody .tableRow:nth-child(odd) { + background-color: var(--utrecht-table-row-alternate-odd-background-color); + color: var(--utrecht-table-row-alternate-odd-color); +} + +.tableBody .tableRow:nth-child(odd):hover { + background-color: var(--utrecht-table-row-hover-background-color); + color: var(--utrecht-table-row-hover-color); +} + +.tableBody .tableRow:nth-child(even) { + background-color: var(--utrecht-table-row-alternate-even-background-color); + color: var(--utrecht-table-row-alternate-even-color); +} +.tableBody .tableRow:nth-child(even):hover { + background-color: var(--utrecht-table-row-hover-background-color); + color: var(--utrecht-table-row-hover-color); +} diff --git a/pwa/src/templates/templateParts/OrganizationDisplayTemplates/table/TableOrganizationDisplayTemplate.tsx b/pwa/src/templates/templateParts/OrganizationDisplayTemplates/table/TableOrganizationDisplayTemplate.tsx index 85b27a4b7..7f7ea8029 100644 --- a/pwa/src/templates/templateParts/OrganizationDisplayTemplates/table/TableOrganizationDisplayTemplate.tsx +++ b/pwa/src/templates/templateParts/OrganizationDisplayTemplates/table/TableOrganizationDisplayTemplate.tsx @@ -36,9 +36,9 @@ export const TableOrganizationDisplayTemplate: React.FC -
+
{!hideTableHead && ( - + {t("Name")} {t("Sources")} @@ -57,7 +57,7 @@ export const TableOrganizationDisplayTemplate: React.FC )} - + {organizations.length > 0 && organizations.map((organization) => ( * { + border-block-end: var(--utrecht-table-header-border-block-end-width) solid var(--utrecht-table-header-border-block-end-color); +} + +.tableHeader { top: 0; position: sticky; background-color: var(--web-app-color-grey) !important; + font-family: var(--utrecht-table-header-font-family); } -.statusBadge { - user-select: none; +.tableHeader > tr > th { + border-inline-end-width: var(--utrecht-table-header-cell-border-inline-end-width); + border-inline-end-style: var(--utrecht-table-header-cell-border-inline-end-style); + border-inline-end-color: var(--utrecht-table-header-cell-border-inline-end-color); +} + +.tableRow > * { + vertical-align: middle !important; +} + +.tableRow:hover { + cursor: pointer; + background-color: var(--utrecht-table-row-hover-background-color); +} + +.tableBody { + border: var(--utrecht-table-body-border); +} + +.tableBody > tr > td { + border-inline-end-width: var(--utrecht-table-cell-border-inline-end-width); + border-inline-end-style: var(--utrecht-table-cell-border-inline-end-style); + border-inline-end-color: var(--utrecht-table-cell-border-inline-end-color); +} + +.tableBody .tableRow:nth-child(odd) { + background-color: var(--utrecht-table-row-alternate-odd-background-color); + color: var(--utrecht-table-row-alternate-odd-color); +} + +.tableBody .tableRow:nth-child(odd):hover { + background-color: var(--utrecht-table-row-hover-background-color); + color: var(--utrecht-table-row-hover-color); +} + +.tableBody .tableRow:nth-child(even) { + background-color: var(--utrecht-table-row-alternate-even-background-color); + color: var(--utrecht-table-row-alternate-even-color); +} +.tableBody .tableRow:nth-child(even):hover { + background-color: var(--utrecht-table-row-hover-background-color); + color: var(--utrecht-table-row-hover-color); } diff --git a/pwa/src/templates/templateParts/ratingOverview/RatingOverview.tsx b/pwa/src/templates/templateParts/ratingOverview/RatingOverview.tsx index a1e00c027..0aec93699 100644 --- a/pwa/src/templates/templateParts/ratingOverview/RatingOverview.tsx +++ b/pwa/src/templates/templateParts/ratingOverview/RatingOverview.tsx @@ -25,7 +25,7 @@ export const RatingOverview: React.FC = ({ rating }) => { return (
- + Status Message @@ -33,9 +33,9 @@ export const RatingOverview: React.FC = ({ rating }) => { - + {acceptedRatings.map((acceptedRating, idx) => ( - + Passed @@ -47,7 +47,7 @@ export const RatingOverview: React.FC = ({ rating }) => { ))} {rejectedRatings.map((rejectedRating, idx) => ( - + Failed diff --git a/pwa/src/templates/templateParts/resultsTemplates/table/TableResultTemplate.module.css b/pwa/src/templates/templateParts/resultsTemplates/table/TableResultTemplate.module.css index 13cb96cb2..b1ff3ce7d 100644 --- a/pwa/src/templates/templateParts/resultsTemplates/table/TableResultTemplate.module.css +++ b/pwa/src/templates/templateParts/resultsTemplates/table/TableResultTemplate.module.css @@ -11,6 +11,12 @@ font-family: var(--utrecht-table-header-font-family); } +.tableHeader > tr > th { + border-inline-end-width: var(--utrecht-table-header-cell-border-inline-end-width); + border-inline-end-style: var(--utrecht-table-header-cell-border-inline-end-style); + border-inline-end-color: var(--utrecht-table-header-cell-border-inline-end-color); +} + .tableRow > * { vertical-align: middle !important; } @@ -25,6 +31,12 @@ border-block-end: var(--utrecht-table-body-border-block-end-width) solid var(--utrecht-table-body-border-block-end-color); } +.tableBody > tr > td { + border-inline-end-width: var(--utrecht-table-cell-border-inline-end-width); + border-inline-end-style: var(--utrecht-table-cell-border-inline-end-style); + border-inline-end-color: var(--utrecht-table-cell-border-inline-end-color); +} + .tableBody .tableRow:nth-child(odd) { background-color: var(--utrecht-table-row-alternate-odd-background-color); color: var(--utrecht-table-row-alternate-odd-color); From 85ef32caa71f0b858e381e4d91d32bbbf33bb6d7 Mon Sep 17 00:00:00 2001 From: Remko Date: Tue, 19 Dec 2023 17:19:43 +0100 Subject: [PATCH 6/9] cleanup --- .../htmlParser/tableBody/getTableBody.module.css | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pwa/src/hooks/htmlParser/tableBody/getTableBody.module.css b/pwa/src/hooks/htmlParser/tableBody/getTableBody.module.css index a17655608..118350fd7 100644 --- a/pwa/src/hooks/htmlParser/tableBody/getTableBody.module.css +++ b/pwa/src/hooks/htmlParser/tableBody/getTableBody.module.css @@ -2,9 +2,8 @@ border: var(--utrecht-table-body-border); } -.tableBody > tr > td { - border-inline-end-width: var(--utrecht-table-cell-border-inline-end-width); - border-inline-end-style: var(--utrecht-table-cell-border-inline-end-style); - border-inline-end-color: var(--utrecht-table-cell-border-inline-end-color); -} - \ No newline at end of file +.tableBody > tr > td { + border-inline-end-width: var(--utrecht-table-cell-border-inline-end-width); + border-inline-end-style: var(--utrecht-table-cell-border-inline-end-style); + border-inline-end-color: var(--utrecht-table-cell-border-inline-end-color); +} From 43545be8c80de435c49b5109aaf35083948e6038 Mon Sep 17 00:00:00 2001 From: Remko Date: Wed, 20 Dec 2023 09:03:57 +0100 Subject: [PATCH 7/9] hotfix --- pwa/src/layout/Head.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pwa/src/layout/Head.tsx b/pwa/src/layout/Head.tsx index 4df6de90f..5bd7a4bb5 100644 --- a/pwa/src/layout/Head.tsx +++ b/pwa/src/layout/Head.tsx @@ -14,7 +14,7 @@ export const Head: React.FC = () => { ); From fbecedf83d96e2441523cdca50339d8bc6c34d94 Mon Sep 17 00:00:00 2001 From: Remko Date: Wed, 20 Dec 2023 10:03:35 +0100 Subject: [PATCH 8/9] mobile fixes --- .../breadcrumbs/Breadcrumbs.module.css | 10 +- .../landing/LandingTemplate.module.css | 10 +- .../OrganizationDetailTemplate.module.css | 1 + .../OrganizationDetailTemplate.tsx | 114 +++++++++--------- .../footer/FooterTemplate.module.css | 5 +- 5 files changed, 79 insertions(+), 61 deletions(-) diff --git a/pwa/src/components/breadcrumbs/Breadcrumbs.module.css b/pwa/src/components/breadcrumbs/Breadcrumbs.module.css index 0d1d76c28..57754d223 100644 --- a/pwa/src/components/breadcrumbs/Breadcrumbs.module.css +++ b/pwa/src/components/breadcrumbs/Breadcrumbs.module.css @@ -1,5 +1,5 @@ .breadcrumbsContainer { - margin-block-start: var(--web-app-size-sm); + margin-block-start: var(--web-app-size-4xl); padding-block-start: var(--web-app-size-sm); padding-block-end: var(--web-app-size-sm); } @@ -25,3 +25,11 @@ .breadcrumbs > ol { align-items: baseline; } + +@media only screen and (min-width: 992px) { + .breadcrumbsContainer { + margin-block-start: var(--web-app-size-sm); + padding-block-start: var(--web-app-size-sm); + padding-block-end: var(--web-app-size-sm); + } +} diff --git a/pwa/src/templates/landing/LandingTemplate.module.css b/pwa/src/templates/landing/LandingTemplate.module.css index 4b8a6da46..daa52cd69 100644 --- a/pwa/src/templates/landing/LandingTemplate.module.css +++ b/pwa/src/templates/landing/LandingTemplate.module.css @@ -17,11 +17,6 @@ max-width: 800px; } -.landingDisplaySwitchButtons { - align-items: center; - justify-content: flex-end; -} - .filtersAndResultsContainer { display: flex; gap: var(--web-app-size-lg); @@ -35,4 +30,9 @@ .cards { grid-template-columns: 1fr 1fr; } + + .landingDisplaySwitchButtons { + align-items: center; + justify-content: flex-end; + } } diff --git a/pwa/src/templates/organizationDetail/OrganizationDetailTemplate.module.css b/pwa/src/templates/organizationDetail/OrganizationDetailTemplate.module.css index 7549ab9f2..77394d303 100644 --- a/pwa/src/templates/organizationDetail/OrganizationDetailTemplate.module.css +++ b/pwa/src/templates/organizationDetail/OrganizationDetailTemplate.module.css @@ -7,6 +7,7 @@ } .container > .backButton { + display: none; margin-block-start: var(--web-app-size-2xl); margin-block-end: var(--web-app-size-sm); } diff --git a/pwa/src/templates/organizationDetail/OrganizationDetailTemplate.tsx b/pwa/src/templates/organizationDetail/OrganizationDetailTemplate.tsx index 951be3ff0..1833aea9d 100644 --- a/pwa/src/templates/organizationDetail/OrganizationDetailTemplate.tsx +++ b/pwa/src/templates/organizationDetail/OrganizationDetailTemplate.tsx @@ -160,24 +160,26 @@ export const OrganizationDetailTemplate: React.FC {/* */}
- {_getOrganization.data?.embedded?.owns?.map((component: any) => ( - - ))} + {_getOrganization.data?.embedded?.owns?.length && + _getOrganization.data?.embedded?.owns?.map((component: any) => ( + + ))} + {!_getOrganization.data?.embedded?.owns?.length && <>Geen resultaten gevonden.}
@@ -185,24 +187,26 @@ export const OrganizationDetailTemplate: React.FC {/* */}
- {_getOrganization.data?.embedded?.supports?.map((component: any) => ( - - ))} + {_getOrganization.data?.embedded?.supports?.length && + _getOrganization.data?.embedded?.supports?.map((component: any) => ( + + ))} + {!_getOrganization.data?.embedded?.supports?.length && <>Geen resultaten gevonden.}
@@ -210,24 +214,26 @@ export const OrganizationDetailTemplate: React.FC {/* */}
- {_getOrganization.data?.embedded?.uses?.map((component: any) => ( - - ))} + {_getOrganization.data?.embedded?.uses?.length && + _getOrganization.data?.embedded?.uses?.map((component: any) => ( + + ))} + {!_getOrganization.data?.embedded?.uses?.length && <>Geen resultaten gevonden.}
diff --git a/pwa/src/templates/templateParts/footer/FooterTemplate.module.css b/pwa/src/templates/templateParts/footer/FooterTemplate.module.css index 37bb3ccf0..47ef41c80 100644 --- a/pwa/src/templates/templateParts/footer/FooterTemplate.module.css +++ b/pwa/src/templates/templateParts/footer/FooterTemplate.module.css @@ -3,7 +3,6 @@ margin: auto; box-sizing: border-box; max-inline-size: var(--utrecht-page-max-inline-size); - padding-inline-start: var(--utrecht-page-margin-inline-start); padding-inline-end: var(--utrecht-page-margin-inline-end); } @@ -104,6 +103,10 @@ } @media only screen and (min-width: 576px) { + .container { + padding-inline-start: var(--utrecht-page-margin-inline-start); + } + .contentGrid { grid-template-columns: repeat(2, minmax(0, 1fr)); } From 810b5970c9d515500c8da5cfc2372ea550b12254 Mon Sep 17 00:00:00 2001 From: Remko Date: Thu, 21 Dec 2023 09:38:37 +0100 Subject: [PATCH 9/9] added gouda theme --- pwa/package-lock.json | 16 ++++----- pwa/package.json | 4 +-- pwa/src/services/getConfig.ts | 4 +++ pwa/src/styling/index.css | 1 + .../templateParts/footer/FooterTemplate.tsx | 9 +++-- pwa/static/configFiles/gouda.json | 36 +++++++++++++++++++ 6 files changed, 55 insertions(+), 15 deletions(-) create mode 100644 pwa/static/configFiles/gouda.json diff --git a/pwa/package-lock.json b/pwa/package-lock.json index 00344969e..5512537b4 100644 --- a/pwa/package-lock.json +++ b/pwa/package-lock.json @@ -8,8 +8,8 @@ "name": "skeleton-pip", "version": "1.0.0", "dependencies": { - "@conduction/components": "2.2.43", - "@conduction/theme": "1.1.4", + "@conduction/components": "2.2.44", + "@conduction/theme": "1.1.5", "@fortawesome/fontawesome-svg-core": "^6.4.2", "@fortawesome/free-brands-svg-icons": "6.4.2", "@fortawesome/free-regular-svg-icons": "6.4.2", @@ -2195,9 +2195,9 @@ } }, "node_modules/@conduction/components": { - "version": "2.2.43", - "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.43.tgz", - "integrity": "sha512-pPmgeLFTEO4zMN5mnetpQnUrlLm9fxNxlalJklhzITtWJP/3SY4tVgfgQCFHo3+EFzqDqUufIcDf7AEI2Jev8A==", + "version": "2.2.44", + "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.44.tgz", + "integrity": "sha512-ompsiZ2r2qlgj8nLpgH9oUHO8ZWINT22doQkdzetqm45bmO4rZqE9sUjBU5i2UofebkBGmx6RwKJwfwtYvO//A==", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.4.2", "@fortawesome/free-solid-svg-icons": "^6.4.2", @@ -2215,9 +2215,9 @@ } }, "node_modules/@conduction/theme": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@conduction/theme/-/theme-1.1.4.tgz", - "integrity": "sha512-gzEgU3EKG6aduaBwmVuLlhU62SLswCTcjWq7Hd/gz7MbeW7Bap7Yex56QlAv36LNQemgW7blbbKX/XmM/hlJCg==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@conduction/theme/-/theme-1.1.5.tgz", + "integrity": "sha512-qHsk/EqfSsSaUpkg6MDv5WtbT5FeYyoG88ql2LurkMIG8dIV8J3Na3dg3BFeiGgt5NMziNbky3WLaWgNPKZKLw==", "dependencies": { "@nl-design-system-unstable/rotterdam-design-tokens": "^1.0.0-alpha.100" } diff --git a/pwa/package.json b/pwa/package.json index 8d3aa9a08..52eb2ef48 100644 --- a/pwa/package.json +++ b/pwa/package.json @@ -23,8 +23,8 @@ "prepare": "cd .. && husky install" }, "dependencies": { - "@conduction/components": "2.2.43", - "@conduction/theme": "1.1.4", + "@conduction/components": "2.2.44", + "@conduction/theme": "1.1.5", "@fortawesome/fontawesome-svg-core": "^6.4.2", "@fortawesome/free-brands-svg-icons": "6.4.2", "@fortawesome/free-regular-svg-icons": "6.4.2", diff --git a/pwa/src/services/getConfig.ts b/pwa/src/services/getConfig.ts index 7321198fc..71580b4fc 100644 --- a/pwa/src/services/getConfig.ts +++ b/pwa/src/services/getConfig.ts @@ -10,6 +10,7 @@ import Dimpact from "./../../static/configFiles/dimpact.json"; import OpenWebconcept from "./../../static/configFiles/open-webconcept.json"; import OpenCatalogi from "./../../static/configFiles/opencatalogi.json"; import Zutphen from "./../../static/configFiles/zutphen.json"; +import Gouda from "./../../static/configFiles/gouda.json"; export const getConfig = (themeOrDomainName: string): Record | undefined => { switch (themeOrDomainName) { @@ -36,6 +37,8 @@ export const getConfig = (themeOrDomainName: string): Record | unde return OpenWebconcept; case "zutphen-theme": return Zutphen; + case "gouda-theme": + return Gouda; default: return CommonGround; @@ -57,6 +60,7 @@ export const availableThemes: TGroupedSelectOption[] = [ label: "Gemeenten", options: [ { label: "Epe", value: "epe-theme" }, + { label: "Gouda", value: "gouda-theme" }, { label: "Leiden", value: "leiden-theme" }, { label: "Noordwijk", value: "noordwijk-theme" }, { label: "Rotterdam", value: "rotterdam-theme" }, diff --git a/pwa/src/styling/index.css b/pwa/src/styling/index.css index 7454c9ee8..8116234b7 100644 --- a/pwa/src/styling/index.css +++ b/pwa/src/styling/index.css @@ -22,6 +22,7 @@ @import "../../node_modules/@conduction/theme/municipalities/opencatalogi-design-tokens/dist/index.css"; @import "../../node_modules/@conduction/theme/municipalities/zutphen-design-tokens/dist/index.css"; @import "../../node_modules/@conduction/theme/municipalities/sloterburg-design-tokens/dist/index.css"; +@import "../../node_modules/@conduction/theme/municipalities/gouda-design-tokens/dist/index.css"; /* Design Tokens maintained by Frameless */ @import "../../node_modules/@nl-design-system-unstable/rotterdam-design-tokens/dist/index.css"; diff --git a/pwa/src/templates/templateParts/footer/FooterTemplate.tsx b/pwa/src/templates/templateParts/footer/FooterTemplate.tsx index 30aa144ad..52e88409d 100644 --- a/pwa/src/templates/templateParts/footer/FooterTemplate.tsx +++ b/pwa/src/templates/templateParts/footer/FooterTemplate.tsx @@ -19,6 +19,7 @@ import { IconPrefix, IconName } from "@fortawesome/fontawesome-svg-core"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faCode, faHeart } from "@fortawesome/free-solid-svg-icons"; import { useFooterContent } from "../../../hooks/footerContent"; +import { Logo as LogoComponent } from "@conduction/components"; export const DEFAULT_FOOTER_CONTENT_URL = "https://raw.githubusercontent.com/OpenCatalogi/web-app/development/pwa/src/templates/templateParts/footer/FooterContent.json"; @@ -141,17 +142,15 @@ const Logo: React.FC = () => { return (
- window.sessionStorage.getItem("FOOTER_LOGO_URL") ? open(window.sessionStorage.getItem("FOOTER_LOGO_URL") ?? "/") : navigate("/") } - src={window.sessionStorage.getItem("FOOTER_LOGO_URL") ?? ""} - alt={t("Footer-logo")} aria-label={`${t("Footer-logo")}, ${t("Can open a new window")}`} - tabIndex={0} + variant="footer" />
); diff --git a/pwa/static/configFiles/gouda.json b/pwa/static/configFiles/gouda.json new file mode 100644 index 000000000..156ce555d --- /dev/null +++ b/pwa/static/configFiles/gouda.json @@ -0,0 +1,36 @@ +{ + "GATSBY_SHOW_THEME_SWITCHER": "false", + + "GATSBY_GITHUB_REPOSITORY_NAME": "web-app", + "GATSBY_USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX": "false", + + "GATSBY_API_URL": "https://api.opencatalogi.nl/api", + "GATSBY_BASE_URL": "https://api.opencatalogi.nl", + + "GATSBY_NL_DESIGN_THEME_CLASSNAME": "gouda-theme", + + "GATSBY_GITHUB_ORGANIZATION_URL": "", + "GATSBY_FAVICON_URL": "https://www.gouda.nl/wp-content/uploads/2023/01/cropped-favicon-32x32.png", + + "GATSBY_PAGE_TITLE": "Gouda's Catalogi", + + "GATSBY_HEADER_LOGO_URL": "", + "GATSBY_HEADER_SHOW_LOGIN": "false", + "GATSBY_HEADER_CONTENT": "https://raw.githubusercontent.com/OpenCatalogi/web-app/main/pwa/src/templates/templateParts/header/HeaderContent.json", + + "GATSBY_JUMBOTRON_TITLE": "", + "GATSBY_JUMBOTRON_SUBTITLE": "", + "GATSBY_JUMBOTRON_IMAGE_PLACEMENT": "false", + "GATSBY_JUMBOTRON_IMAGE_URL": "", + "GATSBY_JUMBOTRON_DESCRIPTION": "", + "GATSBY_JUMBOTRON_ISCARD": "false", + "GATSBY_JUMBOTRON_SEARCHFORM": "true", + "GATSBY_JUMBOTRON_CONTAINER": "true", + + "GATSBY_FOOTER_SHOW_CREATOR": "false", + "GATSBY_FOOTER_LOGO_URL": "https://www.gouda.nl/", + "GATSBY_FOOTER_CONTENT": "https://raw.githubusercontent.com/OpenCatalogi/web-app/25995205e1dbb043822d1c58c5c23f8e6f77ff7e/pwa/src/templates/templateParts/footer/FooterContent.json", + "GATSBY_FOOTER_CONTENT_HEADER": "heading-4", + + "GATSBY_OPTIONAL_START_PAGE": "" +}