Merge pull request #235 from ConductionNL/development

Development to main, week 2
ConductionNL · Jan 16, 2024 · 7a4a105 · 7a4a105
2 parents b5123ac + 278f69f
commit 7a4a105
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 7 deletions.
diff --git a/pwa/docker/default.conf b/pwa/docker/default.conf
@@ -12,6 +12,8 @@ server {
         root   /usr/share/nginx/html;
         index  index.html index.htm;
         try_files $uri $uri/ /index.html;
+
+        add_header X-Content-Type-Options nosniff;
     }
 
     #error_page  404              /404.html;

diff --git a/pwa/package-lock.json b/pwa/package-lock.json
diff --git a/pwa/package.json b/pwa/package.json
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@conduction/components": "2.2.44",
-    "@conduction/theme": "1.1.5",
+    "@conduction/theme": "1.1.12",
     "@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
@@ -20,6 +20,7 @@ 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 Zuiddrecht from "./../../static/configFiles/zuiddrecht.json";
 import { TGroupedSelectOption } from "@conduction/components/lib/components/formFields/select/select";
 
 export const getConfig = (themeOrDomainName: string): Record<string, any> | undefined => {
@@ -72,6 +73,12 @@ export const getConfig = (themeOrDomainName: string): Record<string, any> | unde
     case "zutphen-theme":
       return Zutphen;
 
+    case "open.zuiddrecht.nl":
+    case "zuiddrecht.koophulpje.nl":
+    case "zuiddrecht.openwoo.app":
+    case "zuiddrecht-theme":
+      return Zuiddrecht;
+
     case "open.sloterburg.nl":
     case "sloterburg.koophulpje.nl":
     case "sloterburg.openwoo.app":
@@ -174,6 +181,7 @@ export const availableThemes: TGroupedSelectOption[] = [
       { label: "Texel", value: "texel" },
       { label: "Tubbergen", value: "tubbergen-theme" },
       { label: "Waddinxveen", value: "waddinxveen" },
+      { label: "Zuiddrecht", value: "zuiddrecht-theme" },
       { label: "Zutphen", value: "zutphen-theme" },
     ],
   },

diff --git a/pwa/src/styling/index.css b/pwa/src/styling/index.css
@@ -18,6 +18,7 @@
 @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";
+@import "../../node_modules/@conduction/theme/municipalities/zuiddrecht-design-tokens/dist/index.css";
 
 /* Design Tokens maintained by Frameless */
 @import "../../node_modules/@utrecht/design-tokens/dist/theme.css";

diff --git a/pwa/src/templates/templateParts/footer/FooterTemplate.module.css b/pwa/src/templates/templateParts/footer/FooterTemplate.module.css
@@ -86,6 +86,7 @@
 }
 
 .withLoveLink:hover > :first-child {
+  color: var(--utrecht-page-footer-link-hover-color);
   transform: scale(1.2);
 }
 

diff --git a/pwa/static/.env.development b/pwa/static/.env.development
@@ -15,7 +15,7 @@ GATSBY_SHOW_CATEGORY="true"
 GATSBY_SHOW_ORGANIZATION="true"
 
 # Header
