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 1976-Customise-the-mobile-view

Browse Source
This commit is contained in:
Alexander Friedland 2022-06-20 12:14:59 +02:00 committed by GitHub
commit 84bd3130c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 279 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CHANGELOG.md
View File

@ -4,8 +4,26 @@ All notable changes to this project will be documented in this file. Dates are d
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### [1.10.0](https://github.com/gradido/gradido/compare/1.9.0...1.10.0)
- frontend redeem contribution link [`#1988`](https://github.com/gradido/gradido/pull/1988)
- change new start picture [`#1990`](https://github.com/gradido/gradido/pull/1990)
- feat: Redeem Contribution Link [`#1987`](https://github.com/gradido/gradido/pull/1987)
- fix: Max Amount on Slider for Edit Contribution [`#1986`](https://github.com/gradido/gradido/pull/1986)
- CRUD contribution link admin interface [`#1981`](https://github.com/gradido/gradido/pull/1981)
- fix: `.env` log level for apollo and backend category [`#1967`](https://github.com/gradido/gradido/pull/1967)
- refactor: Admin Pending Creations Table to Contributions Table [`#1949`](https://github.com/gradido/gradido/pull/1949)
- devops: Update Browser List for Unit Tests as Recomended [`#1984`](https://github.com/gradido/gradido/pull/1984)
- feat: CRUD for Contribution Links in Admin Resolver [`#1979`](https://github.com/gradido/gradido/pull/1979)
- 1920 feature create contribution link table [`#1957`](https://github.com/gradido/gradido/pull/1957)
- refactor: 🍰 Delete `user_setting` Table From DB [`#1960`](https://github.com/gradido/gradido/pull/1960)
- locales link german, english navbar [`#1969`](https://github.com/gradido/gradido/pull/1969)
#### [1.9.0](https://github.com/gradido/gradido/compare/1.8.3...1.9.0)
> 2 June 2022
- devops: Release Version 1.9.0 [`#1968`](https://github.com/gradido/gradido/pull/1968)
- refactor: 🍰 Refactor To `filters` Object And Rename Filters Properties [`#1914`](https://github.com/gradido/gradido/pull/1914)
- refactor register button position [`#1964`](https://github.com/gradido/gradido/pull/1964)
- fixed redeem link is mobile start false [`#1958`](https://github.com/gradido/gradido/pull/1958)

2
admin/package.json
View File

@ -3,7 +3,7 @@
"description": "Administraion Interface for Gradido",
"main": "index.js",
"author": "Moriz Wahl",
"version": "1.9.0",
"version": "1.10.0",
"license": "Apache-2.0",
"private": false,
"scripts": {

1
admin/src/components/ContributionLinkForm.vue
View File

@ -181,6 +181,7 @@ export default {
.then((result) => {
this.link = result.data.createContributionLink.link
this.toastSuccess(this.link)
this.onReset()
})
.catch((error) => {
this.toastError(error.message)

2
backend/package.json
View File

@ -1,6 +1,6 @@
{
"name": "gradido-backend",
"version": "1.9.0",
"version": "1.10.0",
"description": "Gradido unified backend providing an API-Service for Gradido Transactions",
"main": "src/index.ts",
"repository": "https://github.com/gradido/gradido/backend",

4
backend/src/graphql/resolver/TransactionLinkResolver.ts
View File

@ -276,8 +276,8 @@ export class TransactionLinkResolver {
logger.info('creation from contribution link commited successfuly.')
} catch (e) {
await queryRunner.rollbackTransaction()
logger.error(`Creation from contribution link was not successful: ${e}`)
throw new Error(`Creation from contribution link was not successful. ${e}`)
logger.error(`Creation from contribution link was not successful: ${e}`)
throw new Error(`Creation from contribution link was not successful. ${e}`)
} finally {
await queryRunner.release()
}

2
database/package.json
View File

@ -1,6 +1,6 @@
{
"name": "gradido-database",
"version": "1.9.0",
"version": "1.10.0",
"description": "Gradido Database Tool to execute database migrations",
"main": "src/index.ts",
"repository": "https://github.com/gradido/gradido/database",

2
frontend/package.json
View File

@ -1,6 +1,6 @@
{
"name": "bootstrap-vue-gradido-wallet",
"version": "1.9.0",
"version": "1.10.0",
"private": true,
"scripts": {
"start": "node run/server.js",

133
frontend/src/components/LanguageSwitch2.spec.js Normal file
View File

@ -0,0 +1,133 @@
import { mount } from '@vue/test-utils'
import LanguageSwitch from './LanguageSwitch2'
const localVue = global.localVue
const updateUserInfosMutationMock = jest.fn().mockResolvedValue({
data: {
updateUserInfos: {
validValues: 1,
},
},
})
describe('LanguageSwitch', () => {
let wrapper
const state = {
email: 'he@ho.he',
language: null,
}
const mocks = {
$store: {
state,
commit: jest.fn(),
},
$i18n: {
locale: 'en',
},
$t: jest.fn((t) => t),
$apollo: {
mutate: updateUserInfosMutationMock,
},
}
const Wrapper = () => {
return mount(LanguageSwitch, { localVue, mocks })
}
describe('mount', () => {
beforeEach(() => {
wrapper = Wrapper()
})
it('renders the component', () => {
expect(wrapper.find('div.language-switch').exists()).toBe(true)
})
describe('with locales en and de', () => {
describe('empty store', () => {
describe('navigator language is "en-US"', () => {
const languageGetter = jest.spyOn(navigator, 'language', 'get')
it('shows English as default navigator langauge', async () => {
languageGetter.mockReturnValue('en-US')
wrapper.vm.setCurrentLanguage()
await wrapper.vm.$nextTick()
expect(wrapper.findAll('span.locales').at(0).text()).toBe('English')
})
})
describe('navigator language is "de-DE"', () => {
const languageGetter = jest.spyOn(navigator, 'language', 'get')
it('shows Deutsch as language ', async () => {
languageGetter.mockReturnValue('de-DE')
wrapper.vm.setCurrentLanguage()
await wrapper.vm.$nextTick()
expect(wrapper.findAll('span.locales').at(1).text()).toBe('Deutsch')
})
})
describe('navigator language is "es-ES" (not supported)', () => {
const languageGetter = jest.spyOn(navigator, 'language', 'get')
it('shows English as language ', async () => {
languageGetter.mockReturnValue('es-ES')
wrapper.vm.setCurrentLanguage()
await wrapper.vm.$nextTick()
expect(wrapper.findAll('span.locales').at(0).text()).toBe('English')
})
})
describe('no navigator langauge', () => {
const languageGetter = jest.spyOn(navigator, 'language', 'get')
it('shows English as language ', async () => {
languageGetter.mockReturnValue(null)
wrapper.vm.setCurrentLanguage()
await wrapper.vm.$nextTick()
expect(wrapper.findAll('span.locales').at(0).text()).toBe('English')
})
})
})
describe('language "de" in store', () => {
it('shows Deutsch as language', async () => {
wrapper.vm.$store.state.language = 'de'
wrapper.vm.setCurrentLanguage()
await wrapper.vm.$nextTick()
expect(wrapper.findAll('span.locales').at(1).text()).toBe('Deutsch')
})
})
describe('language menu', () => {
it('has English and German as languages to choose', () => {
expect(wrapper.findAll('span.locales')).toHaveLength(2)
})
it('has English as first language to choose', () => {
expect(wrapper.findAll('span.locales').at(0).text()).toBe('English')
})
it('has German as second language to choose', () => {
expect(wrapper.findAll('span.locales').at(1).text()).toBe('Deutsch')
})
})
})
describe('calls the API', () => {
it("with locale 'de'", () => {
wrapper.findAll('span.locales').at(1).trigger('click')
expect(updateUserInfosMutationMock).toBeCalledWith(
expect.objectContaining({
variables: {
locale: 'de',
},
}),
)
})
// it("with locale 'en'", () => {
// wrapper.findAll('span.locales').at(0).trigger('click')
// expect(updateUserInfosMutationMock).toBeCalledWith(
// expect.objectContaining({
// variables: {
// locale: 'en',
// },
// }),
// )
// })
})
})
})

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

@ -7,8 +7,8 @@
class="pointer pr-2"
:class="$store.state.language === lang.code ? 'c-blau' : 'c-grey'"
>
{{ lang.name }}
<span class="ml-2">{{ locales.length - 1 > index ? $t('math.pipe') : '' }}</span>
<span class="locales">{{ lang.name }}</span>
<span class="ml-3">{{ locales.length - 1 > index ? $t('math.pipe') : '' }}</span>
</span>
</div>
</template>

18
frontend/src/components/LinkInformations/RedeemInformation.vue
View File

@ -1,8 +1,12 @@
<template>
<div class="redeem-information">
<b-jumbotron bg-variant="muted" text-variant="dark" border-variant="info">
<h1>
{{ firstName }}
<h1 v-if="isContributionLink">
{{ CONFIG.COMMUNITY_NAME }}
{{ $t('contribution-link.thanksYouWith') }} {{ amount | GDD }}
</h1>
<h1 v-else>
{{ user.firstName }}
{{ $t('transaction-link.send_you') }} {{ amount | GDD }}
</h1>
<b>{{ memo }}</b>
@ -10,12 +14,20 @@
</div>
</template>
<script>
import CONFIG from '@/config'
export default {
name: 'RedeemInformation',
props: {
firstName: { type: String, required: true },
user: { type: Object, required: false },
amount: { type: String, required: true },
memo: { type: String, required: true, default: '' },
isContributionLink: { type: Boolean, default: false },
},
data() {
return {
CONFIG,
}
},
}
</script>

7
frontend/src/components/LinkInformations/RedeemLoggedOut.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="redeem-logged-out">
<redeem-information :firstName="user.firstName" :amount="amount" :memo="memo" />
<redeem-information v-bind="linkData" :isContributionLink="isContributionLink" />
<b-jumbotron>
<div class="mb-6">
@ -32,9 +32,8 @@ export default {
RedeemInformation,
},
props: {
user: { type: Object, required: true },
amount: { type: String, required: true },
memo: { type: String, required: true, default: '' },
linkData: { type: Object, required: true },
isContributionLink: { type: Boolean, default: false },
},
computed: {
login() {

7
frontend/src/components/LinkInformations/RedeemSelfCreator.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="redeem-self-creator">
<redeem-information :firstName="user.firstName" :amount="amount" :memo="memo" />
<redeem-information v-bind="linkData" :isContributionLink="isContributionLink" />
<b-jumbotron>
<div class="mb-3 text-center">
@ -23,9 +23,8 @@ export default {
RedeemInformation,
},
props: {
user: { type: Object, required: true },
amount: { type: String, required: true },
memo: { type: String, required: true, default: '' },
linkData: { type: Object, required: true },
isContributionLink: { type: Boolean, default: false },
},
}
</script>

9
frontend/src/components/LinkInformations/RedeemValid.vue
View File

@ -1,9 +1,9 @@
<template>
<div class="redeem-valid">
<redeem-information :firstName="user.firstName" :amount="amount" :memo="memo" />
<redeem-information v-bind="linkData" :isContributionLink="isContributionLink" />
<b-jumbotron>
<div class="mb-3 text-center">
<b-button variant="primary" @click="$emit('redeem-link', amount)" size="lg">
<b-button variant="primary" @click="$emit('redeem-link', linkData.amount)" size="lg">
{{ $t('gdd_per_link.redeem') }}
</b-button>
</div>
@ -19,9 +19,8 @@ export default {
RedeemInformation,
},
props: {
user: { type: Object, required: false },
amount: { type: String, required: false },
memo: { type: String, required: false, default: '' },
linkData: { type: Object, required: true },
isContributionLink: { type: Boolean, default: false },
},
}
</script>

38
frontend/src/graphql/queries.js
View File

@ -114,17 +114,33 @@ export const queryOptIn = gql`
export const queryTransactionLink = gql`
query($code: String!) {
queryTransactionLink(code: $code) {
id
amount
memo
createdAt
validUntil
redeemedAt
deletedAt
user {
firstName
publisherId
email
... on TransactionLink {
id
amount
memo
createdAt
validUntil
redeemedAt
deletedAt
user {
firstName
publisherId
email
}
}
... on ContributionLink {
id
validTo
validFrom
amount
name
memo
cycle
createdAt
code
link
deletedAt
maxAmountPerMonth
}
}
}

3
frontend/src/locales/de.json
View File

@ -26,6 +26,9 @@
"other-communities": "Weitere Gemeinschaften",
"switch-to-this-community": "zu dieser Gemeinschaft wechseln"
},
"contribution-link": {
"thanksYouWith": "dankt dir mit"
},
"decay": {
"before_startblock_transaction": "Diese Transaktion beinhaltet keine Vergänglichkeit.",
"calculation_decay": "Berechnung der Vergänglichkeit",

3
frontend/src/locales/en.json
View File

@ -26,6 +26,9 @@
"other-communities": "Other communities",
"switch-to-this-community": "Switch to this community"
},
"contribution-link": {
"thanksYouWith": "thanks you with"
},
"decay": {
"before_startblock_transaction": "This transaction does not include decay.",
"calculation_decay": "Calculation of Decay",

6
frontend/src/pages/ResetPassword.vue
View File

@ -88,7 +88,11 @@ export default {
? this.$t('message.checkEmail')
: this.$t('message.reset')
this.messageButtonText = this.$t('login')
this.messageButtonLinktTo = '/login'
if (this.$route.params.code) {
this.messageButtonLinktTo = `/login/${this.$route.params.code}`
} else {
this.messageButtonLinktTo = '/login'
}
})
.catch((error) => {
let errorMessage

11
frontend/src/pages/TransactionLink.spec.js
View File

@ -24,6 +24,7 @@ const transactionLinkValidExpireDate = () => {
apolloQueryMock.mockResolvedValue({
data: {
queryTransactionLink: {
__typename: 'TransactionLink',
id: 92,
amount: '22',
memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
@ -82,6 +83,7 @@ describe('TransactionLink', () => {
variables: {
code: 'some-code',
},
fetchPolicy: 'no-cache',
})
})
@ -90,6 +92,7 @@ describe('TransactionLink', () => {
apolloQueryMock.mockResolvedValue({
data: {
queryTransactionLink: {
__typename: 'TransactionLink',
id: 92,
amount: '22',
memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
@ -120,6 +123,7 @@ describe('TransactionLink', () => {
apolloQueryMock.mockResolvedValue({
data: {
queryTransactionLink: {
__typename: 'TransactionLink',
id: 92,
amount: '22',
memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
@ -150,6 +154,7 @@ describe('TransactionLink', () => {
apolloQueryMock.mockResolvedValue({
data: {
queryTransactionLink: {
__typename: 'TransactionLink',
id: 92,
amount: '22',
memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
@ -177,9 +182,11 @@ describe('TransactionLink', () => {
describe('no token in store', () => {
beforeEach(() => {
mocks.$store.state.token = null
apolloQueryMock.mockResolvedValue({
data: {
queryTransactionLink: {
__typename: 'TransactionLink',
id: 92,
amount: '22',
memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
@ -213,6 +220,7 @@ describe('TransactionLink', () => {
apolloQueryMock.mockResolvedValue({
data: {
queryTransactionLink: {
__typename: 'TransactionLink',
id: 92,
amount: '22',
memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
@ -248,6 +256,7 @@ describe('TransactionLink', () => {
apolloQueryMock.mockResolvedValue({
data: {
queryTransactionLink: {
__typename: 'TransactionLink',
id: 92,
amount: '22',
memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
@ -298,7 +307,7 @@ describe('TransactionLink', () => {
})
it('toasts a success message', () => {
expect(mocks.$t).toBeCalledWith('gdd_per_link.redeemed', { n: '22' })
expect(mocks.$t).toBeCalledWith('gdd_per_link.redeem')
expect(toastSuccessSpy).toBeCalledWith('gdd_per_link.redeemed; ')
})

71
frontend/src/pages/TransactionLink.vue
View File

@ -1,18 +1,21 @@
<template>
<div class="show-transaction-link-informations">
<div class="text-center"><b-img :src="img" fluid alt="logo"></b-img></div>
<b-container class="mt-4">
<transaction-link-item :type="itemType">
<template #LOGGED_OUT>
<redeem-logged-out v-bind="linkData" />
<redeem-logged-out :linkData="linkData" :isContributionLink="isContributionLink" />
</template>
<template #SELF_CREATOR>
<redeem-self-creator v-bind="linkData" />
<redeem-self-creator :linkData="linkData" />
</template>
<template #VALID>
<redeem-valid v-bind="linkData" @redeem-link="redeemLink" />
<redeem-valid
:linkData="linkData"
:isContributionLink="isContributionLink"
@redeem-link="redeemLink"
/>
</template>
<template #TEXT>
@ -44,6 +47,7 @@ export default {
return {
img: '/img/brand/green.png',
linkData: {
__typename: 'TransactionLink',
amount: '123.45',
memo: 'memo',
user: {
@ -57,6 +61,7 @@ export default {
setTransactionLinkInformation() {
this.$apollo
.query({
fetchPolicy: 'no-cache',
query: queryTransactionLink,
variables: {
code: this.$route.params.code,
@ -64,37 +69,45 @@ export default {
})
.then((result) => {
this.linkData = result.data.queryTransactionLink
if (this.linkData.__typename === 'ContributionLink' && this.$store.state.token) {
this.mutationLink(this.linkData.amount)
}
})
.catch((err) => {
this.toastError(err.message)
})
},
mutationLink(amount) {
this.$apollo
.mutate({
mutation: redeemTransactionLink,
variables: {
code: this.$route.params.code,
},
})
.then(() => {
this.toastSuccess(
this.$t('gdd_per_link.redeemed', {
n: amount,
}),
)
this.$router.push('/overview')
})
.catch((err) => {
this.toastError(err.message)
this.$router.push('/overview')
})
},
redeemLink(amount) {
this.$bvModal.msgBoxConfirm(this.$t('gdd_per_link.redeem-text')).then(async (value) => {
if (value)
await this.$apollo
.mutate({
mutation: redeemTransactionLink,
variables: {
code: this.$route.params.code,
},
})
.then(() => {
this.toastSuccess(
this.$t('gdd_per_link.redeemed', {
n: amount,
}),
)
this.$router.push('/overview')
})
.catch((err) => {
this.toastError(err.message)
this.$router.push('/overview')
})
this.$bvModal.msgBoxConfirm(this.$t('gdd_per_link.redeem-text')).then((value) => {
if (value) this.mutationLink(amount)
})
},
},
computed: {
isContributionLink() {
return this.$route.params.code.search(/^CL-/) === 0
},
itemType() {
// link wurde gelöscht: am, von
if (this.linkData.deletedAt) {
@ -124,16 +137,12 @@ export default {
if (this.$store.state.token) {
// logged in, nicht berechtigt einzulösen, eigener link
if (this.$store.state.email === this.linkData.user.email) {
if (this.linkData.user && this.$store.state.email === this.linkData.user.email) {
return `SELF_CREATOR`
}
// logged in und berechtigt einzulösen
if (
this.$store.state.email !== this.linkData.user.email &&
!this.linkData.redeemedAt &&
!this.linkData.deletedAt
) {
if (!this.linkData.redeemedAt && !this.linkData.deletedAt) {
return `VALID`
}
}

6
frontend/src/plugins/apolloProvider.js
View File

@ -29,7 +29,11 @@ const authLink = new ApolloLink((operation, forward) => {
const apolloClient = new ApolloClient({
link: authLink.concat(httpLink),
cache: new InMemoryCache(),
cache: new InMemoryCache({
possibleTypes: {
QueryLinkResult: ['TransactionLink', 'ContributionLink'],
},
}),
})
export const apolloProvider = new VueApollo({

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "gradido",
"version": "1.9.0",
"version": "1.10.0",
"description": "Gradido",
"main": "index.js",
"repository": "git@github.com:gradido/gradido.git",