Merge remote-tracking branch 'origin/main' into main

ConductionNL · Oct 19, 2023 · 3197746 · 3197746
2 parents 3286f3f + e472c56
commit 3197746
Show file tree

Hide file tree

Showing 20 changed files with 360 additions and 428 deletions.
diff --git a/pwa/package-lock.json b/pwa/package-lock.json
diff --git a/pwa/package.json b/pwa/package.json
@@ -4,9 +4,7 @@
   "private": true,
   "description": "Product Website Template",
   "author": "Conduction",
-  "keywords": [
-    "gatsby"
-  ],
+  "keywords": ["gatsby"],
   "scripts": {
     "develop": "gatsby develop",
     "start": "gatsby develop",
@@ -24,8 +22,8 @@
     "prepare": "cd .. && husky install"
   },
   "dependencies": {
-    "@conduction/components": "2.2.8",
-    "@conduction/theme": "1.0.45",
+    "@conduction/components": "2.2.17",
+    "@conduction/theme": "1.0.48",
     "@fortawesome/fontawesome-svg-core": "^6.1.1",
     "@fortawesome/free-solid-svg-icons": "^6.4.0",
     "@fortawesome/react-fontawesome": "^0.1.18",

diff --git a/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.tsx b/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.tsx
@@ -22,7 +22,7 @@ const ResultsDisplaySwitch: React.FC<ResultsDisplaySwitchProps> = ({ layoutClass
         appearance={isActive(displayKey, "cards") ? "primary-action-button" : "secondary-action-button"}
         className={styles.button}
         onClick={() => setDisplay({ [displayKey]: "cards" })}
-        discription={t("Show cards")}
+        aria-label={t("Cards view")}
       >
         <FontAwesomeIcon icon={faGripVertical} /> {t("Cards")}
       </Button>
@@ -31,7 +31,7 @@ const ResultsDisplaySwitch: React.FC<ResultsDisplaySwitchProps> = ({ layoutClass
         appearance={isActive(displayKey, "table") ? "primary-action-button" : "secondary-action-button"}
         className={styles.button}
         onClick={() => setDisplay({ [displayKey]: "table" })}
-        discription={t("Show table")}
+        aria-label={t("Table view")}
       >
         <FontAwesomeIcon icon={faTable} /> {t("Table")}
       </Button>

diff --git a/pwa/src/data/content.ts b/pwa/src/data/content.ts
diff --git a/pwa/src/data/detail.ts b/pwa/src/data/detail.ts