From 15adcc098c33f75b9ab414c57079f28812123f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mih=C3=A1ly=20Hideg?= Date: Thu, 28 Nov 2024 23:16:31 +0100 Subject: [PATCH 1/9] update some translations --- frontend/src/components/FooterMultiWord.vue | 4 ++-- frontend/src/routes/email-collection/EmailCollectionPage.vue | 2 +- frontend/src/routes/guide/GuidePage.vue | 2 +- .../src/routes/preferred-candidate/PreferredCandidatePage.vue | 2 +- frontend/src/routes/question/QuestionPage.vue | 2 +- frontend/src/routes/recap/RecapPage.vue | 2 +- frontend/src/routes/result/ResultPage.vue | 2 +- frontend/src/routes/share/SharePage.vue | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/FooterMultiWord.vue b/frontend/src/components/FooterMultiWord.vue index 537dc9b80..4dc4eb825 100644 --- a/frontend/src/components/FooterMultiWord.vue +++ b/frontend/src/components/FooterMultiWord.vue @@ -18,7 +18,7 @@ const router = useRouter();
- Testvot este un ajutor imparțial în a decide pe cine să voteze. + TestVot este o aplicație imparțială care poate ajuta în a decide pe cine să votezi.
@@ -50,7 +50,7 @@ const router = useRouter();
- Kontakt + Contact diff --git a/frontend/src/routes/email-collection/EmailCollectionPage.vue b/frontend/src/routes/email-collection/EmailCollectionPage.vue index 8e176c0aa..da32d20c6 100644 --- a/frontend/src/routes/email-collection/EmailCollectionPage.vue +++ b/frontend/src/routes/email-collection/EmailCollectionPage.vue @@ -74,7 +74,7 @@ const onSubmit = async () => { if (response.ok) { posting.value = false; success.value = true; - message.value = 'Sikeres feliratkozás!'; + message.value = ''; const user = (await response.json()) as User; userStore.setUser(user); diff --git a/frontend/src/routes/guide/GuidePage.vue b/frontend/src/routes/guide/GuidePage.vue index 093c9d67f..9bb06294d 100644 --- a/frontend/src/routes/guide/GuidePage.vue +++ b/frontend/src/routes/guide/GuidePage.vue @@ -60,7 +60,7 @@ const districtNameWithCode = showDistrictCode ? `${districtName} (${districtCode})` : districtName; -const breadcrumbs = `${electionName} — ${districtNameWithCode}`; +const breadcrumbs = `${electionName} — TestVot 2024`; const forwardRoute = computed( () => diff --git a/frontend/src/routes/preferred-candidate/PreferredCandidatePage.vue b/frontend/src/routes/preferred-candidate/PreferredCandidatePage.vue index 235a685f6..4202070d7 100644 --- a/frontend/src/routes/preferred-candidate/PreferredCandidatePage.vue +++ b/frontend/src/routes/preferred-candidate/PreferredCandidatePage.vue @@ -48,7 +48,7 @@ const districtNameWithCode = showDistrictCode ? `${districtName} (${districtCode})` : districtName; -const breadcrumbs = `${electionName} — ${districtNameWithCode}`; +const breadcrumbs = `${electionName} — TestVot 2024`; const handlePreviousClick = () => { // go to the last question diff --git a/frontend/src/routes/question/QuestionPage.vue b/frontend/src/routes/question/QuestionPage.vue index c64d7921b..9885c2fd1 100644 --- a/frontend/src/routes/question/QuestionPage.vue +++ b/frontend/src/routes/question/QuestionPage.vue @@ -51,7 +51,7 @@ const districtNameWithCode = showDistrictCode ? `${districtName} (${districtCode})` : districtName; -const breadcrumbs = `${electionName} — ${districtNameWithCode}`; +const breadcrumbs = `${electionName} — TestVot 2024`; const forwardRoute = computed( () => diff --git a/frontend/src/routes/recap/RecapPage.vue b/frontend/src/routes/recap/RecapPage.vue index db4d64413..082e1a964 100644 --- a/frontend/src/routes/recap/RecapPage.vue +++ b/frontend/src/routes/recap/RecapPage.vue @@ -47,7 +47,7 @@ const districtNameWithCode = showDistrictCode ? `${districtName} (${districtCode})` : districtName; -const breadcrumbs = `${electionName} — ${districtNameWithCode}`; +const breadcrumbs = `${electionName} — TestVot 2024`; const handlePreviousClick = () => { router.push({ diff --git a/frontend/src/routes/result/ResultPage.vue b/frontend/src/routes/result/ResultPage.vue index c209364ea..2c2725891 100644 --- a/frontend/src/routes/result/ResultPage.vue +++ b/frontend/src/routes/result/ResultPage.vue @@ -67,7 +67,7 @@ const districtNameWithCode = showDistrictCode ? `${districtName} (${districtCode})` : districtName; -const breadcrumbs = `${electionName} — ${districtNameWithCode}`; +const breadcrumbs = `${electionName} — TestVot 2024`; const handlePreviousClick = () => { router.push({ diff --git a/frontend/src/routes/share/SharePage.vue b/frontend/src/routes/share/SharePage.vue index 00e113ed4..92c7b9cdc 100644 --- a/frontend/src/routes/share/SharePage.vue +++ b/frontend/src/routes/share/SharePage.vue @@ -66,7 +66,7 @@ watch(isInitialized, (value) => { const districtNameWithCode = showDistrictCode ? `${districtName} (${districtCode})` : districtName; - breadcrumbs.value = `${electionName} — ${districtNameWithCode}`; + breadcrumbs.value = `${electionName} — TestVot 2024`; } }); const handleFillAgainClick = () => { From 085c72816057ecfc0aa24dc8d328af5259265368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mih=C3=A1ly=20Hideg?= Date: Thu, 28 Nov 2024 23:16:39 +0100 Subject: [PATCH 2/9] create hotnews embed --- .../src/components/embeds/HotNewsEmbed.vue | 9 ++++++++ .../src/components/themes/HotNewsTheme.scss | 23 +++++++++++++++++++ .../src/components/themes/HotNewsTheme.vue | 7 ++++++ 3 files changed, 39 insertions(+) create mode 100644 frontend/src/components/embeds/HotNewsEmbed.vue create mode 100644 frontend/src/components/themes/HotNewsTheme.scss create mode 100644 frontend/src/components/themes/HotNewsTheme.vue diff --git a/frontend/src/components/embeds/HotNewsEmbed.vue b/frontend/src/components/embeds/HotNewsEmbed.vue new file mode 100644 index 000000000..ff39b16aa --- /dev/null +++ b/frontend/src/components/embeds/HotNewsEmbed.vue @@ -0,0 +1,9 @@ + + + diff --git a/frontend/src/components/themes/HotNewsTheme.scss b/frontend/src/components/themes/HotNewsTheme.scss new file mode 100644 index 000000000..de29ba283 --- /dev/null +++ b/frontend/src/components/themes/HotNewsTheme.scss @@ -0,0 +1,23 @@ +@import '@/components/themes/DefaultTheme.scss'; + +*:deep() { + // Override any of the default theme variables here + + // Color palette + // ------------- + // Primary colors + --palette-primary-10: 31, 27, 41; + --palette-primary-30: 50, 48, 82; + --palette-primary-50: 64, 69, 110; + --palette-primary-70: 90, 101, 151; + --palette-primary-90: 132, 155, 210; + + // Secondary colors + --palette-secondary-10: 9, 18, 51; + --palette-secondary-30: 112, 65, 65; + --palette-secondary-50: 160, 93, 93; + --palette-secondary-70: 240, 200, 200; + --palette-secondary-90: 252, 236, 236; + + --color-neutral-bg: var(--palette-secondary-70); +} diff --git a/frontend/src/components/themes/HotNewsTheme.vue b/frontend/src/components/themes/HotNewsTheme.vue new file mode 100644 index 000000000..e54fca9e3 --- /dev/null +++ b/frontend/src/components/themes/HotNewsTheme.vue @@ -0,0 +1,7 @@ + + +