From 9dce208d99b2a2718006fd69d85371da85f9bfa0 Mon Sep 17 00:00:00 2001 From: Alexander Ibsen Date: Sun, 21 May 2023 10:00:30 +0200 Subject: [PATCH 01/30] Proper default --- client/src/lib/config.ts | 3 +-- client/src/lib/i18n.ts | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/client/src/lib/config.ts b/client/src/lib/config.ts index 46f6c808..5bff87d6 100644 --- a/client/src/lib/config.ts +++ b/client/src/lib/config.ts @@ -1,7 +1,6 @@ export default { logoUrl: import.meta.env.VITE_LOGO_URL || "https://bit.ly/3Ft20ez", - dbbUrl: - import.meta.env.VITE_DBB_URL || "https://dbb.beta-test.assemblyvoting.net", + dbbUrl: import.meta.env.VITE_DBB_URL || "http://localhost:3003", contactUrl: import.meta.env.VITE_CONTACT_URL || "https://google.com", conferenceUrl: import.meta.env.VITE_CONFERENCE_URL || "http://localhost:3016", }; diff --git a/client/src/lib/i18n.ts b/client/src/lib/i18n.ts index 27131804..2d728c41 100644 --- a/client/src/lib/i18n.ts +++ b/client/src/lib/i18n.ts @@ -175,12 +175,12 @@ const i18n = createI18n({ SpoilRequestItem: { type: "Spoil Request", author: "You", - info: "You have challenged the integrity of the voting system and performed the Benaloh challenge.", + details: "You have challenged the integrity of the voting system and performed the Benaloh challenge.", }, SessionExpiryItem: { type: "Explicit Session Expiry", author: "You", - info: "You have explicitly expired your voter session.", + details: "You have explicitly expired your voter session.", }, AffidavitAcceptItem: { type: "Affidavit Accepted", From d5af64b8d279d366a3fa6a5e3c789d5ec2457090 Mon Sep 17 00:00:00 2001 From: Alexander Ibsen Date: Sun, 21 May 2023 10:36:31 +0200 Subject: [PATCH 02/30] Welcome is responsive --- client/src/App.vue | 7 ++++++ client/src/views/Welcome.vue | 45 ++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/client/src/App.vue b/client/src/App.vue index 1049f759..4d38d8e6 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -191,4 +191,11 @@ body { .DBAS_SkipToContentLink:focus { margin-top: 100px; } + +@media(max-width: 992px) { + .DBAS__InnerContent { + width: 90vw; + } +} + diff --git a/client/src/views/Welcome.vue b/client/src/views/Welcome.vue index e5557eba..c268bb3f 100644 --- a/client/src/views/Welcome.vue +++ b/client/src/views/Welcome.vue @@ -121,12 +121,11 @@ onMounted(() => {
- +

{{ $t("views.welcome.about.header") }}

{{ $t("views.welcome.about.p1") }}

{{ $t("views.welcome.about.p2") }}

- - +
{

-
- -
- +

{{ $t("views.welcome.verify.header") }}

{{ $t("views.welcome.verify.p1") }}

{{ $t("views.welcome.verify.p2") }}

- - + {
-

- - - - - -

@@ -276,6 +255,8 @@ onMounted(() => { display: flex; margin-bottom: 2.5rem; gap: 2.5rem; + + } .Welcome__Card_Overrides { @@ -341,4 +322,18 @@ svg { margin-right: 5px; margin-left: 5px; } + + +@media(max-width: 992px) { + .Welcome__Content { + flex-wrap: wrap; + gap: 1.5rem; + } + + .Welcome__Card_Overrides { + padding: 1.5rem !important; + min-width: 50%; + } +} + From af5b274eb1e37d3ef8f09ac64c9294493a07e87d Mon Sep 17 00:00:00 2001 From: Alexander Ibsen Date: Sun, 21 May 2023 10:44:56 +0200 Subject: [PATCH 03/30] Welcome screen is responsive + global vars --- client/src/App.vue | 10 ++++++++++ client/src/views/Welcome.vue | 5 ++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/client/src/App.vue b/client/src/App.vue index 4d38d8e6..9683e239 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -148,6 +148,11 @@ const setTheme = async (conferenceClient: any) => { From ecd691df3fbc4e7732a5080345ba4ea835aee8c5 Mon Sep 17 00:00:00 2001 From: Alexander Ibsen Date: Sun, 21 May 2023 12:58:46 +0200 Subject: [PATCH 10/30] Nav bar responsive and proper body scaling --- client/src/App.vue | 4 +- client/src/components/Footer.vue | 2 +- client/src/components/HamburgerIcon.vue | 30 +++++ client/src/components/Header.vue | 158 +++++++++++++++++++++--- client/src/components/NavLinks.vue | 61 +++++++++ 5 files changed, 232 insertions(+), 23 deletions(-) create mode 100644 client/src/components/HamburgerIcon.vue create mode 100644 client/src/components/NavLinks.vue diff --git a/client/src/App.vue b/client/src/App.vue index 9683e239..c4e7e76e 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -160,13 +160,13 @@ body { .DBAS { height: 100vh; + height: 100dvh; display: flex; flex-direction: column; } .DBAS__Content { - height: calc(100vh - 120px); - margin-top: 80px; + flex-grow: 1; overflow-y: scroll; } diff --git a/client/src/components/Footer.vue b/client/src/components/Footer.vue index cf52584c..f54f5c04 100644 --- a/client/src/components/Footer.vue +++ b/client/src/components/Footer.vue @@ -13,6 +13,7 @@ diff --git a/client/src/components/NavLinks.vue b/client/src/components/NavLinks.vue new file mode 100644 index 00000000..b3304772 --- /dev/null +++ b/client/src/components/NavLinks.vue @@ -0,0 +1,61 @@ + + + + + From 78c29738b2ec9ae1d219a5fc638f283fd3c207b5 Mon Sep 17 00:00:00 2001 From: Alexander Ibsen Date: Sun, 21 May 2023 13:23:29 +0200 Subject: [PATCH 11/30] Verifier flow responsive + more --- client/src/App.vue | 8 ++++++++ client/src/components/Infobox.vue | 2 +- client/src/views/Welcome.vue | 15 +++++---------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/client/src/App.vue b/client/src/App.vue index c4e7e76e..733850e8 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -158,6 +158,10 @@ body { margin: 0; } +.AVCard--default { + padding: var(--av-padding) !important; +} + .DBAS { height: 100vh; height: 100dvh; @@ -206,6 +210,10 @@ body { .DBAS__InnerContent { width: 90vw; } + + .AVCard { + padding: var(--av-padding) !important; + } } diff --git a/client/src/components/Infobox.vue b/client/src/components/Infobox.vue index a55a03cd..eaaf853d 100644 --- a/client/src/components/Infobox.vue +++ b/client/src/components/Infobox.vue @@ -8,7 +8,7 @@ .Infobox { background-color: #fff; border: solid 1px #e9ecef; - padding: 40px; + padding: var(--av-padding); box-shadow: 0 0 15px rgba(0, 0, 0, 0.15); } diff --git a/client/src/views/Welcome.vue b/client/src/views/Welcome.vue index 2a7ec50f..e2b06677 100644 --- a/client/src/views/Welcome.vue +++ b/client/src/views/Welcome.vue @@ -121,7 +121,7 @@ onMounted(() => {
- +

{{ $t("views.welcome.about.header") }}

{{ $t("views.welcome.about.p1") }}

{{ $t("views.welcome.about.p2") }}

@@ -168,7 +168,7 @@ onMounted(() => {

- +

{{ $t("views.welcome.verify.header") }}

{{ $t("views.welcome.verify.p1") }}

{{ $t("views.welcome.verify.p2") }}

@@ -247,8 +247,8 @@ onMounted(() => { } .Welcome__Header { - margin-bottom: 60px; - margin-top: 120px; + margin-bottom: 40px; + margin-top: 40px; } .Welcome__Content { @@ -259,8 +259,7 @@ onMounted(() => { } -.Welcome__Card_Overrides { - padding: 2.5rem !important; +.AVCard { min-width: 50%; } @@ -329,10 +328,6 @@ svg { flex-wrap: wrap; gap: var(--av-padding); } - - .Welcome__Card_Overrides { - padding: var(--av-padding) !important; - } } From 481cb7a741ebd73c75a102082561fdf4ccea4cae Mon Sep 17 00:00:00 2001 From: Martin Laursen Date: Sun, 21 May 2023 13:27:33 +0200 Subject: [PATCH 12/30] fix logs view --- client/src/views/LogsView.vue | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/client/src/views/LogsView.vue b/client/src/views/LogsView.vue index 396468f0..5591a717 100644 --- a/client/src/views/LogsView.vue +++ b/client/src/views/LogsView.vue @@ -119,15 +119,12 @@ onMounted(() => loadPage(currentPage()));
- + - + {{ $t("views.logs.download_button") }} - +
@@ -151,9 +148,9 @@ onMounted(() => loadPage(currentPage())); } .LogsView { - width: 900px; + max-width: 900px; margin: auto; - font-family: "Open Sans"; + font-family: "Open Sans", sans-serif; } .LogsView__Header * { From ffdf5a26796625ae6c10a66b04759286d5cce0d5 Mon Sep 17 00:00:00 2001 From: Martin Laursen Date: Sun, 21 May 2023 13:43:31 +0200 Subject: [PATCH 13/30] fix button --- client/src/views/LogsView.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/client/src/views/LogsView.vue b/client/src/views/LogsView.vue index 5591a717..a3b599a8 100644 --- a/client/src/views/LogsView.vue +++ b/client/src/views/LogsView.vue @@ -47,6 +47,10 @@ function loadPage(page: number) { } } +function downloadLog() { + window.location.href = `${options.baseURL}/${configStore.boardSlug}/download_log` +} + onMounted(() => loadPage(currentPage())); @@ -119,7 +123,7 @@ onMounted(() => loadPage(currentPage()));
- + {{ $t("views.logs.download_button") }} From 54480d8dcde85faa03eeb79ee7853a3b90490fdd Mon Sep 17 00:00:00 2001 From: Alexander Ibsen Date: Sun, 21 May 2023 13:53:10 +0200 Subject: [PATCH 14/30] Remove help faq and contact --- client/src/components/Header.vue | 63 +----------------------------- client/src/components/NavLinks.vue | 61 ----------------------------- 2 files changed, 1 insertion(+), 123 deletions(-) delete mode 100644 client/src/components/NavLinks.vue diff --git a/client/src/components/Header.vue b/client/src/components/Header.vue index ad4ec9dc..07277fec 100644 --- a/client/src/components/Header.vue +++ b/client/src/components/Header.vue @@ -67,14 +67,6 @@ function toggleMobileMenu(){
- - {{ $t("header.about") }} - - - - {{ $t("header.help") }} - - - - {{ $t("header.contact") }} - -
- - {{ $t("header.about") }} - - {{ $t("header.logs") }} - - - {{ $t("header.help") }} - - - - {{ $t("header.contact") }} - - -import { RouterLink } from "vue-router"; -import DropDown from '@/components/DropDown.vue' - -defineProps({ - -}); - - - - - From c6d9a508f5cb4d3e2ebc2b3585a2f4be5e7844c9 Mon Sep 17 00:00:00 2001 From: Alexander Ibsen Date: Sun, 21 May 2023 14:13:33 +0200 Subject: [PATCH 15/30] Lint --- client/src/App.vue | 5 +-- client/src/components/ExpandableSection.vue | 18 ++++---- client/src/components/HamburgerIcon.vue | 49 +++++++++++++++------ client/src/components/Header.vue | 30 +++++++------ client/src/lib/i18n.ts | 3 +- client/src/views/BallotTrackerView.vue | 15 +++---- client/src/views/LogsView.vue | 2 +- client/src/views/Welcome.vue | 9 +--- 8 files changed, 74 insertions(+), 57 deletions(-) diff --git a/client/src/App.vue b/client/src/App.vue index 733850e8..65b548f0 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -201,8 +201,8 @@ body { margin-top: 100px; } -@media(max-width: 992px) { - :root{ +@media (max-width: 992px) { + :root { --av-padding: 1.5rem; --av-margin-bottom: 1.5rem; } @@ -215,5 +215,4 @@ body { padding: var(--av-padding) !important; } } - diff --git a/client/src/components/ExpandableSection.vue b/client/src/components/ExpandableSection.vue index bf580561..1221d49b 100644 --- a/client/src/components/ExpandableSection.vue +++ b/client/src/components/ExpandableSection.vue @@ -23,8 +23,8 @@ function toggle() {