diff --git a/frontend/src/assets/News/news.json b/frontend/src/assets/News/news.json new file mode 100644 index 000000000..f3b94c431 --- /dev/null +++ b/frontend/src/assets/News/news.json @@ -0,0 +1,16 @@ +[ + { + "id": "0", + "date": "22. Februar 2023", + "text": "Gradido schenkt dir Dankbarkeit im Februar", + "url": "", + "extra": "Gradido ebenet Wege zu sozialem Frieden" + }, + { + "id": "1", + "date": "22. Dezember 2022", + "text": "Gradido schenkt dir Dankbarkeit im Dezember", + "url": "", + "extra": "Gradido ebenet Wege zu sozialem Frieden" + } +] diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss index 3d2f84078..bc02ae4a2 100644 --- a/frontend/src/assets/scss/gradido-template.scss +++ b/frontend/src/assets/scss/gradido-template.scss @@ -5,10 +5,6 @@ body { transition: background-color 0.5s ease, color 0.5s ease; } -.HIDE_FOR_WORK_IN_PROCESS { - display: none; -} - .pointer { cursor: pointer; } diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue index e5a72082c..bf44d4207 100644 --- a/frontend/src/components/Contributions/ContributionListItem.vue +++ b/frontend/src/components/Contributions/ContributionListItem.vue @@ -9,17 +9,20 @@
{{ firstName }} {{ lastName }}
- contributionDate {{ $d(new Date(contributionDate), 'monthAndYear') }} + {{ $d(new Date(contributionDate), 'monthAndYear') }}
-
Beitragstext
+
{{ $t('contributionText') }}
{{ memo }}
+
+ {{ $t('contribution.alert.answerQuestion') }} +
-
Schöpfung
+
{{ $t('creation') }}
{{ amount | GDD }}
@@ -34,7 +37,7 @@ @click="deleteContribution({ id })" > - löschen + {{ $t('delete') }} @@ -51,14 +54,14 @@ " > - bearbeiten + {{ $t('edit') }}
- Moderatorchat + {{ $t('moderatorChat') }}
diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue index 4ec9a8579..26c6e764a 100644 --- a/frontend/src/components/GddSend/TransactionForm.vue +++ b/frontend/src/components/GddSend/TransactionForm.vue @@ -102,10 +102,10 @@ -
Versandart
+
{{ $t('sendMethod') }}
- Gdd versenden + {{ $t('send_gdd') }} - Gdd versenden per Link + {{ $t('send_per_link') }}
- + - + - Dein Vorname +
diff --git a/frontend/src/components/Inputs/Job.vue b/frontend/src/components/Inputs/Job.vue index 0fc07e782..6c0908ec7 100644 --- a/frontend/src/components/Inputs/Job.vue +++ b/frontend/src/components/Inputs/Job.vue @@ -1,6 +1,6 @@ diff --git a/frontend/src/components/Inputs/LastName.vue b/frontend/src/components/Inputs/LastName.vue index e915b2407..c9ef8fe4d 100644 --- a/frontend/src/components/Inputs/LastName.vue +++ b/frontend/src/components/Inputs/LastName.vue @@ -1,6 +1,6 @@ diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue index 7312fb7c7..c9106664a 100644 --- a/frontend/src/components/Menu/Sidebar.vue +++ b/frontend/src/components/Menu/Sidebar.vue @@ -8,14 +8,14 @@ {{ $t('navigation.overview') }} - + + @@ -25,10 +25,10 @@ {{ $t('navigation.transactions') }} - + {{ $t('navigation.members') }} @@ -36,7 +36,11 @@
- + + {{ $t('navigation.info') }} + + {{ $t('navigation.settings') }} diff --git a/frontend/src/components/Overview/CommunityNews.vue b/frontend/src/components/Overview/CommunityNews.vue index fd7c5abf0..c5ae9bb3c 100644 --- a/frontend/src/components/Overview/CommunityNews.vue +++ b/frontend/src/components/Overview/CommunityNews.vue @@ -1,16 +1,36 @@