{{ $t('userIsDeleted') }}
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
diff --git a/frontend/src/components/GddSend/TransactionConfirmationLink.vue b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
index 31ae01cc3..c23ed35d2 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationLink.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationLink.vue
@@ -28,23 +28,21 @@
{{ $t('gdd_per_link.decay-14-day') }}
- {{ $t('math.aprox') }} {{ (amount * 0.028 * -1) | GDD }}
+ {{ $t('math.aprox') }} {{ (amount * -0.028) | GDD }}
{{ $t('form.new_balance') }}
-
- {{ $t('math.aprox') }} {{ (balance - amount - amount * 0.028) | GDD }}
-
+ {{ $t('math.aprox') }} {{ totalBalance | GDD }}
- {{ $t('form.cancel') }}
+ {{ $t('back') }}
-
+
{{ $t('form.generate_now') }}
@@ -60,7 +58,17 @@ export default {
amount: { type: Number, required: true },
memo: { type: String, required: true },
loading: { type: Boolean, required: true },
- selected: { type: String, required: true },
+ },
+ computed: {
+ totalBalance() {
+ return this.balance - this.amount * 1.028
+ },
+ disabled() {
+ if (this.totalBalance < 0) {
+ return true
+ }
+ return this.loading
+ },
},
}
diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js b/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js
index 38dd82866..3504b6e18 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js
+++ b/frontend/src/components/GddSend/TransactionConfirmationSend.spec.js
@@ -45,6 +45,33 @@ describe('GddSend confirm', () => {
it('renders the component div.confirm-box-send', () => {
expect(wrapper.find('div.confirm-box-send').exists()).toBeTruthy()
})
+
+ describe('send now button', () => {
+ beforeEach(() => {
+ jest.clearAllMocks()
+ })
+
+ describe('single click', () => {
+ beforeEach(async () => {
+ await wrapper.find('button.btn-primary').trigger('click')
+ })
+
+ it('emits send transaction one time', () => {
+ expect(wrapper.emitted('send-transaction')).toHaveLength(1)
+ })
+ })
+
+ describe('double click', () => {
+ beforeEach(async () => {
+ await wrapper.find('button.btn-primary').trigger('click')
+ await wrapper.find('button.btn-primary').trigger('click')
+ })
+
+ it('emits send transaction one time', () => {
+ expect(wrapper.emitted('send-transaction')).toHaveLength(1)
+ })
+ })
+ })
})
})
})
diff --git a/frontend/src/components/GddSend/TransactionConfirmationSend.vue b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
index 2d85fa33f..33a8b9351 100644
--- a/frontend/src/components/GddSend/TransactionConfirmationSend.vue
+++ b/frontend/src/components/GddSend/TransactionConfirmationSend.vue
@@ -55,10 +55,14 @@
- {{ $t('form.cancel') }}
+ {{ $t('back') }}
-
+
{{ $t('form.send_now') }}
@@ -73,8 +77,11 @@ export default {
email: { type: String, required: false, default: '' },
amount: { type: Number, required: true },
memo: { type: String, required: true },
- loading: { type: Boolean, required: true },
- selected: { type: String, required: true },
+ },
+ data() {
+ return {
+ disabled: false,
+ }
},
}
diff --git a/frontend/src/components/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js
index e105e2e1b..0b7245b67 100644
--- a/frontend/src/components/GddSend/TransactionForm.spec.js
+++ b/frontend/src/components/GddSend/TransactionForm.spec.js
@@ -62,31 +62,31 @@ describe('TransactionForm', () => {
})
})
- describe('is selected: "send"', () => {
+ describe('send GDD', () => {
beforeEach(async () => {
- // await wrapper.setData({
- // selected: 'send',
- // })
await wrapper.findAll('input[type="radio"]').at(0).setChecked()
})
it('has SEND_TYPES = send', () => {
- expect(wrapper.vm.selected).toBe(SEND_TYPES.send)
+ expect(wrapper.vm.radioSelected).toBe(SEND_TYPES.send)
})
describe('transaction form', () => {
beforeEach(() => {
wrapper.setProps({ balance: 100.0 })
})
+
describe('transaction form show because balance 100,0 GDD', () => {
it('has no warning message ', () => {
expect(wrapper.find('.errors').exists()).toBe(false)
})
+
it('has a reset button', () => {
expect(wrapper.find('.test-buttons').findAll('button').at(0).attributes('type')).toBe(
'reset',
)
})
+
it('has a submit button', () => {
expect(wrapper.find('.test-buttons').findAll('button').at(1).attributes('type')).toBe(
'submit',
@@ -121,6 +121,12 @@ describe('TransactionForm', () => {
expect(wrapper.find('span.errors').text()).toBe('validations.messages.email')
})
+ it('flushes an error message when email is the email of logged in user', async () => {
+ await wrapper.find('#input-group-1').find('input').setValue('user@example.org')
+ await flushPromises()
+ expect(wrapper.find('span.errors').text()).toBe('form.validation.is-not')
+ })
+
it('trims the email after blur', async () => {
await wrapper.find('#input-group-1').find('input').setValue(' valid@email.com ')
await wrapper.find('#input-group-1').find('input').trigger('blur')
@@ -195,6 +201,41 @@ describe('TransactionForm', () => {
expect(wrapper.find('span.errors').text()).toBe('validations.messages.min')
})
+ it('flushes an error message when memo is more than 255 characters', async () => {
+ await wrapper.find('#input-group-3').find('textarea').setValue(`
+Es ist ein König in Thule, der trinkt
+Champagner, es geht ihm nichts drüber;
+Und wenn er seinen Champagner trinkt,
+Dann gehen die Augen ihm über.
+
+Die Ritter sitzen um ihn her,
+Die ganze Historische Schule;
+Ihm aber wird die Zunge schwer,
+Es lallt der König von Thule:
+
+„Als Alexander, der Griechenheld,
+Mit seinem kleinen Haufen
+Erobert hatte die ganze Welt,
+Da gab er sich ans Saufen.
+
+Ihn hatten so durstig gemacht der Krieg
+Und die Schlachten, die er geschlagen;
+Er soff sich zu Tode nach dem Sieg,
+Er konnte nicht viel vertragen.
+
+Ich aber bin ein stärkerer Mann
+Und habe mich klüger besonnen:
+Wie jener endete, fang ich an,
+Ich hab mit dem Trinken begonnen.
+
+Im Rausche wird der Heldenzug
+Mir später weit besser gelingen;
+Dann werde ich, taumelnd von Krug zu Krug,
+Die ganze Welt bezwingen.“`)
+ await flushPromises()
+ expect(wrapper.find('span.errors').text()).toBe('validations.messages.max')
+ })
+
it('flushes no error message when memo is valid', async () => {
await wrapper.find('#input-group-3').find('textarea').setValue('Long enough')
await flushPromises()
@@ -208,7 +249,7 @@ describe('TransactionForm', () => {
})
it('has the text "form.cancel"', () => {
- expect(wrapper.find('button[type="reset"]').text()).toBe('form.reset')
+ expect(wrapper.find('button[type="reset"]').text()).toBe('form.cancel')
})
it('clears all fields on click', async () => {
@@ -259,7 +300,7 @@ describe('TransactionForm', () => {
})
it('has SEND_TYPES = link', () => {
- expect(wrapper.vm.selected).toBe(SEND_TYPES.link)
+ expect(wrapper.vm.radioSelected).toBe(SEND_TYPES.link)
})
it('has no input field of id input-group-1', () => {
diff --git a/frontend/src/components/GddSend/TransactionForm.vue b/frontend/src/components/GddSend/TransactionForm.vue
index 4ffc0d3fc..62361c4d0 100644
--- a/frontend/src/components/GddSend/TransactionForm.vue
+++ b/frontend/src/components/GddSend/TransactionForm.vue
@@ -6,28 +6,38 @@
-
+
{{ $t('send_gdd') }}
-
+
{{ $t('send_per_link') }}
-
@@ -37,16 +33,16 @@
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 3f62012ad..917a25d70 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -5,9 +5,10 @@
const pkg = require('../../package')
const constants = {
+ DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
CONFIG_VERSION: {
DEFAULT: 'DEFAULT',
- EXPECTED: 'v1.2022-03-18',
+ EXPECTED: 'v2.2022-04-07',
CURRENT: '',
},
}
@@ -27,6 +28,19 @@ const environment = {
PORT: process.env.PORT || 3000,
}
+const endpoints = {
+ GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost/graphql',
+ ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token={token}',
+}
+
+const community = {
+ COMMUNITY_NAME: process.env.COMMUNITY_NAME || 'Gradido Entwicklung',
+ COMMUNITY_URL: process.env.COMMUNITY_URL || 'http://localhost/',
+ COMMUNITY_REGISTER_URL: process.env.COMMUNITY_REGISTER_URL || 'http://localhost/register',
+ COMMUNITY_DESCRIPTION:
+ process.env.COMMUNITY_DESCRIPTION || 'Die lokale Entwicklungsumgebung von Gradido.',
+}
+
const meta = {
META_URL: process.env.META_URL || 'http://localhost',
META_TITLE_DE: process.env.META_TITLE_DE || 'Gradido – Dein Dankbarkeitskonto',
@@ -46,11 +60,6 @@ const meta = {
META_AUTHOR: process.env.META_AUTHOR || 'Bernd Hückstädt - Gradido-Akademie',
}
-const endpoints = {
- GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost/graphql',
- ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token={token}',
-}
-
// Check config version
constants.CONFIG_VERSION.CURRENT = process.env.CONFIG_VERSION || constants.CONFIG_VERSION.DEFAULT
if (
@@ -68,6 +77,7 @@ const CONFIG = {
...version,
...environment,
...endpoints,
+ ...community,
...meta,
}
diff --git a/frontend/src/config/index.spec.js b/frontend/src/config/index.spec.js
new file mode 100644
index 000000000..3c4c7865e
--- /dev/null
+++ b/frontend/src/config/index.spec.js
@@ -0,0 +1,9 @@
+import CONFIG from './index'
+
+describe('config/index', () => {
+ describe('decay start block', () => {
+ it('has the correct date set', () => {
+ expect(CONFIG.DECAY_START_TIME).toEqual(new Date('2021-05-13 17:46:31'))
+ })
+ })
+})
diff --git a/frontend/src/filters/amount.js b/frontend/src/filters/amount.js
index ded1cceb7..97340117d 100644
--- a/frontend/src/filters/amount.js
+++ b/frontend/src/filters/amount.js
@@ -13,6 +13,6 @@ const amount = (value) => {
const GDD = (value) => {
value = amount(value)
if (value === '') return ''
- if (!value.match(/^− /)) value = '+ ' + value
+ if (!value.match(/^− /) && !value.match(/^0[.,]00$/)) value = '+ ' + value
return value + ' GDD'
}
diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js
index 95c811f8d..672af5f04 100644
--- a/frontend/src/graphql/mutations.js
+++ b/frontend/src/graphql/mutations.js
@@ -18,6 +18,12 @@ export const setPassword = gql`
}
`
+export const forgotPassword = gql`
+ mutation($email: String!) {
+ forgotPassword(email: $email)
+ }
+`
+
export const updateUserInfos = gql`
mutation(
$firstName: String
@@ -69,7 +75,7 @@ export const sendCoins = gql`
export const createTransactionLink = gql`
mutation($amount: Decimal!, $memo: String!) {
createTransactionLink(amount: $amount, memo: $memo) {
- code
+ link
}
}
`
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 60b929c6d..2bd905e5e 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -45,11 +45,12 @@ export const logout = gql`
export const transactionsQuery = gql`
query($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC) {
transactionList(currentPage: $currentPage, pageSize: $pageSize, order: $order) {
- balanceGDT
- count
- linkCount
- balance
- decayStartBlock
+ balance {
+ balance
+ balanceGDT
+ count
+ linkCount
+ }
transactions {
id
typeId
@@ -70,17 +71,12 @@ export const transactionsQuery = gql`
linkedUser {
email
}
+ transactionLinkId
}
}
}
`
-export const sendResetPasswordEmail = gql`
- query($email: String!) {
- sendResetPasswordEmail(email: $email)
- }
-`
-
export const listGDTEntriesQuery = gql`
query($currentPage: Int!, $pageSize: Int!) {
listGDTEntries(currentPage: $currentPage, pageSize: $pageSize) {
@@ -99,17 +95,6 @@ export const listGDTEntriesQuery = gql`
}
`
-export const communityInfo = gql`
- query {
- getCommunityInfo {
- name
- description
- registerUrl
- url
- }
- }
-`
-
export const communities = gql`
query {
communities {
@@ -154,7 +139,7 @@ export const listTransactionLinks = gql`
amount
holdAvailableAmount
memo
- code
+ link
createdAt
validUntil
redeemedAt
diff --git a/frontend/src/layouts/DashboardLayout_gdd.spec.js b/frontend/src/layouts/DashboardLayout_gdd.spec.js
index ed2199a91..ac079b0f3 100644
--- a/frontend/src/layouts/DashboardLayout_gdd.spec.js
+++ b/frontend/src/layouts/DashboardLayout_gdd.spec.js
@@ -145,11 +145,13 @@ describe('DashboardLayoutGdd', () => {
apolloMock.mockResolvedValue({
data: {
transactionList: {
- balanceGDT: 100,
- count: 4,
- linkCount: 8,
- balance: 1450,
- decay: 1250,
+ balance: {
+ balanceGDT: 100,
+ count: 4,
+ linkCount: 8,
+ balance: 1450,
+ decay: 1250,
+ },
transactions: ['transaction', 'transaction', 'transaction', 'transaction'],
},
},
diff --git a/frontend/src/layouts/DashboardLayout_gdd.vue b/frontend/src/layouts/DashboardLayout_gdd.vue
index 9abcf42cf..f65329470 100755
--- a/frontend/src/layouts/DashboardLayout_gdd.vue
+++ b/frontend/src/layouts/DashboardLayout_gdd.vue
@@ -26,7 +26,6 @@
:transactionCount="transactionCount"
:transactionLinkCount="transactionLinkCount"
:pending="pending"
- :decayStartBlock="decayStartBlock"
@update-transactions="updateTransactions"
@set-tunneled-email="setTunneledEmail"
>
@@ -54,16 +53,13 @@ export default {
},
data() {
return {
- logo: 'img/brand/green.png',
balance: 0,
GdtBalance: 0,
transactions: [],
- bookedBalance: 0,
transactionCount: 0,
transactionLinkCount: 0,
pending: true,
visible: false,
- decayStartBlock: new Date(),
tunneledEmail: null,
}
},
@@ -103,12 +99,13 @@ export default {
data: { transactionList },
} = result
this.GdtBalance =
- transactionList.balanceGDT === null ? null : Number(transactionList.balanceGDT)
+ transactionList.balance.balanceGDT === null
+ ? null
+ : Number(transactionList.balance.balanceGDT)
this.transactions = transactionList.transactions
- this.balance = Number(transactionList.balance)
- this.transactionCount = transactionList.count
- this.transactionLinkCount = transactionList.linkCount
- this.decayStartBlock = new Date(transactionList.decayStartBlock)
+ this.balance = Number(transactionList.balance.balance)
+ this.transactionCount = transactionList.balance.count
+ this.transactionLinkCount = transactionList.balance.linkCount
this.pending = false
})
.catch((error) => {
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 35155ca79..6c891d4b2 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -30,6 +30,7 @@
"delete": "Löschen",
"em-dash": "—",
"error": {
+ "email-already-sent": "Wir haben dir bereits eine E-Mail vor weniger als 10 Minuten geschickt.",
"empty-transactionlist": "Es gab einen Fehler mit der Übermittlung der Anzahl deiner Transaktionen.",
"error": "Fehler!",
"no-account": "Leider konnten wir keinen Account mit diesen Daten finden.",
@@ -51,6 +52,7 @@
"amount": "Betrag",
"at": "am",
"cancel": "Abbrechen",
+ "check_now": "Jetzt prüfen",
"close": "Schließen",
"current_balance": "Aktueller Kontostand",
"date": "Datum",
@@ -59,7 +61,7 @@
"email": "E-Mail",
"firstname": "Vorname",
"from": "Von",
- "generate_now": "jetzt generieren",
+ "generate_now": "Jetzt generieren",
"lastname": "Nachname",
"memo": "Nachricht",
"message": "Nachricht",
@@ -94,42 +96,45 @@
},
"GDD": "GDD",
"gdd_per_link": {
- "choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
+ "choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest. Du kannst auch noch eine Nachricht eintragen. Beim Klick „Jetzt generieren“ wird ein Link erstellt, den du versenden kannst.",
"copy": "kopieren",
"created": "Der Link wurde erstellt!",
"decay-14-day": "Vergänglichkeit für 14 Tage",
"delete-the-link": "Den Link löschen?",
"deleted": "Der Link wurde gelöscht!",
- "expired": "Abgelaufen",
- "has-account": "Du besitzt bereits ein Gradido Konto",
+ "has-account": "Du besitzt bereits ein Gradido Konto?",
"header": "Gradidos versenden per Link",
- "link-copied": "Link wurde in die Zwischenablage kopiert",
+ "isFree": "Gradido ist weltweit kostenfrei.",
+ "link-copied": "Link wurde in die Zwischenablage kopiert. Du kannst ihn jetzt in eine E-Mail oder Nachricht einfügen.",
"link-deleted": "Der Link wurde am {date} gelöscht.",
"link-expired": "Der Link ist nicht mehr gültig. Die Gültigkeit ist am {date} abgelaufen.",
"link-overview": "Linkübersicht",
"links_count": "Aktive Links",
- "links_sum": "Summe deiner versendeten Gradidos",
- "no-account": "Du besitzt noch kein Gradido Konto",
+ "links_sum": "Offene Links und QR-Codes",
+ "no-account": "Du besitzt noch kein Gradido Konto?",
"no-redeem": "Du darfst deinen eigenen Link nicht einlösen!",
"not-copied": "Konnte den Link nicht kopieren: {err}",
"redeem": "Einlösen",
"redeem-text": "Willst du den Betrag jetzt einlösen?",
"redeemed": "Erfolgreich eingelöst! Deinem Konto wurden {n} GDD gutgeschrieben.",
"redeemed-at": "Der Link wurde bereits am {date} eingelöst.",
+ "redeemed-title": "eingelöst",
"to-login": "Log dich ein",
- "to-register": "Registriere ein neues Konto"
+ "to-register": "Registriere ein neues Konto.",
+ "valid_until": "Gültig bis"
},
"gdt": {
- "calculation": "Berechnung der GradidoTransform",
+ "calculation": "Berechnung der Gradido Transform",
"contribution": "Beitrag",
"conversion": "Umrechnung",
- "conversion-gdt-euro": "Umrechnung Euro / GradidoTransform (GDT)",
+ "conversion-gdt-euro": "Umrechnung Euro / Gradido Transform (GDT)",
"credit": "Gutschrift",
"factor": "Faktor",
"formula": "Berechnungsformel",
"funding": "Zu den Förderbeiträgen",
- "gdt-received": "GradidoTransform (GDT) erhalten",
- "no-transactions": "Du hast noch keine GradidoTransform (GDT).",
+ "gdt": "Gradido Transform",
+ "gdt-received": "Gradido Transform (GDT) erhalten",
+ "no-transactions": "Du hast noch keine Gradido Transform (GDT).",
"not-reachable": "Der GDT Server ist nicht erreichbar.",
"publisher": "Dein geworbenes Mitglied hat einen Beitrag bezahlt",
"raise": "Erhöhung",
@@ -140,9 +145,9 @@
"login": "Anmeldung",
"math": {
"aprox": "~",
- "div": "/",
"equal": "=",
"exclaim": "!",
+ "minus": "−",
"pipe": "|"
},
"navigation": {
@@ -159,6 +164,7 @@
"infoText": "Wenn dir dein Empfehlungsgeber seine Publisher-Id gegeben hat, trage sie hier ein, sonst lass das Feld bitte unverändert!",
"publisherId": "Publisher-Id:"
},
+ "qrCode": "QR Code",
"send_gdd": "GDD versenden",
"send_per_link": "GDD versenden per Link",
"settings": {
@@ -249,5 +255,6 @@
},
"transaction-link": {
"send_you": "sendet dir"
- }
+ },
+ "via_link": "über einen Link"
}
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index af54f3b50..759412019 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -30,6 +30,7 @@
"delete": "Delete",
"em-dash": "—",
"error": {
+ "email-already-sent": "We already sent you an email less than 10 minutes ago.",
"empty-transactionlist": "There was an error with the transmission of the number of your transactions.",
"error": "Error!",
"no-account": "Unfortunately we could not find an account to the given data!",
@@ -51,6 +52,7 @@
"amount": "Amount",
"at": "at",
"cancel": "Cancel",
+ "check_now": "Check now",
"close": "Close",
"current_balance": "Current Balance",
"date": "Date",
@@ -100,36 +102,39 @@
"decay-14-day": "Decay for 14 days",
"delete-the-link": "Delete the link?",
"deleted": "The link was deleted!",
- "expired": "Expired",
- "has-account": "You already have a Gradido account",
+ "has-account": "You already have a Gradido account?",
"header": "Send Gradidos via link",
- "link-copied": "Link copied to clipboard",
+ "isFree": "Gradido is free of charge worldwide.",
+ "link-copied": "Link has been copied to the clipboard. You can now paste it into an email or message.",
"link-deleted": "The link was deleted on {date}.",
"link-expired": "The link is no longer valid. The validity expired on {date}.",
"link-overview": "Link overview",
"links_count": "Active links",
- "links_sum": "Total of your sent Gradidos",
- "no-account": "You don't have a Gradido account yet",
+ "links_sum": "Open links and QR codes",
+ "no-account": "You don't have a Gradido account yet?",
"no-redeem": "You not allowed to redeem your own link!",
"not-copied": "Could not copy link: {err}",
"redeem": "Redeem",
"redeem-text": "Do you want to redeem the amount now?",
"redeemed": "Successfully redeemed! Your account has been credited with {n} GDD.",
"redeemed-at": "The link was already redeemed on {date}.",
+ "redeemed-title": "redeemed",
"to-login": "Log in",
- "to-register": "Register a new account"
+ "to-register": "Register a new account.",
+ "valid_until": "Valid until"
},
"gdt": {
- "calculation": "Calculation of GradidoTransform",
+ "calculation": "Calculation of Gradido Transform",
"contribution": "Contribution",
"conversion": "Conversion",
- "conversion-gdt-euro": "Conversion Euro / GradidoTransform (GDT)",
+ "conversion-gdt-euro": "Conversion Euro / Gradido Transform (GDT)",
"credit": "Credit",
"factor": "Factor",
"formula": "Calculation formula",
"funding": "To the funding contributions",
- "gdt-received": "GradidoTransform (GDT) received",
- "no-transactions": "You do not have GradidoTransform (GDT) yet.",
+ "gdt": "Gradido Transform",
+ "gdt-received": "Gradido Transform (GDT) received",
+ "no-transactions": "You do not have Gradido Transform (GDT) yet.",
"not-reachable": "The GDT Server is not reachable.",
"publisher": "A member you referred has paid a contribution",
"raise": "Increase",
@@ -140,9 +145,9 @@
"login": "Login",
"math": {
"aprox": "~",
- "div": "/",
"equal": "=",
"exclaim": "!",
+ "minus": "−",
"pipe": "|"
},
"navigation": {
@@ -159,6 +164,7 @@
"infoText": "If your referrer has given you his publisher id, enter it here, otherwise leave the field unchanged!",
"publisherId": "PublisherID:"
},
+ "qrCode": "QR Code",
"send_gdd": "GDD send",
"send_per_link": "GDD send via link",
"settings": {
@@ -249,5 +255,6 @@
},
"transaction-link": {
"send_you": "wants to send you"
- }
+ },
+ "via_link": "via Link"
}
diff --git a/frontend/src/mixins/getCommunityInfo.js b/frontend/src/mixins/getCommunityInfo.js
deleted file mode 100644
index c6c021f9c..000000000
--- a/frontend/src/mixins/getCommunityInfo.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import { communityInfo } from '../graphql/queries'
-
-export const getCommunityInfoMixin = {
- methods: {
- getCommunityInfo() {
- if (this.$store.state.community.name === '') {
- this.$apollo
- .query({
- query: communityInfo,
- })
- .then((result) => {
- this.$store.commit('community', result.data.getCommunityInfo)
- return result.data.getCommunityInfo
- })
- .catch((error) => {
- this.toastError(error.message)
- })
- }
- },
- },
- created() {
- this.getCommunityInfo()
- },
-}
diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index a547f9cc1..dd703d7fc 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -2,6 +2,8 @@ import { mount, RouterLinkStub } from '@vue/test-utils'
import flushPromises from 'flush-promises'
import ForgotPassword from './ForgotPassword'
+import { toastErrorSpy } from '@test/testSetup'
+
const mockAPIcall = jest.fn()
const localVue = global.localVue
@@ -21,7 +23,7 @@ const createMockObject = (comingFrom) => {
push: mockRouterPush,
},
$apollo: {
- query: mockAPIcall,
+ mutate: mockAPIcall,
},
$route: {
params: {
@@ -116,6 +118,10 @@ describe('ForgotPassword', () => {
await flushPromises()
})
+ it('toasts a standard error message', () => {
+ expect(toastErrorSpy).toBeCalledWith('error.email-already-sent')
+ })
+
it('pushes to "/thx/forgotPassword"', () => {
expect(mockAPIcall).toBeCalledWith(
expect.objectContaining({
diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index 81121fbe7..580a0ed97 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -39,7 +39,7 @@
diff --git a/frontend/src/pages/ResetPassword.spec.js b/frontend/src/pages/ResetPassword.spec.js
index c43f71932..36efa0a11 100644
--- a/frontend/src/pages/ResetPassword.spec.js
+++ b/frontend/src/pages/ResetPassword.spec.js
@@ -150,13 +150,18 @@ describe('ResetPassword', () => {
describe('server response with error code > 10min', () => {
beforeEach(async () => {
- apolloMutationMock.mockRejectedValue({ message: '...Code is older than 10 minutes' })
+ jest.clearAllMocks()
+ apolloMutationMock.mockRejectedValue({
+ message: '...email was sent more than 23 hours and 10 minutes ago',
+ })
await wrapper.find('form').trigger('submit')
await flushPromises()
})
it('toasts an error message', () => {
- expect(toastErrorSpy).toHaveBeenCalledWith('...Code is older than 10 minutes')
+ expect(toastErrorSpy).toHaveBeenCalledWith(
+ '...email was sent more than 23 hours and 10 minutes ago',
+ )
})
it('router pushes to /forgot-password/resetPassword', () => {
diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue
index 7771be5f6..a737246bc 100644
--- a/frontend/src/pages/ResetPassword.vue
+++ b/frontend/src/pages/ResetPassword.vue
@@ -108,7 +108,11 @@ export default {
})
.catch((error) => {
this.toastError(error.message)
- if (error.message.includes('Code is older than 10 minutes'))
+ if (
+ error.message.match(
+ /email was sent more than ([0-9]+ hours)?( and )?([0-9]+ minutes)? ago/,
+ )
+ )
this.$router.push('/forgot-password/resetPassword')
})
},
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 @@
-
-
-
- {{ $t('decay.decay') }}
-
- {{ (Number(balance) - Number(decay)) | GDD }}
- {{ 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.decay') }}
+
+ {{ previousBookedBalance | GDD }}
+ {{ decay === '0' ? $t('math.minus') : '' }}
+ {{ decay | GDD }} {{ $t('math.equal') }}
+ {{ balance | GDD }}
+
+
-
- {{ $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') }}
-
-
-
-
+
-
@@ -33,7 +37,7 @@ import AmountAndNameRow from '../TransactionRows/AmountAndNameRow'
import DecayInformationDecay from '../DecayInformations/DecayInformation-Decay'
export default {
- name: 'slot-decay',
+ name: 'TransactionDecay',
components: {
CollapseIcon,
TypeIcon,
@@ -53,6 +57,10 @@ export default {
type: Object,
required: true,
},
+ previousBookedBalance: {
+ type: String,
+ required: true,
+ },
},
data() {
return {
diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
index 1f2a4388c..b60cc60f8 100644
--- a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
+++ b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js
@@ -12,6 +12,7 @@ const mocks = {
locale: 'en',
},
$t: jest.fn((t) => t),
+ $d: jest.fn((d) => d),
$tc: jest.fn((tc) => tc),
$apollo: {
query: apolloQueryMock,
@@ -43,7 +44,7 @@ describe('TransactionLinkSummary', () => {
listTransactionLinks: [
{
amount: '75',
- code: 'ce28664b5308c17f931c0367',
+ link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
createdAt: '2022-03-16T14:22:40.000Z',
holdAvailableAmount: '5.13109484759482747111',
id: 86,
@@ -54,7 +55,7 @@ describe('TransactionLinkSummary', () => {
},
{
amount: '85',
- code: 'ce28664b5308c17f931c0367',
+ link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
createdAt: '2022-03-16T14:22:40.000Z',
holdAvailableAmount: '5.13109484759482747111',
id: 107,
@@ -64,7 +65,7 @@ describe('TransactionLinkSummary', () => {
},
{
amount: '95',
- code: 'ce28664b5308c17f931c0367',
+ link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
createdAt: '2022-03-16T14:22:40.000Z',
holdAvailableAmount: '5.13109484759482747111',
id: 92,
@@ -75,7 +76,7 @@ describe('TransactionLinkSummary', () => {
},
{
amount: '150',
- code: 'ce28664b5308c17f931c0367',
+ link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
createdAt: '2022-03-16T14:22:40.000Z',
holdAvailableAmount: '5.13109484759482747111',
id: 16,
@@ -99,18 +100,134 @@ describe('TransactionLinkSummary', () => {
expect(wrapper.findComponent({ name: 'CollapseLinksList' }).exists()).toBe(true)
})
- it('calls the API to get the list transaction links', () => {
- expect(apolloQueryMock).toBeCalledWith({
- query: listTransactionLinks,
- variables: {
- currentPage: 1,
- },
- fetchPolicy: 'network-only',
+ describe('click on transaction links', () => {
+ beforeEach(() => {
+ wrapper.find('div.transaction-link-details').trigger('click')
})
- })
- it('has four transactionLinks', () => {
- expect(wrapper.vm.transactionLinks).toHaveLength(4)
+ it('calls the API to get the list transaction links', () => {
+ expect(apolloQueryMock).toBeCalledWith({
+ query: listTransactionLinks,
+ variables: {
+ currentPage: 1,
+ },
+ fetchPolicy: 'network-only',
+ })
+ })
+
+ it('has four transactionLinks', () => {
+ expect(wrapper.vm.transactionLinks).toHaveLength(4)
+ })
+
+ describe('close transaction link details', () => {
+ beforeEach(() => {
+ jest.clearAllMocks()
+ wrapper.find('div.transaction-link-details').trigger('click')
+ })
+
+ it('does not call the API', () => {
+ expect(apolloQueryMock).not.toBeCalled()
+ })
+
+ it('has no component CollapseLinksList', () => {
+ expect(wrapper.findComponent({ name: 'CollapseLinksList' }).isVisible()).toBe(false)
+ })
+
+ describe('reopen transaction link details', () => {
+ beforeEach(() => {
+ jest.clearAllMocks()
+ wrapper.find('div.transaction-link-details').trigger('click')
+ })
+
+ it('calls the API to get the list transaction links', () => {
+ expect(apolloQueryMock).toBeCalledWith({
+ query: listTransactionLinks,
+ variables: {
+ currentPage: 1,
+ },
+ fetchPolicy: 'network-only',
+ })
+ })
+
+ it('has four transactionLinks', () => {
+ expect(wrapper.vm.transactionLinks).toHaveLength(4)
+ })
+ })
+ })
+
+ describe('load more transaction links', () => {
+ beforeEach(async () => {
+ jest.clearAllMocks()
+ apolloQueryMock.mockResolvedValue({
+ data: {
+ listTransactionLinks: [
+ {
+ amount: '76',
+ link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
+ createdAt: '2022-03-16T14:22:40.000Z',
+ holdAvailableAmount: '5.13109484759482747111',
+ id: 87,
+ memo:
+ 'Hat jemand die Nummer von der Hexe aus Schneewittchen? Ich bräuchte mal ein paar Äpfel.',
+ redeemedAt: null,
+ validUntil: '2022-03-30T14:22:40.000Z',
+ },
+ {
+ amount: '86',
+ link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
+ createdAt: '2022-03-16T14:22:40.000Z',
+ holdAvailableAmount: '5.13109484759482747111',
+ id: 108,
+ memo:
+ 'Die Windfahn´ krächzt am Dach, Der Uhu im Geklüfte; Was wispert wie ein Ach Verhallend in die Lüfte?',
+ redeemedAt: null,
+ validUntil: '2022-03-30T14:22:40.000Z',
+ },
+ {
+ amount: '96',
+ link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
+ createdAt: '2022-03-16T14:22:40.000Z',
+ holdAvailableAmount: '5.13109484759482747111',
+ id: 93,
+ memo:
+ 'Verschlafen kräht der Hahn, Ein Blitz noch, und ein trüber, Umwölbter Tag bricht an – Walpurgisnacht vorüber!',
+ redeemedAt: null,
+ validUntil: '2022-03-30T14:22:40.000Z',
+ },
+ {
+ amount: '150',
+ link: 'http://localhost/redeem/ce28664b5308c17f931c0367',
+ createdAt: '2022-03-16T14:22:40.000Z',
+ holdAvailableAmount: '5.13109484759482747111',
+ id: 17,
+ memo: 'Eene meene Flaschenschrank, fertig ist der Hexentrank!',
+ redeemedAt: null,
+ validUntil: '2022-03-30T14:22:40.000Z',
+ },
+ ],
+ },
+ })
+ await wrapper.setData({
+ currentPage: 2,
+ pending: false,
+ pageSize: 5,
+ })
+ })
+
+ it('has eight transactionLinks', () => {
+ expect(wrapper.vm.transactionLinks).toHaveLength(8)
+ })
+
+ it('loads more transaction links', () => {
+ expect(apolloQueryMock).toBeCalledWith({
+ query: listTransactionLinks,
+ variables: {
+ currentPage: 2,
+ },
+ fetchPolicy: 'network-only',
+ })
+ })
+ })
})
describe('reset transaction links', () => {
@@ -142,84 +259,10 @@ describe('TransactionLinkSummary', () => {
})
})
- describe('load more transaction links', () => {
- beforeEach(async () => {
- jest.clearAllMocks()
- apolloQueryMock.mockResolvedValue({
- data: {
- listTransactionLinks: [
- {
- amount: '76',
- code: 'ce28664b5308c17f931c0367',
- createdAt: '2022-03-16T14:22:40.000Z',
- holdAvailableAmount: '5.13109484759482747111',
- id: 87,
- memo:
- 'Hat jemand die Nummer von der Hexe aus Schneewittchen? Ich bräuchte mal ein paar Äpfel.',
- redeemedAt: null,
- validUntil: '2022-03-30T14:22:40.000Z',
- },
- {
- amount: '86',
- code: 'ce28664b5308c17f931c0367',
- createdAt: '2022-03-16T14:22:40.000Z',
- holdAvailableAmount: '5.13109484759482747111',
- id: 108,
- memo:
- 'Die Windfahn´ krächzt am Dach, Der Uhu im Geklüfte; Was wispert wie ein Ach Verhallend in die Lüfte?',
- redeemedAt: null,
- validUntil: '2022-03-30T14:22:40.000Z',
- },
- {
- amount: '96',
- code: 'ce28664b5308c17f931c0367',
- createdAt: '2022-03-16T14:22:40.000Z',
- holdAvailableAmount: '5.13109484759482747111',
- id: 93,
- memo:
- 'Verschlafen kräht der Hahn, Ein Blitz noch, und ein trüber, Umwölbter Tag bricht an – Walpurgisnacht vorüber!',
- redeemedAt: null,
- validUntil: '2022-03-30T14:22:40.000Z',
- },
- {
- amount: '150',
- code: 'ce28664b5308c17f931c0367',
- createdAt: '2022-03-16T14:22:40.000Z',
- holdAvailableAmount: '5.13109484759482747111',
- id: 17,
- memo: 'Eene meene Flaschenschrank, fertig ist der Hexentrank!',
- redeemedAt: null,
- validUntil: '2022-03-30T14:22:40.000Z',
- },
- ],
- },
- })
- await wrapper.setData({
- currentPage: 2,
- pending: false,
- pageSize: 5,
- })
- })
-
- it('has eight transactionLinks', () => {
- expect(wrapper.vm.transactionLinks).toHaveLength(8)
- })
-
- it('loads more transaction links', () => {
- expect(apolloQueryMock).toBeCalledWith({
- query: listTransactionLinks,
- variables: {
- currentPage: 2,
- },
- fetchPolicy: 'network-only',
- })
- })
- })
-
describe('loads transaction links with error', () => {
beforeEach(() => {
apolloQueryMock.mockRejectedValue({ message: 'OUCH!' })
- wrapper = Wrapper()
+ wrapper.find('div.transaction-link-details').trigger('click')
})
it('toasts an error message', () => {
diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.vue b/frontend/src/components/Transactions/TransactionLinkSummary.vue
index 3f80bfd18..c24410924 100644
--- a/frontend/src/components/Transactions/TransactionLinkSummary.vue
+++ b/frontend/src/components/Transactions/TransactionLinkSummary.vue
@@ -1,7 +1,7 @@
- {{ $t('gdd_per_link.header') }}
{{ $t('gdd_per_link.choose-amount') }}
+
- {{ $t('form.reset') }}
+ {{ $t('form.cancel') }}
-
- {{ selected === sendTypes.send ? $t('form.send_now') : $t('form.generate_now') }}
+
+ {{ $t('form.check_now') }}
@@ -159,6 +169,7 @@ export default {
email: { type: String, default: '' },
amount: { type: Number, default: 0 },
memo: { type: String, default: '' },
+ selected: { type: String, default: 'send' },
},
inject: ['getTunneledEmail'],
data() {
@@ -171,14 +182,14 @@ export default {
memo: this.memo,
amountValue: 0.0,
},
- selected: SEND_TYPES.send,
+ radioSelected: this.selected,
}
},
methods: {
onSubmit() {
this.normalizeAmount(true)
this.$emit('set-transaction', {
- selected: this.selected,
+ selected: this.radioSelected,
email: this.form.email,
amount: this.form.amountValue,
memo: this.form.memo,
@@ -213,7 +224,7 @@ export default {
},
},
created() {
- this.form.email = this.recipientEmail ? this.recipientEmail : ''
+ this.form.email = this.recipientEmail ? this.recipientEmail : this.form.email
},
}
diff --git a/frontend/src/components/GddSend/TransactionResultLink.vue b/frontend/src/components/GddSend/TransactionResultLink.vue
index 66b5529d6..633796b23 100644
--- a/frontend/src/components/GddSend/TransactionResultLink.vue
+++ b/frontend/src/components/GddSend/TransactionResultLink.vue
@@ -1,30 +1,34 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/frontend/src/components/QrCode/FigureQrCode.spec.js b/frontend/src/components/QrCode/FigureQrCode.spec.js
new file mode 100644
index 000000000..d19d806d3
--- /dev/null
+++ b/frontend/src/components/QrCode/FigureQrCode.spec.js
@@ -0,0 +1,30 @@
+import { mount } from '@vue/test-utils'
+import FigureQrCode from './FigureQrCode'
+
+const localVue = global.localVue
+
+const propsData = {
+ text: '',
+}
+
+describe('FigureQrCode', () => {
+ let wrapper
+
+ const Wrapper = () => {
+ return mount(FigureQrCode, { localVue, propsData })
+ }
+
+ describe('mount', () => {
+ beforeEach(() => {
+ wrapper = Wrapper()
+ })
+
+ it('renders the Div Element ".figure-qr-code"', () => {
+ expect(wrapper.find('div.figure-qr-code').exists()).toBeTruthy()
+ })
+
+ it('renders the Div Element "q-r-canvas"', () => {
+ expect(wrapper.find('q-r-canvas'))
+ })
+ })
+})
diff --git a/frontend/src/components/QrCode/FigureQrCode.vue b/frontend/src/components/QrCode/FigureQrCode.vue
new file mode 100644
index 000000000..df450a52e
--- /dev/null
+++ b/frontend/src/components/QrCode/FigureQrCode.vue
@@ -0,0 +1,51 @@
+
+
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 @@
-
-
-
+
-
- {{ $t('gdd_per_link.created') }}
-
-
{{ $t('gdd_per_link.created') }}
+
+
+
+ {{ $t('form.close') }}
+
+
+
+
+
+
+
diff --git a/frontend/src/components/Status.spec.js b/frontend/src/components/Status.spec.js
index ba7b03fa4..64a15deb1 100644
--- a/frontend/src/components/Status.spec.js
+++ b/frontend/src/components/Status.spec.js
@@ -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')
})
diff --git a/frontend/src/components/Status.vue b/frontend/src/components/Status.vue
index 9ebe48e09..14d470fb3 100644
--- a/frontend/src/components/Status.vue
+++ b/frontend/src/components/Status.vue
@@ -1,7 +1,10 @@
+
+
- {{ pending || balance === null ? $t('em-dash') : $n(balance, 'decimal') }} {{ statusText }}
+
+ {{ pending || balance === null ? $t('em-dash') : $n(balance, 'decimal') }} {{ statusText }}
+
+
{{ getLinesByType.headline }}
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.spec.js b/frontend/src/components/TransactionLinks/TransactionLink.spec.js
index f019a0ee1..b2d8f6f54 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,
@@ -21,10 +22,10 @@ const mocks = {
const propsData = {
amount: '75',
- code: 'c00000000c000000c0000',
+ 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',
}
@@ -56,22 +57,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()
})
})
})
@@ -88,7 +103,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', () => {
@@ -120,7 +135,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', () => {
@@ -133,7 +148,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 9cbfdfb93..9b40f2992 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -1,20 +1,33 @@
-
+
-
-
+
+
+
+
+
+
+
+
-
+
@@ -33,6 +45,17 @@
+
+
+
+
+
+
diff --git a/frontend/src/components/TransactionRows/AmountAndNameRow.vue b/frontend/src/components/TransactionRows/AmountAndNameRow.vue
index be71b57f6..322ad7dfa 100644
--- a/frontend/src/components/TransactionRows/AmountAndNameRow.vue
+++ b/frontend/src/components/TransactionRows/AmountAndNameRow.vue
@@ -10,9 +10,20 @@
@@ -35,6 +46,11 @@ export default {
type: String,
required: false,
},
+ transactionLinkId: {
+ type: Number,
+ required: false,
+ default: null,
+ },
},
methods: {
tunnelEmail() {
diff --git a/frontend/src/components/TransactionRows/DateRow.vue b/frontend/src/components/TransactionRows/DateRow.vue
index 0c72907fe..5f526caaf 100644
--- a/frontend/src/components/TransactionRows/DateRow.vue
+++ b/frontend/src/components/TransactionRows/DateRow.vue
@@ -2,11 +2,13 @@
-
@@ -26,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 @@
+
+
-
@@ -47,7 +42,7 @@ import DecayRow from '../TransactionRows/DecayRow'
import DecayInformation from '../DecayInformations/DecayInformation'
export default {
- name: 'slot-creation',
+ name: 'TransactionCreation',
components: {
CollapseIcon,
TypeIcon,
@@ -82,8 +77,8 @@ export default {
type: String,
required: true,
},
- decayStartBlock: {
- type: Date,
+ previousBookedBalance: {
+ type: String,
required: true,
},
},
diff --git a/frontend/src/components/Transactions/TransactionDecay.spec.js b/frontend/src/components/Transactions/TransactionDecay.spec.js
index 232e7f85a..8c5236b6e 100644
--- a/frontend/src/components/Transactions/TransactionDecay.spec.js
+++ b/frontend/src/components/Transactions/TransactionDecay.spec.js
@@ -31,6 +31,7 @@ const propsData = {
memo: 'sadasd asdasdasdasdadadd da dad aad',
typeId: 'DECAY',
decayStartBlock: new Date('2021-05-13T17:46:31.000Z'),
+ previousBookedBalance: '43.56',
}
describe('TransactionDecay', () => {
diff --git a/frontend/src/components/Transactions/TransactionDecay.vue b/frontend/src/components/Transactions/TransactionDecay.vue
index 2f235502a..7505ac7c1 100644
--- a/frontend/src/components/Transactions/TransactionDecay.vue
+++ b/frontend/src/components/Transactions/TransactionDecay.vue
@@ -20,8 +20,12 @@
{{ $t('qrCode') }}
+ +
-
- {{ itemText }}
-
+
+
+ {{ itemText }}
+
+
+ {{ $t('via_link') }}
+
{{ itemText }}
{{ diffNow ? $t('gdd_per_link.expired') : $t('form.date') }}
+
+ {{ diffNow ? $t('gdd_per_link.valid_until') : $t('form.date') }}
+
- {{ dateString }}
+ {{ $d(new Date(this.date), 'long') }}
+
+
+
+
+ {{ durationText }}
+
+
+
+
+
diff --git a/frontend/src/components/Transactions/TransactionCreation.spec.js b/frontend/src/components/Transactions/TransactionCreation.spec.js
index e1ea9e0b0..be0713ecf 100644
--- a/frontend/src/components/Transactions/TransactionCreation.spec.js
+++ b/frontend/src/components/Transactions/TransactionCreation.spec.js
@@ -31,6 +31,7 @@ const propsData = {
memo: 'sadasd asdasdasdasdadadd da dad aad',
typeId: 'DECAY',
decayStartBlock: new Date('2021-05-13T17:46:31.000Z'),
+ previousBookedBalance: '43.56',
}
describe('TransactionCreation', () => {
diff --git a/frontend/src/components/Transactions/TransactionCreation.vue b/frontend/src/components/Transactions/TransactionCreation.vue
index f343a92ac..694d907ed 100644
--- a/frontend/src/components/Transactions/TransactionCreation.vue
+++ b/frontend/src/components/Transactions/TransactionCreation.vue
@@ -27,12 +27,7 @@
{{ $t('decay.past_time') }}
+
+
-
@@ -48,7 +48,7 @@ import DecayRow from '../TransactionRows/DecayRow'
import DecayInformation from '../DecayInformations/DecayInformation'
export default {
- name: 'slot-send',
+ name: 'TransactionSend',
components: {
CollapseIcon,
TypeIcon,
@@ -83,8 +83,12 @@ export default {
type: String,
required: true,
},
- decayStartBlock: {
- type: Date,
+ transactionLinkId: {
+ type: Number,
+ required: false,
+ },
+ previousBookedBalance: {
+ type: String,
required: true,
},
},
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 @@
-
-
+
-
@@ -48,7 +48,7 @@ import DecayRow from '../TransactionRows/DecayRow'
import DecayInformation from '../DecayInformations/DecayInformation'
export default {
- name: 'slot-receive',
+ name: 'TransactionReceive',
components: {
CollapseIcon,
TypeIcon,
@@ -82,8 +82,12 @@ export default {
typeId: {
type: String,
},
- decayStartBlock: {
- type: Date,
+ transactionLinkId: {
+ type: Number,
+ required: false,
+ },
+ previousBookedBalance: {
+ type: String,
required: true,
},
},
diff --git a/frontend/src/components/Transactions/TransactionSend.spec.js b/frontend/src/components/Transactions/TransactionSend.spec.js
index 632c0857a..410fcc733 100644
--- a/frontend/src/components/Transactions/TransactionSend.spec.js
+++ b/frontend/src/components/Transactions/TransactionSend.spec.js
@@ -31,6 +31,7 @@ const propsData = {
memo: 'sadasd asdasdasdasdadadd da dad aad',
typeId: 'SEND',
decayStartBlock: new Date('2021-05-13T17:46:31.000Z'),
+ previousBookedBalance: '43.56',
}
describe('TransactionSend', () => {
diff --git a/frontend/src/components/Transactions/TransactionSend.vue b/frontend/src/components/Transactions/TransactionSend.vue
index dfe50225a..f9125b89c 100644
--- a/frontend/src/components/Transactions/TransactionSend.vue
+++ b/frontend/src/components/Transactions/TransactionSend.vue
@@ -13,7 +13,12 @@
@@ -79,6 +79,15 @@ export default {
}
},
methods: {
+ showTransactionLinks() {
+ if (this.visible) {
+ this.visible = false
+ } else {
+ this.transactionLinks = []
+ this.updateListTransactionLinks()
+ this.visible = true
+ }
+ },
async updateListTransactionLinks() {
if (this.currentPage === 0) {
this.transactionLinks = []
@@ -110,8 +119,5 @@ export default {
this.updateListTransactionLinks()
},
},
- created() {
- this.updateListTransactionLinks()
- },
}
diff --git a/frontend/src/components/Transactions/TransactionReceive.spec.js b/frontend/src/components/Transactions/TransactionReceive.spec.js
index f5b27cf47..46cb57e06 100644
--- a/frontend/src/components/Transactions/TransactionReceive.spec.js
+++ b/frontend/src/components/Transactions/TransactionReceive.spec.js
@@ -31,6 +31,7 @@ const propsData = {
memo: 'sadasd asdasdasdasdadadd da dad aad',
typeId: 'RECEIVE',
decayStartBlock: new Date('2021-05-13T17:46:31.000Z'),
+ previousBookedBalance: '43.56',
}
describe('TransactionReceive', () => {
diff --git a/frontend/src/components/Transactions/TransactionReceive.vue b/frontend/src/components/Transactions/TransactionReceive.vue
index d1947a91a..8899b3807 100644
--- a/frontend/src/components/Transactions/TransactionReceive.vue
+++ b/frontend/src/components/Transactions/TransactionReceive.vue
@@ -13,7 +13,12 @@
-
-
-
{{ $store.state.community.description }}
+{{ CONFIG.COMMUNITY_DESCRIPTION }}