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 align-workflow-naming-remove-remove-docker-filter-from-build-tests

Browse Source
This commit is contained in:
Hannes Heine 2023-03-28 15:50:06 +02:00 committed by GitHub
commit 572e7d5c80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 321 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/.eslintrc.js
View File

@ -4,7 +4,7 @@ module.exports = {
node: true,
},
parser: '@typescript-eslint/parser',
plugins: ['prettier', '@typescript-eslint', 'type-graphql'],
plugins: ['prettier', '@typescript-eslint', 'type-graphql', 'jest'],
extends: ['standard', 'eslint:recommended', 'plugin:prettier/recommended'],
// add your custom rules here
rules: {
@ -16,11 +16,17 @@ module.exports = {
htmlWhitespaceSensitivity: 'ignore',
},
],
// jest
'jest/no-disabled-tests': 'error',
'jest/no-focused-tests': 'error',
'jest/no-identical-title': 'error',
'jest/prefer-to-have-length': 'error',
'jest/valid-expect': 'error',
},
overrides: [
// only for ts files
{
files: ['*.ts'],
files: ['*.ts', '*.tsx'],
extends: [
'plugin:@typescript-eslint/recommended',
'plugin:@typescript-eslint/recommended-requiring-type-checking',

1
backend/package.json
View File

@ -62,6 +62,7 @@
"eslint-config-prettier": "^8.3.0",
"eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jest": "^27.2.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-promise": "^5.1.0",

2
backend/src/emails/sendEmailTranslated.test.ts
View File

@ -102,10 +102,12 @@ describe('sendEmailTranslated', () => {
})
})
// eslint-disable-next-line jest/no-disabled-tests
it.skip('calls "i18n.setLocale" with "en"', () => {
expect(i18n.setLocale).toBeCalledWith('en')
})
// eslint-disable-next-line jest/no-disabled-tests
it.skip('calls "i18n.__" for translation', () => {
expect(i18n.__).toBeCalled()
})

27
backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts Normal file
View File

@ -0,0 +1,27 @@
import Decimal from 'decimal.js-light'
import { User as DbUser } from '@entity/User'
import { Transaction as DbTransaction } from '@entity/Transaction'
import { Contribution as DbContribution } from '@entity/Contribution'
import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
import { Event as DbEvent } from '@entity/Event'
import { Event, EventType } from './Event'
export const EVENT_CONTRIBUTION_LINK_REDEEM = async (
user: DbUser,
transaction: DbTransaction,
contribution: DbContribution,
contributionLink: DbContributionLink,
amount: Decimal,
): Promise<DbEvent> =>
Event(
EventType.CONTRIBUTION_LINK_REDEEM,
user,
user,
null,
transaction,
contribution,
null,
null,
contributionLink,
amount,
).save()

23
backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts Normal file
View File

@ -0,0 +1,23 @@
import Decimal from 'decimal.js-light'
import { User as DbUser } from '@entity/User'
import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
import { Event as DbEvent } from '@entity/Event'
import { Event, EventType } from './Event'
export const EVENT_TRANSACTION_LINK_CREATE = async (
user: DbUser,
transactionLink: DbTransactionLink,
amount: Decimal,
): Promise<DbEvent> =>
Event(
EventType.TRANSACTION_LINK_CREATE,
user,
user,
null,
null,
null,
null,
transactionLink,
null,
amount,
).save()

19
backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts Normal file
View File

@ -0,0 +1,19 @@
import { User as DbUser } from '@entity/User'
import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
import { Event as DbEvent } from '@entity/Event'
import { Event, EventType } from './Event'
export const EVENT_TRANSACTION_LINK_DELETE = async (
user: DbUser,
transactionLink: DbTransactionLink,
): Promise<DbEvent> =>
Event(
EventType.TRANSACTION_LINK_DELETE,
user,
user,
null,
null,
null,
null,
transactionLink,
).save()

24
backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts Normal file
View File

@ -0,0 +1,24 @@
import Decimal from 'decimal.js-light'
import { User as DbUser } from '@entity/User'
import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink'
import { Event as DbEvent } from '@entity/Event'
import { Event, EventType } from './Event'
export const EVENT_TRANSACTION_LINK_REDEEM = async (
user: DbUser,
senderUser: DbUser,
transactionLink: DbTransactionLink,
amount: Decimal,
): Promise<DbEvent> =>
Event(
EventType.TRANSACTION_LINK_REDEEM,
user,
user,
senderUser,
null,
null,
null,
transactionLink,
null,
amount,
).save()

4
backend/src/event/Event.ts
View File

@ -51,9 +51,13 @@ export { EVENT_CONTRIBUTION_CREATE } from './EVENT_CONTRIBUTION_CREATE'
export { EVENT_CONTRIBUTION_DELETE } from './EVENT_CONTRIBUTION_DELETE'
export { EVENT_CONTRIBUTION_UPDATE } from './EVENT_CONTRIBUTION_UPDATE'
export { EVENT_CONTRIBUTION_MESSAGE_CREATE } from './EVENT_CONTRIBUTION_MESSAGE_CREATE'
export { EVENT_CONTRIBUTION_LINK_REDEEM } from './EVENT_CONTRIBUTION_LINK_REDEEM'
export { EVENT_LOGIN } from './EVENT_LOGIN'
export { EVENT_REGISTER } from './EVENT_REGISTER'
export { EVENT_SEND_ACCOUNT_MULTIREGISTRATION_EMAIL } from './EVENT_SEND_ACCOUNT_MULTIREGISTRATION_EMAIL'
export { EVENT_SEND_CONFIRMATION_EMAIL } from './EVENT_SEND_CONFIRMATION_EMAIL'
export { EVENT_TRANSACTION_SEND } from './EVENT_TRANSACTION_SEND'
export { EVENT_TRANSACTION_RECEIVE } from './EVENT_TRANSACTION_RECEIVE'
export { EVENT_TRANSACTION_LINK_CREATE } from './EVENT_TRANSACTION_LINK_CREATE'
export { EVENT_TRANSACTION_LINK_DELETE } from './EVENT_TRANSACTION_LINK_DELETE'
export { EVENT_TRANSACTION_LINK_REDEEM } from './EVENT_TRANSACTION_LINK_REDEEM'

4
backend/src/event/EventType.ts
View File

@ -15,6 +15,7 @@ export enum EventType {
CONTRIBUTION_DELETE = 'CONTRIBUTION_DELETE',
CONTRIBUTION_UPDATE = 'CONTRIBUTION_UPDATE',
CONTRIBUTION_MESSAGE_CREATE = 'CONTRIBUTION_MESSAGE_CREATE',
CONTRIBUTION_LINK_REDEEM = 'CONTRIBUTION_LINK_REDEEM',
LOGIN = 'LOGIN',
REGISTER = 'REGISTER',
REDEEM_REGISTER = 'REDEEM_REGISTER',
@ -22,6 +23,9 @@ export enum EventType {
SEND_CONFIRMATION_EMAIL = 'SEND_CONFIRMATION_EMAIL',
TRANSACTION_SEND = 'TRANSACTION_SEND',
TRANSACTION_RECEIVE = 'TRANSACTION_RECEIVE',
TRANSACTION_LINK_CREATE = 'TRANSACTION_LINK_CREATE',
TRANSACTION_LINK_DELETE = 'TRANSACTION_LINK_DELETE',
TRANSACTION_LINK_REDEEM = 'TRANSACTION_LINK_REDEEM',
// VISIT_GRADIDO = 'VISIT_GRADIDO',
// VERIFY_REDEEM = 'VERIFY_REDEEM',
// INACTIVE_ACCOUNT = 'INACTIVE_ACCOUNT',

10
backend/src/graphql/arg/SubscribeNewsletterArgs.ts
View File

@ -1,10 +0,0 @@
import { ArgsType, Field } from 'type-graphql'
@ArgsType()
export default class SubscribeNewsletterArgs {
@Field(() => String)
email: string
@Field(() => String)
language: string
}

20
backend/src/graphql/resolver/ContributionLinkResolver.test.ts
View File

@ -280,7 +280,7 @@ describe('Contribution Links', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "A Start-Date must be set"', () => {
expect(logger.error).toBeCalledWith('A Start-Date must be set')
})
@ -301,7 +301,7 @@ describe('Contribution Links', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "An End-Date must be set"', () => {
expect(logger.error).toBeCalledWith('An End-Date must be set')
})
@ -325,7 +325,7 @@ describe('Contribution Links', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "The value of validFrom must before or equals the validTo"', () => {
expect(logger.error).toBeCalledWith(
`The value of validFrom must before or equals the validTo`,
)
@ -348,7 +348,7 @@ describe('Contribution Links', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "The value of name is too short"', () => {
expect(logger.error).toBeCalledWith('The value of name is too short', 3)
})
@ -369,7 +369,7 @@ describe('Contribution Links', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "The value of name is too long"', () => {
expect(logger.error).toBeCalledWith('The value of name is too long', 101)
})
@ -390,7 +390,7 @@ describe('Contribution Links', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "The value of memo is too short"', () => {
expect(logger.error).toBeCalledWith('The value of memo is too short', 3)
})
@ -411,7 +411,7 @@ describe('Contribution Links', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "The value of memo is too long"', () => {
expect(logger.error).toBeCalledWith('The value of memo is too long', 256)
})
@ -432,7 +432,7 @@ describe('Contribution Links', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "The amount must be a positiv value"', () => {
expect(logger.error).toBeCalledWith('The amount must be a positiv value', new Decimal(0))
})
})
@ -490,7 +490,7 @@ describe('Contribution Links', () => {
})
})
it('logs the error thrown', () => {
it('logs the error "Contribution Link not found"', () => {
expect(logger.error).toBeCalledWith('Contribution Link not found', -1)
})
@ -572,7 +572,7 @@ describe('Contribution Links', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "Contribution Link not found"', () => {
expect(logger.error).toBeCalledWith('Contribution Link not found', -1)
})
})

