Development to main, week 52

.github/workflows/woo-page-deploy.yml

@@ -16,9 +16,10 @@ env: # Change these to your preferences any image url can also be a base encoded
   HEADER_LOGO_URL: "https://conduction.nl/wp-content/uploads/2021/07/cropped-conductionlogo-1.png"
   ORGANISATION_NAME: "Conduction"
   JUMBOTRON_IMAGE_URL: "https://www.conduction.nl/wp-content/uploads/2021/07/cropped-Conduction_HOME_0000_afb1-1.png"
-  FOOTER_LOGO_URL: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDIwMDEwOTA0Ly9FTiIKICAgICJodHRwOi8vd3d3LnczLm9yZy9UUi8yMDAxL1JFQy1TVkctMjAwMTA5MDQvRFREL3N2ZzEwLmR0ZCI+CjxzdmcgdmVyc2lvbj0iMS4wIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgICAgd2lkdGg9IjcxLjAwMDAwMHB0IiBoZWlnaHQ9IjcwLjAwMDAwMHB0IiB2aWV3Qm94PSIwIDAgNzEuMDAwMDAwIDcwLjAwMDAwMCIKICAgICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCBtZWV0Ij4KCiAgICA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLjAwMDAwMCw3MC4wMDAwMDApIHNjYWxlKDAuMTAwMDAwLC0wLjEwMDAwMCkiCiAgICAgICBmaWxsPSIjNDM3NkZDIiBzdHJva2U9Im5vbmUiPgogICAgICAgIDxwYXRoIGQ9Ik0yMTggNTkyIGwtMTM3IC03NyAwIC0xNjUgMCAtMTY1IDEzMSAtNzQgYzcyIC00MSAxMzcgLTc0IDE0MyAtNzQgNgowIDcwIDMzIDE0MyA3NCBsMTMxIDc0IDEgMTY1IDAgMTY1IC02OCAzNyBjLTM3IDIxIC05OSA1NiAtMTM3IDc3IGwtNzEgNDAKLTEzNiAtNzd6IG0yOTUgLTg1IGw1NyAtMzIgMCAtMTI1IDAgLTEyNSAtMTA2IC02MCBjLTU4IC0zMyAtMTA4IC02MCAtMTExCi01OSAtMyAwIC01MiAyNyAtMTA5IDYwIGwtMTAzIDU5IDAgMTI1IDAgMTI1IDEwNyA2MSAxMDcgNjIgNTAgLTI5IGMyNyAtMTYKNzYgLTQ0IDEwOCAtNjJ6Ii8+CiAgICAgICAgPHBhdGggZD0iTTI3OCA0NzIgbC02OCAtMzcgMCAtODUgMCAtODUgNzMgLTM5IDczIC0zOSA2MiAzNCBjMzQgMTggNjIgMzcgNjIKNDEgMCA0IC0xNCAxNSAtMzEgMjMgLTI4IDE1IC0zMyAxNSAtNTQgMSAtMzEgLTIwIC00NiAtMjAgLTg0IDIgLTI3IDE1IC0zMQoyMiAtMzEgNjIgMCA0MCA0IDQ3IDMxIDYzIDM4IDIxIDUzIDIxIDg0IDEgMjEgLTE0IDI2IC0xNCA1NCAxIDE3IDggMzEgMTkgMzEKMjMgMCA4IC0xMTMgNzIgLTEyNiA3MiAtNSAwIC0zOSAtMTcgLTc2IC0zOHoiLz4KICAgIDwvZz4KPC9zdmc+Cg=="
+  FOOTER_LOGO_URL: "true"
   FOOTER_LOGO_HREF: "https://conduction.nl/",
-  FOOTER_CONTENT: "https://raw.githubusercontent.com/ConductionNL/woo-website-template/main/pwa/src/templates/templateParts/footer/FooterContent.json"
+  FOOTER_CONTENT: "https://raw.githubusercontent.com/ConductionNL/${{github.event.repository.name}}/main/FooterContent.json"
+  FOOTER_CONTENT_HEADER: "heading-2"
   # OIDN_NUMBER: " "
   ENV_VARS_SET: "true"
 
