diff --git a/frontend/src/assets/scss/gradido-template.scss b/frontend/src/assets/scss/gradido-template.scss index 59b461dce..9edb72a4f 100644 --- a/frontend/src/assets/scss/gradido-template.scss +++ b/frontend/src/assets/scss/gradido-template.scss @@ -11,7 +11,7 @@ body { .bg-gradient { background: rgb(4 112 6); - background: linear-gradient(90deg, rgb(4 112 6 / 100%) 73%, rgb(197 141 56 / 100%) 100%); + background: linear-gradient(90deg, rgb(4 112 6 / 100%) 22%, rgb(197 141 56 / 100%) 98%); color: white; } diff --git a/frontend/src/components/Contributions/ContributionForm.spec.js b/frontend/src/components/Contributions/ContributionForm.spec.js index c417ca54c..bc7ed9785 100644 --- a/frontend/src/components/Contributions/ContributionForm.spec.js +++ b/frontend/src/components/Contributions/ContributionForm.spec.js @@ -12,6 +12,7 @@ describe('ContributionForm', () => { date: '', memo: '', amount: '', + hours: 0, }, isThisMonth: true, minimalDate: new Date(), @@ -375,6 +376,7 @@ describe('ContributionForm', () => { date: now, memo: 'Mein Beitrag zur Gemeinschaft für diesen Monat ...', amount: '200', + hours: 0, }, ]), ]), diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue index 7ef5835c0..210841b05 100644 --- a/frontend/src/components/Contributions/ContributionForm.vue +++ b/frontend/src/components/Contributions/ContributionForm.vue @@ -3,13 +3,12 @@ -
- - - -
-
{{ $t('contribution.exhausted') }}
+ + + + + @@ -111,7 +109,7 @@ export default { this.form.id = null this.form.date = '' this.form.memo = '' - this.form.hours = 0.0 + this.form.hours = 0 this.form.amount = '' }, }, diff --git a/frontend/src/components/Contributions/ContributionListItem.spec.js b/frontend/src/components/Contributions/ContributionListItem.spec.js index 86b0efa31..3415ee5d3 100644 --- a/frontend/src/components/Contributions/ContributionListItem.spec.js +++ b/frontend/src/components/Contributions/ContributionListItem.spec.js @@ -48,7 +48,7 @@ describe('ContributionListItem', () => { it('is x-circle when deletedAt is present', async () => { await wrapper.setProps({ deletedAt: new Date().toISOString() }) - expect(wrapper.vm.icon).toBe('x-circle') + expect(wrapper.vm.icon).toBe('trash') }) it('is check when confirmedAt is present', async () => { diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue index d46b79c52..1f35097ef 100644 --- a/frontend/src/components/Contributions/ContributionListItem.vue +++ b/frontend/src/components/Contributions/ContributionListItem.vue @@ -30,7 +30,10 @@
{{ $t('creation') }} {{ $t('(') }}{{ amount / 20 }} {{ $t('h') }}{{ $t(')') }}
-
{{ amount | GDD }}
+
+ {{ $t('contribution.deleted') }} +
+
{{ amount | GDD }}
@@ -168,7 +171,7 @@ export default { }, computed: { icon() { - if (this.deletedAt) return 'x-circle' + if (this.deletedAt) return 'trash' if (this.confirmedAt) return 'check' if (this.state === 'IN_PROGRESS') return 'question-circle' return 'bell-fill' diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.vue b/frontend/src/components/GddSend/TransactionConfirmationLink.vue index 91fea3486..1600a4966 100644 --- a/frontend/src/components/GddSend/TransactionConfirmationLink.vue +++ b/frontend/src/components/GddSend/TransactionConfirmationLink.vue @@ -35,12 +35,15 @@ {{ $t('form.new_balance') }} {{ (balance - amount) | GDD }} - - - {{ $t('back') }} + + + + {{ $t('back') }} + - + - + @@ -39,12 +39,15 @@ {{ $t('form.new_balance') }} {{ (balance - amount) | GDD }} - - - {{ $t('back') }} + + + + {{ $t('back') }} + - + {{ $t('form.no_gdd_available') }}
- - - + + + {{ $t('form.reset') }} - - + + {{ $t('form.check_now') }} diff --git a/frontend/src/components/GddTransactionList.vue b/frontend/src/components/GddTransactionList.vue index f3524c6fe..deed0dedb 100644 --- a/frontend/src/components/GddTransactionList.vue +++ b/frontend/src/components/GddTransactionList.vue @@ -26,45 +26,46 @@ -
{{ $t('lastMonth') }}
-
- - +
+
+ + - + - + - - + + +
{ it('emits input with new value', async () => { await wrapper.find('input').setValue('12') expect(wrapper.emitted('input')).toBeTruthy() - expect(wrapper.emitted('input')).toEqual([['12']]) + expect(wrapper.emitted('input')).toEqual([[12]]) }) }) diff --git a/frontend/src/components/Inputs/InputHour.vue b/frontend/src/components/Inputs/InputHour.vue index 10fc00363..89380e73f 100644 --- a/frontend/src/components/Inputs/InputHour.vue +++ b/frontend/src/components/Inputs/InputHour.vue @@ -32,11 +32,11 @@ export default { type: Object, default: () => {}, }, - name: { type: String, required: true, default: 'Time' }, - label: { type: String, required: true, default: 'Time' }, - placeholder: { type: String, required: true, default: 'Time' }, + name: { type: String, required: true }, + label: { type: String, required: true }, + placeholder: { type: String, required: true }, value: { type: Number, required: true, default: 0 }, - validMaxTime: { type: Number, required: true, default: 0 }, + validMaxTime: { type: Number, required: true }, }, data() { return { @@ -50,7 +50,7 @@ export default { }, watch: { currentValue() { - this.$emit('input', this.currentValue) + this.$emit('input', Number(this.currentValue)) }, value() { if (this.value !== this.currentValue) this.currentValue = this.value diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue index 309e3ffd5..f939de71d 100644 --- a/frontend/src/components/Menu/Navbar.vue +++ b/frontend/src/components/Menu/Navbar.vue @@ -1,64 +1,49 @@ @@ -91,6 +76,10 @@ export default { diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue index 864d42906..9388b0e64 100644 --- a/frontend/src/components/Menu/Sidebar.vue +++ b/frontend/src/components/Menu/Sidebar.vue @@ -1,6 +1,11 @@