IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1727-Change-button-text-and-observe-spelling

Browse Source
This commit is contained in:
Alexander Friedland 2022-04-04 22:41:19 +02:00 committed by GitHub
commit 51d4e855b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/GddTransactionList.vue
View File

@ -70,7 +70,8 @@
:total-rows="transactionCount"
></pagination-buttons>
<div v-if="transactionCount <= 0" class="mt-4 text-center">
<span>{{ $t('transaction.nullTransactions') }}</span>
<b-icon v-if="pending" icon="three-dots" animation="cylon"></b-icon>
<div v-else>{{ $t('transaction.nullTransactions') }}</div>
</div>
</div>
</template>
@ -108,6 +109,7 @@ export default {
transactionCount: { type: Number, default: 0 },
transactionLinkCount: { type: Number, default: 0 },
showPagination: { type: Boolean, default: false },
pending: { type: Boolean },
},
methods: {
updateTransactions() {

5
frontend/src/components/Menu/Navbar.vue
View File

@ -10,7 +10,10 @@
</div>
<b-navbar-nav class="ml-auto" is-nav>
<b-nav-item>{{ pending ? $t('em-dash') : balance | amount }} {{ $t('GDD') }}</b-nav-item>
<b-nav-item>
<b-icon v-if="pending" icon="three-dots" animation="cylon"></b-icon>
<div v-else>{{ pending ? $t('em-dash') : balance | amount }} {{ $t('GDD') }}</div>
</b-nav-item>
<b-nav-item to="/profile" right class="d-none d-sm-none d-md-none d-lg-flex shadow-lg">
<small>
{{ $store.state.firstName }} {{ $store.state.lastName }}

8
frontend/src/components/Status.spec.js
View File

@ -26,8 +26,8 @@ describe('Status', () => {
})
describe('balance is pending', () => {
it('it displays an en-dash', () => {
expect(wrapper.find('div.gdd-status-div').text()).toEqual('em-dash GDD')
it('displays an animation icon test-pending-icon', () => {
expect(wrapper.find('.test-pending-icon').exists()).toBe(true)
})
})
@ -38,6 +38,10 @@ describe('Status', () => {
})
})
it('does not display an animation icon test-pending-icon', () => {
expect(wrapper.find('.test-pending-icon').exists()).toBe(false)
})
it('it displays the ammount of GDD', () => {
expect(wrapper.find('div.gdd-status-div').text()).toEqual('1234 GDD')
})

5
frontend/src/components/Status.vue
View File

@ -1,7 +1,10 @@
<template>
<div class="gdd-status">
<div class="p-0 gdd-status-div">
{{ pending || balance === null ? $t('em-dash') : $n(balance, 'decimal') }} {{ statusText }}
<b-icon v-if="pending" icon="three-dots" animation="cylon" class="test-pending-icon"></b-icon>
<div v-else>
{{ pending || balance === null ? $t('em-dash') : $n(balance, 'decimal') }} {{ statusText }}
</div>
</div>
</div>
</template>

1
frontend/src/pages/Overview.vue
View File

@ -21,6 +21,7 @@
:decayStartBlock="decayStartBlock"
:transaction-count="transactionCount"
:transactionLinkCount="transactionLinkCount"
:pending="pending"
@update-transactions="updateTransactions"
v-on="$listeners"
/>