-GATSBY_FAVICON_URL="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDIwMDEwOTA0Ly9FTiIKICAgICJodHRwOi8vd3d3LnczLm9yZy9UUi8yMDAxL1JFQy1TVkctMjAwMTA5MDQvRFREL3N2ZzEwLmR0ZCI+CjxzdmcgdmVyc2lvbj0iMS4wIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgICAgd2lkdGg9IjcxLjAwMDAwMHB0IiBoZWlnaHQ9IjcwLjAwMDAwMHB0IiB2aWV3Qm94PSIwIDAgNzEuMDAwMDAwIDcwLjAwMDAwMCIKICAgICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCBtZWV0Ij4KCiAgICA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLjAwMDAwMCw3MC4wMDAwMDApIHNjYWxlKDAuMTAwMDAwLC0wLjEwMDAwMCkiCiAgICAgICBmaWxsPSIjNDM3NkZDIiBzdHJva2U9Im5vbmUiPgogICAgICAgIDxwYXRoIGQ9Ik0yMTggNTkyIGwtMTM3IC03NyAwIC0xNjUgMCAtMTY1IDEzMSAtNzQgYzcyIC00MSAxMzcgLTc0IDE0MyAtNzQgNgowIDcwIDMzIDE0MyA3NCBsMTMxIDc0IDEgMTY1IDAgMTY1IC02OCAzNyBjLTM3IDIxIC05OSA1NiAtMTM3IDc3IGwtNzEgNDAKLTEzNiAtNzd6IG0yOTUgLTg1IGw1NyAtMzIgMCAtMTI1IDAgLTEyNSAtMTA2IC02MCBjLTU4IC0zMyAtMTA4IC02MCAtMTExCi01OSAtMyAwIC01MiAyNyAtMTA5IDYwIGwtMTAzIDU5IDAgMTI1IDAgMTI1IDEwNyA2MSAxMDcgNjIgNTAgLTI5IGMyNyAtMTYKNzYgLTQ0IDEwOCAtNjJ6Ii8+CiAgICAgICAgPHBhdGggZD0iTTI3OCA0NzIgbC02OCAtMzcgMCAtODUgMCAtODUgNzMgLTM5IDczIC0zOSA2MiAzNCBjMzQgMTggNjIgMzcgNjIKNDEgMCA0IC0xNCAxNSAtMzEgMjMgLTI4IDE1IC0zMyAxNSAtNTQgMSAtMzEgLTIwIC00NiAtMjAgLTg0IDIgLTI3IDE1IC0zMQoyMiAtMzEgNjIgMCA0MCA0IDQ3IDMxIDYzIDM4IDIxIDUzIDIxIDg0IDEgMjEgLTE0IDI2IC0xNCA1NCAxIDE3IDggMzEgMTkgMzEKMjMgMCA4IC0xMTMgNzIgLTEyNiA3MiAtNSAwIC0zOSAtMTcgLTc2IC0zOHoiLz4KICAgIDwvZz4KPC9zdmc+Cg=="
+GATSBY_FAVICON_URL="data:image/svg+xml,%3Csvg id='Laag_1' data-name='Laag 1' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 259.81 300'%3E%3Cpath d='M129.9,0,0,75V225l129.9,75,129.91-75V75Zm96.8,205.89-96.8,55.88L33.1,205.89V94.11l96.8-55.89,96.8,55.89Z' style='fill:%234376fc'/%3E%3Cpolygon points='129.59 112.23 160.01 129.79 195.41 109.35 129.59 71.35 61.47 110.67 61.47 189.33 129.59 228.65 195.41 190.65 160.01 170.21 129.59 187.77 96.88 168.88 96.88 131.12 129.59 112.23' style='fill:%234376fc'/%3E%3C/svg%3E"
 
 # Jumbotron
 GATSBY_ORGANISATION_NAME=Conduction

diff --git a/pwa/static/configFiles/conduction.json b/pwa/static/configFiles/conduction.json
@@ -2,7 +2,7 @@
   "GATSBY_SHOW_THEME_SWITCHER": "false",
   "GATSBY_API_BASE_URL": "https://api.common-gateway.commonground.nu/api",
   "GATSBY_NL_DESIGN_THEME_CLASSNAME": "conduction-theme",