@@ -56,6 +57,7 @@ jobs:
           envkey_GATSBY_FOOTER_LOGO_URL: ${{ env.FOOTER_LOGO_URL }}
           envkey_GATSBY_FOOTER_LOGO_HREF: ${{ env.FOOTER_LOGO_HREF }}
           envkey_GATSBY_FOOTER_CONTENT: ${{ env.FOOTER_CONTENT }}
+          envkey_GATSBY_FOOTER_CONTENT_HEADER: ${{ env.FOOTER_CONTENT_HEADER }}
           # envkey_GATSBY_OIDN_NUMBER: ${{ env.OIDN_NUMBER }}
           envkey_GATSBY_ENV_VARS_SET: ${{ env.ENV_VARS_SET }}
           directory: pwa/static

publiccode.yaml

@@ -3,7 +3,7 @@ name: woo-website-template
 applicationSuite: null
 url: https://github.com/ConductionNL/woo-website-template
 landingURL: null
-isBasedOn: https://github.com/ConductionNL/PetstoreBundle
+isBasedOn: null
 softwareVersion: null
 logo: https://avatars.githubusercontent.com/u/106860777?v=4
 monochromeLogo: null
@@ -18,9 +18,9 @@ softwareType: softwareAddon
 description:
   en:
     localisedName: null
-    genericName: Template for setting up a Woo page using NL Design tokens.
-    shortDescription: woo-website-template
-    longDescription: Template for setting up a Woo page using NL Design tokens.
+    genericName: null
+    shortDescription: "Template for setting up a Woo page using NL Design tokens."
+    longDescription: "Template for setting up a Woo page using NL Design tokens."
     documentation: null
     apiDocumentation: null
     features: []
@@ -29,9 +29,9 @@ description:
     awards: []
   nl:
     localisedName: null
-    genericName: Template voor het opzetten van een Woo pagina aan de hand van NL Design tokens.
-    shortDescription: woo-website-template
-    longDescription: Template voor het opzetten van een Woo pagina aan de hand van NL Design tokens.
+    genericName: null
+    shortDescription: "Template voor het opzetten van een Woo pagina aan de hand van NL Design tokens."
+    longDescription: "Template voor het opzetten van een Woo pagina aan de hand van NL Design tokens."
     documentation: null
     apiDocumentation: null
     features: []

pwa/package.json

