From b294ab8c87453abf224502aa229fa086c41b0d9d Mon Sep 17 00:00:00 2001 From: Alex Panturu Date: Wed, 29 May 2024 17:19:30 +0300 Subject: [PATCH 1/2] explorer: add visible version commit hash and build date --- .../__snapshots__/Footer.spec.js.snap | 90 ++++++++++++------- explorer/src/lib/components/footer/Footer.css | 13 ++- .../src/lib/components/footer/Footer.svelte | 54 ++++++----- explorer/vite.config.js | 2 +- 4 files changed, 99 insertions(+), 60 deletions(-) diff --git a/explorer/src/lib/components/__tests__/__snapshots__/Footer.spec.js.snap b/explorer/src/lib/components/__tests__/__snapshots__/Footer.spec.js.snap index 61681328d0..1559ac7505 100644 --- a/explorer/src/lib/components/__tests__/__snapshots__/Footer.spec.js.snap +++ b/explorer/src/lib/components/__tests__/__snapshots__/Footer.spec.js.snap @@ -6,49 +6,71 @@ exports[`Footer > renders the Footer component 1`] = ` class="footer" >
- - © 2018 - 2024 Dusk Network B.V. All Rights Reserved. - -
- -
- - Privacy policy - + + © 2018 - 2024 Dusk Network B.V. All Rights Reserved. + +
+ +
+ + Privacy policy + + + + + Terms of use + + +
- Terms of use + + + + + Dusk Logo + + + + - + + Explorer v + 0.0.0 + ( + hash1234 2024-01-12 + ) + + `; diff --git a/explorer/src/lib/components/footer/Footer.css b/explorer/src/lib/components/footer/Footer.css index 0a595a2d04..ecb2663cac 100644 --- a/explorer/src/lib/components/footer/Footer.css +++ b/explorer/src/lib/components/footer/Footer.css @@ -1,9 +1,14 @@ .footer { display: flex; - flex-direction: row; + flex-direction: column; padding: 1.25rem 0; font-size: 0.875rem; - justify-content: flex-end; + align-items: flex-end; + gap: 0.625rem; +} + +.footer__content { + display: flex; } .footer__copyright { @@ -41,6 +46,10 @@ @media (max-width: 768px) { .footer { + align-items: center; + } + + .footer__content { flex-wrap: wrap; justify-content: space-between; gap: 0.625rem; diff --git a/explorer/src/lib/components/footer/Footer.svelte b/explorer/src/lib/components/footer/Footer.svelte index a515437ed5..fd0b9594c7 100644 --- a/explorer/src/lib/components/footer/Footer.svelte +++ b/explorer/src/lib/components/footer/Footer.svelte @@ -7,30 +7,38 @@
-
- © 2018 - 2024 Dusk Network B.V. All Rights Reserved. +
+
+ © 2018 - 2024 Dusk Network B.V. All Rights Reserved. +
+
+ Privacy policy + Terms of use +
+ + + + + +
-
- Privacy policy - Terms of use + Explorer v{import.meta.env.APP_VERSION} ({import.meta.env + .APP_BUILD_INFO})
- - - - - -
diff --git a/explorer/vite.config.js b/explorer/vite.config.js index c2ca23c4b2..810824b903 100644 --- a/explorer/vite.config.js +++ b/explorer/vite.config.js @@ -7,7 +7,7 @@ export default defineConfig(({ mode }) => { const env = loadEnv(mode, process.cwd()); const buildDate = new Date().toISOString().substring(0, 10); const buildHash = execSync( - "git log -1 --grep='web-wallet:' --format=format:'%h'" + "git log -1 --grep='explorer:' --format=format:'%h'" ); const APP_VERSION = process.env.npm_package_version ?? "unknown"; const APP_BUILD_INFO = `${buildHash.toString() || "unknown"} ${buildDate}`; From b0f555921a646f88bba0834faf6e05fb10ffbb76 Mon Sep 17 00:00:00 2001 From: Alex Panturu Date: Mon, 10 Jun 2024 17:30:14 +0300 Subject: [PATCH 2/2] explorer: update design of version commit hash and build date --- .../__snapshots__/Footer.spec.js.snap | 42 +++++------- explorer/src/lib/components/footer/Footer.css | 39 +++++++---- .../src/lib/components/footer/Footer.svelte | 19 +++--- .../__snapshots__/layout.spec.js.snap | 68 +++++++++++-------- 4 files changed, 89 insertions(+), 79 deletions(-) diff --git a/explorer/src/lib/components/__tests__/__snapshots__/Footer.spec.js.snap b/explorer/src/lib/components/__tests__/__snapshots__/Footer.spec.js.snap index 1559ac7505..b38cf9deba 100644 --- a/explorer/src/lib/components/__tests__/__snapshots__/Footer.spec.js.snap +++ b/explorer/src/lib/components/__tests__/__snapshots__/Footer.spec.js.snap @@ -6,16 +6,24 @@ exports[`Footer > renders the Footer component 1`] = ` class="footer" >
-
- - © 2018 - 2024 Dusk Network B.V. All Rights Reserved. - -
+ + © 2018 - 2024 Dusk Network B.V. All Rights Reserved. + + + Explorer v + 0.0.0 + ( + hash1234 2024-01-12 + ) + +
+ +
@@ -25,7 +33,6 @@ exports[`Footer > renders the Footer component 1`] = ` > Privacy policy - renders the Footer component 1`] = ` > Terms of use -
renders the Footer component 1`] = ` media="(max-width:768px)" srcset="/some-base-path/dusk_logo_icon.svg" /> - Dusk Logo renders the Footer component 1`] = ` sizes="(max-width:768px) 20px, 86px" src="/some-base-path/dusk_logo.svg" /> - - - -
- -
- - Explorer v - 0.0.0 - ( - hash1234 2024-01-12 - ) -
diff --git a/explorer/src/lib/components/footer/Footer.css b/explorer/src/lib/components/footer/Footer.css index ecb2663cac..5d97e1b3f8 100644 --- a/explorer/src/lib/components/footer/Footer.css +++ b/explorer/src/lib/components/footer/Footer.css @@ -1,26 +1,27 @@ .footer { display: flex; - flex-direction: column; + flex-direction: row; padding: 1.25rem 0; font-size: 0.875rem; - align-items: flex-end; - gap: 0.625rem; + justify-content: space-between; } -.footer__content { +.footer__copyright { display: flex; + gap: 0.625rem; + order: 1; } -.footer__copyright { - order: 1; +.footer__links-test { + display: flex; + gap: 1.25rem; + order: 2; } .footer__links { - padding-left: 1.25rem; - padding-right: 1.875rem; display: flex; gap: 1.25rem; - order: 2; + order: 1; } .footer__links-link { @@ -37,19 +38,21 @@ } .footer__logo { - order: 3; + order: 2; } .footer__logo-image { width: 5.375rem; } -@media (max-width: 768px) { - .footer { - align-items: center; +@media (max-width: 1200px) { + .footer__copyright { + flex-direction: column; } +} - .footer__content { +@media (max-width: 768px) { + .footer { flex-wrap: wrap; justify-content: space-between; gap: 0.625rem; @@ -59,7 +62,13 @@ order: 3; width: 100%; display: flex; - justify-content: flex-end; + flex-direction: column; + } + + .footer__links-test { + justify-content: space-between; + width: 100%; + padding: 0; } .footer__links { diff --git a/explorer/src/lib/components/footer/Footer.svelte b/explorer/src/lib/components/footer/Footer.svelte index fd0b9594c7..b4d148a6af 100644 --- a/explorer/src/lib/components/footer/Footer.svelte +++ b/explorer/src/lib/components/footer/Footer.svelte @@ -7,10 +7,15 @@
-
-
- © 2018 - 2024 Dusk Network B.V. All Rights Reserved. -
+
+ © 2018 - 2024 Dusk Network B.V. All Rights Reserved. + Explorer v{import.meta.env.APP_VERSION} ({import.meta.env + .APP_BUILD_INFO}) +
+ +
-
- Explorer v{import.meta.env.APP_VERSION} ({import.meta.env - .APP_BUILD_INFO}) -
diff --git a/explorer/src/routes/__tests__/__snapshots__/layout.spec.js.snap b/explorer/src/routes/__tests__/__snapshots__/layout.spec.js.snap index d160ea0eda..33b4dc5b26 100644 --- a/explorer/src/routes/__tests__/__snapshots__/layout.spec.js.snap +++ b/explorer/src/routes/__tests__/__snapshots__/layout.spec.js.snap @@ -145,44 +145,56 @@ exports[`Main layout > should render the app's main layout 1`] = ` © 2018 - 2024 Dusk Network B.V. All Rights Reserved. + + + Explorer v + 0.0.0 + ( + hash1234 2024-01-12 + ) +
- - Privacy policy - + + Privacy policy + + + + Terms of use + +
- Terms of use + + + + Dusk Logo +
- -