-  "GATSBY_FAVICON_URL": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDIwMDEwOTA0Ly9FTiIKICAgICJodHRwOi8vd3d3LnczLm9yZy9UUi8yMDAxL1JFQy1TVkctMjAwMTA5MDQvRFREL3N2ZzEwLmR0ZCI+CjxzdmcgdmVyc2lvbj0iMS4wIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgICAgd2lkdGg9IjcxLjAwMDAwMHB0IiBoZWlnaHQ9IjcwLjAwMDAwMHB0IiB2aWV3Qm94PSIwIDAgNzEuMDAwMDAwIDcwLjAwMDAwMCIKICAgICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCBtZWV0Ij4KCiAgICA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLjAwMDAwMCw3MC4wMDAwMDApIHNjYWxlKDAuMTAwMDAwLC0wLjEwMDAwMCkiCiAgICAgICBmaWxsPSIjNDM3NkZDIiBzdHJva2U9Im5vbmUiPgogICAgICAgIDxwYXRoIGQ9Ik0yMTggNTkyIGwtMTM3IC03NyAwIC0xNjUgMCAtMTY1IDEzMSAtNzQgYzcyIC00MSAxMzcgLTc0IDE0MyAtNzQgNgowIDcwIDMzIDE0MyA3NCBsMTMxIDc0IDEgMTY1IDAgMTY1IC02OCAzNyBjLTM3IDIxIC05OSA1NiAtMTM3IDc3IGwtNzEgNDAKLTEzNiAtNzd6IG0yOTUgLTg1IGw1NyAtMzIgMCAtMTI1IDAgLTEyNSAtMTA2IC02MCBjLTU4IC0zMyAtMTA4IC02MCAtMTExCi01OSAtMyAwIC01MiAyNyAtMTA5IDYwIGwtMTAzIDU5IDAgMTI1IDAgMTI1IDEwNyA2MSAxMDcgNjIgNTAgLTI5IGMyNyAtMTYKNzYgLTQ0IDEwOCAtNjJ6Ii8+CiAgICAgICAgPHBhdGggZD0iTTI3OCA0NzIgbC02OCAtMzcgMCAtODUgMCAtODUgNzMgLTM5IDczIC0zOSA2MiAzNCBjMzQgMTggNjIgMzcgNjIKNDEgMCA0IC0xNCAxNSAtMzEgMjMgLTI4IDE1IC0zMyAxNSAtNTQgMSAtMzEgLTIwIC00NiAtMjAgLTg0IDIgLTI3IDE1IC0zMQoyMiAtMzEgNjIgMCA0MCA0IDQ3IDMxIDYzIDM4IDIxIDUzIDIxIDg0IDEgMjEgLTE0IDI2IC0xNCA1NCAxIDE3IDggMzEgMTkgMzEKMjMgMCA4IC0xMTMgNzIgLTEyNiA3MiAtNSAwIC0zOSAtMTcgLTc2IC0zOHoiLz4KICAgIDwvZz4KPC9zdmc+Cg==",
+  "GATSBY_FAVICON_URL": "data:image/svg+xml,%3Csvg id='Laag_1' data-name='Laag 1' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 259.81 300'%3E%3Cpath d='M129.9,0,0,75V225l129.9,75,129.91-75V75Zm96.8,205.89-96.8,55.88L33.1,205.89V94.11l96.8-55.89,96.8,55.89Z' style='fill:%234376fc'/%3E%3Cpolygon points='129.59 112.23 160.01 129.79 195.41 109.35 129.59 71.35 61.47 110.67 61.47 189.33 129.59 228.65 195.41 190.65 160.01 170.21 129.59 187.77 96.88 168.88 96.88 131.12 129.59 112.23' style='fill:%234376fc'/%3E%3C/svg%3E",
   "GATSBY_ORGANISATION_NAME": "Conduction",
   "GATSBY_JUMBOTRON_IMAGE_URL": "https://www.conduction.nl/wp-content/uploads/2021/07/cropped-Conduction_HOME_0000_afb1-1.png",
   "GATSBY_FOOTER_LOGO_HREF": "https://www.conduction.nl/",

diff --git a/pwa/static/configFiles/zuiddrecht.json b/pwa/static/configFiles/zuiddrecht.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,6 +86,7 @@ @@
     }
     .withLoveLink:hover > :first-child {
+      color: var(--utrecht-page-footer-link-hover-color);
       transform: scale(1.2);
     }
@@ Expand Down @@