From 83cf2c00bb214d33d786b9d28bd554dfdb5b4cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joa=CC=83o=20Sobral?= Date: Thu, 16 Jan 2025 17:05:42 +0000 Subject: [PATCH 01/10] =?UTF-8?q?chore=20=F0=9F=A7=B9:=20add=20swiss-feder?= =?UTF-8?q?al-ci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/package.json | 1 + yarn.lock | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/app/package.json b/app/package.json index 8f729c8fd..a897c44f3 100644 --- a/app/package.json +++ b/app/package.json @@ -23,6 +23,7 @@ "@dnd-kit/utilities": "3.2.2", "@emotion/react": "^11.8.2", "@emotion/styled": "^11.8.1", + "@interactivethings/swiss-federal-ci": "^2.16.1", "@juggle/resize-observer": "^3.4.0", "@lingui/core": "^3.17.2", "@lingui/react": "^3.17.2", diff --git a/yarn.lock b/yarn.lock index 7f47e3c01..2f7ce547d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4410,6 +4410,11 @@ resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz#56f00962ff0c4e0eb93d34a047d29fa995e3e342" integrity sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg== +"@interactivethings/swiss-federal-ci@^2.16.1": + version "2.16.1" + resolved "https://registry.yarnpkg.com/@interactivethings/swiss-federal-ci/-/swiss-federal-ci-2.16.1.tgz#4f595501f5a3519990958d862d2fff093c1e242a" + integrity sha512-2WcZRF28sPX6AO8RhuaPCENG5UPVYZNVRxPlNTvZTnxu+UZmSBFot0RalfDZQLjT/0qcY717pxUDws3/2wz1rg== + "@isaacs/cliui@^8.0.2": version "8.0.2" resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" From ab8c3c1c6c006d27e8744126be8e2dc3d3ca774d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joa=CC=83o=20Sobral?= Date: Fri, 17 Jan 2025 12:45:44 +0000 Subject: [PATCH 02/10] =?UTF-8?q?chore=20=F0=9F=A7=B9:=20add=20missing=20p?= =?UTF-8?q?eer=20dependency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/package.json | 1 + yarn.lock | 186 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 155 insertions(+), 32 deletions(-) diff --git a/app/package.json b/app/package.json index a897c44f3..5336234ea 100644 --- a/app/package.json +++ b/app/package.json @@ -137,6 +137,7 @@ "topojson-client": "^3.1.0", "topojson-server": "^3.0.1", "ts-pattern": "4.3.0", + "tss-react": "^4.9.14", "typescript-lru-cache": "^2.0.0", "urql": "^2.0.5", "use-debounce": "^7.0.0", diff --git a/yarn.lock b/yarn.lock index eaeb43c69..158147897 100644 --- a/yarn.lock +++ b/yarn.lock @@ -257,7 +257,7 @@ "@babel/highlight" "^7.24.2" picocolors "^1.0.0" -"@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.0": +"@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.0", "@babel/code-frame@^7.26.2": version "7.26.2" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85" integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ== @@ -286,7 +286,29 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.26.2.tgz#278b6b13664557de95b8f35b90d96785850bb56e" integrity sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg== -"@babel/core@7.12.9", "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.10.5", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.12.9", "@babel/core@^7.14.6", "@babel/core@^7.18.9", "@babel/core@^7.23.0", "@babel/core@^7.23.2", "@babel/core@^7.24.4", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.7.7": +"@babel/core@7.12.9": + version "7.12.9" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8" + integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/generator" "^7.12.5" + "@babel/helper-module-transforms" "^7.12.1" + "@babel/helpers" "^7.12.5" + "@babel/parser" "^7.12.7" + "@babel/template" "^7.12.7" + "@babel/traverse" "^7.12.9" + "@babel/types" "^7.12.7" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.1" + json5 "^2.1.2" + lodash "^4.17.19" + resolve "^1.3.2" + semver "^5.4.1" + source-map "^0.5.0" + +"@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.10.5", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.12.9", "@babel/core@^7.18.9", "@babel/core@^7.23.0", "@babel/core@^7.23.2", "@babel/core@^7.24.4", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.7.7": version "7.26.0" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.26.0.tgz#d78b6023cc8f3114ccf049eb219613f74a747b40" integrity sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg== @@ -316,6 +338,17 @@ jsesc "^2.5.1" source-map "^0.5.0" +"@babel/generator@^7.12.5", "@babel/generator@^7.26.5": + version "7.26.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.5.tgz#e44d4ab3176bbcaf78a5725da5f1dc28802a9458" + integrity sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw== + dependencies: + "@babel/parser" "^7.26.5" + "@babel/types" "^7.26.5" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" + jsesc "^3.0.2" + "@babel/generator@^7.20.14": version "7.23.0" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420" @@ -594,6 +627,15 @@ "@babel/traverse" "^7.25.9" "@babel/types" "^7.25.9" +"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.26.0": + version "7.26.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz#8ce54ec9d592695e58d84cd884b7b5c6a2fdeeae" + integrity sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw== + dependencies: + "@babel/helper-module-imports" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" + "@babel/traverse" "^7.25.9" + "@babel/helper-module-transforms@^7.14.5": version "7.15.8" resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz" @@ -619,15 +661,6 @@ "@babel/helper-split-export-declaration" "^7.22.6" "@babel/helper-validator-identifier" "^7.22.20" -"@babel/helper-module-transforms@^7.26.0": - version "7.26.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz#8ce54ec9d592695e58d84cd884b7b5c6a2fdeeae" - integrity sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw== - dependencies: - "@babel/helper-module-imports" "^7.25.9" - "@babel/helper-validator-identifier" "^7.25.9" - "@babel/traverse" "^7.25.9" - "@babel/helper-optimise-call-expression@^7.14.5", "@babel/helper-optimise-call-expression@^7.15.4": version "7.15.4" resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz" @@ -837,7 +870,7 @@ "@babel/template" "^7.22.15" "@babel/types" "^7.22.19" -"@babel/helpers@^7.26.0": +"@babel/helpers@^7.12.5", "@babel/helpers@^7.26.0": version "7.26.0" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.26.0.tgz#30e621f1eba5aa45fe6f4868d2e9154d884119a4" integrity sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw== @@ -882,7 +915,12 @@ js-tokens "^4.0.0" picocolors "^1.0.0" -"@babel/parser@7.12.16", "@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.6", "@babel/parser@^7.14.7", "@babel/parser@^7.15.4", "@babel/parser@^7.20.15", "@babel/parser@^7.20.7", "@babel/parser@^7.21.4", "@babel/parser@^7.22.15", "@babel/parser@^7.23.0", "@babel/parser@^7.24.0", "@babel/parser@^7.24.4", "@babel/parser@^7.24.5", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.2", "@babel/parser@^7.7.2": +"@babel/parser@7.12.16": + version "7.12.16" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.16.tgz#cc31257419d2c3189d394081635703f549fc1ed4" + integrity sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw== + +"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.12.7", "@babel/parser@^7.14.7", "@babel/parser@^7.15.4", "@babel/parser@^7.20.15", "@babel/parser@^7.20.7", "@babel/parser@^7.21.4", "@babel/parser@^7.22.15", "@babel/parser@^7.23.0", "@babel/parser@^7.24.0", "@babel/parser@^7.24.4", "@babel/parser@^7.24.5", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.2", "@babel/parser@^7.26.5", "@babel/parser@^7.7.2": version "7.26.5" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.5.tgz#6fec9aebddef25ca57a935c86dbb915ae2da3e1f" integrity sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw== @@ -2535,6 +2573,15 @@ resolved "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.6.tgz" integrity sha512-oAoSp82jhJFnXKybKTOj5QF04XxiDRyiiqrFToiU1udlBXuZoADlPmmnOcuqBrZxSNNUjzJIVK8vt838Qoqjxg== +"@babel/template@^7.12.7", "@babel/template@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016" + integrity sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg== + dependencies: + "@babel/code-frame" "^7.25.9" + "@babel/parser" "^7.25.9" + "@babel/types" "^7.25.9" + "@babel/template@^7.15.4", "@babel/template@^7.3.3": version "7.15.4" resolved "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz" @@ -2562,15 +2609,6 @@ "@babel/parser" "^7.24.0" "@babel/types" "^7.24.0" -"@babel/template@^7.25.9": - version "7.25.9" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016" - integrity sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg== - dependencies: - "@babel/code-frame" "^7.25.9" - "@babel/parser" "^7.25.9" - "@babel/types" "^7.25.9" - "@babel/traverse@7.12.13": version "7.12.13" resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.13.tgz" @@ -2601,6 +2639,19 @@ debug "^4.1.0" globals "^11.1.0" +"@babel/traverse@^7.12.9": + version "7.26.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.26.5.tgz#6d0be3e772ff786456c1a37538208286f6e79021" + integrity sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ== + dependencies: + "@babel/code-frame" "^7.26.2" + "@babel/generator" "^7.26.5" + "@babel/parser" "^7.26.5" + "@babel/template" "^7.25.9" + "@babel/types" "^7.26.5" + debug "^4.3.1" + globals "^11.1.0" + "@babel/traverse@^7.18.9", "@babel/traverse@^7.23.2": version "7.24.0" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.0.tgz#4a408fbf364ff73135c714a2ab46a5eab2831b1e" @@ -2663,6 +2714,14 @@ "@babel/helper-validator-identifier" "^7.14.9" to-fast-properties "^2.0.0" +"@babel/types@^7.12.7", "@babel/types@^7.26.5": + version "7.26.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.5.tgz#7a1e1c01d28e26d1fe7f8ec9567b3b92b9d07747" + integrity sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg== + dependencies: + "@babel/helper-string-parser" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" + "@babel/types@^7.16.7": version "7.17.0" resolved "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz" @@ -2733,14 +2792,6 @@ "@babel/helper-string-parser" "^7.25.9" "@babel/helper-validator-identifier" "^7.25.9" -"@babel/types@^7.26.5": - version "7.26.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.5.tgz#7a1e1c01d28e26d1fe7f8ec9567b3b92b9d07747" - integrity sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg== - dependencies: - "@babel/helper-string-parser" "^7.25.9" - "@babel/helper-validator-identifier" "^7.25.9" - "@base2/pretty-print-object@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.1.tgz#371ba8be66d556812dc7fb169ebc3c08378f69d4" @@ -2954,6 +3005,17 @@ source-map "^0.5.7" stylis "4.0.13" +"@emotion/cache@*": + version "11.14.0" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.14.0.tgz#ee44b26986eeb93c8be82bb92f1f7a9b21b2ed76" + integrity sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA== + dependencies: + "@emotion/memoize" "^0.9.0" + "@emotion/sheet" "^1.4.0" + "@emotion/utils" "^1.4.2" + "@emotion/weak-memoize" "^0.4.0" + stylis "4.2.0" + "@emotion/cache@^10.0.27": version "10.0.29" resolved "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz" @@ -2980,6 +3042,11 @@ resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz" integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== +"@emotion/hash@^0.9.2": + version "0.9.2" + resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.9.2.tgz#ff9221b9f58b4dfe61e619a7788734bd63f6898b" + integrity sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g== + "@emotion/is-prop-valid@^0.8.2": version "0.8.8" resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz" @@ -3004,6 +3071,11 @@ resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz" integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ== +"@emotion/memoize@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.9.0.tgz#745969d649977776b43fc7648c556aaa462b4102" + integrity sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ== + "@emotion/react@^11.8.2": version "11.8.2" resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.8.2.tgz#e51f5e6372e22e82780836c9288da19af4b51e70" @@ -3017,6 +3089,17 @@ "@emotion/weak-memoize" "^0.2.5" hoist-non-react-statics "^3.3.1" +"@emotion/serialize@*": + version "1.3.3" + resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.3.3.tgz#d291531005f17d704d0463a032fe679f376509e8" + integrity sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA== + dependencies: + "@emotion/hash" "^0.9.2" + "@emotion/memoize" "^0.9.0" + "@emotion/unitless" "^0.10.0" + "@emotion/utils" "^1.4.2" + csstype "^3.0.2" + "@emotion/serialize@^0.11.15": version "0.11.16" resolved "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz" @@ -3049,6 +3132,11 @@ resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2" integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g== +"@emotion/sheet@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.4.0.tgz#c9299c34d248bc26e82563735f78953d2efca83c" + integrity sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg== + "@emotion/styled@^11.8.1": version "11.8.1" resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.8.1.tgz#856f6f63aceef0eb783985fa2322e2bf66d04e17" @@ -3070,11 +3158,21 @@ resolved "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz" integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== +"@emotion/unitless@^0.10.0": + version "0.10.0" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.10.0.tgz#2af2f7c7e5150f497bdabd848ce7b218a27cf745" + integrity sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg== + "@emotion/use-insertion-effect-with-fallbacks@^1.0.0", "@emotion/use-insertion-effect-with-fallbacks@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.1.tgz#08de79f54eb3406f9daaf77c76e35313da963963" integrity sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw== +"@emotion/utils@*", "@emotion/utils@^1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.4.2.tgz#6df6c45881fcb1c412d6688a311a98b7f59c1b52" + integrity sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA== + "@emotion/utils@0.11.3": version "0.11.3" resolved "https://registry.npmjs.org/@emotion/utils/-/utils-0.11.3.tgz" @@ -3095,6 +3193,11 @@ resolved "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz" integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA== +"@emotion/weak-memoize@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz#5e13fac887f08c44f76b0ccaf3370eb00fec9bb6" + integrity sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg== + "@endemolshinegroup/cosmiconfig-typescript-loader@3.0.2": version "3.0.2" resolved "https://registry.npmjs.org/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-3.0.2.tgz" @@ -15366,7 +15469,7 @@ fwd-stream@^1.0.4: dependencies: readable-stream "~1.0.26-4" -gensync@^1.0.0-beta.2: +gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== @@ -22301,7 +22404,7 @@ resolve@^1.21.0, resolve@^1.22.1: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -resolve@^1.22.4: +resolve@^1.22.4, resolve@^1.3.2: version "1.22.10" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39" integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w== @@ -22625,6 +22728,11 @@ semver@7.x, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: dependencies: lru-cache "^6.0.0" +semver@^5.4.1: + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== + semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" @@ -23676,6 +23784,11 @@ stylis@4.0.13: resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91" integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag== +stylis@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.2.0.tgz#79daee0208964c8fe695a42fcffcac633a211a51" + integrity sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw== + stylus-lookup@^3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/stylus-lookup/-/stylus-lookup-3.0.2.tgz#c9eca3ff799691020f30b382260a67355fefdddd" @@ -24354,6 +24467,15 @@ tslib@~2.2.0: resolved "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz" integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w== +tss-react@^4.9.14: + version "4.9.14" + resolved "https://registry.yarnpkg.com/tss-react/-/tss-react-4.9.14.tgz#0b606b7a08fe80670c8c7d09f2c24421422a2300" + integrity sha512-nAj4RCQk3ADzrmtxmTcmN1B9EKxPMIxuCfJ3ll964CksndJ2/ZImF6rAMo2Kud5yE3ENXHpPIBHCyuMtgptMvw== + dependencies: + "@emotion/cache" "*" + "@emotion/serialize" "*" + "@emotion/utils" "*" + tsutils@^3.21.0: version "3.21.0" resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz" From 72e24f9769fa3ead4fcf91d0cd3c35db8703dc4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joa=CC=83o=20Sobral?= Date: Fri, 17 Jan 2025 17:09:47 +0000 Subject: [PATCH 03/10] =?UTF-8?q?feat=20=E2=9A=A1=EF=B8=8F:=20footer=20fro?= =?UTF-8?q?m=20swiss-federal-ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/footer.tsx | 380 +++++++++++--------------------------- 1 file changed, 108 insertions(+), 272 deletions(-) diff --git a/app/components/footer.tsx b/app/components/footer.tsx index ebdf8febe..1cba1eef7 100644 --- a/app/components/footer.tsx +++ b/app/components/footer.tsx @@ -1,291 +1,127 @@ -import { t, Trans } from "@lingui/macro"; -import { Box, Link, Theme, Typography } from "@mui/material"; -import { makeStyles } from "@mui/styles"; -import NextLink from "next/link"; -import { forwardRef, ReactNode } from "react"; +import { + FooterSection, + FooterSectionButton, + FooterSectionSocialMediaButton, + FooterSectionSocialMediaButtonGroup, + FooterSectionText, + FooterSectionTitle, + Footer as SwissFederalCiFooter, +} from "@interactivethings/swiss-federal-ci/dist/components"; +import { t } from "@lingui/macro"; +import { Link } from "@mui/material"; -import Flex, { FlexProps } from "@/components/flex"; import contentRoutes from "@/content-routes.json"; import { BUILD_COMMIT, BUILD_GITHUB_REPO, BUILD_VERSION } from "@/domain/env"; import { useLocale } from "@/locales/use-locale"; -const Version = () => { - let commitLink = null; - +const mkVersionLink = () => { + let commitLink = ""; + let href = ""; if (BUILD_GITHUB_REPO && BUILD_COMMIT) { - commitLink = ( - <> - ( - - {BUILD_COMMIT.substr(0, 7)} - - ) - - ); - } else if (BUILD_COMMIT) { + commitLink = BUILD_COMMIT.substr(0, 7); + href = `${BUILD_GITHUB_REPO}/commit/${BUILD_COMMIT}`; + } + if (BUILD_COMMIT) { commitLink = `(${BUILD_COMMIT.substr(0, 7)})`; } - - return ( - <> - {BUILD_VERSION} {commitLink} - - ); + return { title: `${BUILD_VERSION} ${commitLink}`, href, external: true }; }; -const useStyles = makeStyles((theme: Theme) => ({ - root: { - backgroundColor: theme.palette.grey[200], - borderTopWidth: "1px", - borderTopStyle: "solid", - borderTopColor: theme.palette.grey[100], - }, - logoContainer: { - padding: `${theme.spacing(5)} ${theme.spacing(4)}`, - borderTopWidth: "1px", - borderBottomWidth: "1px", - borderTopStyle: "solid", - borderBottomStyle: "solid", - borderTopColor: theme.palette.divider, - borderBottomColor: theme.palette.divider, - }, -})); - -export const Footer = ({ sx }: { sx?: FlexProps["sx"] }) => { +export const Footer = () => { const locale = useLocale(); - const classes = useStyles(); + const legalLink = { + title: contentRoutes.legal[locale].title, + href: contentRoutes.legal[locale].path, + external: false, + }; + const imprintLink = { + title: contentRoutes.imprint[locale].title, + href: contentRoutes.imprint[locale].path, + external: false, + }; + const versionLink = mkVersionLink(); return ( - - - + + + + + + + + + + + + + - - Federal Office for the Environment FOEN - - - - - - + + - - - - + + - - - - - Changelog - - - Tutorials - - - - Status - - - - {contentRoutes.legal[locale].title} - - - - - {contentRoutes.imprint[locale].title} - - - - - - ); -}; - -const useFooterLinkStyles = makeStyles((theme: Theme) => ({ - root: { - color: theme.palette.primary.main, - fontSize: "0.875rem", - textDecoration: "none", - cursor: "pointer", - "&:hover": { - color: theme.palette.primary.hover, - }, - "&:active": { - color: theme.palette.primary.hover, - }, - "&:disabled": { - cursor: "initial", - color: theme.palette.primary.disabled, - }, - }, - bottomLink: { - fontSize: "0.875rem", - - borderTopStyle: "solid", - borderTopColor: theme.palette.divider, - - textDecoration: "none", - cursor: "pointer", - "&:hover": { - color: theme.palette.primary.hover, - }, - "&:active": { - color: theme.palette.primary.hover, - }, - "&:disabled": { - cursor: "initial", - color: theme.palette.primary.disabled, - }, - }, -})); - -const FooterLink = ({ - children, - ...props -}: { - children: ReactNode; - href?: string; -}) => { - const classes = useFooterLinkStyles(); - return ( - - {children} - + + + + ); }; - -const FooterLinkBottom = forwardRef< - HTMLAnchorElement, - { children: ReactNode; href?: string } ->(function FooterLinkBottom({ children, ...props }, ref) { - const classes = useFooterLinkStyles(); - - return ( - - {children} - - ); -}); - -const Logo = () => ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -); From 625dbe44df195972293350145bea0955574e7e17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joa=CC=83o=20Sobral?= Date: Fri, 17 Jan 2025 17:10:04 +0000 Subject: [PATCH 04/10] =?UTF-8?q?chore=20=F0=9F=A7=B9:=20translations?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/locales/de/messages.po | 40 ++++++++++++++++++++------------- app/locales/en/messages.po | 32 ++++++++++++++++---------- app/locales/fr/messages.po | 40 ++++++++++++++++++++------------- app/locales/it/messages.po | 46 ++++++++++++++++++++++---------------- 4 files changed, 95 insertions(+), 63 deletions(-) diff --git a/app/locales/de/messages.po b/app/locales/de/messages.po index 1bc1dd458..9f7863de1 100644 --- a/app/locales/de/messages.po +++ b/app/locales/de/messages.po @@ -35,10 +35,6 @@ msgstr "[ Ohne Beschreibung ]" msgid "annotation.add.title" msgstr "[ Ohne Titel ]" -#: app/configurator/components/beta-tag.tsx -msgid "beta-tag.tooltip" -msgstr "Diese Funktion befindet sich derzeit in der Entwicklung. Möglicherweise treten Fehler auf und Leistungsprobleme." - #: app/browser/dataset-browse.tsx msgid "browse-panel.organizations" msgstr "Organisationen" @@ -328,11 +324,11 @@ msgstr "Vertikale Achse" #: app/configurator/components/field-i18n.ts msgid "controls.bar.grouped" -msgstr "" +msgstr "Gruppiert" #: app/configurator/components/field-i18n.ts msgid "controls.bar.stacked" -msgstr "" +msgstr "Gestapelt" #: app/charts/chart-config-ui-options.ts #: app/charts/chart-config-ui-options.ts @@ -418,11 +414,11 @@ msgstr "Es sind mindestens zwei numerische Messungen erforderlich." #: app/charts/index.ts msgid "controls.chart.disabled.numerical" -msgstr "Es ist mindestens eine numerische Massnahme erforderlich." +msgstr "Es ist mindestens eine numerische Mass erforderlich." #: app/charts/index.ts msgid "controls.chart.disabled.same-unit" -msgstr "Es sind mindestens zwei Zahlenwerte mit gleicher Einheit erforderlich." +msgstr "Es sind mindestens zwei numerische Masse mit der gleichen Einheit erforderlich." #: app/charts/index.ts #: app/charts/index.ts @@ -683,15 +679,15 @@ msgstr "Dashboard" #: app/configurator/components/preview-breakpoint.tsx msgid "controls.layout.preview-lg" -msgstr "Vorschau mit kleinem Desktop-Bildschirm" +msgstr "Vorschau in grosser Breite" #: app/configurator/components/preview-breakpoint.tsx msgid "controls.layout.preview-md" -msgstr "Vorschau mit Tablet" +msgstr "Vorschau in mittlerer Breite" #: app/configurator/components/preview-breakpoint.tsx msgid "controls.layout.preview-sm" -msgstr "Vorschau mit Phone-Breite" +msgstr "Vorschau in kleiner Breite" #: app/configurator/components/preview-breakpoint.tsx msgid "controls.layout.preview-xl" @@ -916,7 +912,7 @@ msgstr "Konfidenzintervall anzeigen" #: app/configurator/components/chart-options-selector.tsx msgid "controls.section.show-confidence-interval.explanation" -msgstr "Zeigen Sie Unsicherheiten an, die sich aus Datenpunkten ergeben, um Konfidenzintervalle darzustellen" +msgstr "Unsicherheiten, die sich aus Datenpunkten ergeben anzeigen, um Konfidenzintervalle darzustellen" #: app/configurator/components/chart-options-selector.tsx msgid "controls.section.show-dots" @@ -1328,12 +1324,24 @@ msgid "flashes.couldnt-load-cube.view-cube-checker" msgstr "Ansicht im Cube Validator" #: app/components/footer.tsx -msgid "footer.institution.name" -msgstr "Bundesamt für Umwelt BAFU" +msgid "footer.about_us.label" +msgstr "Über dieses Portal" + +#: app/components/footer.tsx +msgid "footer.about_us.text" +msgstr "Das Portal visualize.admin.ch ermöglicht die Visualisierung von Schweizer Open Government Data, die durch den LINDAS Linked Data Service bereitgestellt werden. Open Government Data (OGD) sind Daten, die der Öffentlichkeit kostenlos in computerlesbarem Format zur Verfügung gestellt werden." + +#: app/components/footer.tsx +msgid "footer.button.lindas" +msgstr "LINDAS Linked Data Dienste" #: app/components/footer.tsx -msgid "footer.institution.url" -msgstr "https://www.bafu.admin.ch/bafu/de/home.html" +msgid "footer.contact.title" +msgstr "Informiert bleiben" + +#: app/components/footer.tsx +msgid "footer.information.title" +msgstr "Weitere Informationen" #: app/components/footer.tsx msgid "footer.status" diff --git a/app/locales/en/messages.po b/app/locales/en/messages.po index 996499a1f..f4194ff4f 100644 --- a/app/locales/en/messages.po +++ b/app/locales/en/messages.po @@ -35,10 +35,6 @@ msgstr "[ No Description ]" msgid "annotation.add.title" msgstr "[ No Title ]" -#: app/configurator/components/beta-tag.tsx -msgid "beta-tag.tooltip" -msgstr "This feature is currently under development, you may encounter bugs and performance problems." - #: app/browser/dataset-browse.tsx msgid "browse-panel.organizations" msgstr "Organizations" @@ -683,19 +679,19 @@ msgstr "Dashboard" #: app/configurator/components/preview-breakpoint.tsx msgid "controls.layout.preview-lg" -msgstr "Preview using large width" +msgstr "Preview with large width" #: app/configurator/components/preview-breakpoint.tsx msgid "controls.layout.preview-md" -msgstr "Preview using tablet" +msgstr "Preview with medium width" #: app/configurator/components/preview-breakpoint.tsx msgid "controls.layout.preview-sm" -msgstr "Preview using mobile" +msgstr "Preview with small width" #: app/configurator/components/preview-breakpoint.tsx msgid "controls.layout.preview-xl" -msgstr "Preview using extra large width" +msgstr "Preview with extra large width" #: app/configurator/components/field-i18n.ts msgid "controls.layout.singleURLs" @@ -1328,12 +1324,24 @@ msgid "flashes.couldnt-load-cube.view-cube-checker" msgstr "View in Cube Validator" #: app/components/footer.tsx -msgid "footer.institution.name" -msgstr "Federal Office for the Environment FOEN" +msgid "footer.about_us.label" +msgstr "About Us" + +#: app/components/footer.tsx +msgid "footer.about_us.text" +msgstr "The portal visualize.admin.ch allows the visualization of Swiss Open Government Data provided by the LINDAS Linked Data Service. Open Government Data (OGD) are data that are made available to the public free of charge in computer-readable format." + +#: app/components/footer.tsx +msgid "footer.button.lindas" +msgstr "LINDAS Linked Data Services" + +#: app/components/footer.tsx +msgid "footer.contact.title" +msgstr "Stay informed" #: app/components/footer.tsx -msgid "footer.institution.url" -msgstr "https://www.bafu.admin.ch/bafu/en/home.html" +msgid "footer.information.title" +msgstr "Further information" #: app/components/footer.tsx msgid "footer.status" diff --git a/app/locales/fr/messages.po b/app/locales/fr/messages.po index 7c38c59a1..b4709c31e 100644 --- a/app/locales/fr/messages.po +++ b/app/locales/fr/messages.po @@ -35,10 +35,6 @@ msgstr "[ Pas de description ]" msgid "annotation.add.title" msgstr "[ Pas de titre ]" -#: app/configurator/components/beta-tag.tsx -msgid "beta-tag.tooltip" -msgstr "Cette fonctionnalité est actuellement en cours de développement, vous pouvez rencontrer des bugs et des problèmes de performances." - #: app/browser/dataset-browse.tsx msgid "browse-panel.organizations" msgstr "Organisations" @@ -683,19 +679,19 @@ msgstr "Dashboard" #: app/configurator/components/preview-breakpoint.tsx msgid "controls.layout.preview-lg" -msgstr "Aperçu petit écran de bureau" +msgstr "Aperçu en grande largeur" #: app/configurator/components/preview-breakpoint.tsx msgid "controls.layout.preview-md" -msgstr "Aperçu tablette" +msgstr "Aperçu en largeur moyenne" #: app/configurator/components/preview-breakpoint.tsx msgid "controls.layout.preview-sm" -msgstr "Aperçu mobile" +msgstr "Aperçu en petite largeur" #: app/configurator/components/preview-breakpoint.tsx msgid "controls.layout.preview-xl" -msgstr "Prévisualisation en utilisant une largeur extra large" +msgstr "Aperçu en très grande largeur" #: app/configurator/components/field-i18n.ts msgid "controls.layout.singleURLs" @@ -916,7 +912,7 @@ msgstr "Afficher l'intervalle de confiance" #: app/configurator/components/chart-options-selector.tsx msgid "controls.section.show-confidence-interval.explanation" -msgstr "Afficher les incertitudes s'étendant des points de données pour représenter les intervalles de confiance" +msgstr "Afficher les incertitudes" #: app/configurator/components/chart-options-selector.tsx msgid "controls.section.show-dots" @@ -1171,7 +1167,7 @@ msgstr "Mots clés" #: app/browser/dataset-browse.tsx msgid "dataset-result.dimension-joined-by" -msgstr "Contient des valeurs de" +msgstr "Rejoint via" #: app/browser/dataset-browse.tsx msgid "dataset-result.shared-dimensions" @@ -1328,12 +1324,24 @@ msgid "flashes.couldnt-load-cube.view-cube-checker" msgstr "Voir dans Cube Validator" #: app/components/footer.tsx -msgid "footer.institution.name" -msgstr "Office fédéral de l'environnement OFEV" +msgid "footer.about_us.label" +msgstr "À propos de ce portail" + +#: app/components/footer.tsx +msgid "footer.about_us.text" +msgstr "Le portail visualize.admin.ch permet de visualiser les Open Government Data suisses fournies par le LINDAS Linked Data Service. Les Open Government Data (OGD) sont des données mises gratuitement à la disposition du public dans un format lisible par ordinateur." + +#: app/components/footer.tsx +msgid "footer.button.lindas" +msgstr "Services de données liées LINDAS" + +#: app/components/footer.tsx +msgid "footer.contact.title" +msgstr "Rester informé" #: app/components/footer.tsx -msgid "footer.institution.url" -msgstr "https://www.bafu.admin.ch/bafu/fr/home.html" +msgid "footer.information.title" +msgstr "Plus d'informations" #: app/components/footer.tsx msgid "footer.status" @@ -1506,7 +1514,7 @@ msgstr "Gardez à l'esprit que la suppression de cette visualisation affectera t #: app/login/components/login-menu.tsx msgid "login.profile.feature-request" -msgstr "Requête de fonctionnalité" +msgstr "Demande de fonctionnalité" #: app/login/components/login-menu.tsx msgid "login.profile.feedback" @@ -1610,7 +1618,7 @@ msgstr "Supprimer la bordure" #: app/components/publish-actions.tsx msgid "publication.embed.iframe.remove-border.warn" -msgstr "Pour intégrer des visualisations dans des systèmes sans frontière." +msgstr "Pour intégrer des visualisations sans bordure dans des systèmes externes." #: app/components/publish-actions.tsx msgid "publication.embed.iframe.responsive" diff --git a/app/locales/it/messages.po b/app/locales/it/messages.po index f7837c9ad..31120beed 100644 --- a/app/locales/it/messages.po +++ b/app/locales/it/messages.po @@ -35,10 +35,6 @@ msgstr "[ Nessuna descrizione ]" msgid "annotation.add.title" msgstr "[ Nessun titolo ]" -#: app/configurator/components/beta-tag.tsx -msgid "beta-tag.tooltip" -msgstr "Questa funzionalità è attualmente in fase di sviluppo, potresti riscontrare bug e problemi di prestazioni." - #: app/browser/dataset-browse.tsx msgid "browse-panel.organizations" msgstr "Organizzazioni" @@ -328,11 +324,11 @@ msgstr "Asse verticale" #: app/configurator/components/field-i18n.ts msgid "controls.bar.grouped" -msgstr "" +msgstr "Raggruppate" #: app/configurator/components/field-i18n.ts msgid "controls.bar.stacked" -msgstr "" +msgstr "Impilate" #: app/charts/chart-config-ui-options.ts #: app/charts/chart-config-ui-options.ts @@ -402,11 +398,11 @@ msgstr "Misura dell'asse destro" #: app/charts/index.ts msgid "controls.chart.disabled.categorical" -msgstr "È richiesta almeno una dimensione categoriale." +msgstr "È richiesta almeno una dimensione di tipo categoriale." #: app/charts/index.ts msgid "controls.chart.disabled.different-unit" -msgstr "Sono necessarie almeno due misure numeriche con unità diverse." +msgstr "Sono richieste almeno due misure numeriche con unità diverse." #: app/charts/index.ts msgid "controls.chart.disabled.geographical" @@ -414,7 +410,7 @@ msgstr "È richiesta almeno una dimensione geografica." #: app/charts/index.ts msgid "controls.chart.disabled.multiple-measures" -msgstr "Sono necessarie almeno due misure numeriche." +msgstr "Sono richieste almeno due misure numeriche." #: app/charts/index.ts msgid "controls.chart.disabled.numerical" @@ -683,7 +679,7 @@ msgstr "Dashboard" #: app/configurator/components/preview-breakpoint.tsx msgid "controls.layout.preview-lg" -msgstr "Anteprima su un piccolo desktop" +msgstr "Anteprima utilizzando larghezza large" #: app/configurator/components/preview-breakpoint.tsx msgid "controls.layout.preview-md" @@ -916,7 +912,7 @@ msgstr "Mostra intervallo di confidenza" #: app/configurator/components/chart-options-selector.tsx msgid "controls.section.show-confidence-interval.explanation" -msgstr "Mostra le incertezze che si estendono dai punti dati per rappresentare gli intervalli di confidenza" +msgstr "Mostra le incertezze" #: app/configurator/components/chart-options-selector.tsx msgid "controls.section.show-dots" @@ -1328,12 +1324,24 @@ msgid "flashes.couldnt-load-cube.view-cube-checker" msgstr "Visualizza in Cube Validator" #: app/components/footer.tsx -msgid "footer.institution.name" -msgstr "Ufficio federale dell'ambiente UFAM" +msgid "footer.about_us.label" +msgstr "Informazioni su questo portale" + +#: app/components/footer.tsx +msgid "footer.about_us.text" +msgstr "Il portale visualize.admin.ch consente di visualizzare i dati aperti del governo svizzero forniti dal Linked Data Service LINDAS. Gli Open Government Data (OGD) sono dati resi disponibili gratuitamente al pubblico in formato leggibile al computer." + +#: app/components/footer.tsx +msgid "footer.button.lindas" +msgstr "Servizi di dati collegati LINDAS" + +#: app/components/footer.tsx +msgid "footer.contact.title" +msgstr "Rimanete informati" #: app/components/footer.tsx -msgid "footer.institution.url" -msgstr "https://www.bafu.admin.ch/bafu/it/home.html" +msgid "footer.information.title" +msgstr "Ulteriori informazioni" #: app/components/footer.tsx msgid "footer.status" @@ -1590,7 +1598,7 @@ msgstr "Rinomina la visualizzazione" #: app/components/publish-actions.tsx msgid "publication.embed.external-application" -msgstr "Codice da incorporare su come \"External Application\"" +msgstr "Codice da incorporare per \"External Application\"" #: app/components/publish-actions.tsx msgid "publication.embed.external-application.caption" @@ -1610,7 +1618,7 @@ msgstr "Rimuovere il bordo" #: app/components/publish-actions.tsx msgid "publication.embed.iframe.remove-border.warn" -msgstr "Per incorporare visualizzazioni in sistemi senza Border." +msgstr "Per visualizzazioni incorporate in sistemi senza bordi." #: app/components/publish-actions.tsx msgid "publication.embed.iframe.responsive" @@ -1618,7 +1626,7 @@ msgstr "Iframe reattivo" #: app/components/publish-actions.tsx msgid "publication.embed.iframe.responsive.warn" -msgstr "Per incorporare visualizzazioni in pagine web senza supporto CMS. L'iframe sarà reattivo. La parte JavaScript del codice di incorporamento assicura che l'iframe mantenga sempre le dimensioni corrette." +msgstr "Per visualizzazioni incorporate in pagine web senza supporto CMS. L'iframe sarà reattivo. La parte del codice JavaScript di incorporamento assicura che l'iframe mantenga sempre le dimensioni corrette." #: app/components/publish-actions.tsx msgid "publication.embed.iframe.static" @@ -1626,7 +1634,7 @@ msgstr "Iframe statico" #: app/components/publish-actions.tsx msgid "publication.embed.iframe.static.warn" -msgstr "Per incorporare le visualizzazioni in sistemi senza componenti Web o supporto JavaScript. (ad esempio, WordPress)" +msgstr "Per visualizzazioni incorporate in sistemi senza componenti Web o supporto JavaScript. (Ad esempio WordPress)" #: app/components/publish-actions.tsx msgid "publication.popup.share" From 792555b2df3aafdae4d462dfa201b8ac69507776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joa=CC=83o=20Sobral?= Date: Mon, 20 Jan 2025 14:24:55 +0000 Subject: [PATCH 05/10] =?UTF-8?q?fix=20=F0=9F=90=9B:=20add=20missing=20pro?= =?UTF-8?q?p=20to=20footer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/footer.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/components/footer.tsx b/app/components/footer.tsx index 1cba1eef7..0e0457f23 100644 --- a/app/components/footer.tsx +++ b/app/components/footer.tsx @@ -8,7 +8,7 @@ import { Footer as SwissFederalCiFooter, } from "@interactivethings/swiss-federal-ci/dist/components"; import { t } from "@lingui/macro"; -import { Link } from "@mui/material"; +import { Link, SxProps } from "@mui/material"; import contentRoutes from "@/content-routes.json"; import { BUILD_COMMIT, BUILD_GITHUB_REPO, BUILD_VERSION } from "@/domain/env"; @@ -27,7 +27,7 @@ const mkVersionLink = () => { return { title: `${BUILD_VERSION} ${commitLink}`, href, external: true }; }; -export const Footer = () => { +export const Footer = ({ sx }: { sx?: SxProps }) => { const locale = useLocale(); const legalLink = { title: contentRoutes.legal[locale].title, @@ -42,6 +42,7 @@ export const Footer = () => { const versionLink = mkVersionLink(); return ( From c20feeba5b2e1b39eb62649dc91d7f6318fb4eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joa=CC=83o=20Sobral?= Date: Mon, 20 Jan 2025 14:59:07 +0000 Subject: [PATCH 06/10] =?UTF-8?q?chore=20=F0=9F=A7=B9:=20mock=20swiss=20li?= =?UTF-8?q?brary=20to=20pass=20jest=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/jest.setup.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/jest.setup.ts b/app/jest.setup.ts index 17a1f29f0..e43993d95 100644 --- a/app/jest.setup.ts +++ b/app/jest.setup.ts @@ -111,3 +111,5 @@ jest.mock("rdf-cube-view-query", () => ({ })); jest.mock("@zazuko/cube-hierarchy-query/index", () => ({})); + +jest.mock("@interactivethings/swiss-federal-ci/dist/components", () => {}); From 6ad090f54769c6fea709dd29c6ff2b7e89011c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joa=CC=83o=20Sobral?= Date: Mon, 20 Jan 2025 16:24:37 +0000 Subject: [PATCH 07/10] =?UTF-8?q?chore=20=F0=9F=A7=B9:=20add=20@graphql-to?= =?UTF-8?q?ols/schema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/package.json | 2 ++ yarn.lock | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/app/package.json b/app/package.json index 5336234ea..7c1d47e00 100644 --- a/app/package.json +++ b/app/package.json @@ -23,6 +23,7 @@ "@dnd-kit/utilities": "3.2.2", "@emotion/react": "^11.8.2", "@emotion/styled": "^11.8.1", + "@graphql-tools/schema": "^10.0.16", "@interactivethings/swiss-federal-ci": "^2.16.1", "@juggle/resize-observer": "^3.4.0", "@lingui/core": "^3.17.2", @@ -164,6 +165,7 @@ "@graphql-codegen/typescript-operations": "^1.18.2", "@graphql-codegen/typescript-resolvers": "^1.19.4", "@graphql-codegen/typescript-urql": "^2.0.9", + "@graphql-tools/schema": "^10.0.16", "@lingui/cli": "^3.17.2", "@lingui/macro": "^3.17.2", "@mdx-js/loader": "^1.6.22", diff --git a/yarn.lock b/yarn.lock index 158147897..bd60a33d8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3940,6 +3940,14 @@ "@graphql-tools/utils" "^9.2.1" tslib "^2.4.0" +"@graphql-tools/merge@^9.0.17": + version "9.0.17" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-9.0.17.tgz#57c98b74d6553fb0c053d4a121405d6088e119b6" + integrity sha512-3K4g8KKbIqfdmK0L5+VtZsqwAeElPkvT5ejiH+KEhn2wyKNCi4HYHxpQk8xbu+dSwLlm9Lhet1hylpo/mWCkuQ== + dependencies: + "@graphql-tools/utils" "^10.7.2" + tslib "^2.4.0" + "@graphql-tools/mock@^7.0.0": version "7.0.0" resolved "https://registry.npmjs.org/@graphql-tools/mock/-/mock-7.0.0.tgz" @@ -4019,6 +4027,16 @@ lodash "4.17.21" tslib "~2.2.0" +"@graphql-tools/schema@^10.0.16": + version "10.0.16" + resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-10.0.16.tgz#82b82f9193e708fc0d34f9f3ba80ccc7a057aefa" + integrity sha512-G2zgb8hNg9Sx6Z2FSXm57ToNcwMls9A9cUm+EsCrnGGDsryzN5cONYePUpSGj5NCFivVp3o1FT5dg19P/1qeqQ== + dependencies: + "@graphql-tools/merge" "^9.0.17" + "@graphql-tools/utils" "^10.7.2" + tslib "^2.4.0" + value-or-promise "^1.0.12" + "@graphql-tools/schema@^6.0.9": version "6.2.4" resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-6.2.4.tgz#cc4e9f5cab0f4ec48500e666719d99fc5042481d" @@ -4101,6 +4119,16 @@ dependencies: tslib "^2.4.0" +"@graphql-tools/utils@^10.7.2": + version "10.7.2" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-10.7.2.tgz#feafb7be9211570037288f5a3cadab76de41a097" + integrity sha512-Wn85S+hfkzfVFpXVrQ0hjnePa3p28aB6IdAGCiD1SqBCSMDRzL+OFEtyAyb30nV9Mqflqs9lCqjqlR2puG857Q== + dependencies: + "@graphql-typed-document-node/core" "^3.1.1" + cross-inspect "1.0.1" + dset "^3.1.4" + tslib "^2.4.0" + "@graphql-tools/utils@^6.0.9", "@graphql-tools/utils@^6.2.4": version "6.2.4" resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-6.2.4.tgz#38a2314d2e5e229ad4f78cca44e1199e18d55856" @@ -12769,6 +12797,13 @@ cross-fetch@3.1.4, cross-fetch@^3.0.4, cross-fetch@^3.0.6: dependencies: node-fetch "2.6.1" +cross-inspect@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cross-inspect/-/cross-inspect-1.0.1.tgz#15f6f65e4ca963cf4cc1a2b5fef18f6ca328712b" + integrity sha512-Pcw1JTvZLSJH83iiGWt6fRcT+BjZlCDRVwYLbUcHzv/CRpB7r0MlSrGbIyQvVSNyGnbt7G4AXuyCiDR3POvZ1A== + dependencies: + tslib "^2.4.0" + cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" @@ -13835,6 +13870,11 @@ dotenv@^8.2.0: resolved "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz" integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== +dset@^3.1.4: + version "3.1.4" + resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.4.tgz#f8eaf5f023f068a036d08cd07dc9ffb7d0065248" + integrity sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA== + dunder-proto@^1.0.0, dunder-proto@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a" From b4796fbdb1373112d73f65216ab6be9cb67f6d2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joa=CC=83o=20Sobral?= Date: Mon, 20 Jan 2025 17:14:17 +0000 Subject: [PATCH 08/10] =?UTF-8?q?chore=20=F0=9F=A7=B9:=20remove=20wrong=20?= =?UTF-8?q?dependency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/app/package.json b/app/package.json index 7c1d47e00..ddaab1c5b 100644 --- a/app/package.json +++ b/app/package.json @@ -23,7 +23,6 @@ "@dnd-kit/utilities": "3.2.2", "@emotion/react": "^11.8.2", "@emotion/styled": "^11.8.1", - "@graphql-tools/schema": "^10.0.16", "@interactivethings/swiss-federal-ci": "^2.16.1", "@juggle/resize-observer": "^3.4.0", "@lingui/core": "^3.17.2", From ef4f6311ef55715c663e285eebb74407d4695cb1 Mon Sep 17 00:00:00 2001 From: Bartosz Prusinowski Date: Thu, 27 Feb 2025 16:49:39 +0100 Subject: [PATCH 09/10] chore: Sync translations --- app/locales/de/messages.po | 4 ++-- app/locales/en/messages.po | 2 +- app/locales/fr/messages.po | 6 +++--- app/locales/it/messages.po | 14 +++++++------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/locales/de/messages.po b/app/locales/de/messages.po index bf052e4b6..8fcf1eafb 100644 --- a/app/locales/de/messages.po +++ b/app/locales/de/messages.po @@ -611,7 +611,7 @@ msgstr "Basis Farbe" #: app/configurator/components/chart-controls/drawer-color-palette-content.tsx #: app/login/components/color-palettes/profile-color-palette-form.tsx msgid "controls.custom-color-palettes.caption-categorical" -msgstr "Verwenden Sie klare, kontrastreiche Farben. Vermeiden Sie die Verwendung von zu vielen Farben, maximal 5-7. Verwenden Sie sequenzielle Paletten für geordnete Daten und divergierende Paletten für Extreme." +msgstr "Verwenden Sie klare, kontrastreiche Farben. Beschränken Sie sich auf 5–7 Farben. Nutzen Sie sequenzielle Paletten für geordnete Daten und divergierende Paletten für Extremwerte." #: app/configurator/components/chart-controls/drawer-color-palette-content.tsx #: app/login/components/color-palettes/profile-color-palette-form.tsx @@ -621,7 +621,7 @@ msgstr "Wählen Sie kontrastierende Farben für Start- und Endpunkt. Diese Farbe #: app/configurator/components/chart-controls/drawer-color-palette-content.tsx #: app/login/components/color-palettes/profile-color-palette-form.tsx msgid "controls.custom-color-palettes.caption-sequential" -msgstr "Wählen Sie eine dunkle Endpunktfarbe für einen starken Kontrast zwischen niedrigen und hohen Werten; die helle Farbe wird automatisch berechnet. Sequentielle Farbpaletten eignen sich für geordnete Daten wie Temperaturen oder Bevölkerungsdichten." +msgstr "Verwenden Sie klare, kontrastreiche Farben. Vermeiden Sie die Verwendung von zu vielen Farben, maximal 5-7. Verwenden Sie sequenzielle Paletten für geordnete Daten und divergierende Paletten für Extreme." #: app/login/components/color-palettes/profile-color-palette-form.tsx msgid "controls.custom-color-palettes.categorical" diff --git a/app/locales/en/messages.po b/app/locales/en/messages.po index 3f46aee35..76fa8329d 100644 --- a/app/locales/en/messages.po +++ b/app/locales/en/messages.po @@ -621,7 +621,7 @@ msgstr "Choose contrasting colors for the start and end points. These colors wil #: app/configurator/components/chart-controls/drawer-color-palette-content.tsx #: app/login/components/color-palettes/profile-color-palette-form.tsx msgid "controls.custom-color-palettes.caption-sequential" -msgstr "Select a dark endpoint color for a strong contrast between low and high values; the light color is calculated automatically. Sequential color palettes are suitable for ordered data such as temperatures or population densities." +msgstr "Select a dark endpoint color for a strong contrast between low and high values; the light color is calculated automatically. Sequential color palettes are suitable for ordered data such as temperatures or population densities" #: app/login/components/color-palettes/profile-color-palette-form.tsx msgid "controls.custom-color-palettes.categorical" diff --git a/app/locales/fr/messages.po b/app/locales/fr/messages.po index 1aa2f8864..fe658b22e 100644 --- a/app/locales/fr/messages.po +++ b/app/locales/fr/messages.po @@ -611,17 +611,17 @@ msgstr "Couleur de base" #: app/configurator/components/chart-controls/drawer-color-palette-content.tsx #: app/login/components/color-palettes/profile-color-palette-form.tsx msgid "controls.custom-color-palettes.caption-categorical" -msgstr "Utilisez des couleurs distinctes et contrastées. Évitez d'utiliser trop de couleurs, au maximum 5 à 7. Appliquez des palettes séquentielles pour les données ordonnées et des palettes divergentes pour les extrêmes." +msgstr "Utilisez des couleurs claires et contrastées. Limitez-vous à 5-7 couleurs. Utilisez des palettes séquentielles pour les données ordonnées et des palettes divergentes pour les valeurs extrêmes." #: app/configurator/components/chart-controls/drawer-color-palette-content.tsx #: app/login/components/color-palettes/profile-color-palette-form.tsx msgid "controls.custom-color-palettes.caption-diverging" -msgstr "Choisissez des couleurs contrastées pour les points de départ et d'arrivée. Ces couleurs permettent de distinguer visuellement les valeurs extrêmes. Les palettes divergentes sont idéales pour les données comportant un point médian significatif, tel que zéro ou une moyenne. IT Scegliere colori contrastanti per i punti iniziali e finali. Questi colori facilitano la distinzione visiva dei valori estremi. Le palette divergenti sono ideali per dati con un punto medio significativo, come zero o un valore medio." +msgstr "Choisissez des couleurs contrastées pour les points de départ et d'arrivée. Ces couleurs permettent de distinguer visuellement les valeurs extrêmes. Les palettes divergentes sont idéales pour les données comportant un point médian significatif, tel que zéro ou une moyenne." #: app/configurator/components/chart-controls/drawer-color-palette-content.tsx #: app/login/components/color-palettes/profile-color-palette-form.tsx msgid "controls.custom-color-palettes.caption-sequential" -msgstr "Sélectionnez une couleur d'extrémité foncée pour obtenir un fort contraste entre les valeurs faibles et élevées ; la couleur claire est calculée automatiquement. Les palettes de couleurs séquentielles conviennent aux données ordonnées telles que les températures ou les densités de population." +msgstr "Choisissez une couleur de point final sombre pour un fort contraste entre les valeurs basses et élevées. La couleur claire est calculée automatiquement. Les palettes de couleurs séquentielles conviennent aux données ordonnées telles que les températures ou les densités de population." #: app/login/components/color-palettes/profile-color-palette-form.tsx msgid "controls.custom-color-palettes.categorical" diff --git a/app/locales/it/messages.po b/app/locales/it/messages.po index 171af0aaa..1beb77c6f 100644 --- a/app/locales/it/messages.po +++ b/app/locales/it/messages.po @@ -611,17 +611,17 @@ msgstr "Colore base" #: app/configurator/components/chart-controls/drawer-color-palette-content.tsx #: app/login/components/color-palettes/profile-color-palette-form.tsx msgid "controls.custom-color-palettes.caption-categorical" -msgstr "Utilizzare colori distinti e ad alto contrasto. Evitare di usare troppi colori, massimo 5-7. Applicare tavolozze sequenziali per i dati ordinati e tavolozze divergenti per gli estremi." +msgstr "Utilizza colori distinti con alto contrasto. Limita la palette a un massimo di 5-7 colori. Usa palette sequenziali per rappresentare dati e palette divergenti per evidenziare gli estremi." #: app/configurator/components/chart-controls/drawer-color-palette-content.tsx #: app/login/components/color-palettes/profile-color-palette-form.tsx msgid "controls.custom-color-palettes.caption-diverging" -msgstr "Scegliere colori contrastanti per i punti iniziali e finali. Questi colori facilitano la distinzione visiva dei valori estremi. Le palette divergenti sono ideali per dati con un punto medio significativo, come zero o un valore medio." +msgstr "Scegli colori contrastanti per i punti iniziali e finali: questo aiuterà a distinguere visivamente gli estremi. Le palette divergenti sono particolarmente efficaci per i dati che hanno un punto medio significativo, come zero o un valore medio." #: app/configurator/components/chart-controls/drawer-color-palette-content.tsx #: app/login/components/color-palettes/profile-color-palette-form.tsx msgid "controls.custom-color-palettes.caption-sequential" -msgstr "Per ottenere un forte contrasto tra valori bassi e alti, è possibile selezionare un colore scuro per l'endpoint; il colore chiaro viene calcolato automaticamente. Le tavolozze di colori sequenziali sono adatte per dati ordinati come le temperature o le densità di popolazione." +msgstr "Seleziona un colore scuro per il punto finale per creare un forte contrasto tra valori bassi e alti, il colore chiaro viene calcolato automaticamente. Le tavolozze di colori sequenziali sono ideali per rappresentare dati come temperature o densità della popolazione." #: app/login/components/color-palettes/profile-color-palette-form.tsx msgid "controls.custom-color-palettes.categorical" @@ -679,7 +679,7 @@ msgstr "Titolo tavolozza (obbligatorio)" #: app/configurator/components/chart-controls/drawer-color-palette-content.tsx #: app/login/components/color-palettes/profile-color-palette-form.tsx msgid "controls.custom-color-palettes.title-unavailable" -msgstr "Questo nome è già in uso. Scegliete un nome unico per la vostra tavolozza di colori." +msgstr "Questo nome è già in uso. Scegliete un nome univoco per la vostra tavolozza di colori." #: app/login/components/color-palettes/profile-color-palette-form.tsx msgid "controls.custom-color-palettes.type" @@ -1745,15 +1745,15 @@ msgstr "Le mie tavolozze" #: app/login/components/color-palettes/profile-color-palette-content.tsx msgid "login.profile.my-color-palettes.delete" -msgstr "Cancellare il colore Paleete" +msgstr "Cancellare la tavolozza di colori" #: app/login/components/color-palettes/profile-color-palette-content.tsx msgid "login.profile.my-color-palettes.description" -msgstr "Salvate una tavolozza di colori personalizzata per selezionare facilmente i colori delle vostre visualizzazioni." +msgstr "Salvate una tavolozza di colori personalizzata per selezionare facilmente i vostri colori durante la creazione di una visualizzazione." #: app/login/components/color-palettes/profile-color-palette-content.tsx msgid "login.profile.my-color-palettes.edit" -msgstr "Modifica colore Paleete" +msgstr "Modifica colore della tavolozza" #: app/login/components/profile-content-tabs.tsx #: app/login/components/profile-content-tabs.tsx From 1602d43c53fa0824b022be04955efb32092ad37c Mon Sep 17 00:00:00 2001 From: Bartosz Prusinowski Date: Thu, 27 Feb 2025 16:52:27 +0100 Subject: [PATCH 10/10] refactor: Clean up --- app/components/footer.tsx | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/app/components/footer.tsx b/app/components/footer.tsx index 0e0457f23..4c1ba86cf 100644 --- a/app/components/footer.tsx +++ b/app/components/footer.tsx @@ -1,11 +1,11 @@ import { + Footer as SwissFederalCiFooter, FooterSection, FooterSectionButton, FooterSectionSocialMediaButton, FooterSectionSocialMediaButtonGroup, FooterSectionText, FooterSectionTitle, - Footer as SwissFederalCiFooter, } from "@interactivethings/swiss-federal-ci/dist/components"; import { t } from "@lingui/macro"; import { Link, SxProps } from "@mui/material"; @@ -17,14 +17,20 @@ import { useLocale } from "@/locales/use-locale"; const mkVersionLink = () => { let commitLink = ""; let href = ""; - if (BUILD_GITHUB_REPO && BUILD_COMMIT) { - commitLink = BUILD_COMMIT.substr(0, 7); - href = `${BUILD_GITHUB_REPO}/commit/${BUILD_COMMIT}`; - } + if (BUILD_COMMIT) { commitLink = `(${BUILD_COMMIT.substr(0, 7)})`; } - return { title: `${BUILD_VERSION} ${commitLink}`, href, external: true }; + + if (BUILD_GITHUB_REPO) { + href = `${BUILD_GITHUB_REPO}/commit/${BUILD_COMMIT}`; + } + + return { + title: `${BUILD_VERSION} ${commitLink}`, + href, + external: true, + }; }; export const Footer = ({ sx }: { sx?: SxProps }) => {