Merge remote-tracking branch 'origin/development' into Theme-test-branch

ConductionNL · Dec 18, 2023 · 2911506 · 2911506
2 parents edb7baa + a1f64b8
commit 2911506
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 6 deletions.
diff --git a/pwa/package-lock.json b/pwa/package-lock.json
diff --git a/pwa/package.json b/pwa/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@conduction/components": "2.2.41",
-    "@conduction/theme": "file:../../conduction-theme",
+    "@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
@@ -17,55 +17,113 @@ 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<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 "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:
@@ -100,6 +158,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/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) {

diff --git a/pwa/static/configFiles/xxllnc.json b/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"
 }
diff --git a/pwa/static/configFiles/zutphen.json 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": "00000001813584620000",
+  "GATSBY_SHOW_CATEGORY": "true",
+  "GATSBY_SHOW_ORGANIZATION": "true"
+}