8
backend/src/graphql/resolver/ContributionMessageResolver.test.ts
View File

@ -115,7 +115,7 @@ describe('ContributionMessageResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "ContributionMessage was not sent successfully: Error: Contribution not found"', () => {
expect(logger.error).toBeCalledWith(
'ContributionMessage was not sent successfully: Error: Contribution not found',
new Error('Contribution not found'),
@ -155,7 +155,7 @@ describe('ContributionMessageResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "ContributionMessage was not sent successfully: Error: Admin can not answer on his own contribution"', () => {
expect(logger.error).toBeCalledWith(
'ContributionMessage was not sent successfully: Error: Admin can not answer on his own contribution',
new Error('Admin can not answer on his own contribution'),
@ -265,7 +265,7 @@ describe('ContributionMessageResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "ContributionMessage was not sent successfully: Error: Contribution not found"', () => {
expect(logger.error).toBeCalledWith(
'ContributionMessage was not sent successfully: Error: Contribution not found',
new Error('Contribution not found'),
@ -297,7 +297,7 @@ describe('ContributionMessageResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "ContributionMessage was not sent successfully: Error: Can not send message to contribution of another user"', () => {
expect(logger.error).toBeCalledWith(
'ContributionMessage was not sent successfully: Error: Can not send message to contribution of another user',
new Error('Can not send message to contribution of another user'),

73
backend/src/graphql/resolver/ContributionResolver.test.ts
View File

@ -201,7 +201,7 @@ describe('ContributionResolver', () => {
expect(errorObjects).toEqual([new GraphQLError('Memo text is too short')])
})
it('logs the error found', () => {
it('logs the error "Memo text is too short"', () => {
expect(logger.error).toBeCalledWith('Memo text is too short', 4)
})
@ -219,7 +219,7 @@ describe('ContributionResolver', () => {
expect(errorObjects).toEqual([new GraphQLError('Memo text is too long')])
})
it('logs the error found', () => {
it('logs the error "Memo text is too long"', () => {
expect(logger.error).toBeCalledWith('Memo text is too long', 259)
})
@ -238,7 +238,7 @@ describe('ContributionResolver', () => {
])
})
it('logs the error found', () => {
it('logs the error "No information for available creations for the given date"', () => {
expect(logger.error).toBeCalledWith(
'No information for available creations for the given date',
expect.any(Date),
@ -261,7 +261,7 @@ describe('ContributionResolver', () => {
])
})
it('logs the error found', () => {
it('logs the error "No information for available creations for the given date" again', () => {
expect(logger.error).toBeCalledWith(
'No information for available creations for the given date',
expect.any(Date),
@ -337,7 +337,7 @@ describe('ContributionResolver', () => {
expect(errorObjects).toEqual([new GraphQLError('Memo text is too short')])
})
it('logs the error found', () => {
it('logs the error "Memo text is too short"', () => {
expect(logger.error).toBeCalledWith('Memo text is too short', 4)
})
})
@ -358,7 +358,7 @@ describe('ContributionResolver', () => {
expect(errorObjects).toEqual([new GraphQLError('Memo text is too long')])
})
it('logs the error found', () => {
it('logs the error "Memo text is too long"', () => {
expect(logger.error).toBeCalledWith('Memo text is too long', 259)
})
})
@ -383,7 +383,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error found', () => {
it('logs the error "Contribution not found"', () => {
expect(logger.error).toBeCalledWith('Contribution not found', -1)
})
})
@ -412,7 +412,7 @@ describe('ContributionResolver', () => {
])
})
it('logs the error found', () => {
it('logs the error "Can not update contribution of another user"', () => {
expect(logger.error).toBeCalledWith(
'Can not update contribution of another user',
expect.any(Object),
@ -446,7 +446,7 @@ describe('ContributionResolver', () => {
])
})
it('logs the error found', () => {
it('logs the error "An admin is not allowed to update an user contribution"', () => {
expect(logger.error).toBeCalledWith(
'An admin is not allowed to update an user contribution',
)
@ -492,7 +492,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error found', () => {
it('logs the error "Contribution can not be updated due to status"', () => {
expect(logger.error).toBeCalledWith(
'Contribution can not be updated due to status',
ContributionStatus.DELETED,
@ -527,7 +527,7 @@ describe('ContributionResolver', () => {
])
})
it('logs the error found', () => {
it('logs the error "The amount to be created exceeds the amount still available for this month"', () => {
expect(logger.error).toBeCalledWith(
'The amount to be created exceeds the amount still available for this month',
new Decimal(1019),
@ -554,7 +554,7 @@ describe('ContributionResolver', () => {
])
})
it('logs the error found', () => {
it('logs the error "Month of contribution can not be changed"', () => {
expect(logger.error).toBeCalledWith('Month of contribution can not be changed')
})
})
@ -659,7 +659,7 @@ describe('ContributionResolver', () => {
expect(errorObjects).toEqual([new GraphQLError('Contribution not found')])
})
it('logs the error found', () => {
it('logs the error "Contribution not found"', () => {
expect(logger.error).toBeCalledWith('Contribution not found', -1)
})
})
@ -703,7 +703,7 @@ describe('ContributionResolver', () => {
expect(errorObjects).toEqual([new GraphQLError('Contribution not found')])
})
it('logs the error found', () => {
it('logs the error "Contribution not found"', () => {
expect(logger.error).toBeCalledWith('Contribution not found', expect.any(Number))
})
})
@ -748,7 +748,7 @@ describe('ContributionResolver', () => {
expect(errorObjects).toEqual([new GraphQLError('Contribution not found')])
})
it('logs the error found', () => {
it('logs the error "Contribution not found"', () => {
expect(logger.error).toBeCalledWith(`Contribution not found`, expect.any(Number))
})
})
@ -793,7 +793,7 @@ describe('ContributionResolver', () => {
expect(errorObjects).toEqual([new GraphQLError('Contribution not found')])
})
it('logs the error found', () => {
it('logs the error "Contribution not found"', () => {
expect(logger.error).toBeCalledWith(`Contribution not found`, expect.any(Number))
})
})
@ -879,7 +879,7 @@ describe('ContributionResolver', () => {
expect(errorObjects).toEqual([new GraphQLError('Contribution not found')])
})
it('logs the error found', () => {
it('logs the error "Contribution not found"', () => {
expect(logger.error).toBeCalledWith('Contribution not found', expect.any(Number))
})
})
@ -909,7 +909,7 @@ describe('ContributionResolver', () => {
])
})
it('logs the error found', () => {
it('logs the error "Can not delete contribution of another user"', () => {
expect(logger.error).toBeCalledWith(
'Can not delete contribution of another user',
expect.any(Contribution),
@ -984,7 +984,7 @@ describe('ContributionResolver', () => {
])
})
it('logs the error found', () => {
it('logs the error "A confirmed contribution can not be deleted"', () => {
expect(logger.error).toBeCalledWith(
'A confirmed contribution can not be deleted',
expect.objectContaining({ contributionStatus: 'CONFIRMED' }),
@ -1849,7 +1849,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "Could not find user"', () => {
expect(logger.error).toBeCalledWith('Could not find user', 'some@fake.email')
})
})
@ -1876,7 +1876,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "Cannot create contribution since the user was deleted"', () => {
expect(logger.error).toBeCalledWith(
'Cannot create contribution since the user was deleted',
expect.objectContaining({
@ -1912,7 +1912,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "Cannot create contribution since the users email is not activated"', () => {
expect(logger.error).toBeCalledWith(
'Cannot create contribution since the users email is not activated',
expect.objectContaining({ emailChecked: false }),
@ -1938,7 +1938,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "CreationDate is invalid"', () => {
expect(logger.error).toBeCalledWith('CreationDate is invalid', 'invalid-date')
})
})
@ -1960,7 +1960,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "No information for available creations for the given date"', () => {
expect(logger.error).toBeCalledWith(
'No information for available creations for the given date',
new Date(variables.creationDate),
@ -1985,7 +1985,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "No information for available creations for the given date"', () => {
expect(logger.error).toBeCalledWith(
'No information for available creations for the given date',
new Date(variables.creationDate),
@ -2010,7 +2010,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "The amount to be created exceeds the amount still available for this month"', () => {
expect(logger.error).toBeCalledWith(
'The amount to be created exceeds the amount still available for this month',
new Decimal(2000),
@ -2062,7 +2062,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "The amount to be created exceeds the amount still available for this month"', () => {
expect(logger.error).toBeCalledWith(
'The amount to be created exceeds the amount still available for this month',
new Decimal(1000),
@ -2101,7 +2101,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "Could not find User"', () => {
expect(logger.error).toBeCalledWith('Could not find User', 'bob@baumeister.de')
})
})
@ -2127,7 +2127,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "User was deleted"', () => {
expect(logger.error).toBeCalledWith('User was deleted', 'stephen@hawking.uk')
})
})
@ -2153,7 +2153,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "Contribution not found"', () => {
expect(logger.error).toBeCalledWith('Contribution not found', -1)
})
})
@ -2185,7 +2185,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "User of the pending contribution and send user does not correspond"', () => {
expect(logger.error).toBeCalledWith(
'User of the pending contribution and send user does not correspond',
)
@ -2220,7 +2220,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "The amount to be created exceeds the amount still available for this month"', () => {
expect(logger.error).toBeCalledWith(
'The amount to be created exceeds the amount still available for this month',
new Decimal(1900),
@ -2229,6 +2229,7 @@ describe('ContributionResolver', () => {
})
})
// eslint-disable-next-line jest/no-disabled-tests
describe.skip('creation update is successful changing month', () => {
// skipped as changing the month is currently disable
it('returns update creation object', async () => {
@ -2332,7 +2333,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "Contribution not found"', () => {
expect(logger.error).toBeCalledWith('Contribution not found', -1)
})
})
@ -2474,7 +2475,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "Contribution not found"', () => {
expect(logger.error).toBeCalledWith('Contribution not found', -1)
})
})
@ -2508,7 +2509,7 @@ describe('ContributionResolver', () => {
)
})
it('logs the error thrown', () => {
it('logs the error "Moderator can not confirm own contribution"', () => {
expect(logger.error).toBeCalledWith('Moderator can not confirm own contribution')
})
})
@ -2603,7 +2604,7 @@ describe('ContributionResolver', () => {
})
})
it('logs the error thrown', () => {
it('logs the error "Contribution already confirmed"', () => {
expect(logger.error).toBeCalledWith(
'Contribution already confirmed',
expect.any(Number),

17
backend/src/graphql/resolver/KlicktippResolver.ts
View File

@ -1,7 +1,5 @@
/* eslint-disable @typescript-eslint/no-unsafe-return */
import { Resolver, Query, Authorized, Arg, Mutation, Args } from 'type-graphql'
import SubscribeNewsletterArgs from '@arg/SubscribeNewsletterArgs'
import { Resolver, Query, Authorized, Arg, Mutation, Ctx } from 'type-graphql'
import {
getKlickTippUser,
@ -10,6 +8,7 @@ import {
klicktippSignIn,
} from '@/apis/KlicktippController'
import { RIGHTS } from '@/auth/RIGHTS'
import { Context, getUser } from '@/server/context'
@Resolver()
export class KlicktippResolver {
@ -27,15 +26,15 @@ export class KlicktippResolver {
@Authorized([RIGHTS.UNSUBSCRIBE_NEWSLETTER])
@Mutation(() => Boolean)
async unsubscribeNewsletter(@Arg('email') email: string): Promise<boolean> {
return await unsubscribe(email)
async unsubscribeNewsletter(@Ctx() context: Context): Promise<boolean> {
const user = getUser(context)
return unsubscribe(user.emailContact.email)
}
@Authorized([RIGHTS.SUBSCRIBE_NEWSLETTER])
@Mutation(() => Boolean)
async subscribeNewsletter(
@Args() { email, language }: SubscribeNewsletterArgs,
): Promise<boolean> {
return await klicktippSignIn(email, language)
async subscribeNewsletter(@Ctx() context: Context): Promise<boolean> {
const user = getUser(context)
return klicktippSignIn(user.emailContact.email, user.language)
}
}

44
backend/src/graphql/resolver/TransactionLinkResolver.test.ts
View File

@ -33,6 +33,9 @@ import Decimal from 'decimal.js-light'
import { GraphQLError } from 'graphql'
import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
import { logger } from '@test/testSetup'
import { EventType } from '@/event/Event'
import { Event as DbEvent } from '@entity/Event'
import { UserContact } from '@entity/UserContact'
// mock semaphore to allow use fake timers
jest.mock('@/util/TRANSACTIONS_LOCK')
@ -96,7 +99,7 @@ describe('TransactionLinkResolver', () => {
errors: [new GraphQLError('Amount must be a positive number')],
})
})
it('logs the error thrown', () => {
it('logs the error "Amount must be a positive number" - 0', () => {
expect(logger.error).toBeCalledWith('Amount must be a positive number', new Decimal(0))
})
@ -114,7 +117,7 @@ describe('TransactionLinkResolver', () => {
errors: [new GraphQLError('Amount must be a positive number')],
})
})
it('logs the error thrown', () => {
it('logs the error "Amount must be a positive number" - -10', () => {
expect(logger.error).toBeCalledWith('Amount must be a positive number', new Decimal(-10))
})
@ -132,7 +135,7 @@ describe('TransactionLinkResolver', () => {
errors: [new GraphQLError('User has not enough GDD')],
})
})
it('logs the error thrown', () => {
it('logs the error "User has not enough GDD"', () => {
expect(logger.error).toBeCalledWith('User has not enough GDD', expect.any(Number))
})
})
@ -184,7 +187,7 @@ describe('TransactionLinkResolver', () => {
})
})
it('logs the error thrown', () => {
it('logs the error "No contribution link found to given code"', () => {
expect(logger.error).toBeCalledWith(
'No contribution link found to given code',
'CL-123456',
@ -228,7 +231,7 @@ describe('TransactionLinkResolver', () => {
await resetEntity(DbContributionLink)
})
it('logs the error thrown', () => {
it('logs the error "Contribution link is not valid yet"', () => {
expect(logger.error).toBeCalledWith('Contribution link is not valid yet', validFrom)
expect(logger.error).toBeCalledWith(
'Creation from contribution link was not successful',
@ -267,7 +270,7 @@ describe('TransactionLinkResolver', () => {
await resetEntity(DbContributionLink)
})
it('logs the error thrown', () => {
it('logs the error "Contribution link has unknown cycle"', () => {
expect(logger.error).toBeCalledWith('Contribution link has unknown cycle', 'INVALID')
expect(logger.error).toBeCalledWith(
'Creation from contribution link was not successful',
@ -306,7 +309,7 @@ describe('TransactionLinkResolver', () => {
await resetEntity(DbContributionLink)
})
it('logs the error thrown', () => {
it('logs the error "Contribution link is no longer valid"', () => {
expect(logger.error).toBeCalledWith('Contribution link is no longer valid', validTo)
expect(logger.error).toBeCalledWith(
'Creation from contribution link was not successful',
@ -402,7 +405,7 @@ describe('TransactionLinkResolver', () => {
})
})
it('logs the error thrown', () => {
it('logs the error "Creation from contribution link was not successful"', () => {
expect(logger.error).toBeCalledWith(
'Creation from contribution link was not successful',
new Error(
@ -445,6 +448,24 @@ describe('TransactionLinkResolver', () => {
})
})
it('stores the CONTRIBUTION_LINK_REDEEM event in the database', async () => {
const userConatct = await UserContact.findOneOrFail(
{ email: 'bibi@bloxberg.de' },
{ relations: ['user'] },
)
await expect(DbEvent.find()).resolves.toContainEqual(
expect.objectContaining({
type: EventType.CONTRIBUTION_LINK_REDEEM,
affectedUserId: userConatct.user.id,
actingUserId: userConatct.user.id,
involvedTransactionId: expect.any(Number),
involvedContributionId: expect.any(Number),
involvedContributionLinkId: contributionLink?.id,
amount: contributionLink?.amount,
}),
)
})
it('does not allow the user to redeem the contribution link a second time on the same day', async () => {
jest.clearAllMocks()
await expect(
@ -459,7 +480,7 @@ describe('TransactionLinkResolver', () => {
})
})
it('logs the error thrown', () => {
it('logs the error "Creation from contribution link was not successful"', () => {
expect(logger.error).toBeCalledWith(
'Creation from contribution link was not successful',
new Error('Contribution link already redeemed today'),
@ -511,7 +532,7 @@ describe('TransactionLinkResolver', () => {
})
})
it('logs the error thrown', () => {
it('logs the error "Creation from contribution link was not successful"', () => {
expect(logger.error).toBeCalledWith(
'Creation from contribution link was not successful',
new Error('Contribution link already redeemed today'),
@ -714,7 +735,7 @@ describe('TransactionLinkResolver', () => {
})
})
it('logs the error thrown', () => {
it('logs the error "Could not find requested User"', () => {
expect(logger.error).toBeCalledWith('Could not find requested User', -1)
})
})
@ -853,6 +874,7 @@ describe('TransactionLinkResolver', () => {
})
// TODO: works not as expected, because 'redeemedAt' and 'redeemedBy' have to be added to the transaktion link factory
// eslint-disable-next-line jest/no-disabled-tests
describe.skip('filter by redeemed', () => {
it('finds 6 open transaction links, 1 deleted, and no redeemed', async () => {
await expect(

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

@ -35,6 +35,12 @@ import LogError from '@/server/LogError'
import { getLastTransaction } from './util/getLastTransaction'
import transactionLinkList from './util/transactionLinkList'
import {
EVENT_CONTRIBUTION_LINK_REDEEM,
EVENT_TRANSACTION_LINK_CREATE,
EVENT_TRANSACTION_LINK_DELETE,
EVENT_TRANSACTION_LINK_REDEEM,
} from '@/event/Event'
// TODO: do not export, test it inside the resolver
export const transactionLinkCode = (date: Date): string => {
@ -89,6 +95,7 @@ export class TransactionLinkResolver {
await DbTransactionLink.save(transactionLink).catch((e) => {
throw new LogError('Unable to save transaction link', e)
})
await EVENT_TRANSACTION_LINK_CREATE(user, transactionLink, amount)
return new TransactionLink(transactionLink, new User(user))
}
@ -122,6 +129,8 @@ export class TransactionLinkResolver {
throw new LogError('Transaction link could not be deleted', e)
})
await EVENT_TRANSACTION_LINK_DELETE(user, transactionLink)
return true
}
@ -272,7 +281,13 @@ export class TransactionLinkResolver {
await queryRunner.manager.update(DbContribution, { id: contribution.id }, contribution)
await queryRunner.commitTransaction()
logger.info('creation from contribution link commited successfuly.')
await EVENT_CONTRIBUTION_LINK_REDEEM(
user,
transaction,
contribution,
contributionLink,
contributionLink.amount,
)
} catch (e) {
await queryRunner.rollbackTransaction()
throw new LogError('Creation from contribution link was not successful', e)
@ -321,6 +336,12 @@ export class TransactionLinkResolver {
user,
transactionLink,
)
await EVENT_TRANSACTION_LINK_REDEEM(
user,
{ id: transactionLink.userId } as DbUser,
transactionLink,
transactionLink.amount,
)
return true
}

1
backend/src/graphql/resolver/UserResolver.test.ts
View File

@ -797,6 +797,7 @@ describe('UserResolver', () => {
})
})
// eslint-disable-next-line jest/no-disabled-tests
describe.skip('user is in database but password is not set', () => {
beforeAll(async () => {
jest.clearAllMocks()

2
backend/src/graphql/resolver/semaphore.test.ts
View File

@ -5,8 +5,6 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import Decimal from 'decimal.js-light'
// eslint-disable-next-line @typescript-eslint/no-unused-vars
import { logger } from '@test/testSetup'
import { userFactory } from '@/seeds/factory/user'
import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
import { bobBaumeister } from '@/seeds/users/bob-baumeister'

1
backend/src/util/decay.test.ts
View File

@ -16,6 +16,7 @@ describe('utils/decay', () => {
expect(decayFormula(amount, seconds).toString()).toBe('1.000000021964959992727444')
})
// we get pretty close, but not exact here, skipping
// eslint-disable-next-line jest/no-disabled-tests
it.skip('has correct forward calculation', () => {
const amount = new Decimal(1.0).div(
new Decimal('0.99999997803504048973201202316767079413460520837376'),

55
backend/yarn.lock
View File

@ -1239,6 +1239,14 @@
"@typescript-eslint/types" "5.53.0"
"@typescript-eslint/visitor-keys" "5.53.0"
"@typescript-eslint/scope-manager@5.54.1":
version "5.54.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.54.1.tgz#6d864b4915741c608a58ce9912edf5a02bb58735"
integrity sha512-zWKuGliXxvuxyM71UA/EcPxaviw39dB2504LqAmFDjmkpO8qNLHcmzlh6pbHs1h/7YQ9bnsO8CCcYCSA8sykUg==
dependencies:
"@typescript-eslint/types" "5.54.1"
"@typescript-eslint/visitor-keys" "5.54.1"
"@typescript-eslint/types@4.33.0":
version "4.33.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72"
@ -1249,6 +1257,11 @@
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.53.0.tgz#f79eca62b97e518ee124086a21a24f3be267026f"
integrity sha512-5kcDL9ZUIP756K6+QOAfPkigJmCPHcLN7Zjdz76lQWWDdzfOhZDTj1irs6gPBKiXx5/6O3L0+AvupAut3z7D2A==
"@typescript-eslint/types@5.54.1":
version "5.54.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.54.1.tgz#29fbac29a716d0f08c62fe5de70c9b6735de215c"
integrity sha512-G9+1vVazrfAfbtmCapJX8jRo2E4MDXxgm/IMOF4oGh3kq7XuK3JRkOg6y2Qu1VsTRmWETyTkWt1wxy7X7/yLkw==
"@typescript-eslint/typescript-estree@4.33.0":
version "4.33.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz#0dfb51c2908f68c5c08d82aefeaf166a17c24609"
@ -1275,6 +1288,19 @@
semver "^7.3.7"
tsutils "^3.21.0"
"@typescript-eslint/typescript-estree@5.54.1":
version "5.54.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.1.tgz#df7b6ae05fd8fef724a87afa7e2f57fa4a599be1"
integrity sha512-bjK5t+S6ffHnVwA0qRPTZrxKSaFYocwFIkZx5k7pvWfsB1I57pO/0M0Skatzzw1sCkjJ83AfGTL0oFIFiDX3bg==
dependencies:
"@typescript-eslint/types" "5.54.1"
"@typescript-eslint/visitor-keys" "5.54.1"
debug "^4.3.4"
globby "^11.1.0"
is-glob "^4.0.3"
semver "^7.3.7"
tsutils "^3.21.0"
"@typescript-eslint/utils@5.53.0":
version "5.53.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.53.0.tgz#e55eaad9d6fffa120575ffaa530c7e802f13bce8"
@ -1289,6 +1315,20 @@
eslint-utils "^3.0.0"
semver "^7.3.7"
"@typescript-eslint/utils@^5.10.0":
version "5.54.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.54.1.tgz#7a3ee47409285387b9d4609ea7e1020d1797ec34"
integrity sha512-IY5dyQM8XD1zfDe5X8jegX6r2EVU5o/WJnLu/znLPWCBF7KNGC+adacXnt5jEYS9JixDcoccI6CvE4RCjHMzCQ==
dependencies:
"@types/json-schema" "^7.0.9"
"@types/semver" "^7.3.12"
"@typescript-eslint/scope-manager" "5.54.1"
"@typescript-eslint/types" "5.54.1"
"@typescript-eslint/typescript-estree" "5.54.1"
eslint-scope "^5.1.1"
eslint-utils "^3.0.0"
semver "^7.3.7"
"@typescript-eslint/visitor-keys@4.33.0":
version "4.33.0"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd"
@ -1305,6 +1345,14 @@
"@typescript-eslint/types" "5.53.0"
eslint-visitor-keys "^3.3.0"
"@typescript-eslint/visitor-keys@5.54.1":
version "5.54.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.1.tgz#d7a8a0f7181d6ac748f4d47b2306e0513b98bf8b"
integrity sha512-q8iSoHTgwCfgcRJ2l2x+xCbu8nBlRAlsQ33k24Adj8eoVBE0f8dUeI+bAa8F84Mv05UGbAx57g2zrRsYIooqQg==
dependencies:
"@typescript-eslint/types" "5.54.1"
eslint-visitor-keys "^3.3.0"
"@wry/equality@^0.1.2":
version "0.1.11"
resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.11.tgz#35cb156e4a96695aa81a9ecc4d03787bc17f1790"
@ -2714,6 +2762,13 @@ eslint-plugin-import@^2.23.4:
resolve "^1.20.0"
tsconfig-paths "^3.11.0"
eslint-plugin-jest@^27.2.1:
version "27.2.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.2.1.tgz#b85b4adf41c682ea29f1f01c8b11ccc39b5c672c"
integrity sha512-l067Uxx7ZT8cO9NJuf+eJHvt6bqJyz2Z29wykyEdz/OtmcELQl2MQGQLX8J94O1cSJWAwUSEvCjwjA7KEK3Hmg==
dependencies:
"@typescript-eslint/utils" "^5.10.0"
eslint-plugin-node@^11.1.0:
version "11.1.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d"

7
frontend/src/components/UserSettings/UserNewsletter.spec.js
View File

@ -60,9 +60,6 @@ describe('UserCard_Newsletter', () => {
it('calls the unsubscribe mutation', () => {
expect(mockAPIcall).toBeCalledWith({
mutation: unsubscribeNewsletter,
variables: {
email: 'peter@lustig.de',
},
})
})
@ -89,10 +86,6 @@ describe('UserCard_Newsletter', () => {
it('calls the subscribe mutation', () => {
expect(mockAPIcall).toBeCalledWith({
mutation: subscribeNewsletter,
variables: {
email: 'peter@lustig.de',
language: 'de',
},
})
})

4
frontend/src/components/UserSettings/UserNewsletter.vue
View File

@ -41,10 +41,6 @@ export default {
this.$apollo
.mutate({
mutation: this.newsletterState ? subscribeNewsletter : unsubscribeNewsletter,
variables: {
email: this.$store.state.email,
language: this.newsletterState ? this.$store.state.language : undefined,
},
})
.then(() => {
this.$store.commit('newsletterState', this.newsletterState)

8
frontend/src/graphql/mutations.js
View File

@ -1,14 +1,14 @@
import gql from 'graphql-tag'
export const subscribeNewsletter = gql`
mutation($email: String!, $language: String!) {
subscribeNewsletter(email: $email, language: $language)
mutation {
subscribeNewsletter
}
`
export const unsubscribeNewsletter = gql`
mutation($email: String!) {
unsubscribeNewsletter(email: $email)
mutation {
unsubscribeNewsletter
}
`

68
frontend/src/locales/fr.json
View File

@ -23,7 +23,7 @@
"choose-another-community": "Choisissez une autre communauté",
"community": "Communauté",
"communityMember": "Vous etes un membre actif",
"continue-to-registration": "Continuez l´inscription",
"continue-to-registration": "Continuez l'inscription",
"moderator": "Modérateur",
"moderators": "Modérateurs",
"myContributions": "Mes contributions",
@ -43,20 +43,20 @@
"deleted": "Supprimé",
"denied": "supprimé",
"in_progress": "Il y a une question du modérateur.",
"myContributionNoteList": "À tout moment vous pouvez éditer ou supprimer les données qui n´ont pas été confirmées.",
"myContributionNoteList": "À tout moment vous pouvez éditer ou supprimer les données qui n'ont pas été confirmées.",
"pending": "Inscription en attente de validation"
},
"date": "Contribution pour:",
"delete": "Supprimer la contribution! Êtes-vous sûr?",
"deleted": "La contribution a été supprimée! Mais elle restera visible.",
"formText": {
"bringYourTalentsTo": "Apportez vos talents à la communauté! Votre participation bénévole sera récompensée de 20 GDD/heure jusqu´à un plafond de 1000 GDD/mois.",
"describeYourCommunity": "Décrivez votre activité/service à la communauté en mentionnant le nombre d´heures, et calculez le montant à raison de 20 GDD/heure! Après confirmation par l´un de nos collaborateurs, le montant sera crédité sur votre compte.",
"bringYourTalentsTo": "Apportez vos talents à la communauté! Votre participation bénévole sera récompensée de 20 GDD/heure jusqu'à un plafond de 1000 GDD/mois.",
"describeYourCommunity": "Décrivez votre activité/service à la communauté en mentionnant le nombre d'heures, et calculez le montant à raison de 20 GDD/heure! Après confirmation par l'un de nos collaborateurs, le montant sera crédité sur votre compte.",
"maxGDDforMonth": "Vous pouvez seulement déclarer un montant maximum de (montant) GDD pour le mois sélectionné.",
"openAmountForMonth": "Pour <b>{monthAndYear}</b>, vous pouvez encore déclarer <b>{creation}</b> GDD.",
"yourContribution": "Votre contribution au bien commun"
},
"noDateSelected": "Choisissez n´importe quelle date du mois",
"noDateSelected": "Choisissez n'importe quelle date du mois",
"selectDate": "Quand a été effectuée votre contribution?",
"submit": "Soumettre",
"submitted": "La contribution a été soumise.",
@ -70,7 +70,7 @@
"contributionText": "Texte de la contribution",
"creation": "Création",
"decay": {
"before_startblock_transaction": "Cette transaction n´est pas péremptoire.",
"before_startblock_transaction": "Cette transaction n'est pas péremptoire.",
"calculation_decay": "Calcul de la décroissance",
"calculation_total": "Calcul du montant total",
"decay": "Décroissance",
@ -94,9 +94,9 @@
"email-already-sent": "Nous vous avons déjà envoyé un email il y a moins de 10 minutes.",
"empty-transactionlist": "Il y a eu une erreur lors de la transmission du numéro de votre transaction.",
"error": "Erreur!",
"no-account": "Malheureusement nous n´avons pas pu trouver de compte (actif) correspondant aux données transmises.",
"no-transactionlist": "Il y a malheureusement eu une erreur. Aucune transaction n´a été envoyée depuis l`serveur.",
"no-user": "Pas d`utilisateur pour cet identifiant.",
"no-account": "Malheureusement nous n'avons pas pu trouver de compte (actif) correspondant aux données transmises.",
"no-transactionlist": "Il y a malheureusement eu une erreur. Aucune transaction n'a été envoyée depuis l'serveur.",
"no-user": "Pas d'utilisateur pour cet identifiant.",
"session-expired": "La session a expiré pour des raisons de sécurité.",
"unknown-error": "Erreur inconnue: "
},
@ -131,7 +131,7 @@
"memo": "Note",
"message": "Message",
"new_balance": "Montant du solde après confirmation",
"no_gdd_available": "Vous n´avez pas de GDD à envoyer.",
"no_gdd_available": "Vous n'avez pas de GDD à envoyer.",
"password": "Mot de passe",
"passwordRepeat": "Répétez le mot de passe",
"password_new": "Nouveau mot de passe",
@ -145,7 +145,7 @@
"sender": "Expéditeur",
"send_check": "Confirmez la transaction. Veuillez revérifier toutes les données svp!",
"send_now": "Envoyez maintenant",
"send_transaction_error": "Malheureusement, la transaction n´a pas pu être effectuée!",
"send_transaction_error": "Malheureusement, la transaction n'a pas pu être effectuée!",
"send_transaction_success": "Votre transaction a été effectuée avec succès",
"sorry": "Désolé",
"thx": "Merci",
@ -155,8 +155,8 @@
"gddCreationTime": "Le champ {_field_} doit comprendre un nombre entre {min} et {max} avec un maximum de une décimale.",
"gddSendAmount": "Le champ {_field_} doit comprendre un nombre entre {min} et {max} avec un maximum de deux chiffres après la virgule",
"is-not": "Vous ne pouvez pas vous envoyer de Gradido à vous-même",
"usernmae-regex": "Le nom d´utilisateur doit commencer par une lettre, suivi d´au moins deux caractères alphanumériques.",
"usernmae-unique": "Ce nom d´utilisateur est déjà pris."
"usernmae-regex": "Le nom d'utilisateur doit commencer par une lettre, suivi d'au moins deux caractères alphanumériques.",
"usernmae-unique": "Ce nom d'utilisateur est déjà pris."
},
"your_amount": "Votre montant"
},
@ -167,7 +167,7 @@
"copy-link": "Copier le lien",
"copy-link-with-text": "Copier le lien et le texte",
"created": "Le lien a été créé!",
"credit-your-gradido": "Pour l´accréditation du Gradido, cliquer sur le lien!",
"credit-your-gradido": "Pour l'accréditation du Gradido, cliquer sur le lien!",
"delete-the-link": "Supprimer le lien?",
"deleted": "Le lien a été supprimé!",
"expiredOn": "A expiré le",
@ -177,13 +177,13 @@
"link-and-text-copied": "Le lien et votre message ont été copiés dans le presse-papier. Vous pouvez maintenant le joindre à un email ou à un message..",
"link-copied": "Le lien a été copié dans le presse-papier. Vous pouvez désormais le coller dans votre email ou votre message.",
"link-deleted": "Le lien a été supprimé le on {date}.",
"link-expired": "Le lien n´est plus valide. Sa validité a expiré le {date}.",
"link-expired": "Le lien n'est plus valide. Sa validité a expiré le {date}.",
"link-hint": "Attention : tout le monde peut utiliser ce lien. Veuillez en prendre soin!",
"link-overview": "Aperçu du lien",
"links_count": "Liens actifs",
"links_sum": "Ouvrir les liens et les QR codes",
"no-account": "Vous n´avez pas encore de compte Gradido?",
"no-redeem": "Vous n´êtes pas autorisé à percevoir votre propre lien!",
"no-account": "Vous n'avez pas encore de compte Gradido?",
"no-redeem": "Vous n'êtes pas autorisé à percevoir votre propre lien!",
"not-copied": "Malheureusement votre appareil ne permet pas de copier! Veuillez copier le lien manuellement svp!",
"redeem": "Encaisser",
"redeemed": "Encaissé avec succès! Votre compte est crédité de {n} GDD.",
@ -191,8 +191,8 @@
"redeemed-title": "encaisser",
"to-login": "Connexion",
"to-register": "Enregistrer un nouveau compte.",
"validUntil": "Valide jusqu´au",
"validUntilDate": "Le lien est valide jusqu´au {date}."
"validUntil": "Valide jusqu'au",
"validUntilDate": "Le lien est valide jusqu'au {date}."
},
"GDT": "GDT",
"gdt": {
@ -208,7 +208,7 @@
"gdt-received": "Gradido Transform (GDT) perçu",
"gdtKonto": "Compte GDT",
"no-transactions": "Vous ne possédez pas encore Gradido Transform (GDT).",
"not-reachable": "Le Serveur GDT n´est pas accessible.",
"not-reachable": "Le Serveur GDT n'est pas accessible.",
"publisher": "Un membre que vous avez référé a apporté un contribution",
"raise": "Augmentation",
"recruited-member": "Membre invité"
@ -226,15 +226,15 @@
"maxReached": "Max. atteint",
"member": "Membre",
"message": {
"activateEmail": "Votre compte n´a pas encore été activé. Veuillez vérifier vos emails et cliquer sur le lien d´activation ou faites la demande d´un nouveau lien en utilisant la page qui permet de générer un nouveau mot de passe.",
"activateEmail": "Votre compte n'a pas encore été activé. Veuillez vérifier vos emails et cliquer sur le lien d'activation ou faites la demande d'un nouveau lien en utilisant la page qui permet de générer un nouveau mot de passe.",
"checkEmail": "Votre email a bien été vérifié. Vous pouvez vous enregistrer maintenant.",
"email": "Nous vous avons envoyé un email.",
"errorTitle": "Attention!",
"register": "Vous êtes enregistré maintenant, merci de vérifier votre boîte mail et cliquer sur le lien d´activation.",
"register": "Vous êtes enregistré maintenant, merci de vérifier votre boîte mail et cliquer sur le lien d'activation.",
"reply": "Merci, ta réponse a été envoyée.",
"reset": "Votre mot de passe a été modifié.",
"title": "Merci!",
"unsetPassword": "Votre mot de passe n´a pas été accepté. Merci de le réinitialiser."
"unsetPassword": "Votre mot de passe n'a pas été accepté. Merci de le réinitialiser."
},
"navigation": {
"admin_area": "Partie administrative",
@ -262,7 +262,7 @@
"send_per_link": "Envoyer GDD via lien",
"session": {
"extend": "Rester connecter",
"lightText": "S´il n´apparaît aucune activité pendant plus de 10 minutes, la session expirera pour des raisons de sécurité.",
"lightText": "S'il n'apparaît aucune activité pendant plus de 10 minutes, la session expirera pour des raisons de sécurité.",
"logoutIn": "Se déconnecter ",
"warningText": "Êtes-vous toujours connecté?"
},
@ -285,12 +285,12 @@
"newsletter": {
"newsletter": "Information par email",
"newsletterFalse": "Vous ne recevrez aucune information par email.",
"newsletterTrue": "Vous recevrez de l´information par email."
"newsletterTrue": "Vous recevrez de l'information par email."
},
"password": {
"change-password": "Changer le mot de passe",
"forgot_pwd": "Mot de passe oublié?",
"resend_subtitle": "Votre lien d´activation a expiré, vous pouvez en obtenir un nouveau ici.",
"resend_subtitle": "Votre lien d'activation a expiré, vous pouvez en obtenir un nouveau ici.",
"reset": "Réinitialiser le mot de passe",
"reset-password": {
"text": "Entrez un nouveau mot de passe que vous utiliserez dans le futur pour vous connecter à votre compte Gradido.."
@ -305,21 +305,21 @@
"showAmountGDD": "Votre montant GDD est visible.",
"showAmountGDT": "Votre montant GDT est visible."
},
"signin": "S´identifier",
"signup": "S´inscrire",
"signin": "S'identifier",
"signup": "S'inscrire",
"site": {
"forgotPassword": {
"heading": "Veuillez entrer l´adresse email sous laquelle vous êtes enregistré ici svp."
"heading": "Veuillez entrer l'adresse email sous laquelle vous êtes enregistré ici svp."
},
"resetPassword": {
"heading": "Entrez votre mot de passe et répétez l´action svp."
"heading": "Entrez votre mot de passe et répétez l'action svp."
},
"signup": {
"agree": "J´accepte le <a href='https://gradido.net/en/datenschutz/' target='_blank' > politique de confidentialité </a>.",
"agree": "J'accepte le <a href='https://gradido.net/en/datenschutz/' target='_blank' > politique de confidentialité </a>.",
"dont_match": "Les mots de passe ne correspondent pas.",
"lowercase": "Une lettre minuscule est requise.",
"minimum": "8 caractères minimum.",
"no-whitespace": "Pas d´espace ni d´onglet",
"no-whitespace": "Pas d'espace ni d'onglet",
"one_number": "Un chiffre requis.",
"special-char": "Un caractère spécial requis (e.g. _ or ä)",
"uppercase": "Une lettre majuscule requise."
@ -339,8 +339,8 @@
},
"transaction": {
"lastTransactions": "Dernières transactions",
"nullTransactions": "Vous n´avez pas encore de transaction effectuée sur votre compte.",
"receiverDeleted": "Le compte du destinataire n´existe plus",
"nullTransactions": "Vous n'avez pas encore de transaction effectuée sur votre compte.",
"receiverDeleted": "Le compte du destinataire n'existe plus",
"receiverNotFound": "Destinataire inconnu",
"show_all": "Voir toutes les <strong>{count}</strong> transactions."
},