IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-02-06 09:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

linter fixes

Browse Source
This commit is contained in:
Kamila 2024-08-09 08:08:34 +02:00
parent 6a5869fd3e
commit 0de05680b6
14 changed files with 67 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/components/ContributionMessages/ParseMessage.vue
View File

@ -16,8 +16,7 @@
</template> </template>
<script> <script>
const LINK_REGEX_PATTERN = const LINK_REGEX_PATTERN = /(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*))/i
/(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*))/i
export default { export default {
name: 'ParseMessage', name: 'ParseMessage',

3
frontend/src/components/Contributions/ContributionList.spec.js
View File

@ -31,7 +31,8 @@ describe('ContributionList', () => {
{ {
id: 2, id: 2,
date: '05/04/2022', date: '05/04/2022',
memo: 'Ich habe 50 Stunden den Nachbarkindern bei ihren Hausaufgaben geholfen und Nachhilfeunterricht gegeben.', memo:
'Ich habe 50 Stunden den Nachbarkindern bei ihren Hausaufgaben geholfen und Nachhilfeunterricht gegeben.',
amount: '1000', amount: '1000',
}, },
], ],

6
frontend/src/components/GddTransactionList.spec.js
View File

@ -113,7 +113,8 @@ describe('GddTransactionList', () => {
balance: '31.76099091058520945292', balance: '31.76099091058520945292',
previousBalance: '30.76', previousBalance: '30.76',
balanceDate: '2022-02-28T13:55:47', balanceDate: '2022-02-28T13:55:47',
memo: 'Um den Kessel schlingt den Reihn, Werft die Eingeweid‘ hinein. Kröte du, die Nacht und Tag Unterm kalten Steine lag,', memo:
'Um den Kessel schlingt den Reihn, Werft die Eingeweid‘ hinein. Kröte du, die Nacht und Tag Unterm kalten Steine lag,',
linkedUser: { linkedUser: {
firstName: 'Bibi', firstName: 'Bibi',
lastName: 'Bloxberg', lastName: 'Bloxberg',
@ -132,7 +133,8 @@ describe('GddTransactionList', () => {
balance: '10', balance: '10',
previousBalance: '31.75', previousBalance: '31.75',
balanceDate: '2022-02-23T10:55:30', balanceDate: '2022-02-23T10:55:30',
memo: 'Monatlanges Gift sog ein, In den Topf zuerst hinein… (William Shakespeare, Die Hexen aus Macbeth)', memo:
'Monatlanges Gift sog ein, In den Topf zuerst hinein… (William Shakespeare, Die Hexen aus Macbeth)',
linkedUser: { linkedUser: {
firstName: 'Bibi', firstName: 'Bibi',
lastName: 'Bloxberg', lastName: 'Bloxberg',

18
frontend/src/components/Transactions/TransactionLinkSummary.spec.js
View File

@ -55,7 +55,8 @@ describe('TransactionLinkSummary', () => {
createdAt: '2022-03-16T14:22:40.000Z', createdAt: '2022-03-16T14:22:40.000Z',
holdAvailableAmount: '5.13109484759482747111', holdAvailableAmount: '5.13109484759482747111',
id: 86, id: 86,
memo: 'Hokuspokus Haselnuss, Vogelbein und Fliegenfuß, damit der Trick gelingen muss!', memo:
'Hokuspokus Haselnuss, Vogelbein und Fliegenfuß, damit der Trick gelingen muss!',
redeemedAt: null, redeemedAt: null,
validUntil: '2022-03-30T14:22:40.000Z', validUntil: '2022-03-30T14:22:40.000Z',
}, },
@ -75,7 +76,8 @@ describe('TransactionLinkSummary', () => {
createdAt: '2022-03-16T14:22:40.000Z', createdAt: '2022-03-16T14:22:40.000Z',
holdAvailableAmount: '5.13109484759482747111', holdAvailableAmount: '5.13109484759482747111',
id: 92, id: 92,
memo: 'Abrakadabra 1,2,3, die Sonne kommt herbei. Schweinepups und Spuckebrei, der Regen ist vorbei.', memo:
'Abrakadabra 1,2,3, die Sonne kommt herbei. Schweinepups und Spuckebrei, der Regen ist vorbei.',
redeemedAt: null, redeemedAt: null,
validUntil: '2022-03-30T14:22:40.000Z', validUntil: '2022-03-30T14:22:40.000Z',
}, },
@ -85,7 +87,8 @@ describe('TransactionLinkSummary', () => {
createdAt: '2022-03-16T14:22:40.000Z', createdAt: '2022-03-16T14:22:40.000Z',
holdAvailableAmount: '5.13109484759482747111', holdAvailableAmount: '5.13109484759482747111',
id: 16, id: 16,
memo: 'Abrakadabra 1,2,3 was verschwunden ist komme herbei.Wieseldreck und Schweinemist, zaubern das ist keine List.', memo:
'Abrakadabra 1,2,3 was verschwunden ist komme herbei.Wieseldreck und Schweinemist, zaubern das ist keine List.',
redeemedAt: null, redeemedAt: null,
validUntil: '2022-03-30T14:22:40.000Z', validUntil: '2022-03-30T14:22:40.000Z',
}, },
@ -173,7 +176,8 @@ describe('TransactionLinkSummary', () => {
createdAt: '2022-03-16T14:22:40.000Z', createdAt: '2022-03-16T14:22:40.000Z',
holdAvailableAmount: '5.13109484759482747111', holdAvailableAmount: '5.13109484759482747111',
id: 87, id: 87,
memo: 'Hat jemand die Nummer von der Hexe aus Schneewittchen? Ich bräuchte mal ein paar Äpfel.', memo:
'Hat jemand die Nummer von der Hexe aus Schneewittchen? Ich bräuchte mal ein paar Äpfel.',
redeemedAt: null, redeemedAt: null,
validUntil: '2022-03-30T14:22:40.000Z', validUntil: '2022-03-30T14:22:40.000Z',
}, },
@ -183,7 +187,8 @@ describe('TransactionLinkSummary', () => {
createdAt: '2022-03-16T14:22:40.000Z', createdAt: '2022-03-16T14:22:40.000Z',
holdAvailableAmount: '5.13109484759482747111', holdAvailableAmount: '5.13109484759482747111',
id: 108, id: 108,
memo: 'Die Windfahn´ krächzt am Dach, Der Uhu im Geklüfte; Was wispert wie ein Ach Verhallend in die Lüfte?', memo:
'Die Windfahn´ krächzt am Dach, Der Uhu im Geklüfte; Was wispert wie ein Ach Verhallend in die Lüfte?',
redeemedAt: null, redeemedAt: null,
validUntil: '2022-03-30T14:22:40.000Z', validUntil: '2022-03-30T14:22:40.000Z',
}, },
@ -193,7 +198,8 @@ describe('TransactionLinkSummary', () => {
createdAt: '2022-03-16T14:22:40.000Z', createdAt: '2022-03-16T14:22:40.000Z',
holdAvailableAmount: '5.13109484759482747111', holdAvailableAmount: '5.13109484759482747111',
id: 93, id: 93,
memo: 'Verschlafen kräht der Hahn, Ein Blitz noch, und ein trüber, Umwölbter Tag bricht an – Walpurgisnacht vorüber!', memo:
'Verschlafen kräht der Hahn, Ein Blitz noch, und ein trüber, Umwölbter Tag bricht an – Walpurgisnacht vorüber!',
redeemedAt: null, redeemedAt: null,
validUntil: '2022-03-30T14:22:40.000Z', validUntil: '2022-03-30T14:22:40.000Z',
}, },

2
frontend/src/components/UserSettings/UserNamingFormat.vue
View File

@ -26,7 +26,7 @@ import { useAppToast } from '@/composables/useToast'
const { t } = useI18n() const { t } = useI18n()
const store = useStore() const store = useStore()
const { toastError } = useAppToast() const { toastSuccess, toastError } = useAppToast()
const props = defineProps({ const props = defineProps({
initialValue: { type: String, default: 'PUBLISH_NAME_ALIAS_OR_INITALS' }, initialValue: { type: String, default: 'PUBLISH_NAME_ALIAS_OR_INITALS' },

6
frontend/src/components/UserSettings/UserSettingsSwitch.vue
View File

@ -10,17 +10,17 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import { ref, computed } from 'vue'
import { useStore } from 'vuex' import { useStore } from 'vuex'
import { ref } from 'vue'
import { updateUserInfos } from '@/graphql/mutations' import { updateUserInfos } from '@/graphql/mutations'
import { useMutation } from '@vue/apollo-composable' import { useMutation } from '@vue/apollo-composable'
import { BFormCheckbox } from 'bootstrap-vue-next' import { BFormCheckbox } from 'bootstrap-vue-next'
import { useAppToast } from '@/composables/useToast' import { useAppToast } from '@/composables/useToast'
const store = useStore() const store = useStore()
const { toastError } = useAppToast() const { toastSuccess, toastError } = useAppToast()
defineProps({ const props = defineProps({
initialValue: { type: Boolean, default: false }, initialValue: { type: Boolean, default: false },
attrName: { type: String }, attrName: { type: String },
enabledText: { type: String }, enabledText: { type: String },

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

@ -13,19 +13,19 @@ export const unsubscribeNewsletter = gql`
` `
export const setPassword = gql` export const setPassword = gql`
mutation ($code: String!, $password: String!) { mutation($code: String!, $password: String!) {
setPassword(code: $code, password: $password) setPassword(code: $code, password: $password)
} }
` `
export const forgotPassword = gql` export const forgotPassword = gql`
mutation ($email: String!) { mutation($email: String!) {
forgotPassword(email: $email) forgotPassword(email: $email)
} }
` `
export const updateUserInfos = gql` export const updateUserInfos = gql`
mutation ( mutation(
$firstName: String $firstName: String
$lastName: String $lastName: String
$alias: String $alias: String
@ -61,7 +61,7 @@ export const updateUserInfos = gql`
` `
export const createUser = gql` export const createUser = gql`
mutation ( mutation(
$firstName: String! $firstName: String!
$lastName: String! $lastName: String!
$email: String! $email: String!
@ -83,7 +83,7 @@ export const createUser = gql`
` `
export const sendCoins = gql` export const sendCoins = gql`
mutation ( mutation(
$recipientCommunityIdentifier: String! $recipientCommunityIdentifier: String!
$recipientIdentifier: String! $recipientIdentifier: String!
$amount: Decimal! $amount: Decimal!
@ -99,7 +99,7 @@ export const sendCoins = gql`
` `
export const createTransactionLink = gql` export const createTransactionLink = gql`
mutation ($amount: Decimal!, $memo: String!) { mutation($amount: Decimal!, $memo: String!) {
createTransactionLink(amount: $amount, memo: $memo) { createTransactionLink(amount: $amount, memo: $memo) {
link link
amount amount
@ -110,19 +110,19 @@ export const createTransactionLink = gql`
` `
export const deleteTransactionLink = gql` export const deleteTransactionLink = gql`
mutation ($id: Int!) { mutation($id: Int!) {
deleteTransactionLink(id: $id) deleteTransactionLink(id: $id)
} }
` `
export const redeemTransactionLink = gql` export const redeemTransactionLink = gql`
mutation ($code: String!) { mutation($code: String!) {
redeemTransactionLink(code: $code) redeemTransactionLink(code: $code)
} }
` `
export const createContribution = gql` export const createContribution = gql`
mutation ($creationDate: String!, $memo: String!, $amount: Decimal!) { mutation($creationDate: String!, $memo: String!, $amount: Decimal!) {
createContribution(creationDate: $creationDate, memo: $memo, amount: $amount) { createContribution(creationDate: $creationDate, memo: $memo, amount: $amount) {
amount amount
memo memo
@ -131,7 +131,7 @@ export const createContribution = gql`
` `
export const updateContribution = gql` export const updateContribution = gql`
mutation ($contributionId: Int!, $amount: Decimal!, $memo: String!, $creationDate: String!) { mutation($contributionId: Int!, $amount: Decimal!, $memo: String!, $creationDate: String!) {
updateContribution( updateContribution(
contributionId: $contributionId contributionId: $contributionId
amount: $amount amount: $amount
@ -146,13 +146,13 @@ export const updateContribution = gql`
` `
export const deleteContribution = gql` export const deleteContribution = gql`
mutation ($id: Int!) { mutation($id: Int!) {
deleteContribution(id: $id) deleteContribution(id: $id)
} }
` `
export const createContributionMessage = gql` export const createContributionMessage = gql`
mutation ($contributionId: Int!, $message: String!) { mutation($contributionId: Int!, $message: String!) {
createContributionMessage(contributionId: $contributionId, message: $message) { createContributionMessage(contributionId: $contributionId, message: $message) {
id id
message message
@ -166,7 +166,7 @@ export const createContributionMessage = gql`
` `
export const login = gql` export const login = gql`
mutation ($email: String!, $password: String!, $publisherId: Int) { mutation($email: String!, $password: String!, $publisherId: Int) {
login(email: $email, password: $password, publisherId: $publisherId) { login(email: $email, password: $password, publisherId: $publisherId) {
gradidoID gradidoID
alias alias

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

@ -35,7 +35,7 @@ export const authenticateHumhubAutoLogin = gql`
` `
export const transactionsQuery = gql` export const transactionsQuery = gql`
query ($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC) { query($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC) {
transactionList(currentPage: $currentPage, pageSize: $pageSize, order: $order) { transactionList(currentPage: $currentPage, pageSize: $pageSize, order: $order) {
balance { balance {
balance balance
@ -72,7 +72,7 @@ export const transactionsQuery = gql`
` `
export const listGDTEntriesQuery = gql` export const listGDTEntriesQuery = gql`
query ($currentPage: Int!, $pageSize: Int!) { query($currentPage: Int!, $pageSize: Int!) {
listGDTEntries(currentPage: $currentPage, pageSize: $pageSize) { listGDTEntries(currentPage: $currentPage, pageSize: $pageSize) {
count count
gdtEntries { gdtEntries {
@ -101,19 +101,19 @@ export const selectCommunities = gql`
` `
export const queryOptIn = gql` export const queryOptIn = gql`
query ($optIn: String!) { query($optIn: String!) {
queryOptIn(optIn: $optIn) queryOptIn(optIn: $optIn)
} }
` `
export const checkUsername = gql` export const checkUsername = gql`
query ($username: String!) { query($username: String!) {
checkUsername(username: $username) checkUsername(username: $username)
} }
` `
export const queryTransactionLink = gql` export const queryTransactionLink = gql`
query ($code: String!) { query($code: String!) {
queryTransactionLink(code: $code) { queryTransactionLink(code: $code) {
... on TransactionLink { ... on TransactionLink {
id id
@ -148,7 +148,7 @@ export const queryTransactionLink = gql`
` `
export const listTransactionLinks = gql` export const listTransactionLinks = gql`
query ($currentPage: Int = 1, $pageSize: Int = 5) { query($currentPage: Int = 1, $pageSize: Int = 5) {
listTransactionLinks(currentPage: $currentPage, pageSize: $pageSize) { listTransactionLinks(currentPage: $currentPage, pageSize: $pageSize) {
links { links {
id id
@ -165,7 +165,7 @@ export const listTransactionLinks = gql`
` `
export const listContributionLinks = gql` export const listContributionLinks = gql`
query ($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC) { query($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC) {
listContributionLinks(currentPage: $currentPage, pageSize: $pageSize, order: $order) { listContributionLinks(currentPage: $currentPage, pageSize: $pageSize, order: $order) {
links { links {
id id
@ -185,7 +185,7 @@ export const listContributionLinks = gql`
` `
export const listContributions = gql` export const listContributions = gql`
query ( query(
$currentPage: Int = 1 $currentPage: Int = 1
$pageSize: Int = 25 $pageSize: Int = 25
$order: Order = DESC $order: Order = DESC
@ -220,7 +220,7 @@ export const listContributions = gql`
` `
export const listAllContributions = gql` export const listAllContributions = gql`
query ($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC) { query($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC) {
listAllContributions(currentPage: $currentPage, pageSize: $pageSize, order: $order) { listAllContributions(currentPage: $currentPage, pageSize: $pageSize, order: $order) {
contributionCount contributionCount
contributionList { contributionList {
@ -266,7 +266,7 @@ export const searchAdminUsers = gql`
` `
export const listContributionMessages = gql` export const listContributionMessages = gql`
query ($contributionId: Int!, $pageSize: Int = 25, $currentPage: Int = 1, $order: Order = ASC) { query($contributionId: Int!, $pageSize: Int = 25, $currentPage: Int = 1, $order: Order = ASC) {
listContributionMessages( listContributionMessages(
contributionId: $contributionId contributionId: $contributionId
pageSize: $pageSize pageSize: $pageSize
@ -299,7 +299,7 @@ export const openCreations = gql`
` `
export const user = gql` export const user = gql`
query ($identifier: String!, $communityIdentifier: String!) { query($identifier: String!, $communityIdentifier: String!) {
user(identifier: $identifier, communityIdentifier: $communityIdentifier) { user(identifier: $identifier, communityIdentifier: $communityIdentifier) {
firstName firstName
lastName lastName

2
frontend/src/layouts/DashboardLayout.vue
View File

@ -434,7 +434,7 @@ const setVisible = (bool) => {
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
background-image: url("/img/svg/Gradido_Blaetter_Mainpage.svg") !important; background-image: url('/img/svg/Gradido_Blaetter_Mainpage.svg') !important;
} }
.b-right { .b-right {

16
frontend/src/pages/Circles.vue
View File

@ -86,14 +86,14 @@ const humhubUri = ref('')
const humhubAllowed = computed(() => store.state.humhubAllowed) const humhubAllowed = computed(() => store.state.humhubAllowed)
const { const { refetch: refetchAuthenticateHumhub, onResult, onError } = useQuery(
refetch: refetchAuthenticateHumhub, authenticateHumhubAutoLogin,
onResult, null,
onError, {
} = useQuery(authenticateHumhubAutoLogin, null, { fetchPolicy: 'network-only',
fetchPolicy: 'network-only', enabled: false,
enabled: false, },
}) )
onResult(({ data }) => { onResult(({ data }) => {
if (data) { if (data) {

5
frontend/src/pages/InfoStatistic.vue
View File

@ -47,8 +47,9 @@ const supportMail = CONFIG.COMMUNITY_SUPPORT_MAIL
const admins = computed(() => itemsAdminUser.value.filter((item) => item.role === 'ADMIN')) const admins = computed(() => itemsAdminUser.value.filter((item) => item.role === 'ADMIN'))
const moderators = computed(() => itemsAdminUser.value.filter((item) => item.role === 'MODERATOR')) const moderators = computed(() => itemsAdminUser.value.filter((item) => item.role === 'MODERATOR'))
const { onResult: onContributionLinksResult, onError: onContributionLinksError } = const { onResult: onContributionLinksResult, onError: onContributionLinksError } = useQuery(
useQuery(listContributionLinks) listContributionLinks,
)
const { onResult: onAdminUsersResult, onError: onAdminUsersError } = useQuery(searchAdminUsers) const { onResult: onAdminUsersResult, onError: onAdminUsersError } = useQuery(searchAdminUsers)
onContributionLinksResult(({ data }) => { onContributionLinksResult(({ data }) => {

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

@ -233,7 +233,8 @@ describe('TransactionLink', () => {
__typename: 'TransactionLink', __typename: 'TransactionLink',
id: 92, id: 92,
amount: '22', amount: '22',
memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ', memo:
'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
createdAt: '2022-03-17T16:10:28.000Z', createdAt: '2022-03-17T16:10:28.000Z',
validUntil: transactionLinkValidExpireDate(), validUntil: transactionLinkValidExpireDate(),
redeemedAt: null, redeemedAt: null,
@ -268,7 +269,8 @@ describe('TransactionLink', () => {
__typename: 'TransactionLink', __typename: 'TransactionLink',
id: 92, id: 92,
amount: '22', amount: '22',
memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ', memo:
'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
createdAt: '2022-03-17T16:10:28.000Z', createdAt: '2022-03-17T16:10:28.000Z',
validUntil: transactionLinkValidExpireDate(), validUntil: transactionLinkValidExpireDate(),
redeemedAt: null, redeemedAt: null,
@ -343,7 +345,8 @@ describe('TransactionLink', () => {
__typename: 'TransactionLink', __typename: 'TransactionLink',
id: 92, id: 92,
amount: '22', amount: '22',
memo: 'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ', memo:
'Abrakadabra drei, vier, fünf, sechs, hier steht jetzt ein Memotext! Hex hex ',
createdAt: '2022-03-17T16:10:28.000Z', createdAt: '2022-03-17T16:10:28.000Z',
validUntil: transactionLinkValidExpireDate(), validUntil: transactionLinkValidExpireDate(),
redeemedAt: null, redeemedAt: null,

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

@ -137,11 +137,7 @@ const variables = ref({
pageSize: pageSize.value, pageSize: pageSize.value,
}) })
const { const { load: loadGdt, onResult, onError } = useLazyQuery(listGDTEntriesQuery, variables, {
load: loadGdt,
onResult,
onError,
} = useLazyQuery(listGDTEntriesQuery, variables, {
fetchPolicy: 'network-only', fetchPolicy: 'network-only',
}) })

3
frontend/src/validation-rules.js
View File

@ -191,8 +191,7 @@ import nl from '@vee-validate/i18n/dist/locale/nl.json'
import tr from '@vee-validate/i18n/dist/locale/tr.json' import tr from '@vee-validate/i18n/dist/locale/tr.json'
// Email and username regex patterns remain the same // Email and username regex patterns remain the same
const EMAIL_REGEX = const EMAIL_REGEX = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
const USERNAME_REGEX = /^(?=.{3,20}$)[a-zA-Z0-9]+(?:[_-][a-zA-Z0-9]+?)*$/ const USERNAME_REGEX = /^(?=.{3,20}$)[a-zA-Z0-9]+(?:[_-][a-zA-Z0-9]+?)*$/
export const loadAllRules = (i18nCallback, apollo) => { export const loadAllRules = (i18nCallback, apollo) => {