@@ -22,8 +22,8 @@
     "prepare": "cd .. && husky install"
   },
   "dependencies": {
-    "@conduction/components": "2.2.36",
-    "@conduction/theme": "1.0.56",
+    "@conduction/components": "2.2.44",
+    "@conduction/theme": "1.1.5",
     "@fortawesome/fontawesome-svg-core": "^6.5.0",
     "@fortawesome/free-brands-svg-icons": "6.5.0",
     "@fortawesome/free-regular-svg-icons": "6.5.0",

pwa/src/services/getConfig.ts

@@ -17,59 +17,131 @@ 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 Sloterburg from "./../../static/configFiles/sloterburg.json";
+import Gouda from "./../../static/configFiles/gouda.json";
 import { TGroupedSelectOption } from "@conduction/components/lib/components/formFields/select/select";
 
 export const getConfig = (themeOrDomainName: string): Record<string, any> | undefined => {
   switch (themeOrDomainName) {
     case "open.epe.nl":
+    case "epe.koophulpje.nl":
+    case "epe.openwoo.app":
     case "epe-theme":
       return Epe;
+
     case "open.noordwijk.nl":
+    case "noordwijk.koophulpje.nl":
+    case "noordwijk.openwoo.app":
     case "noordwijk-theme":
       return Noordwijk;
+
     case "open.rotterdam.nl":
+    case "rotterdam.koophulpje.nl":
+    case "rotterdam.openwoo.app":
     case "rotterdam-theme":
       return Rotterdam;
+
     case "open.noaberkracht.nl":
+    case "noaberkracht.koophulpje.nl":
+    case "noaberkracht.openwoo.app":
     case "noaberkracht-theme":
       return Noaberkracht;
+
     case "open.tubbergen.nl":
+    case "tubbergen.koophulpje.nl":
+    case "tubbergen.openwoo.app":
     case "tubbergen-theme":
       return Tubbergen;
+
     case "open.dinkelland.nl":
+    case "dinkelland.koophulpje.nl":
+    case "dinkelland.openwoo.app":
     case "dinkelland-theme":
       return Dinkelland;
+
     case "open.xxllnc.nl":
+    case "xxllnc.koophulpje.nl":
+    case "xxllnc.openwoo.app":
     case "xxllnc-theme":
       return Xxllnc;
+
+    case "open.zutphen.nl":
+    case "zutphen.koophulpje.nl":
+    case "zutphen.openwoo.app":
+    case "zutphen-theme":
+      return Zutphen;
+
+    case "open.sloterburg.nl":
+    case "sloterburg.koophulpje.nl":
+    case "sloterburg.openwoo.app":
+    case "sloterburg-theme":
+      return Sloterburg;
+
+    case "open.gouda.nl":
+    case "gouda.koophulpje.nl":
+    case "gouda.openwoo.app":
+    case "gouda-theme":
+      return Gouda;
+
     case "koophulpje.nl":
     case "open-webconcept-theme":
+    case "openwoo.app":
       // case "localhost": // development purposes
       return OpenWebconcept;
 
     case "barendrecht":
+    case "barendrecht.koophulpje.nl":
+    case "barendrecht.openwoo.app":
       return Barendrecht;
+
     case "ridderkerk":
+    case "ridderkerk.koophulpje.nl":
+    case "ridderkerk.openwoo.app":
       return Ridderkerk;
+
     case "buren":
+    case "buren.koophulpje.nl":
+    case "buren.openwoo.app":
       return Buren;
+
     case "albrandswaard":
+    case "albrandswaard.koophulpje.nl":
+    case "albrandswaard.openwoo.app":
       return Albrandswaard;
+
     case "stedebroec":
+    case "stedebroec.koophulpje.nl":
+    case "stedebroec.openwoo.app":
       return StedeBroec;
+
     case "lansingerland":
+    case "lansingerland.koophulpje.nl":
+    case "lansingerland.openwoo.app":
       return Lansingerland;
+
     case "waddinxveen":
+    case "waddinxveen.koophulpje.nl":
+    case "waddinxveen.openwoo.app":
       return Waddinxveen;
+
     case "rijssen-holten":
+    case "rijssen-holten.koophulpje.nl":
+    case "rijssen-holten.openwoo.app":
       return RijssenHolten;
+
     case "hoeksche-waard":
+    case "hoeksche-waard.koophulpje.nl":
+    case "hoeksche-waard.openwoo.app":
       return HoekscheWaard;
+
     case "texel":
+    case "texel.koophulpje.nl":
+    case "texel.openwoo.app":
       return Texel;
 
     default:
-      return Conduction;
+      return OpenWebconcept;
   }
 };
 
@@ -90,16 +162,19 @@ export const availableThemes: TGroupedSelectOption[] = [
       { label: "Buren", value: "buren" },
       { label: "Dinkelland", value: "dinkelland-theme" },
       { label: "Epe", value: "epe-theme" },
+      { label: "Gouda", value: "gouda-theme" },
       { label: "Hoeksche Waard", value: "hoeksche-waard" },
       { label: "Lansingerland", value: "lansingerland" },
       { label: "Noordwijk", value: "noordwijk-theme" },
       { label: "Ridderkerk", value: "ridderkerk" },
       { label: "Rijssen-Holten", value: "rijssen-holten" },
       { label: "Rotterdam", value: "rotterdam-theme" },
+      { label: "Sloterburg", value: "sloterburg-theme" },
       { label: "Stede Broec", value: "stedebroec" },
       { label: "Texel", value: "texel" },
       { label: "Tubbergen", value: "tubbergen-theme" },
       { label: "Waddinxveen", value: "waddinxveen" },
+      { label: "Zutphen", value: "zutphen-theme" },
     ],
   },
   {

pwa/src/styling/index.css

@@ -14,6 +14,10 @@
 @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/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/@utrecht/design-tokens/dist/theme.css";

pwa/src/templates/jumbotronTemplate/JumbotronTemplate.module.css

@@ -11,17 +11,25 @@
   padding-inline-end: 48px;
   padding-block-start: 40px;
   padding-block-end: 40px;
-  border-bottom: var(--conduction-card-wrapper-border-width)
-    var(--conduction-card-wrapper-border-style)
-    var(--conduction-card-wrapper-border-color);
+
+  border-width: var(--conduction-card-wrapper-border-width);
+  border-style: var(--conduction-card-wrapper-border-style);
+  border-color: var(--conduction-card-wrapper-border-color);
+  border-bottom-width: var(--conduction-card-wrapper-border-width);
+  border-bottom-style: var(--conduction-card-wrapper-border-style);
+  border-bottom-color: var(--conduction-card-wrapper-border-color);
 }
 
 .card:hover {
   background-color: var(--conduction-card-wrapper-background-color);
   cursor: default;
-  border-bottom: var(--conduction-card-wrapper-border-width)
-    var(--conduction-card-wrapper-border-style)
-    var(--conduction-card-wrapper-border-color);
+
+  border-width: var(--conduction-card-wrapper-border-width);
+  border-style: var(--conduction-card-wrapper-border-style);
+  border-color: var(--conduction-card-wrapper-border-color);
+  border-bottom-width: var(--conduction-card-wrapper-border-width);
+  border-bottom-style: var(--conduction-card-wrapper-border-style);
+  border-bottom-color: var(--conduction-card-wrapper-border-color);
 }
 
 .description {

pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.module.css

@@ -27,6 +27,13 @@
   text-overflow: ellipsis;
 }
 
