diff --git a/pwa/package-lock.json b/pwa/package-lock.json
index 35ac365b..229618da 100644
--- a/pwa/package-lock.json
+++ b/pwa/package-lock.json
@@ -8,8 +8,8 @@
"name": "product-website-template",
"version": "1.0.0",
"dependencies": {
- "@conduction/components": "2.2.18",
- "@conduction/theme": "1.0.52",
+ "@conduction/components": "2.2.23",
+ "@conduction/theme": "1.0.53",
"@fortawesome/fontawesome-svg-core": "^6.1.1",
"@fortawesome/free-brands-svg-icons": "6.4.2",
"@fortawesome/free-regular-svg-icons": "6.4.2",
@@ -41,7 +41,6 @@
"@nl-design-system-unstable/westervoort-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/zevenaar-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/zwolle-design-tokens": "^1.0.0-alpha.100",
- "@parcel/watcher": "^2.3.0",
"@tabler/icons-react": "2.21.0",
"@types/qs": "^6.9.9",
"@types/react": "^18.0.28",
@@ -75,6 +74,7 @@
"showdown": "^2.1.0"
},
"devDependencies": {
+ "@parcel/watcher": "^2.3.0",
"@types/dateformat": "^5.0.0",
"@types/dedent": "^0.7.0",
"@types/node": "^17.0.23",
@@ -2061,9 +2061,9 @@
}
},
"node_modules/@conduction/components": {
- "version": "2.2.18",
- "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.18.tgz",
- "integrity": "sha512-dXuDeA4BVGtNzQ0w2t2J3tDoqEHEOehwd0YYm68NWCDYMy/EtlX8tJpTrQSbXpkKt/pQV6dGt5WuBknWHOPHkA==",
+ "version": "2.2.23",
+ "resolved": "https://registry.npmjs.org/@conduction/components/-/components-2.2.23.tgz",
+ "integrity": "sha512-2AV9btRq2W4wwx73zVuN1k+/sJ1ACZoG+yJ1yyxGMZRKvzIBxisxQR2GJjqvW5W44R0Y3izKyfPXcKDhPLamqg==",
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.2.0",
"@fortawesome/free-solid-svg-icons": "^6.2.0",
@@ -2116,9 +2116,9 @@
}
},
"node_modules/@conduction/theme": {
- "version": "1.0.52",
- "resolved": "https://registry.npmjs.org/@conduction/theme/-/theme-1.0.52.tgz",
- "integrity": "sha512-TEp3B60/yjgJ0i1vn5HwTltCKONMOHvzmZU3sFDF0gJ9Ov7d7sXh9fd2cLQ3mZfMJB3CYDoRyS1Wxnt6GYh5IQ==",
+ "version": "1.0.53",
+ "resolved": "https://registry.npmjs.org/@conduction/theme/-/theme-1.0.53.tgz",
+ "integrity": "sha512-5A8/K+60qQKfTYINAYJiXDSDNsKArDpxBotAduw6shxfH3ZSPFBcVE62yG2Gt7xJnwXyqgpC5OYI1T/P6BRhaw==",
"dependencies": {
"@nl-design-system-unstable/rotterdam-design-tokens": "^1.0.0-alpha.100"
}
@@ -3651,7 +3651,9 @@
},
"node_modules/@parcel/watcher": {
"version": "2.3.0",
- "license": "MIT",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.3.0.tgz",
+ "integrity": "sha512-pW7QaFiL11O0BphO+bq3MgqeX/INAk9jgBldVDYjlQPO4VddoZnF22TcF9onMhnLVHuNqBJeRf+Fj7eezi/+rQ==",
+ "hasInstallScript": true,
"dependencies": {
"detect-libc": "^1.0.3",
"is-glob": "^4.0.3",
@@ -3680,6 +3682,215 @@
"@parcel/watcher-win32-x64": "2.3.0"
}
},
+ "node_modules/@parcel/watcher-android-arm64": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.3.0.tgz",
+ "integrity": "sha512-f4o9eA3dgk0XRT3XhB0UWpWpLnKgrh1IwNJKJ7UJek7eTYccQ8LR7XUWFKqw6aEq5KUNlCcGvSzKqSX/vtWVVA==",
+ "cpu": [
+ "arm64"
+ ],
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/@parcel/watcher-darwin-arm64": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.3.0.tgz",
+ "integrity": "sha512-mKY+oijI4ahBMc/GygVGvEdOq0L4DxhYgwQqYAz/7yPzuGi79oXrZG52WdpGA1wLBPrYb0T8uBaGFo7I6rvSKw==",
+ "cpu": [
+ "arm64"
+ ],
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/@parcel/watcher-darwin-x64": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.3.0.tgz",
+ "integrity": "sha512-20oBj8LcEOnLE3mgpy6zuOq8AplPu9NcSSSfyVKgfOhNAc4eF4ob3ldj0xWjGGbOF7Dcy1Tvm6ytvgdjlfUeow==",
+ "cpu": [
+ "x64"
+ ],
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/@parcel/watcher-freebsd-x64": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.3.0.tgz",
+ "integrity": "sha512-7LftKlaHunueAEiojhCn+Ef2CTXWsLgTl4hq0pkhkTBFI3ssj2bJXmH2L67mKpiAD5dz66JYk4zS66qzdnIOgw==",
+ "cpu": [
+ "x64"
+ ],
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/@parcel/watcher-linux-arm-glibc": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.3.0.tgz",
+ "integrity": "sha512-1apPw5cD2xBv1XIHPUlq0cO6iAaEUQ3BcY0ysSyD9Kuyw4MoWm1DV+W9mneWI+1g6OeP6dhikiFE6BlU+AToTQ==",
+ "cpu": [
+ "arm"
+ ],
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/@parcel/watcher-linux-arm64-glibc": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.3.0.tgz",
+ "integrity": "sha512-mQ0gBSQEiq1k/MMkgcSB0Ic47UORZBmWoAWlMrTW6nbAGoLZP+h7AtUM7H3oDu34TBFFvjy4JCGP43JlylkTQA==",
+ "cpu": [
+ "arm64"
+ ],
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/@parcel/watcher-linux-arm64-musl": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.3.0.tgz",
+ "integrity": "sha512-LXZAExpepJew0Gp8ZkJ+xDZaTQjLHv48h0p0Vw2VMFQ8A+RKrAvpFuPVCVwKJCr5SE+zvaG+Etg56qXvTDIedw==",
+ "cpu": [
+ "arm64"
+ ],
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/@parcel/watcher-linux-x64-glibc": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.3.0.tgz",
+ "integrity": "sha512-P7Wo91lKSeSgMTtG7CnBS6WrA5otr1K7shhSjKHNePVmfBHDoAOHYRXgUmhiNfbcGk0uMCHVcdbfxtuiZCHVow==",
+ "cpu": [
+ "x64"
+ ],
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/@parcel/watcher-linux-x64-musl": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.3.0.tgz",
+ "integrity": "sha512-+kiRE1JIq8QdxzwoYY+wzBs9YbJ34guBweTK8nlzLKimn5EQ2b2FSC+tAOpq302BuIMjyuUGvBiUhEcLIGMQ5g==",
+ "cpu": [
+ "x64"
+ ],
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/@parcel/watcher-win32-arm64": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.3.0.tgz",
+ "integrity": "sha512-35gXCnaz1AqIXpG42evcoP2+sNL62gZTMZne3IackM+6QlfMcJLy3DrjuL6Iks7Czpd3j4xRBzez3ADCj1l7Aw==",
+ "cpu": [
+ "arm64"
+ ],
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
+ "node_modules/@parcel/watcher-win32-ia32": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.3.0.tgz",
+ "integrity": "sha512-FJS/IBQHhRpZ6PiCjFt1UAcPr0YmCLHRbTc00IBTrelEjlmmgIVLeOx4MSXzx2HFEy5Jo5YdhGpxCuqCyDJ5ow==",
+ "cpu": [
+ "ia32"
+ ],
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">= 10.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/parcel"
+ }
+ },
"node_modules/@parcel/watcher-win32-x64": {
"version": "2.3.0",
"cpu": [
diff --git a/pwa/package.json b/pwa/package.json
index ec06859d..df837aa9 100644
--- 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.18",
- "@conduction/theme": "1.0.52",
+ "@conduction/components": "2.2.23",
+ "@conduction/theme": "1.0.53",
"@fortawesome/fontawesome-svg-core": "^6.1.1",
"@fortawesome/free-brands-svg-icons": "6.4.2",
"@fortawesome/free-regular-svg-icons": "6.4.2",
@@ -57,7 +55,6 @@
"@nl-design-system-unstable/westervoort-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/zevenaar-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/zwolle-design-tokens": "^1.0.0-alpha.100",
- "@parcel/watcher": "^2.3.0",
"@tabler/icons-react": "2.21.0",
"@types/qs": "^6.9.9",
"@types/react": "^18.0.28",
@@ -91,6 +88,7 @@
"showdown": "^2.1.0"
},
"devDependencies": {
+ "@parcel/watcher": "^2.3.0",
"@types/dateformat": "^5.0.0",
"@types/dedent": "^0.7.0",
"@types/node": "^17.0.23",
diff --git a/pwa/src/templates/templateParts/footer/FooterTemplate.module.css b/pwa/src/templates/templateParts/footer/FooterTemplate.module.css
index f8b4b867..de6400f1 100644
--- a/pwa/src/templates/templateParts/footer/FooterTemplate.module.css
+++ b/pwa/src/templates/templateParts/footer/FooterTemplate.module.css
@@ -105,7 +105,7 @@
margin-top: 38px;
display: flex;
justify-content: space-between;
- align-items: flex-end;
+ align-items: center;
}
.iconLeft {
diff --git a/pwa/src/templates/templateParts/footer/FooterTemplate.tsx b/pwa/src/templates/templateParts/footer/FooterTemplate.tsx
index 610c32f1..5f511489 100644
--- a/pwa/src/templates/templateParts/footer/FooterTemplate.tsx
+++ b/pwa/src/templates/templateParts/footer/FooterTemplate.tsx
@@ -15,6 +15,7 @@ import { navigate } from "gatsby-link";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faCode, faHeart } from "@fortawesome/free-solid-svg-icons";
import { useTranslation } from "react-i18next";
+import { Logo } from "@conduction/components";
import { IconPrefix, IconName } from "@fortawesome/fontawesome-svg-core";
import { useFooterContent } from "../../../hooks/footerContent";
@@ -78,7 +79,15 @@ export const FooterTemplate: React.FC = () => {
-
+ {process.env.GATSBY_FOOTER_LOGO_URL !== "false" && (
+
+ process.env.GATSBY_FOOTER_LOGO_HREF ? open(process.env.GATSBY_FOOTER_LOGO_HREF) : navigate("/")
+ }
+ />
+ )}
+
@@ -132,26 +141,6 @@ const DynamicSectionHeading: React.FC<{ content: TDynamicContentItem; heading?:
}
};
-const Logo: React.FC = () => {
- if (process.env.GATSBY_FOOTER_LOGO_URL === "false") return <>;
- const { t } = useTranslation();
-
- return (
-
-
![]()
- process.env.GATSBY_FOOTER_LOGO_HREF ? open(process.env.GATSBY_FOOTER_LOGO_HREF) : navigate("/")
- }
- src={process.env.GATSBY_FOOTER_LOGO_URL}
- alt={t("Footer-logo")}
- aria-label={`${t("Footer-logo")}, ${t("Can open a new window")}`}
- tabIndex={0}
- />
-
-
-
![]()
navigate("/")}
- src={process.env.GATSBY_HEADER_LOGO_URL}
- alt={t("Navbar-Logo")}
- tabIndex={0}
- />
-
+
navigate("/")} />
+