From 61935e04c7b8a983314d34641a8329da6847a0c7 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 15 Jul 2021 21:16:24 +0200 Subject: [PATCH] fix recipent, fix lint, test open --- frontend/src/components/DecayInformation.vue | 5 +++- frontend/src/locales/de.json | 2 +- frontend/src/locales/en.json | 2 +- .../GddSend/TransactionConfirmation.vue | 2 +- .../GddSend/TransactionForm.spec.js | 6 ++--- .../GddSend/TransactionForm.vue | 25 +++++++++--------- .../AccountOverview/GddTransactionList.vue | 26 ++++++++++--------- 7 files changed, 36 insertions(+), 32 deletions(-) diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue index 65ed3aed3..ac0834d2c 100644 --- a/frontend/src/components/DecayInformation.vue +++ b/frontend/src/components/DecayInformation.vue @@ -28,7 +28,10 @@
- {{ $d($moment.unix(decay.decay_start), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }} + + {{ $d($moment.unix(decay.decay_start), 'long') }} + {{ $i18n.locale === 'de' ? 'Uhr' : '' }} +
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index ce5a1fd41..4de2f7a66 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -43,7 +43,7 @@ "close": "schließen", "edit": "bearbeiten", "save": "speichern", - "receiver":"Empfänger", + "recipient":"Empfänger", "sender":"Absender", "username":"Username", "firstname":"Vorname", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 18984d37f..79d811f78 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -43,7 +43,7 @@ "close":"Close", "edit": "Edit", "save": "save", - "receiver":"Receiver", + "recipient":"Recipient", "sender":"Sender", "username":"Username", "firstname":"Firstname", diff --git a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionConfirmation.vue b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionConfirmation.vue index d81311b79..0d902542b 100644 --- a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionConfirmation.vue +++ b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionConfirmation.vue @@ -6,7 +6,7 @@ {{ email }} - {{ $t('form.receiver') }} + {{ $t('form.recipient') }} {{ $n(amount, 'decimal') }} GDD diff --git a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.spec.js b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.spec.js index 28b769a3c..6178805c8 100644 --- a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.spec.js +++ b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.spec.js @@ -50,7 +50,7 @@ describe('GddSend', () => { }) it('has a label form.receiver', () => { - expect(wrapper.find('label.input-1').text()).toBe('form.receiver') + expect(wrapper.find('label.input-1').text()).toBe('form.recipient') }) it('has a placeholder "E-Mail"', () => { @@ -121,8 +121,8 @@ describe('GddSend', () => { ) }) - it('has a label form.memo', () => { - expect(wrapper.find('label.input-3').text()).toBe('form.memo') + it('has a label form.message', () => { + expect(wrapper.find('label.input-3').text()).toBe('form.message') }) it('flushes an error message when memo is less than 5 characters', async () => { diff --git a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue index cc9587e75..8f2f8780d 100644 --- a/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue +++ b/frontend/src/views/Pages/AccountOverview/GddSend/TransactionForm.vue @@ -21,8 +21,7 @@ }" v-slot="{ errors }" > - - + - - {{ error }} - + + {{ error }} + @@ -60,7 +59,7 @@ gddSendAmount: [0.01, balance], }" v-slot="{ errors, valid }" - > + > @@ -79,9 +78,9 @@ class="pl-3" > - - {{ error }} - + + {{ error }} + @@ -94,7 +93,7 @@ }" :name="$t('form.message')" v-slot="{ errors }" - > + > @@ -107,9 +106,9 @@ class="pl-3" > - - {{ error }} - + + {{ error }} + diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue index e1d770e3d..1d8473884 100644 --- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue @@ -9,18 +9,18 @@
-
+
-
+
{{ getProperties(type).operator }} - + {{ $n(balance, 'decimal') }} {{ $n(balance, 'decimal') }}
- + {{ $t('form.message') }}
@@ -30,20 +30,23 @@
-
+
{{ name ? name : '' }} -
- {{ memo }} - -
+
+ + {{ memo }} + +
{{ $t('decay.decay_since_last_transaction') }} -
{{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
+
+ {{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }} +
-
+
i @@ -57,7 +60,6 @@
{{ type === 'receive' ? $t('form.from') : $t('form.to1') }}: -
{{ name }}