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 2010-send-email-to-transaction-link-sender

Browse Source
This commit is contained in:
Hannes Heine 2022-09-09 06:26:26 +02:00 committed by GitHub
commit 2f41737d58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="contribution-messages-formular">
<div>
<div class="mt-5">
<b-form @submit.prevent="onSubmit" @reset.prevent="onReset">
<b-form-textarea
id="textarea"

7
admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="contribution-messages-list-item">
<is-moderator v-if="isModerator" :message="message"></is-moderator>
<is-moderator v-if="message.isModerator" :message="message"></is-moderator>
<is-not-moderator v-else :message="message"></is-not-moderator>
</div>
</template>
@ -23,10 +23,5 @@ export default {
},
},
},
computed: {
isModerator() {
return this.$store.state.moderator.id === this.message.userId
},
},
}
</script>

2
admin/src/components/ContributionMessages/slots/IsModerator.vue
View File

@ -5,7 +5,7 @@
<span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
<span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
<small class="ml-4 text-success">{{ $t('moderator') }}</small>
<div class="mt-2 text-bold h4">{{ message.message }}</div>
<div class="mt-2">{{ message.message }}</div>
</div>
</div>
</template>

6
admin/src/components/ContributionMessages/slots/IsNotModerator.vue
View File

@ -2,11 +2,9 @@
<div class="slot-is-not-moderator">
<div>
<b-avatar :text="initialLetters" variant="info"></b-avatar>
<span class="ml-2 mr-2 text-bold">
{{ message.userFirstName }} {{ message.userLastName }}
</span>
<span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
<span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
<div class="mt-2 text-bold h4">{{ message.message }}</div>
<div class="mt-2">{{ message.message }}</div>
</div>
</div>
</template>

1
admin/src/graphql/listContributionMessages.js
View File

@ -18,6 +18,7 @@ export const listContributionMessages = gql`
userFirstName
userLastName
userId
isModerator
}
}
}

3
backend/package.json
View File

@ -14,7 +14,8 @@
"dev": "cross-env TZ=UTC nodemon -w src --ext ts --exec ts-node -r tsconfig-paths/register src/index.ts",
"lint": "eslint --max-warnings=0 --ext .js,.ts .",
"test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles",
"seed": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/index.ts"
"seed": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/index.ts",
"klicktipp": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/util/klicktipp.ts"
},
"dependencies": {
"@types/jest": "^27.0.2",

28
backend/src/util/klicktipp.ts Normal file
View File

@ -0,0 +1,28 @@
import connection from '@/typeorm/connection'
import { getKlickTippUser } from '@/apis/KlicktippController'
import { User } from '@entity/User'
export async function retrieveNotRegisteredEmails(): Promise<string[]> {
const con = await connection()
if (!con) {
throw new Error('No connection to database')
}
const users = await User.find()
const notRegisteredUser = []
for (let i = 0; i < users.length; i++) {
const user = users[i]
try {
await getKlickTippUser(user.email)
} catch (err) {
notRegisteredUser.push(user.email)
// eslint-disable-next-line no-console
console.log(`${user.email}`)
}
}
await con.close()
// eslint-disable-next-line no-console
console.log('User die nicht bei KlickTipp vorhanden sind: ', notRegisteredUser)
return notRegisteredUser
}
retrieveNotRegisteredEmails()

1
frontend/src/components/ContributionMessages/ContributionMessagesList.vue
View File

@ -7,7 +7,6 @@
</b-container>
<contribution-messages-formular
v-if="['PENDING', 'IN_PROGRESS'].includes(state)"
class="mt-5"
:contributionId="contributionId"
@get-list-contribution-messages="getListContributionMessages"
@update-state="updateState"

2
frontend/src/components/ContributionMessages/slots/IsModerator.vue
View File

@ -4,7 +4,7 @@
<span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
<span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
<small class="ml-4 text-success">{{ $t('community.moderator') }}</small>
<div class="mt-2 h3">{{ message.message }}</div>
<div class="mt-2">{{ message.message }}</div>
</div>
</template>
<script>

6
frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
View File

@ -2,11 +2,9 @@
<div class="slot-is-not-moderator">
<div class="text-right">
<b-avatar :text="initialLetters" variant="info"></b-avatar>
<span class="ml-2 mr-2 text-bold">
{{ message.userFirstName }} {{ message.userLastName }}
</span>
<span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
<span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
<div class="mt-2 h3">{{ message.message }}</div>
<div class="mt-2">{{ message.message }}</div>
</div>
</div>
</template>

5
frontend/src/components/Contributions/ContributionListItem.vue
View File

@ -27,10 +27,7 @@
</span>
</div>
<div class="mr-2">{{ memo }}</div>
<div
v-if="!['CONFIRMED', 'DELETED'].includes(state) && !firstName"
class="d-flex flex-row-reverse"
>
<div class="d-flex flex-row-reverse">
<div
v-if="!['CONFIRMED', 'DELETED'].includes(state)"
class="pointer ml-5"