+.cardContainer:hover .description {
+  color: var(
+    --conduction-card-wrapper-hover-color,
+    var(--conduction-card-wrapper-color)
+  ) !important;
+}
+
 .cardFooter {
   margin-top: auto;
 }

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;

pwa/src/templates/templateParts/tableResultsTemplate/TableResultsTemplate.module.css

@@ -12,6 +12,18 @@
   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;
 }
@@ -23,6 +35,14 @@
 
 .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 > 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) {

pwa/src/templates/wooItemDetailTemplate/WOOItemDetailTemplate.module.css

@@ -45,6 +45,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);

pwa/static/configFiles/sloterburg.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": "sloterburg-theme",
+  "GATSBY_FAVICON_URL": "https://cuatro.sim-cdn.nl/sloterburg/uploads/styles/favicon/media/favicon357500.png?cb=U6Ix86ic",
+  "GATSBY_ORGANISATION_NAME": "Gemeente Sloterburg",
+  "GATSBY_JUMBOTRON_IMAGE_URL": "https://cuatro.sim-cdn.nl/sloterburg/uploads/styles/large_5x2_2560x1024/media/kasteel.jpg?cb=RcxlJqfm",
+  "GATSBY_FOOTER_LOGO_HREF": "https://sloterburg.nl/",
+  "GATSBY_FOOTER_CONTENT": "https://raw.githubusercontent.com/ConductionNL/woo-website-template/main/docs/FooterContent.json",
+  "GATSBY_FOOTER_CONTENT_HEADER": "heading-2",
+  "GATSBY_OIDN_NUMBER": "sloterburg",
+  "GATSBY_SHOW_CATEGORY": "true",
+  "GATSBY_SHOW_ORGANIZATION": "true"
+}

pwa/static/configFiles/xxllnc.json

@@ -8,7 +8,7 @@
   "GATSBY_FOOTER_LOGO_HREF": "https://xxllnc.nl/",
   "GATSBY_FOOTER_CONTENT": "https://raw.githubusercontent.com/ConductionNL/woo-website-xxllnc/main/FooterContent.json",
   "GATSBY_FOOTER_CONTENT_HEADER": "",
-  "GATSBY_OIDN_NUMBER": "",
+  "GATSBY_OIDN_NUMBER": "00000003737277330000",
   "GATSBY_SHOW_CATEGORY": "true",
-  "GATSBY_SHOW_ORGANIZATION": "true"
+  "GATSBY_SHOW_ORGANIZATION": "false"
 }

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": "00000001813584620000",
+  "GATSBY_SHOW_CATEGORY": "true",
+  "GATSBY_SHOW_ORGANIZATION": "false"
+}