-
{{ $t('transactionlink.form_header') }}
+ {{ $t('transactionlink.name') }}
-
+
+
+
+
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
diff --git a/frontend/src/components/GddSend/TransactionResultLink.vue b/frontend/src/components/GddSend/TransactionResultLink.vue
index 79369fc99..8774bdf7e 100644
--- a/frontend/src/components/GddSend/TransactionResultLink.vue
+++ b/frontend/src/components/GddSend/TransactionResultLink.vue
@@ -1,27 +1,32 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/TransactionCollapse.vue b/frontend/src/components/TransactionCollapse.vue
index 98358475b..bf9b547df 100644
--- a/frontend/src/components/TransactionCollapse.vue
+++ b/frontend/src/components/TransactionCollapse.vue
@@ -1,5 +1,5 @@
-
@@ -82,10 +77,6 @@ export default {
type: String,
required: true,
},
- decayStartBlock: {
- type: Date,
- required: true,
- },
previousBookedBalance: {
type: String,
required: true,
diff --git a/frontend/src/components/Transactions/TransactionDecay.vue b/frontend/src/components/Transactions/TransactionDecay.vue
index 372705a4c..7505ac7c1 100644
--- a/frontend/src/components/Transactions/TransactionDecay.vue
+++ b/frontend/src/components/Transactions/TransactionDecay.vue
@@ -20,7 +20,7 @@
-
-
+
+
-
+ {{ $t('decay.decay') }}
@@ -17,6 +17,7 @@
{{ previousBookedBalance | GDD }}
+ {{ decay === '0' ? $t('math.minus') : '' }}
{{ decay | GDD }} {{ $t('math.equal') }}
{{ balance | GDD }}
diff --git a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
index 5802bfb4b..0df254bb4 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-DecayStartblock.vue
@@ -1,56 +1,80 @@
-
- {{ $t('decay.Starting_block_decay') }}
- {{ $t('decay.decay_introduced') }}
-
-
- {{ $d(new Date(decay.start), 'long') }}
-
+
+
+
+
+
+
+
+
+
+
+
- {{ $t('decay.decay') }}
- {{ decay.decay | GDD }}
+
+
+ {{ $t('decay.decay') }}
+ {{ decay.decay | GDD }}
+
+
-
+
+
-
+
{{ $t('decay.calculation_total') }}
+
-
- {{ $t(`decay.types.${typeId.toLowerCase()}`) }}
- {{ amount | GDD }}
-
-
-
- {{ $t('decay.decay') }}
- {{ decay.decay | GDD }}
-
-
-
- {{ $t('decay.total') }}
-
- {{ (Number(amount) + Number(decay.decay)) | GDD }}
+
+
+
+ {{ $t(`decay.types.${typeId.toLowerCase()}`) }}
+ {{ amount | GDD }}
+
+
+
+ {{ $t('decay.decay') }}
+ {{ decay.decay | GDD }}
+
+
+
+ {{ $t('decay.total') }}
+
+ {{ (Number(amount) + Number(decay.decay)) | GDD }}
+
+
diff --git a/frontend/src/components/DecayInformations/DecayInformation.vue b/frontend/src/components/DecayInformations/DecayInformation.vue
index ae76a5bb4..690f6532b 100644
--- a/frontend/src/components/DecayInformations/DecayInformation.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation.vue
@@ -14,6 +14,7 @@
import DecayInformationLong from '../DecayInformations/DecayInformation-Long'
import DecayInformationBeforeStartblock from '../DecayInformations/DecayInformation-BeforeStartblock'
import DecayInformationDecayStartblock from '../DecayInformations/DecayInformation-DecayStartblock'
+import CONFIG from '@/config'
export default {
components: {
@@ -34,14 +35,10 @@ export default {
type: String,
required: true,
},
- decayStartBlock: {
- type: Date,
- required: true,
- },
},
computed: {
isStartBlock() {
- return new Date(this.decay.start).getTime() === this.decayStartBlock.getTime()
+ return new Date(this.decay.start).getTime() === CONFIG.DECAY_START_TIME.getTime()
},
},
}
diff --git a/frontend/src/components/GddSend/QrCode.spec.js b/frontend/src/components/GddSend/QrCode.spec.js
deleted file mode 100644
index 66da5748d..000000000
--- a/frontend/src/components/GddSend/QrCode.spec.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import { mount } from '@vue/test-utils'
-import QrCode from './QrCode'
-
-const localVue = global.localVue
-
-describe('QrCode', () => {
- let wrapper
-
- const mocks = {
- $t: jest.fn((t) => t),
- }
-
- const stubs = {
- QrcodeStream: true,
- QrcodeCapture: true,
- }
-
- const Wrapper = () => {
- return mount(QrCode, { localVue, mocks, stubs })
- }
-
- describe('mount', () => {
- beforeEach(() => {
- wrapper = Wrapper()
- })
-
- it('renders the component', () => {
- expect(wrapper.find('div.alert').exists()).toBeTruthy()
- })
-
- describe('scanning', () => {
- beforeEach(async () => {
- wrapper.find('a').trigger('click')
- })
-
- it('has a scanning stream', () => {
- expect(wrapper.findComponent({ name: 'QrcodeStream' }).exists()).toBeTruthy()
- })
-
- describe('decode', () => {
- beforeEach(async () => {
- await wrapper
- .findComponent({ name: 'QrcodeStream' })
- .vm.$emit('decode', '[{"email": "user@example.org", "amount": 10.0}]')
- })
-
- it('emits set transaction', () => {
- expect(wrapper.emitted()['set-transaction']).toEqual([
- [
- {
- email: 'user@example.org',
- amount: 10,
- },
- ],
- ])
- })
- })
-
- describe('detect', () => {
- beforeEach(async () => {
- await wrapper.find('div.row > *').vm.$emit('detect')
- })
-
- it('calls onDetect', () => {
- expect(wrapper.vm.detect).toBeTruthy()
- })
- })
- })
- })
-})
diff --git a/frontend/src/components/GddSend/QrCode.vue b/frontend/src/components/GddSend/QrCode.vue
deleted file mode 100644
index 32e527cfe..000000000
--- a/frontend/src/components/GddSend/QrCode.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
+
+
+ {{ $t('decay.decay_introduced') }}
+
+
+ {{ $d(new Date(decay.start), 'long') }}
+
+
+ +
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('form.cancel') }}
-
-
-
-
-
- {{ $t('gdd_per_link.created') }}
-
-
{{ $t('gdd_per_link.created') }}
+
+
+
+ {{ $t('form.close') }}
+
+
+
+
{{ getLinesByType.headline }}
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index 8e455360b..2988f2026 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.spec.js
+++ b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
@@ -13,6 +13,7 @@ const mocks = {
locale: 'en',
},
$t: jest.fn((t) => t),
+ $d: jest.fn((d) => d),
$tc: jest.fn((tc) => tc),
$apollo: {
mutate: mockAPIcall,
@@ -25,7 +26,7 @@ const propsData = {
link: 'http://localhost/redeem/c00000000c000000c0000',
holdAvailableAmount: '5.13109484759482747111',
id: 12,
- memo: 'Wie schön hier etwas Quatsch zu lesen!',
+ memo: 'Katzenauge, Eulenschrei, was verschwunden komm herbei!',
validUntil: '2022-03-30T14:22:40.000Z',
}
@@ -57,22 +58,36 @@ describe('TransactionLink', () => {
describe('copy with success', () => {
beforeEach(async () => {
navigatorClipboardMock.mockResolvedValue()
- await wrapper.findAll('button').at(0).trigger('click')
+ await wrapper.find('.test-copy-link').trigger('click')
+ })
+ it('should call clipboard.writeText', () => {
+ expect(navigator.clipboard.writeText).toHaveBeenCalledWith(
+ 'http://localhost/redeem/c00000000c000000c0000',
+ )
})
-
it('toasts success message', () => {
expect(toastSuccessSpy).toBeCalledWith('gdd_per_link.link-copied')
})
})
+ })
- describe('copy with error', () => {
+ describe('qr code modal', () => {
+ let spy
+
+ beforeEach(() => {
+ jest.clearAllMocks()
+ })
+
+ describe('with success', () => {
beforeEach(async () => {
- navigatorClipboardMock.mockRejectedValue()
- await wrapper.findAll('button').at(0).trigger('click')
+ spy = jest.spyOn(wrapper.vm.$bvModal, 'show')
+ // spy.mockImplementation(() => Promise.resolve('some value'))
+ // mockAPIcall.mockResolvedValue()
+ await wrapper.find('.test-qr-code').trigger('click')
})
- it('toasts error message', () => {
- expect(toastErrorSpy).toBeCalledWith('gdd_per_link.not-copied')
+ it('qr-code Modal if show', () => {
+ expect(spy).toBeCalled()
})
})
})
@@ -89,7 +104,7 @@ describe('TransactionLink', () => {
spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
spy.mockImplementation(() => Promise.resolve('some value'))
mockAPIcall.mockResolvedValue()
- await wrapper.findAll('button').at(1).trigger('click')
+ await wrapper.find('.test-delete-link').trigger('click')
})
it('test Modal if confirm true', () => {
@@ -121,7 +136,7 @@ describe('TransactionLink', () => {
spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
spy.mockImplementation(() => Promise.resolve('some value'))
mockAPIcall.mockRejectedValue({ message: 'Something went wrong :(' })
- await wrapper.findAll('button').at(1).trigger('click')
+ await wrapper.find('.test-delete-link').trigger('click')
})
it('toasts an error message', () => {
@@ -134,7 +149,7 @@ describe('TransactionLink', () => {
spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
spy.mockImplementation(() => Promise.resolve(false))
mockAPIcall.mockResolvedValue()
- await wrapper.findAll('button').at(1).trigger('click')
+ await wrapper.find('.test-delete-link').trigger('click')
})
it('does not call the API', () => {
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index 1c5ad690f..29cadc1b0 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -1,20 +1,33 @@
-
+
-
-
+
+
+
+
+
+
+
+
-
+
@@ -33,6 +45,12 @@
+
+
+
diff --git a/frontend/src/components/TransactionRows/DateRow.vue b/frontend/src/components/TransactionRows/DateRow.vue
index 7f93656f7..5f526caaf 100644
--- a/frontend/src/components/TransactionRows/DateRow.vue
+++ b/frontend/src/components/TransactionRows/DateRow.vue
@@ -8,7 +8,7 @@
@@ -28,12 +28,5 @@ export default {
default: false,
},
},
- computed: {
- dateString() {
- return this.diffNow
- ? this.$moment(this.date).locale(this.$i18n.locale).fromNow()
- : this.$d(new Date(this.date), 'long')
- },
- },
}
diff --git a/frontend/src/components/TransactionRows/DurationRow.vue b/frontend/src/components/TransactionRows/DurationRow.vue
new file mode 100644
index 000000000..d40d9e35b
--- /dev/null
+++ b/frontend/src/components/TransactionRows/DurationRow.vue
@@ -0,0 +1,44 @@
+
+
-
+
+ {{ link }}
+
- {{ dateString }}
+ {{ $d(new Date(this.date), 'long') }}
+
+
+
+
+ {{ durationText }}
+
+
+
+
+
diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index dce11307b..694d907ed 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -27,12 +27,7 @@
{{ $t('decay.past_time') }}
+
+
-
@@ -88,10 +83,6 @@ export default {
type: String,
required: true,
},
- decayStartBlock: {
- type: Date,
- required: true,
- },
transactionLinkId: {
type: Number,
required: false,
diff --git a/frontend/src/components/UserCard.spec.js b/frontend/src/components/UserCard.spec.js
index 0fe13c416..6977917f5 100644
--- a/frontend/src/components/UserCard.spec.js
+++ b/frontend/src/components/UserCard.spec.js
@@ -11,7 +11,8 @@ describe('UserCard', () => {
$n: jest.fn((n) => String(n)),
$store: {
state: {
- email: 'user@example.org',
+ firstName: 'Bibi',
+ lastName: 'Bloxberg',
},
},
}
@@ -28,9 +29,12 @@ describe('UserCard', () => {
it('renders the Div Element ".userdata-card"', () => {
expect(wrapper.find('div.userdata-card').exists()).toBeTruthy()
})
+ it('renders the SPAN Element ".b-avatar"', () => {
+ expect(wrapper.find('span.b-avatar').exists()).toBeTruthy()
+ })
- it('renders the Div Element "vue-qrcode"', () => {
- expect(wrapper.find('vue-qrcode'))
+ it('find the first letters of the firstName and lastName', () => {
+ expect(wrapper.find('span.b-avatar').text()).toBe('B B')
})
})
})
diff --git a/frontend/src/components/UserCard.vue b/frontend/src/components/UserCard.vue
index beca89532..2ed17403b 100755
--- a/frontend/src/components/UserCard.vue
+++ b/frontend/src/components/UserCard.vue
@@ -2,11 +2,7 @@
-
+
-
@@ -87,10 +82,6 @@ export default {
typeId: {
type: String,
},
- decayStartBlock: {
- type: Date,
- required: true,
- },
transactionLinkId: {
type: Number,
required: false,
diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index a1ea3c88e..f9125b89c 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -33,12 +33,7 @@
@@ -79,6 +79,14 @@ export default {
}
},
methods: {
+ showTransactionLinks() {
+ if (this.visible) {
+ this.visible = false
+ } else {
+ this.updateListTransactionLinks()
+ this.visible = true
+ }
+ },
async updateListTransactionLinks() {
if (this.currentPage === 0) {
this.transactionLinks = []
@@ -110,8 +118,5 @@ export default {
this.updateListTransactionLinks()
},
},
- created() {
- this.updateListTransactionLinks()
- },
}
diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index 32e40f71e..8899b3807 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -33,12 +33,7 @@
-
- {{ $store.state.community.name }}
+ {{ CONFIG.COMMUNITY_NAME }}
@@ -63,7 +63,7 @@
import InputPassword from '@/components/Inputs/InputPassword'
import InputEmail from '@/components/Inputs/InputEmail'
import { login } from '@/graphql/queries'
-import { getCommunityInfoMixin } from '@/mixins/getCommunityInfo'
+import CONFIG from '@/config'
export default {
name: 'Login',
@@ -71,7 +71,6 @@ export default {
InputPassword,
InputEmail,
},
- mixins: [getCommunityInfoMixin],
data() {
return {
form: {
@@ -79,6 +78,7 @@ export default {
password: '',
},
passwordVisible: false,
+ CONFIG,
}
},
methods: {
diff --git a/frontend/src/pages/Overview.spec.js b/frontend/src/pages/Overview.spec.js
index af234801e..8f0dda01d 100644
--- a/frontend/src/pages/Overview.spec.js
+++ b/frontend/src/pages/Overview.spec.js
@@ -25,12 +25,6 @@ describe('Overview', () => {
wrapper = Wrapper()
})
- it('has a status gdd-status-gdd', () => {
- expect(wrapper.find('div.gdd-status-gdd').exists()).toBeTruthy()
- })
- it('has a status gdd-status-gdt', () => {
- expect(wrapper.find('div.gdd-status-gdt').exists()).toBeTruthy()
- })
it('has a transactions table', () => {
expect(wrapper.find('div.gdd-transaction-list').exists()).toBeTruthy()
})
diff --git a/frontend/src/pages/Overview.vue b/frontend/src/pages/Overview.vue
index 9723f6ade..15e140058 100644
--- a/frontend/src/pages/Overview.vue
+++ b/frontend/src/pages/Overview.vue
@@ -1,24 +1,10 @@
- {{ $store.state.community.description }} + {{ CONFIG.COMMUNITY_DESCRIPTION }}
{{ $t('login') }}
-
-
-
-
-
-
diff --git a/frontend/src/pages/SelectCommunity.spec.js b/frontend/src/pages/SelectCommunity.spec.js
index f8896ae15..25ec8db93 100644
--- a/frontend/src/pages/SelectCommunity.spec.js
+++ b/frontend/src/pages/SelectCommunity.spec.js
@@ -1,5 +1,5 @@
import { mount, RouterLinkStub } from '@vue/test-utils'
-import { communities, communityInfo } from '@/graphql/queries'
+import { communities } from '@/graphql/queries'
import SelectCommunity from './SelectCommunity'
import { toastErrorSpy } from '@test/testSetup'
@@ -14,45 +14,33 @@ const spinnerMock = jest.fn(() => {
}
})
-const apolloQueryMock = jest
- .fn()
- .mockResolvedValueOnce({
- data: {
- getCommunityInfo: {
- name: 'test12',
- description: 'test community 12',
- url: 'http://test12.test12/',
- registerUrl: 'http://test12.test12/register',
+const apolloQueryMock = jest.fn().mockResolvedValue({
+ data: {
+ communities: [
+ {
+ id: 1,
+ name: 'Gradido Entwicklung',
+ description: 'Die lokale Entwicklungsumgebung von Gradido.',
+ url: 'http://localhost/',
+ registerUrl: 'http://localhost/register-community',
},
- },
- })
- .mockResolvedValue({
- data: {
- communities: [
- {
- id: 1,
- name: 'Gradido Entwicklung',
- description: 'Die lokale Entwicklungsumgebung von Gradido.',
- url: 'http://localhost/',
- registerUrl: 'http://localhost/register-community',
- },
- {
- id: 2,
- name: 'Gradido Staging',
- description: 'Der Testserver der Gradido-Akademie.',
- url: 'https://stage1.gradido.net/',
- registerUrl: 'https://stage1.gradido.net/register-community',
- },
- {
- id: 3,
- name: 'Gradido-Akademie',
- description: 'Freies Institut für Wirtschaftsbionik.',
- url: 'https://gradido.net',
- registerUrl: 'https://gdd1.gradido.com/register-community',
- },
- ],
- },
- })
+ {
+ id: 2,
+ name: 'Gradido Staging',
+ description: 'Der Testserver der Gradido-Akademie.',
+ url: 'https://stage1.gradido.net/',
+ registerUrl: 'https://stage1.gradido.net/register-community',
+ },
+ {
+ id: 3,
+ name: 'Gradido-Akademie',
+ description: 'Freies Institut für Wirtschaftsbionik.',
+ url: 'https://gradido.net',
+ registerUrl: 'https://gdd1.gradido.com/register-community',
+ },
+ ],
+ },
+})
const mockStoreCommit = jest.fn()
@@ -95,12 +83,6 @@ describe('SelectCommunity', () => {
wrapper = Wrapper()
})
- it('calls the API to get the community info data', () => {
- expect(apolloQueryMock).toBeCalledWith({
- query: communityInfo,
- })
- })
-
it('calls the API to get the communities data', () => {
expect(apolloQueryMock).toBeCalledWith({
query: communities,
@@ -141,12 +123,6 @@ describe('SelectCommunity', () => {
wrapper = Wrapper()
})
- it('does not call community info data when already filled', () => {
- expect(apolloQueryMock).not.toBeCalledWith({
- query: communityInfo,
- })
- })
-
it('has a Community name', () => {
expect(wrapper.find('.card-body b').text()).toBe('Gradido Entwicklung')
})
diff --git a/frontend/src/pages/SelectCommunity.vue b/frontend/src/pages/SelectCommunity.vue
index 0535e4fe7..8702d3e2e 100644
--- a/frontend/src/pages/SelectCommunity.vue
+++ b/frontend/src/pages/SelectCommunity.vue
@@ -5,9 +5,9 @@
- {{ $store.state.community.name }}
+ {{ CONFIG.COMMUNITY_NAME }}
-
@@ -49,7 +49,7 @@
-
{{ $store.state.community.description }}
+{{ CONFIG.COMMUNITY_DESCRIPTION }}