From ac4872d06d6d483fdc4ab0bd70532884e3a5a5f6 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Thu, 8 May 2025 10:02:10 +0200
Subject: [PATCH 01/36] keep message display open after answear

---
 .../components/Contributions/ContributionListItem.vue    | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 2b0e2b0a1..72678c081 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -278,15 +278,6 @@ onError((err) => {
   toastError(err.message)
 })
 
-watch(
-  () => visible.value,
-  () => {
-    if (visible.value) {
-      getListContributionMessages()
-    }
-  },
-)
-
 function updateStatus(id) {
   emit('update-status', id)
 }

From 9b1e162042e78ea2f8f710a4e6c11f0440b5f732 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 9 May 2025 09:49:07 +0200
Subject: [PATCH 02/36] fix: prevent layout jump during collapse animation

---
 .../ContributionMessages/ContributionMessagesList.vue        | 4 ++--
 .../src/components/Contributions/ContributionListItem.vue    | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index b7f97daff..56b7fea8b 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -14,8 +14,8 @@
       />
     </div>
 
-    <div v-b-toggle="'collapse' + String(contributionId)" class="text-center pointer clearboth">
-      <BButton variant="outline-primary" block class="mb-3">
+    <div class="text-center pointer clearboth">
+      <BButton variant="outline-primary" block @click="$emit('close-all-open-collapse')">
         <IBiArrowUpShort />
         {{ $t('form.close') }}
       </BButton>
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 72678c081..7aa50812a 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -104,16 +104,17 @@
           </div>
         </BCol>
       </BRow>
-      <div v-else class="pb-3"></div>
-      <BCollapse :id="collapseId" :model-value="visible" class="mt-2">
+      <BCollapse :id="collapseId" :model-value="visible">
         <contribution-messages-list
           :messages="messagesGet"
           :status="status"
           :contribution-id="contributionId"
           @get-list-contribution-messages="getListContributionMessages"
           @update-status="updateStatus"
+          @close-all-open-collapse="visible = false"
         />
       </BCollapse>
+      <div class="pb-3"></div>
     </div>
   </div>
 </template>

From 2cabeb87bbe79a97a66756157d10115a1bdb15d9 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Sat, 10 May 2025 19:06:43 +0200
Subject: [PATCH 03/36] refactor contribution list, stay open after adding
 contribution message

---
 backend/src/graphql/model/Contribution.ts     |  20 ++-
 .../src/graphql/model/ContributionMessage.ts  |  10 +-
 .../resolver/ContributionMessageResolver.ts   |  20 +--
 .../graphql/resolver/ContributionResolver.ts  |  86 +++++++++---
 .../resolver/util/findContributionMessages.ts |  10 +-
 .../resolver/util/loadContributions.ts        |  41 ++++++
 .../ContributionMessagesFormular.vue          |  28 ++--
 .../ContributionMessagesList.vue              |   6 -
 .../Contributions/ContributionList.vue        |  84 +++++-------
 .../Contributions/ContributionListItem.vue    |  49 +++++--
 frontend/src/constants.js                     |   1 +
 frontend/src/graphql/contributions.graphql    |  59 +++++++++
 frontend/src/graphql/queries.js               |  14 +-
 frontend/src/pages/Community.vue              | 125 ++++--------------
 14 files changed, 309 insertions(+), 244 deletions(-)
 create mode 100644 backend/src/graphql/resolver/util/loadContributions.ts
 create mode 100644 frontend/src/graphql/contributions.graphql

diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index 301348ccc..21f47bf2d 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -1,13 +1,15 @@
 import { Contribution as dbContribution } from '@entity/Contribution'
-import { User as DbUser } from '@entity/User'
+import { ContributionMessage as dbContributionMessage } from '@entity/ContributionMessage'
 import { Decimal } from 'decimal.js-light'
 import { Field, Int, ObjectType } from 'type-graphql'
 
+import { ContributionMessage } from './ContributionMessage'
 import { User } from './User'
 
 @ObjectType()
 export class Contribution {
-  constructor(contribution: dbContribution, user?: DbUser | null) {
+  constructor(contribution: dbContribution) {
+    const user = contribution.user
     this.id = contribution.id
     this.firstName = user?.firstName ?? null
     this.lastName = user?.lastName ?? null
@@ -18,7 +20,7 @@ export class Contribution {
     this.confirmedBy = contribution.confirmedBy
     this.contributionDate = contribution.contributionDate
     this.status = contribution.contributionStatus
-    this.messagesCount = contribution.messages ? contribution.messages.length : 0
+    this.messagesCount = contribution.messages?.length ?? 0
     this.deniedAt = contribution.deniedAt
     this.deniedBy = contribution.deniedBy
     this.deletedAt = contribution.deletedAt
@@ -28,9 +30,12 @@ export class Contribution {
     this.moderatorId = contribution.moderatorId
     this.userId = contribution.userId
     this.resubmissionAt = contribution.resubmissionAt
-    if (user) {
-      this.user = new User(user)
-    }
+    this.user = user ? new User(user) : null
+    this.messages = contribution.messages
+      ? contribution.messages.map(
+          (message: dbContributionMessage) => new ContributionMessage(message),
+        )
+      : null
   }
 
   @Field(() => Int)
@@ -87,6 +92,9 @@ export class Contribution {
   @Field(() => Int)
   messagesCount: number
 
+  @Field(() => [ContributionMessage], { nullable: true })
+  messages: ContributionMessage[] | null
+
   @Field(() => String)
   status: string
 
diff --git a/backend/src/graphql/model/ContributionMessage.ts b/backend/src/graphql/model/ContributionMessage.ts
index 6f70d5024..998717c83 100644
--- a/backend/src/graphql/model/ContributionMessage.ts
+++ b/backend/src/graphql/model/ContributionMessage.ts
@@ -1,18 +1,18 @@
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
-import { User } from '@entity/User'
 import { Field, Int, ObjectType } from 'type-graphql'
 
 @ObjectType()
 export class ContributionMessage {
-  constructor(contributionMessage: DbContributionMessage, user: User) {
+  constructor(contributionMessage: DbContributionMessage) {
+    const user = contributionMessage.user
     this.id = contributionMessage.id
     this.message = contributionMessage.message
     this.createdAt = contributionMessage.createdAt
     this.updatedAt = contributionMessage.updatedAt
     this.type = contributionMessage.type
-    this.userFirstName = user.firstName
-    this.userLastName = user.lastName
-    this.userId = user.id
+    this.userFirstName = user?.firstName ?? null
+    this.userLastName = user?.lastName ?? null
+    this.userId = user?.id ?? null
     this.isModerator = contributionMessage.isModerator
   }
 
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts
index 88cd73bc7..3eae0b042 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts
@@ -75,7 +75,7 @@ export class ContributionMessageResolver {
       { id: contributionId } as DbContribution,
       finalContributionMessage,
     )
-    return new ContributionMessage(finalContributionMessage, user)
+    return new ContributionMessage(finalContributionMessage)
   }
 
   @Authorized([RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES])
@@ -87,16 +87,12 @@ export class ContributionMessageResolver {
   ): Promise<ContributionMessageListResult> {
     const [contributionMessages, count] = await findContributionMessages({
       contributionId,
-      currentPage,
-      pageSize,
-      order,
+      pagination: { currentPage, pageSize, order },
     })
 
     return {
       count,
-      messages: contributionMessages.map(
-        (message) => new ContributionMessage(message, message.user),
-      ),
+      messages: contributionMessages.map((message) => new ContributionMessage(message)),
     }
   }
 
@@ -109,17 +105,13 @@ export class ContributionMessageResolver {
   ): Promise<ContributionMessageListResult> {
     const [contributionMessages, count] = await findContributionMessages({
       contributionId,
-      currentPage,
-      pageSize,
-      order,
+      pagination: { currentPage, pageSize, order },
       showModeratorType: true,
     })
 
     return {
       count,
-      messages: contributionMessages.map(
-        (message) => new ContributionMessage(message, message.user),
-      ),
+      messages: contributionMessages.map((message) => new ContributionMessage(message)),
     }
   }
 
@@ -194,6 +186,6 @@ export class ContributionMessageResolver {
       finalContribution,
       finalContributionMessage,
     )
-    return new ContributionMessage(finalContributionMessage, moderator)
+    return new ContributionMessage(finalContributionMessage)
   }
 }
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index a137b0d79..365c52f5d 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -24,7 +24,6 @@ import { AdminUpdateContributionArgs } from '@arg/AdminUpdateContributionArgs'
 import { ContributionArgs } from '@arg/ContributionArgs'
 import { Paginated } from '@arg/Paginated'
 import { SearchContributionsFilterArgs } from '@arg/SearchContributionsFilterArgs'
-import { ContributionMessageType } from '@enum/ContributionMessageType'
 import { ContributionStatus } from '@enum/ContributionStatus'
 import { ContributionType } from '@enum/ContributionType'
 import { TransactionTypeId } from '@enum/TransactionTypeId'
@@ -60,11 +59,15 @@ import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 import { calculateDecay } from '@/util/decay'
 import { fullName } from '@/util/utilities'
 
+import { ContributionMessage } from '@model/ContributionMessage'
+import { ContributionMessageType } from '../enum/ContributionMessageType'
 import { findContribution } from './util/contributions'
 import { getOpenCreations, getUserCreation, validateContribution } from './util/creations'
 import { extractGraphQLFields, extractGraphQLFieldsForSelect } from './util/extractGraphQLFields'
+import { findContributionMessages } from './util/findContributionMessages'
 import { findContributions } from './util/findContributions'
 import { getLastTransaction } from './util/getLastTransaction'
+import { loadAllContributions, loadUserContributions } from './util/loadContributions'
 import { sendTransactionsToDltConnector } from './util/sendTransactionsToDltConnector'
 
 @Resolver(() => Contribution)
@@ -143,46 +146,59 @@ export class ContributionResolver {
     @Ctx() context: Context,
     @Args()
     paginated: Paginated,
-    @Arg('statusFilter', () => [ContributionStatus], { nullable: true })
-    statusFilter?: ContributionStatus[] | null,
   ): Promise<ContributionListResult> {
     const user = getUser(context)
-    const filter = new SearchContributionsFilterArgs()
-    filter.statusFilter = statusFilter
-    filter.userId = user.id
-    const [dbContributions, count] = await findContributions(paginated, filter, true, {
-      messages: true,
-    })
+    const [dbContributions, count] = await loadUserContributions(user.id, paginated)
+
+    // show contributions in progress first
+    const inProgressContributions = dbContributions.filter(
+      (contribution) => contribution.contributionStatus === ContributionStatus.IN_PROGRESS,
+    )
+    const notInProgressContributions = dbContributions.filter(
+      (contribution) => contribution.contributionStatus !== ContributionStatus.IN_PROGRESS,
+    )
 
     return new ContributionListResult(
       count,
-      dbContributions.map((contribution) => {
-        // filter out moderator messages for this call
+      [...inProgressContributions, ...notInProgressContributions].map((contribution) => {
+        // we currently expect not much contribution messages for needing pagination
+        // but if we get more than expected, we should get warned
+        if ((contribution.messages?.length || 0) > 10) {
+          logger.warn('more contribution messages as expected, consider pagination', {
+            contributionId: contribution.id,
+            expected: 10,
+            actual: contribution.messages?.length || 0,
+          })
+        }
         contribution.messages = contribution.messages?.filter(
-          (m) => (m.type as ContributionMessageType) !== ContributionMessageType.MODERATOR,
+          (message) => message.type !== ContributionMessageType.MODERATOR,
         )
-        return new Contribution(contribution, user)
+        return new Contribution(contribution)
       }),
     )
   }
 
+  @Authorized([RIGHTS.LIST_CONTRIBUTIONS])
+  @Query(() => Int)
+  async countContributionsInProgress(@Ctx() context: Context): Promise<number> {
+    const user = getUser(context)
+    const count = await DbContribution.count({
+      where: { userId: user.id, contributionStatus: ContributionStatus.IN_PROGRESS },
+    })
+    return count
+  }
+
   @Authorized([RIGHTS.LIST_ALL_CONTRIBUTIONS])
   @Query(() => ContributionListResult)
   async listAllContributions(
     @Args()
     paginated: Paginated,
-    @Arg('statusFilter', () => [ContributionStatus], { nullable: true })
-    statusFilter?: ContributionStatus[] | null,
   ): Promise<ContributionListResult> {
-    const filter = new SearchContributionsFilterArgs()
-    filter.statusFilter = statusFilter
-    const [dbContributions, count] = await findContributions(paginated, filter, false, {
-      user: true,
-    })
+    const [dbContributions, count] = await loadAllContributions(paginated)
 
     return new ContributionListResult(
       count,
-      dbContributions.map((contribution) => new Contribution(contribution, contribution.user)),
+      dbContributions.map((contribution) => new Contribution(contribution)),
     )
   }
 
@@ -370,7 +386,7 @@ export class ContributionResolver {
 
     return new ContributionListResult(
       count,
-      dbContributions.map((contribution) => new Contribution(contribution, contribution.user)),
+      dbContributions.map((contribution) => new Contribution(contribution)),
     )
   }
 
@@ -627,4 +643,30 @@ export class ContributionResolver {
     }
     return new User(user)
   }
+
+  @Authorized([RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES])
+  @FieldResolver(() => [ContributionMessage], { nullable: true })
+  async messages(
+    @Root() contribution: Contribution,
+    @Arg('pagination', () => Paginated) pagination: Paginated,
+  ): Promise<ContributionMessage[] | null> {
+    if (contribution.messagesCount === 0) {
+      return null
+    }
+    const [contributionMessages] = await findContributionMessages({
+      contributionId: contribution.id,
+      pagination,
+    })
+    // we currently expect not much contribution messages for needing pagination
+    // but if we get more than expected, we should get warned
+    if (contributionMessages.length > pagination.pageSize) {
+      logger.warn('more contribution messages as expected, consider pagination', {
+        contributionId: contribution.id,
+        expected: pagination.pageSize,
+        actual: contributionMessages.length,
+      })
+    }
+
+    return contributionMessages.map((message) => new ContributionMessage(message))
+  }
 }
diff --git a/backend/src/graphql/resolver/util/findContributionMessages.ts b/backend/src/graphql/resolver/util/findContributionMessages.ts
index 460b62b38..9f9209e7c 100644
--- a/backend/src/graphql/resolver/util/findContributionMessages.ts
+++ b/backend/src/graphql/resolver/util/findContributionMessages.ts
@@ -1,28 +1,26 @@
 import { In } from '@dbTools/typeorm'
 import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage'
 
+import { Paginated } from '@arg/Paginated'
 import { ContributionMessageType } from '@enum/ContributionMessageType'
-import { Order } from '@enum/Order'
 
 interface FindContributionMessagesOptions {
   contributionId: number
-  pageSize: number
-  currentPage: number
-  order: Order
+  pagination: Paginated
   showModeratorType?: boolean
 }
 
 export const findContributionMessages = async (
   options: FindContributionMessagesOptions,
 ): Promise<[DbContributionMessage[], number]> => {
-  const { contributionId, pageSize, currentPage, order, showModeratorType } = options
+  const { contributionId, pagination, showModeratorType } = options
 
   const messageTypes = [ContributionMessageType.DIALOG, ContributionMessageType.HISTORY]
 
   if (showModeratorType) {
     messageTypes.push(ContributionMessageType.MODERATOR)
   }
-
+  const { currentPage, pageSize, order } = pagination
   return DbContributionMessage.findAndCount({
     where: {
       contributionId,
diff --git a/backend/src/graphql/resolver/util/loadContributions.ts b/backend/src/graphql/resolver/util/loadContributions.ts
new file mode 100644
index 000000000..18f4a4fe6
--- /dev/null
+++ b/backend/src/graphql/resolver/util/loadContributions.ts
@@ -0,0 +1,41 @@
+import { Paginated } from '@arg/Paginated'
+import { FindManyOptions } from '@dbTools/typeorm'
+import { Contribution as DbContribution } from '@entity/Contribution'
+
+function buildBaseOptions(paginated: Paginated): FindManyOptions<DbContribution> {
+  const { order, currentPage, pageSize } = paginated
+  return {
+    order: { createdAt: order, id: order },
+    skip: (currentPage - 1) * pageSize,
+    take: pageSize,
+  }
+}
+
+/*
+ * Load user contributions with messages
+ * @param userId if userId is set, load all contributions of the user, with messages
+ * @param paginated pagination, see {@link Paginated}
+ */
+export const loadUserContributions = async (
+  userId: number,
+  paginated: Paginated,
+): Promise<[DbContribution[], number]> => {
+  return DbContribution.findAndCount({
+    where: { userId },
+    relations: { messages: { user: true } },
+    ...buildBaseOptions(paginated),
+  })
+}
+
+/*
+ * Load all contributions
+ * @param paginated pagination, see {@link Paginated}
+ */
+export const loadAllContributions = async (
+  paginated: Paginated,
+): Promise<[DbContribution[], number]> => {
+  return DbContribution.findAndCount({
+    relations: { user: true },
+    ...buildBaseOptions(paginated),
+  })
+}
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 85363665f..634823168 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -5,10 +5,10 @@
       <BForm @submit.prevent="onSubmit" @reset="onReset">
         <BFormTextarea
           id="textarea"
-          :model-value="form.text"
+          :model-value="formText"
           :placeholder="$t('form.memo')"
           :rows="3"
-          @update:model-value="form.text = $event"
+          @update:model-value="formText = $event"
         />
         <BRow class="mt-4 mb-4">
           <BCol>
@@ -39,35 +39,37 @@ const props = defineProps({
   },
 })
 
-const emit = defineEmits(['get-list-contribution-messages', 'update-status'])
+const emit = defineEmits([
+  'get-list-contribution-messages',
+  'update-status',
+  'add-contribution-message',
+])
 
 const { t } = useI18n()
 const { toastSuccess, toastError } = useAppToast()
 
 const { mutate: createContributionMessageMutation } = useMutation(createContributionMessage)
 
-const form = ref({
-  text: '',
-})
+const formText = ref('')
 
 const isSubmitting = ref(false)
 
 const disabled = computed(() => {
-  return form.value.text === '' || isSubmitting.value
+  return formText.value === '' || isSubmitting.value
 })
 
 async function onSubmit() {
   isSubmitting.value = true
-
   try {
-    await createContributionMessageMutation({
+    const result = await createContributionMessageMutation({
       contributionId: props.contributionId,
-      message: form.value.text,
+      message: formText.value,
     })
 
-    emit('get-list-contribution-messages', false)
+    // emit('get-list-contribution-messages', false)
+    formText.value = ''
     emit('update-status', props.contributionId)
-    form.value.text = ''
+    emit('add-contribution-message', result.data.createContributionMessage)
     toastSuccess(t('message.reply'))
   } catch (error) {
     toastError(error.message)
@@ -77,6 +79,6 @@ async function onSubmit() {
 }
 
 function onReset() {
-  form.value.text = ''
+  formText.value = ''
 }
 </script>
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index 56b7fea8b..1406ce744 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -10,7 +10,6 @@
         v-if="['PENDING', 'IN_PROGRESS'].includes(status)"
         :contribution-id="contributionId"
         v-bind="$attrs"
-        @update-status="updateStatus"
       />
     </div>
 
@@ -46,11 +45,6 @@ export default {
       required: true,
     },
   },
-  methods: {
-    updateStatus(id) {
-      this.$emit('update-status', id)
-    },
-  },
 }
 </script>
 <style scoped>
diff --git a/frontend/src/components/Contributions/ContributionList.vue b/frontend/src/components/Contributions/ContributionList.vue
index e7fbd750d..ec4cc6cbb 100644
--- a/frontend/src/components/Contributions/ContributionList.vue
+++ b/frontend/src/components/Contributions/ContributionList.vue
@@ -1,27 +1,16 @@
 <template>
-  <div class="contribution-list">
+  <div v-if="items.length === 0 && !loading.value">
+    {{ emptyText }}
+  </div>
+  <div v-else class="contribution-list">
     <div v-for="item in items" :key="item.id + 'a'" class="mb-3">
       <contribution-list-item
-        v-if="item.status === 'IN_PROGRESS'"
         v-bind="item"
         :contribution-id="item.id"
         :all-contribution="allContribution"
         @close-all-open-collapse="$emit('close-all-open-collapse')"
         @update-contribution-form="updateContributionForm"
         @delete-contribution="deleteContribution"
-        @update-status="updateStatus"
-      />
-    </div>
-    <div v-for="item2 in items" :key="item2.id" class="mb-3">
-      <contribution-list-item
-        v-if="item2.status !== 'IN_PROGRESS'"
-        v-bind="item2"
-        :contribution-id="item2.id"
-        :all-contribution="allContribution"
-        @close-all-open-collapse="$emit('close-all-open-collapse')"
-        @update-contribution-form="updateContributionForm"
-        @delete-contribution="deleteContribution"
-        @update-status="updateStatus"
       />
     </div>
     <BPagination
@@ -39,59 +28,58 @@
   </div>
 </template>
 <script setup>
-import { ref, computed, watch } from 'vue'
+import { ref, computed, watch, watchEffect, onMounted } from 'vue'
 import ContributionListItem from '@/components/Contributions/ContributionListItem.vue'
+import { listContributions, listAllContributions } from '@/graphql/contributions.graphql'
+import { useQuery } from '@vue/apollo-composable'
+import { PAGE_SIZE } from '@/constants'
 
 const props = defineProps({
-  items: {
-    type: Array,
-    required: true,
-  },
-  contributionCount: {
-    type: Number,
-    required: true,
-  },
-  showPagination: {
-    type: Boolean,
-    required: true,
-  },
-  pageSize: {
-    type: Number,
-    default: 25,
-  },
   allContribution: {
     type: Boolean,
     required: false,
     default: false,
   },
+  emptyText: {
+    type: String,
+    required: false,
+    default: '',
+  },
 })
 
 const emit = defineEmits([
   'close-all-open-collapse',
-  'update-list-contributions',
   'update-contribution-form',
   'delete-contribution',
-  'update-status',
 ])
 
 const currentPage = ref(1)
-const messages = ref([])
+
+const contributionListResult = computed(() => {
+  return props.allContribution
+    ? result.value?.listAllContributions
+    : result.value?.listContributions
+})
+
+const contributionCount = computed(() => {
+  return contributionListResult.value?.contributionCount || 0
+})
+const items = computed(() => {
+  return contributionListResult.value?.contributionList || []
+})
 
 const isPaginationVisible = computed(() => {
-  return props.showPagination && props.pageSize < props.contributionCount
+  return PAGE_SIZE < contributionCount.value
 })
 
-watch(currentPage, () => {
-  updateListContributions()
-})
-
-const updateListContributions = () => {
-  emit('update-list-contributions', {
+const { result, loading } = useQuery(
+  props.allContribution ? listAllContributions : listContributions,
+  () => ({
     currentPage: currentPage.value,
-    pageSize: props.pageSize,
-  })
-  window.scrollTo(0, 0)
-}
+    pageSize: PAGE_SIZE,
+  }),
+  { fetchPolicy: 'cache-and-network' },
+)
 
 const updateContributionForm = (item) => {
   emit('update-contribution-form', item)
@@ -100,8 +88,4 @@ const updateContributionForm = (item) => {
 const deleteContribution = (item) => {
   emit('delete-contribution', item)
 }
-
-const updateStatus = (id) => {
-  emit('update-status', id)
-}
 </script>
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 7aa50812a..9c2c164d3 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -2,7 +2,7 @@
   <div>
     <div
       class="contribution-list-item bg-white app-box-shadow gradido-border-radius pt-3 px-3"
-      :class="status === 'IN_PROGRESS' && !allContribution ? 'pulse border border-205' : ''"
+      :class="localStatus === 'IN_PROGRESS' && !allContribution ? 'pulse border border-205' : ''"
     >
       <BRow>
         <BCol cols="3" lg="2" md="2">
@@ -39,7 +39,7 @@
             {{ $t('moderatorChangedMemo') }}
           </div>
           <div
-            v-if="status === 'IN_PROGRESS' && !allContribution"
+            v-if="localStatus === 'IN_PROGRESS' && !allContribution"
             class="text-danger pointer hover-font-bold"
             @click="visible = !visible"
           >
@@ -50,11 +50,11 @@
           <div class="small">
             {{ $t('creation') }} {{ $t('(') }}{{ hours }} {{ $t('h') }}{{ $t(')') }}
           </div>
-          <div v-if="status === 'DENIED' && allContribution" class="fw-bold">
+          <div v-if="localStatus === 'DENIED' && allContribution" class="fw-bold">
             <variant-icon icon="x-circle" variant="danger" />
             {{ $t('contribution.alert.denied') }}
           </div>
-          <div v-if="status === 'DELETED'" class="small">
+          <div v-if="localStatus === 'DELETED'" class="small">
             {{ $t('contribution.deleted') }}
           </div>
           <div v-else class="fw-bold">{{ $filters.GDD(amount) }}</div>
@@ -66,12 +66,16 @@
         </BCol>
       </BRow>
       <BRow
-        v-if="(!['CONFIRMED', 'DELETED'].includes(status) && !allContribution) || messagesCount > 0"
+        v-if="
+          (!['CONFIRMED', 'DELETED'].includes(localStatus) && !allContribution) || messagesCount > 0
+        "
         class="p-2"
       >
         <BCol cols="3" class="me-auto text-center">
           <div
-            v-if="!['CONFIRMED', 'DELETED'].includes(status) && !allContribution && !moderatorId"
+            v-if="
+              !['CONFIRMED', 'DELETED'].includes(localStatus) && !allContribution && !moderatorId
+            "
             class="test-delete-contribution pointer me-3"
             @click="deleteContribution({ id })"
           >
@@ -82,7 +86,9 @@
         </BCol>
         <BCol cols="3" class="text-center">
           <div
-            v-if="!['CONFIRMED', 'DELETED'].includes(status) && !allContribution && !moderatorId"
+            v-if="
+              !['CONFIRMED', 'DELETED'].includes(localStatus) && !allContribution && !moderatorId
+            "
             class="test-edit-contribution pointer me-3"
             @click="
               $emit('update-contribution-form', {
@@ -104,14 +110,15 @@
           </div>
         </BCol>
       </BRow>
-      <BCollapse :id="collapseId" :model-value="visible">
+      <BCollapse :model-value="visible">
         <contribution-messages-list
           :messages="messagesGet"
-          :status="status"
+          :status="localStatus"
           :contribution-id="contributionId"
           @get-list-contribution-messages="getListContributionMessages"
           @update-status="updateStatus"
           @close-all-open-collapse="visible = false"
+          @add-contribution-message="addContributionMessage"
         />
       </BCollapse>
       <div class="pb-3"></div>
@@ -140,6 +147,10 @@ const props = defineProps({
   memo: {
     type: String,
   },
+  messages: {
+    type: Array,
+    required: false,
+  },
   firstName: {
     type: String,
     required: false,
@@ -208,6 +219,16 @@ const { t } = useI18n()
 
 const messagesGet = ref([])
 const visible = ref(false)
+const localStatus = ref(props.status)
+
+watch(
+  () => props.messages,
+  () => {
+    messagesGet.value = props.messages
+  },
+  // parent is loading messages already
+  { immediate: false },
+)
 
 const variant = computed(() => {
   if (props.deletedAt) return 'danger'
@@ -266,6 +287,10 @@ function getListContributionMessages(closeCollapse = true) {
   }
 }
 
+function addContributionMessage(message) {
+  messagesGet.value.push(message)
+}
+
 onResult((resultValue) => {
   if (resultValue.data) {
     messagesGet.value.length = 0
@@ -279,11 +304,11 @@ onError((err) => {
   toastError(err.message)
 })
 
-function updateStatus(id) {
-  emit('update-status', id)
+const updateStatus = (id) => {
+  localStatus.value = 'PENDING'
 }
 
-const emit = defineEmits(['delete-contribution', 'close-all-open-collapse', 'update-status'])
+const emit = defineEmits(['delete-contribution', 'close-all-open-collapse'])
 </script>
 
 <style lang="scss" scoped>
diff --git a/frontend/src/constants.js b/frontend/src/constants.js
index 2a40a57c8..f53926e91 100644
--- a/frontend/src/constants.js
+++ b/frontend/src/constants.js
@@ -1 +1,2 @@
 export const GDD_PER_HOUR = 20
+export const PAGE_SIZE = 25
diff --git a/frontend/src/graphql/contributions.graphql b/frontend/src/graphql/contributions.graphql
new file mode 100644
index 000000000..c35021fed
--- /dev/null
+++ b/frontend/src/graphql/contributions.graphql
@@ -0,0 +1,59 @@
+
+fragment contributionFields on Contribution {
+  id
+  amount
+  memo
+  createdAt
+  contributionDate
+  confirmedAt
+  confirmedBy
+  status
+  messagesCount
+  deniedAt
+  deniedBy
+  updatedBy
+  updatedAt
+}
+
+fragment contributionMessageFields on ContributionMessage {
+  id
+  message
+  createdAt
+  updatedAt
+  type
+  userFirstName
+  userLastName
+  userId
+}
+
+query listContributions ($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC) {
+  listContributions(currentPage: $currentPage, pageSize: $pageSize, order: $order) {
+    contributionCount
+    contributionList {
+      ...contributionFields
+      deletedAt
+      moderatorId
+      messages(pagination: { currentPage: 1, pageSize: 10, order: DESC }) {
+        ...contributionMessageFields
+      }
+    }
+  }
+}
+
+query countContributionsInProgress {
+  countContributionsInProgress
+}
+
+
+query listAllContributions ($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC) {
+  listAllContributions(currentPage: $currentPage, pageSize: $pageSize, order: $order) {
+    contributionCount
+    contributionList {
+      firstName
+      lastName
+      ...contributionFields
+    }
+  }
+}
+
+
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index edd034344..9fd971661 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -188,18 +188,8 @@ export const listContributionLinks = gql`
 `
 
 export const listContributions = gql`
-  query (
-    $currentPage: Int = 1
-    $pageSize: Int = 25
-    $order: Order = DESC
-    $statusFilter: [ContributionStatus!]
-  ) {
-    listContributions(
-      currentPage: $currentPage
-      pageSize: $pageSize
-      order: $order
-      statusFilter: $statusFilter
-    ) {
+  query ($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC) {
+    listContributions(currentPage: $currentPage, pageSize: $pageSize, order: $order) {
       contributionCount
       contributionList {
         id
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index 7fe55bd99..fe5e260a7 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -2,7 +2,7 @@
   <div class="community-page">
     <div>
       <BTabs :model-value="tabIndex" no-nav-style borderless align="center">
-        <BTab no-body>
+        <BTab no-body lazy>
           <open-creations-amount
             :minimal-date="minimalDate"
             :max-gdd-last-month="maxForMonths[0]"
@@ -18,39 +18,18 @@
             @update-contribution="handleUpdateContribution"
           />
         </BTab>
-        <BTab no-body>
-          <div v-if="items.length === 0">
-            {{ $t('contribution.noContributions.myContributions') }}
-          </div>
-          <div v-else>
-            <contribution-list
-              :items="items"
-              :contribution-count="contributionCount"
-              :show-pagination="true"
-              :page-size="pageSize"
-              @close-all-open-collapse="closeAllOpenCollapse"
-              @update-list-contributions="handleUpdateListContributions"
-              @update-contribution-form="handleUpdateContributionForm"
-              @delete-contribution="handleDeleteContribution"
-              @update-status="updateStatus"
-            />
-          </div>
+        <BTab no-body lazy>
+          <contribution-list
+            :empty-text="$t('contribution.noContributions.myContributions')"
+            @update-contribution-form="handleUpdateContributionForm"
+            @delete-contribution="handleDeleteContribution"
+          />
         </BTab>
-        <BTab no-body>
-          <div v-if="itemsAll.length === 0">
-            {{ $t('contribution.noContributions.allContributions') }}
-          </div>
-          <div v-else>
-            <contribution-list
-              :items="itemsAll"
-              :contribution-count="contributionCountAll"
-              :show-pagination="true"
-              :page-size="pageSizeAll"
-              :all-contribution="true"
-              @update-list-contributions="handleUpdateListAllContributions"
-              @update-contribution-form="handleUpdateContributionForm"
-            />
-          </div>
+        <BTab no-body lazy>
+          <contribution-list
+            :empty-text="$t('contribution.noContributions.allContributions')"
+            :all-contribution="true"
+          />
         </BTab>
       </BTabs>
     </div>
@@ -65,7 +44,8 @@ import OpenCreationsAmount from '@/components/Contributions/OpenCreationsAmount'
 import ContributionForm from '@/components/Contributions/ContributionForm'
 import ContributionList from '@/components/Contributions/ContributionList'
 import { createContribution, updateContribution, deleteContribution } from '@/graphql/mutations'
-import { listContributions, listAllContributions, openCreations } from '@/graphql/queries'
+import { openCreations } from '@/graphql/queries'
+import { countContributionsInProgress } from '@/graphql/contributions.graphql'
 import { useAppToast } from '@/composables/useToast'
 import { useI18n } from 'vue-i18n'
 import { GDD_PER_HOUR } from '../constants'
@@ -130,51 +110,30 @@ const { onResult: onOpenCreationsResult, refetch: refetchOpenCreations } = useQu
     fetchPolicy: 'network-only',
   },
 )
-const { onResult: onListAllContributionsResult, refetch: refetchAllContributions } = useQuery(
-  listAllContributions,
-  () => ({
-    currentPage: currentPageAll.value,
-    pageSize: pageSizeAll.value,
-  }),
-  { fetchPolicy: 'no-cache' },
-)
-const { onResult: onListContributionsResult, refetch: refetchContributions } = useQuery(
-  listContributions,
-  () => ({
-    currentPage: currentPage.value,
-    pageSize: pageSize.value,
-  }),
-  { fetchPolicy: 'network-only' },
-)
 
 const { mutate: createContributionMutation } = useMutation(createContribution)
 const { mutate: updateContributionMutation } = useMutation(updateContribution)
 const { mutate: deleteContributionMutation } = useMutation(deleteContribution)
 
+const { onResult: handleInProgressContributionFound } = useQuery(
+  countContributionsInProgress,
+  {},
+  {
+    fetchPolicy: 'network-only',
+  },
+)
+
 onOpenCreationsResult(({ data }) => {
   if (data) {
     openCreationsData.value = data.openCreations
   }
 })
 
-onListAllContributionsResult(({ data }) => {
+// jump to my contributions if in progress contribution found
+handleInProgressContributionFound(({ data }) => {
   if (data) {
-    contributionCountAll.value = data.listAllContributions.contributionCount
-    itemsAll.value.length = 0
-    data.listAllContributions.contributionList.forEach((entry) => {
-      itemsAll.value.push(entry)
-    })
-  }
-})
-
-onListContributionsResult(({ data }) => {
-  if (data) {
-    contributionCount.value = data.listContributions.contributionCount
-    items.value.length = 0
-    data.listContributions.contributionList.forEach((entry) => {
-      items.value.push({ ...entry })
-    })
-    if (items.value.find((item) => item.status === 'IN_PROGRESS')) {
+    const count = data.countContributionsInProgress
+    if (count > 0) {
       tabIndex.value = 1
       if (route.params.tab !== 'contributions') {
         router.push({ params: { tab: 'contributions' } })
@@ -187,19 +146,11 @@ onListContributionsResult(({ data }) => {
 const updateTabIndex = () => {
   const index = COMMUNITY_TABS.indexOf(route.params.tab)
   tabIndex.value = index > -1 ? index : 0
-  closeAllOpenCollapse()
-}
-
-const closeAllOpenCollapse = () => {
-  document.querySelectorAll('.collapse.show').forEach((el) => {
-    el.classList.remove('show')
-  })
 }
 
 const refetchData = () => {
-  refetchAllContributions()
-  refetchContributions()
   refetchOpenCreations()
+  handleInProgressContributionFound()
 }
 
 const handleSaveContribution = async (data) => {
@@ -243,21 +194,6 @@ const handleDeleteContribution = async (data) => {
   }
 }
 
-const handleUpdateListAllContributions = (pagination) => {
-  currentPageAll.value = pagination.currentPage
-  pageSizeAll.value = pagination.pageSize
-  refetchAllContributions({
-    currentPage: currentPage.value,
-    pageSize: pageSize.value,
-  })
-}
-
-const handleUpdateListContributions = (pagination) => {
-  currentPage.value = pagination.currentPage
-  pageSize.value = pagination.pageSize
-  refetchContributions()
-}
-
 const handleUpdateContributionForm = (item) => {
   form.value = {
     id: item.id,
@@ -272,13 +208,6 @@ const handleUpdateContributionForm = (item) => {
   router.push({ params: { tab: 'contribute' } })
 }
 
-const updateStatus = (id) => {
-  const item = items.value.find((item) => item.id === id)
-  if (item) {
-    item.status = 'PENDING'
-  }
-}
-
 watch(() => route.params.tab, updateTabIndex)
 
 onMounted(updateTabIndex)

From c4238a897c9db081dd90f0a141c686f1f0c10e02 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Tue, 13 May 2025 09:16:53 +0200
Subject: [PATCH 04/36] refactor contributions in frontend

---
 .../components/CreationTransactionList.vue    |   4 +-
 .../graphql/adminListContributions.graphql    |   4 +-
 admin/src/pages/CreationConfirm.vue           |   4 +-
 backend/src/graphql/arg/ContributionArgs.ts   |   2 +-
 backend/src/graphql/model/Contribution.ts     |  61 +-----
 .../graphql/model/UnconfirmedContribution.ts  |  56 +++---
 .../graphql/resolver/ContributionResolver.ts  |  47 ++---
 .../src/graphql/resolver/util/creations.ts    |   1 +
 .../resolver/util/loadContributions.ts        |  12 +-
 .../UnconfirmedContributionUser.role.ts       |   4 +-
 .../ContributionMessagesFormular.vue          |   7 +-
 .../ContributionMessagesList.vue              |   2 +-
 .../ContributionMessagesListItem.vue          |  13 --
 .../Contributions/ContributionCreate.vue      |  56 ++++++
 .../Contributions/ContributionEdit.vue        |  56 ++++++
 .../Contributions/ContributionForm.vue        | 113 ++++++-----
 .../Contributions/ContributionList.spec.js    |  74 ++++++-
 .../Contributions/ContributionList.vue        |  71 ++++---
 .../ContributionListItem.spec.js              |  13 +-
 .../Contributions/ContributionListItem.vue    | 184 ++++++++----------
 .../src/components/Inputs/InputAmount.vue     |   2 -
 .../src/components/Inputs/LabeledInput.vue    |   8 +-
 frontend/src/graphql/contributions.graphql    |  80 ++++++--
 frontend/src/graphql/mutations.js             |  30 ---
 frontend/src/graphql/queries.js               |  60 ------
 frontend/src/graphql/user.graphql             |   6 +
 frontend/src/pages/Community.spec.js          |  64 +++---
 frontend/src/pages/Community.vue              | 154 ++-------------
 28 files changed, 591 insertions(+), 597 deletions(-)
 create mode 100644 frontend/src/components/Contributions/ContributionCreate.vue
 create mode 100644 frontend/src/components/Contributions/ContributionEdit.vue
 create mode 100644 frontend/src/graphql/user.graphql

diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index 09dd41901..7cc8acbcb 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -34,8 +34,8 @@
           {{ t('help.transactionlist.confirmed') }}
         </div>
         <div>
-          {{ t('transactionlist.status') }} {{ t('math.equals') }}
-          {{ t('help.transactionlist.status') }}
+          {{ t('transactionlist.contributionStatus') }} {{ t('math.equals') }}
+          {{ t('help.transactionlist.contributionStatus') }}
         </div>
       </BCollapse>
     </div>
diff --git a/admin/src/graphql/adminListContributions.graphql b/admin/src/graphql/adminListContributions.graphql
index dde9750af..57c26c10a 100644
--- a/admin/src/graphql/adminListContributions.graphql
+++ b/admin/src/graphql/adminListContributions.graphql
@@ -25,7 +25,7 @@ query adminListContributions(
       confirmedBy
       updatedAt
       updatedBy
-      status
+      contributionStatus
       messagesCount
       deniedAt
       deniedBy
@@ -54,7 +54,7 @@ query adminListContributionsShort(
       createdAt
       contributionDate
       confirmedAt
-      status
+      contributionStatus
     }
   }
 }
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 9a70c188d..74588f9f4 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -224,7 +224,7 @@ const fields = computed(
       ],
       // all contributions
       [
-        { key: 'status', label: t('status') },
+        { key: 'contributionStatus', label: t('status') },
         baseFields.firstName,
         baseFields.lastName,
         baseFields.amount,
@@ -425,7 +425,7 @@ const updateStatus = (id) => {
   const target = items.value.find((obj) => obj.id === id)
   if (target) {
     target.messagesCount++
-    target.status = 'IN_PROGRESS'
+    target.contributionStatus = 'IN_PROGRESS'
   }
 }
 </script>
diff --git a/backend/src/graphql/arg/ContributionArgs.ts b/backend/src/graphql/arg/ContributionArgs.ts
index 9f3951ac2..3a505a0c4 100644
--- a/backend/src/graphql/arg/ContributionArgs.ts
+++ b/backend/src/graphql/arg/ContributionArgs.ts
@@ -20,5 +20,5 @@ export class ContributionArgs {
 
   @Field(() => String)
   @isValidDateString()
-  creationDate: string
+  contributionDate: string
 }
diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index 21f47bf2d..209ebf4f8 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -1,64 +1,27 @@
 import { Contribution as dbContribution } from '@entity/Contribution'
-import { ContributionMessage as dbContributionMessage } from '@entity/ContributionMessage'
-import { Decimal } from 'decimal.js-light'
+
 import { Field, Int, ObjectType } from 'type-graphql'
 
-import { ContributionMessage } from './ContributionMessage'
-import { User } from './User'
+import { UnconfirmedContribution } from './UnconfirmedContribution'
 
 @ObjectType()
-export class Contribution {
+export class Contribution extends UnconfirmedContribution {
   constructor(contribution: dbContribution) {
-    const user = contribution.user
-    this.id = contribution.id
-    this.firstName = user?.firstName ?? null
-    this.lastName = user?.lastName ?? null
-    this.amount = contribution.amount
-    this.memo = contribution.memo
+    super(contribution)
     this.createdAt = contribution.createdAt
     this.confirmedAt = contribution.confirmedAt
     this.confirmedBy = contribution.confirmedBy
     this.contributionDate = contribution.contributionDate
-    this.status = contribution.contributionStatus
-    this.messagesCount = contribution.messages?.length ?? 0
+    
     this.deniedAt = contribution.deniedAt
     this.deniedBy = contribution.deniedBy
     this.deletedAt = contribution.deletedAt
     this.deletedBy = contribution.deletedBy
     this.updatedAt = contribution.updatedAt
     this.updatedBy = contribution.updatedBy
-    this.moderatorId = contribution.moderatorId
-    this.userId = contribution.userId
     this.resubmissionAt = contribution.resubmissionAt
-    this.user = user ? new User(user) : null
-    this.messages = contribution.messages
-      ? contribution.messages.map(
-          (message: dbContributionMessage) => new ContributionMessage(message),
-        )
-      : null
   }
 
-  @Field(() => Int)
-  id: number
-
-  @Field(() => Int, { nullable: true })
-  userId: number | null
-
-  @Field(() => User, { nullable: true })
-  user: User | null
-
-  @Field(() => String, { nullable: true })
-  firstName: string | null
-
-  @Field(() => String, { nullable: true })
-  lastName: string | null
-
-  @Field(() => Decimal)
-  amount: Decimal
-
-  @Field(() => String)
-  memo: string
-
   @Field(() => Date)
   createdAt: Date
 
@@ -87,19 +50,7 @@ export class Contribution {
   updatedBy: number | null
 
   @Field(() => Date)
-  contributionDate: Date
-
-  @Field(() => Int)
-  messagesCount: number
-
-  @Field(() => [ContributionMessage], { nullable: true })
-  messages: ContributionMessage[] | null
-
-  @Field(() => String)
-  status: string
-
-  @Field(() => Int, { nullable: true })
-  moderatorId: number | null
+  contributionDate: Date 
 
   @Field(() => Date, { nullable: true })
   resubmissionAt: Date | null
diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts
index ad2d914c1..e3d0e3152 100644
--- a/backend/src/graphql/model/UnconfirmedContribution.ts
+++ b/backend/src/graphql/model/UnconfirmedContribution.ts
@@ -1,42 +1,44 @@
 import { Contribution } from '@entity/Contribution'
-import { User } from '@entity/User'
+import { ContributionMessage as dbContributionMessage } from '@entity/ContributionMessage'
+
 import { Decimal } from 'decimal.js-light'
 import { Field, Int, ObjectType } from 'type-graphql'
 
+import { ContributionMessage } from './ContributionMessage'
+import { User } from './User' 
+
 @ObjectType()
 export class UnconfirmedContribution {
-  constructor(contribution: Contribution, user: User | undefined, creations: Decimal[]) {
+  constructor(contribution: Contribution) {
+    const user = contribution.user
     this.id = contribution.id
     this.userId = contribution.userId
     this.amount = contribution.amount
     this.memo = contribution.memo
-    this.date = contribution.contributionDate
-    this.firstName = user ? user.firstName : ''
-    this.lastName = user ? user.lastName : ''
-    this.email = user ? user.emailContact.email : ''
-    this.moderator = contribution.moderatorId
-    this.creation = creations
-    this.status = contribution.contributionStatus
-    this.messageCount = contribution.messages ? contribution.messages.length : 0
-  }
+    this.contributionDate = contribution.contributionDate
+    this.user = user ? new User(user) : null
+    this.moderatorId = contribution.moderatorId
+    this.contributionStatus = contribution.contributionStatus
+    this.messagesCount = contribution.messages ? contribution.messages.length : 0
 
-  @Field(() => String)
-  firstName: string
+    this.messages = contribution.messages
+      ? contribution.messages.map(
+          (message: dbContributionMessage) => new ContributionMessage(message),
+        )
+      : null
+  }
 
   @Field(() => Int)
   id: number
 
-  @Field(() => String)
-  lastName: string
+  @Field(() => Int, { nullable: true })
+  userId: number | null
 
-  @Field(() => Int)
-  userId: number
-
-  @Field(() => String)
-  email: string
+  @Field(() => User, { nullable: true })
+  user: User | null
 
   @Field(() => Date)
-  date: Date
+  contributionDate: Date
 
   @Field(() => String)
   memo: string
@@ -45,14 +47,14 @@ export class UnconfirmedContribution {
   amount: Decimal
 
   @Field(() => Int, { nullable: true })
-  moderator: number | null
-
-  @Field(() => [Decimal])
-  creation: Decimal[]
+  moderatorId: number | null
 
   @Field(() => String)
-  status: string
+  contributionStatus: string
 
   @Field(() => Int)
-  messageCount: number
+  messagesCount: number
+
+  @Field(() => [ContributionMessage], { nullable: true })
+  messages: ContributionMessage[] | null
 }
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 365c52f5d..8d77f462d 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -85,7 +85,7 @@ export class ContributionResolver {
   @Authorized([RIGHTS.CREATE_CONTRIBUTION])
   @Mutation(() => UnconfirmedContribution)
   async createContribution(
-    @Args() { amount, memo, creationDate }: ContributionArgs,
+    @Args() { amount, memo, contributionDate }: ContributionArgs,
     @Ctx() context: Context,
   ): Promise<UnconfirmedContribution> {
     const clientTimezoneOffset = getClientTimezoneOffset(context)
@@ -93,14 +93,14 @@ export class ContributionResolver {
     const user = getUser(context)
     const creations = await getUserCreation(user.id, clientTimezoneOffset)
     logger.trace('creations', creations)
-    const creationDateObj = new Date(creationDate)
-    validateContribution(creations, amount, creationDateObj, clientTimezoneOffset)
+    const contributionDateObj = new Date(contributionDate)
+    validateContribution(creations, amount, contributionDateObj, clientTimezoneOffset)
 
     const contribution = DbContribution.create()
     contribution.userId = user.id
     contribution.amount = amount
     contribution.createdAt = new Date()
-    contribution.contributionDate = creationDateObj
+    contribution.contributionDate = contributionDateObj
     contribution.memo = memo
     contribution.contributionType = ContributionType.USER
     contribution.contributionStatus = ContributionStatus.PENDING
@@ -109,7 +109,7 @@ export class ContributionResolver {
     await DbContribution.save(contribution)
     await EVENT_CONTRIBUTION_CREATE(user, contribution, amount)
 
-    return new UnconfirmedContribution(contribution, user, creations)
+    return new UnconfirmedContribution(contribution)
   }
 
   @Authorized([RIGHTS.DELETE_CONTRIBUTION])
@@ -144,12 +144,12 @@ export class ContributionResolver {
   @Query(() => ContributionListResult)
   async listContributions(
     @Ctx() context: Context,
-    @Args()
-    paginated: Paginated,
+    @Arg('pagination') pagination: Paginated,
+    @Arg('messagePagination') messagePagination: Paginated,
   ): Promise<ContributionListResult> {
     const user = getUser(context)
-    const [dbContributions, count] = await loadUserContributions(user.id, paginated)
-
+    const [dbContributions, count] = await loadUserContributions(user.id, pagination, messagePagination)
+    
     // show contributions in progress first
     const inProgressContributions = dbContributions.filter(
       (contribution) => contribution.contributionStatus === ContributionStatus.IN_PROGRESS,
@@ -163,10 +163,10 @@ export class ContributionResolver {
       [...inProgressContributions, ...notInProgressContributions].map((contribution) => {
         // we currently expect not much contribution messages for needing pagination
         // but if we get more than expected, we should get warned
-        if ((contribution.messages?.length || 0) > 10) {
+        if ((contribution.messages?.length || 0) > messagePagination.pageSize) {
           logger.warn('more contribution messages as expected, consider pagination', {
             contributionId: contribution.id,
-            expected: 10,
+            expected: messagePagination.pageSize,
             actual: contribution.messages?.length || 0,
           })
         }
@@ -191,10 +191,9 @@ export class ContributionResolver {
   @Authorized([RIGHTS.LIST_ALL_CONTRIBUTIONS])
   @Query(() => ContributionListResult)
   async listAllContributions(
-    @Args()
-    paginated: Paginated,
+    @Arg('pagination') pagination: Paginated,
   ): Promise<ContributionListResult> {
-    const [dbContributions, count] = await loadAllContributions(paginated)
+    const [dbContributions, count] = await loadAllContributions(pagination)
 
     return new ContributionListResult(
       count,
@@ -215,8 +214,7 @@ export class ContributionResolver {
       contributionArgs,
       context,
     )
-    const { contribution, contributionMessage, availableCreationSums } =
-      await updateUnconfirmedContributionContext.run()
+    const { contribution, contributionMessage } = await updateUnconfirmedContributionContext.run()
     await getConnection().transaction(async (transactionalEntityManager: EntityManager) => {
       await transactionalEntityManager.save(contribution)
       if (contributionMessage) {
@@ -226,7 +224,7 @@ export class ContributionResolver {
     const user = getUser(context)
     await EVENT_CONTRIBUTION_UPDATE(user, contribution, contributionArgs.amount)
 
-    return new UnconfirmedContribution(contribution, user, availableCreationSums)
+    return new UnconfirmedContribution(contribution)
   }
 
   @Authorized([RIGHTS.ADMIN_CREATE_CONTRIBUTION])
@@ -629,25 +627,28 @@ export class ContributionResolver {
 
   // Field resolvers
   @Authorized([RIGHTS.USER])
-  @FieldResolver(() => User)
+  @FieldResolver(() => User, { nullable: true })
   async user(
     @Root() contribution: DbContribution,
     @Info() info: GraphQLResolveInfo,
-  ): Promise<User> {
-    let user = contribution.user
+  ): Promise<User | null> {
+    let user: DbUser | null = contribution.user
     if (!user) {
       const queryBuilder = DbUser.createQueryBuilder('user')
       queryBuilder.where('user.id = :userId', { userId: contribution.userId })
       extractGraphQLFieldsForSelect(info, queryBuilder, 'user')
-      user = await queryBuilder.getOneOrFail()
+      user = await queryBuilder.getOne()
     }
-    return new User(user)
+    if (user) {
+      return new User(user)
+    }
+    return null
   }
 
   @Authorized([RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES])
   @FieldResolver(() => [ContributionMessage], { nullable: true })
   async messages(
-    @Root() contribution: Contribution,
+    @Root() contribution: UnconfirmedContribution,
     @Arg('pagination', () => Paginated) pagination: Paginated,
   ): Promise<ContributionMessage[] | null> {
     if (contribution.messagesCount === 0) {
diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts
index 694d3a867..719c86b9b 100644
--- a/backend/src/graphql/resolver/util/creations.ts
+++ b/backend/src/graphql/resolver/util/creations.ts
@@ -73,6 +73,7 @@ export const getUserCreations = async (
     await sumAmountContributionPerUserAndLast3MonthQuery.getRawMany()
 
   logger.trace(sumAmountContributionPerUserAndLast3Month)
+  console.log(JSON.stringify(sumAmountContributionPerUserAndLast3Month, null, 2))
 
   await queryRunner.release()
 
diff --git a/backend/src/graphql/resolver/util/loadContributions.ts b/backend/src/graphql/resolver/util/loadContributions.ts
index 18f4a4fe6..2cc44bc47 100644
--- a/backend/src/graphql/resolver/util/loadContributions.ts
+++ b/backend/src/graphql/resolver/util/loadContributions.ts
@@ -3,9 +3,8 @@ import { FindManyOptions } from '@dbTools/typeorm'
 import { Contribution as DbContribution } from '@entity/Contribution'
 
 function buildBaseOptions(paginated: Paginated): FindManyOptions<DbContribution> {
-  const { order, currentPage, pageSize } = paginated
+  const { currentPage, pageSize } = paginated
   return {
-    order: { createdAt: order, id: order },
     skip: (currentPage - 1) * pageSize,
     take: pageSize,
   }
@@ -19,10 +18,15 @@ function buildBaseOptions(paginated: Paginated): FindManyOptions<DbContribution>
 export const loadUserContributions = async (
   userId: number,
   paginated: Paginated,
+  messagePagination: Paginated,
 ): Promise<[DbContribution[], number]> => {
+  const { order } = paginated
+  const { order: messageOrder } = messagePagination
   return DbContribution.findAndCount({
     where: { userId },
+    withDeleted: true,
     relations: { messages: { user: true } },
+    order: { createdAt: order, id: order, messages: { createdAt: messageOrder } },
     ...buildBaseOptions(paginated),
   })
 }
@@ -34,8 +38,10 @@ export const loadUserContributions = async (
 export const loadAllContributions = async (
   paginated: Paginated,
 ): Promise<[DbContribution[], number]> => {
+  const { order } = paginated
   return DbContribution.findAndCount({
-    relations: { user: true },
+    relations: { user: { emailContact: true } },
+    order: { createdAt: order, id: order},
     ...buildBaseOptions(paginated),
   })
 }
diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts
index fe7d55d80..26b2be872 100644
--- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts
+++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts
@@ -18,14 +18,14 @@ export class UnconfirmedContributionUserRole extends AbstractUnconfirmedContribu
     contribution: Contribution,
     private updateData: ContributionArgs,
   ) {
-    super(contribution, updateData.amount, new Date(updateData.creationDate))
+    super(contribution, updateData.amount, new Date(updateData.contributionDate))
     logger.debug('use UnconfirmedContributionUserRole')
   }
 
   protected update(): void {
     this.self.amount = this.updateData.amount
     this.self.memo = this.updateData.memo
-    this.self.contributionDate = new Date(this.updateData.creationDate)
+    this.self.contributionDate = new Date(this.updateData.contributionDate)
     this.self.contributionStatus = ContributionStatus.PENDING
     this.self.updatedAt = new Date()
     // null because updated by user them self
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 634823168..6738d84a9 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -39,11 +39,7 @@ const props = defineProps({
   },
 })
 
-const emit = defineEmits([
-  'get-list-contribution-messages',
-  'update-status',
-  'add-contribution-message',
-])
+const emit = defineEmits(['get-list-contribution-messages', 'add-contribution-message'])
 
 const { t } = useI18n()
 const { toastSuccess, toastError } = useAppToast()
@@ -68,7 +64,6 @@ async function onSubmit() {
 
     // emit('get-list-contribution-messages', false)
     formText.value = ''
-    emit('update-status', props.contributionId)
     emit('add-contribution-message', result.data.createContributionMessage)
     toastSuccess(t('message.reply'))
   } catch (error) {
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index 1406ce744..288e1ad7f 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -14,7 +14,7 @@
     </div>
 
     <div class="text-center pointer clearboth">
-      <BButton variant="outline-primary" block @click="$emit('close-all-open-collapse')">
+      <BButton variant="outline-primary" block @click="$emit('close-messages-list')">
         <IBiArrowUpShort />
         {{ $t('form.close') }}
       </BButton>
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
index 108079704..c1712bbf0 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -38,12 +38,6 @@
           <parse-message v-bind="message" data-test="message"></parse-message>
         </BCol>
         <BCol cols="2">
-          <!--          <avatar-->
-          <!--            class="vue3-avatar"-->
-          <!--            :name="storeName.username"-->
-          <!--            :initials="storeName.initials"-->
-          <!--            :border="false"-->
-          <!--          />-->
           <app-avatar
             class="vue3-avatar"
             :name="storeName.username"
@@ -55,12 +49,6 @@
     <div v-else>
       <BRow class="mb-3 p-2 is-moderator">
         <BCol cols="2">
-          <!--          <avatar-->
-          <!--            class="vue3-avatar"-->
-          <!--            :name="moderationName.username"-->
-          <!--            :initials="moderationName.initials"-->
-          <!--            :border="false"-->
-          <!--          />-->
           <app-avatar :name="moderationName.username" :initials="moderationName.initials" />
         </BCol>
         <BCol cols="10">
@@ -70,7 +58,6 @@
               {{ $t('community.moderator') }}
             </span>
           </div>
-
           <div class="small" data-test="date">{{ $d(new Date(message.createdAt), 'short') }}</div>
           <parse-message v-bind="message" data-test="message"></parse-message>
         </BCol>
diff --git a/frontend/src/components/Contributions/ContributionCreate.vue b/frontend/src/components/Contributions/ContributionCreate.vue
new file mode 100644
index 000000000..cd67622e4
--- /dev/null
+++ b/frontend/src/components/Contributions/ContributionCreate.vue
@@ -0,0 +1,56 @@
+<template>
+  <contribution-form
+    v-if="maxForMonths"
+    :model-value="form"
+    :max-gdd-last-month="parseFloat(maxForMonths.openCreations[1].amount)"
+    :max-gdd-this-month="parseFloat(maxForMonths.openCreations[2].amount)"
+    @upsert-contribution="handleCreateContribution"
+    @reset-form="resetForm"
+  />
+</template>
+
+<script setup>
+import ContributionForm from '@/components/Contributions/ContributionForm.vue'
+import { GDD_PER_HOUR } from '@/constants'
+import { useQuery, useMutation } from '@vue/apollo-composable'
+import { openCreationsAmounts, createContribution } from '@/graphql/contributions.graphql'
+import { useAppToast } from '@/composables/useToast'
+import { useI18n } from 'vue-i18n'
+import { ref } from 'vue'
+
+const { toastError, toastSuccess } = useAppToast()
+const { t } = useI18n()
+
+const { result: maxForMonths, refetch } = useQuery(
+  openCreationsAmounts,
+  {},
+  { fetchPolicy: 'no-cache' },
+)
+const { mutate: createContributionMutation } = useMutation(createContribution)
+
+const form = ref(emptyForm())
+
+function emptyForm() {
+  return {
+    contributionDate: undefined,
+    memo: '',
+    hours: '',
+    amount: GDD_PER_HOUR,
+  }
+}
+
+async function handleCreateContribution(contribution) {
+  try {
+    await createContributionMutation({ ...contribution })
+    toastSuccess(t('contribution.submitted'))
+    resetForm()
+    refetch()
+  } catch (err) {
+    toastError(err.message)
+  }
+}
+
+function resetForm() {
+  form.value = emptyForm()
+}
+</script>
diff --git a/frontend/src/components/Contributions/ContributionEdit.vue b/frontend/src/components/Contributions/ContributionEdit.vue
new file mode 100644
index 000000000..ed2b7c012
--- /dev/null
+++ b/frontend/src/components/Contributions/ContributionEdit.vue
@@ -0,0 +1,56 @@
+<template>
+  <contribution-form
+    :model-value="modelValue"
+    :max-gdd-last-month="maxForMonths[0]"
+    :max-gdd-this-month="maxForMonths[1]"
+    @upsert-contribution="handleUpdateContribution"
+    @reset-form="emit('reset-form')"
+  />
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import ContributionForm from '@/components/Contributions/ContributionForm.vue'
+import { useQuery, useMutation } from '@vue/apollo-composable'
+import { openCreations, updateContribution } from '@/graphql/contributions.graphql'
+import { useAppToast } from '@/composables/useToast'
+import { useI18n } from 'vue-i18n'
+
+const { toastError, toastSuccess } = useAppToast()
+const { t } = useI18n()
+
+const emit = defineEmits(['contribution-updated', 'reset-form'])
+
+const props = defineProps({
+  modelValue: { type: Object, required: true },
+})
+
+const { result: openCreationsResult } = useQuery(openCreations, {}, { fetchPolicy: 'no-cache' })
+const { mutate: updateContributionMutation } = useMutation(updateContribution)
+
+const maxForMonths = computed(() => {
+  const originalDate = new Date(props.modelValue.contributionDate)
+  if (openCreationsResult.value && openCreationsResult.value.openCreations.length) {
+    return openCreationsResult.value.openCreations.slice(1).map((creation) => {
+      if (
+        creation.year === originalDate.getFullYear() &&
+        creation.month === originalDate.getMonth()
+      ) {
+        return parseFloat(creation.amount) + parseFloat(props.modelValue.amount)
+      }
+      return parseFloat(creation.amount)
+    })
+  }
+  return [0, 0]
+})
+
+async function handleUpdateContribution(contribution) {
+  try {
+    await updateContributionMutation({ contributionId: props.modelValue.id, ...contribution })
+    toastSuccess(t('contribution.updated'))
+    emit('contribution-updated')
+  } catch (err) {
+    toastError(err.message)
+  }
+}
+</script>
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 19540c514..18d28c0f5 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -1,4 +1,10 @@
 <template>
+  <open-creations-amount
+    :minimal-date="minimalDate"
+    :max-gdd-last-month="maxGddLastMonth"
+    :max-gdd-this-month="maxGddThisMonth"
+  />
+  <div class="mb-3"></div>
   <div class="contribution-form">
     <BForm
       class="form-style p-3 bg-white app-box-shadow gradido-border-radius"
@@ -6,13 +12,13 @@
     >
       <ValidatedInput
         id="contribution-date"
-        :model-value="date"
-        name="date"
+        :model-value="form.contributionDate"
+        name="contributionDate"
         :label="$t('contribution.selectDate')"
         :no-flip="true"
         class="mb-4 bg-248"
         type="date"
-        :rules="validationSchema.fields.date"
+        :rules="validationSchema.fields.contributionDate"
         @update:model-value="updateField"
       />
       <div v-if="noOpenCreation" class="p-3" data-test="contribution-message">
@@ -21,7 +27,7 @@
       <div v-else>
         <ValidatedInput
           id="contribution-memo"
-          :model-value="memo"
+          :model-value="form.memo"
           name="memo"
           :label="$t('contribution.activity')"
           :placeholder="$t('contribution.yourActivity')"
@@ -31,7 +37,7 @@
         />
         <ValidatedInput
           name="hours"
-          :model-value="hours"
+          :model-value="form.hours"
           :label="$t('form.hours')"
           placeholder="0.01"
           step="0.01"
@@ -41,7 +47,7 @@
         />
         <LabeledInput
           id="contribution-amount"
-          :model-value="amount"
+          :model-value="form.amount"
           class="mt-3"
           name="amount"
           :label="$t('form.amount')"
@@ -57,7 +63,7 @@
               type="reset"
               variant="secondary"
               data-test="button-cancel"
-              @click="fullFormReset"
+              @click="emit('reset-form')"
             >
               {{ $t('form.cancel') }}
             </BButton>
@@ -80,7 +86,7 @@
 </template>
 
 <script setup>
-import { reactive, computed, watch } from 'vue'
+import { reactive, computed, watch, ref, onMounted, onUnmounted, toRaw } from 'vue'
 import { useI18n } from 'vue-i18n'
 import ValidatedInput from '@/components/Inputs/ValidatedInput'
 import LabeledInput from '@/components/Inputs/LabeledInput'
@@ -88,35 +94,42 @@ import { memo as memoSchema } from '@/validationSchemas'
 import { object, date as dateSchema, number } from 'yup'
 import { GDD_PER_HOUR } from '../../constants'
 
+const amountToHours = (amount) => parseFloat(amount / GDD_PER_HOUR).toFixed(2)
+const hoursToAmount = (hours) => parseFloat(hours * GDD_PER_HOUR).toFixed(2)
+const entityDataToForm = (entityData) => ({
+  ...entityData,
+  hours: entityData.hours !== undefined ? entityData.hours : amountToHours(entityData.amount),
+  contributionDate: entityData.contributionDate
+    ? new Date(entityData.contributionDate).toISOString().slice(0, 10)
+    : undefined,
+})
+
 const props = defineProps({
   modelValue: { type: Object, required: true },
   maxGddLastMonth: { type: Number, required: true },
   maxGddThisMonth: { type: Number, required: true },
 })
 
-const emit = defineEmits(['update-contribution', 'set-contribution', 'update:modelValue'])
+const emit = defineEmits(['upsert-contribution', 'update:modelValue', 'reset-form'])
 
 const { t } = useI18n()
 
-const form = reactive({ ...props.modelValue })
+const form = reactive(entityDataToForm(props.modelValue))
 
-// update local form if in parent form changed, it is necessary because the community page will reuse this form also for editing existing
-// contributions, and it will reusing a existing instance of this component
-watch(
-  () => props.modelValue,
-  (newValue) => Object.assign(form, newValue),
-)
-
-// use computed to make sure child input update if props from parent from this component change
-const amount = computed(() => form.amount)
-const date = computed(() => form.date)
-const hours = computed(() => form.hours)
-const memo = computed(() => form.memo)
+const now = ref(new Date()) // checked every minute, updated if day, month or year changed
 
 const isThisMonth = computed(() => {
-  const formDate = new Date(form.date)
-  const now = new Date()
-  return formDate.getMonth() === now.getMonth() && formDate.getFullYear() === now.getFullYear()
+  const formContributionDate = new Date(form.contributionDate)
+  return (
+    formContributionDate.getMonth() === now.value.getMonth() &&
+    formContributionDate.getFullYear() === now.value.getFullYear()
+  )
+})
+
+const minimalDate = computed(() => {
+  const minimalDate = new Date(now.value)
+  minimalDate.setMonth(now.value.getMonth() - 1, 1)
+  return minimalDate
 })
 
 // reactive validation schema, because some boundaries depend on form input and existing data
@@ -129,11 +142,10 @@ const validationSchema = computed(() => {
   return object({
     // The date field is required and needs to be a valid date
     // contribution date
-    date: dateSchema()
+    contributionDate: dateSchema()
       .required()
-      .min(new Date(new Date().setMonth(new Date().getMonth() - 1, 1)).toISOString().slice(0, 10)) // min date is first day of last month
-      .max(new Date().toISOString().slice(0, 10))
-      .default(''), // date cannot be in the future
+      .min(minimalDate.value.toISOString().slice(0, 10)) // min date is first day of last month
+      .max(now.value.toISOString().slice(0, 10)), // date cannot be in the future
     memo: memoSchema,
     hours: number()
       .required()
@@ -150,11 +162,12 @@ const validationSchema = computed(() => {
 
 const disabled = computed(() => !validationSchema.value.isValidSync(form))
 
+// decide message if no open creation exists
 const noOpenCreation = computed(() => {
   if (props.maxGddThisMonth <= 0 && props.maxGddLastMonth <= 0) {
     return t('contribution.noOpenCreation.allMonth')
   }
-  if (form.date) {
+  if (form.contributionDate) {
     if (isThisMonth.value && props.maxGddThisMonth <= 0) {
       return t('contribution.noOpenCreation.thisMonth')
     }
@@ -165,36 +178,36 @@ const noOpenCreation = computed(() => {
   return undefined
 })
 
+// make sure, that base date for min and max date is up to date, even if user work at midnight
+onMounted(() => {
+  const interval = setInterval(() => {
+    const localNow = new Date()
+    if (
+      localNow.getDate() !== now.value.getDate() ||
+      localNow.getMonth() !== now.value.getMonth() ||
+      localNow.getFullYear() !== now.value.getFullYear()
+    ) {
+      now.value = localNow
+    }
+  }, 60 * 1000) // check every minute
+
+  onUnmounted(() => {
+    clearInterval(interval)
+  })
+})
+
 const updateField = (newValue, name) => {
   if (typeof name === 'string' && name.length) {
     form[name] = newValue
     if (name === 'hours') {
-      const amount = form.hours ? (form.hours * GDD_PER_HOUR).toFixed(2) : GDD_PER_HOUR
+      const amount = form.hours ? hoursToAmount(form.hours) : GDD_PER_HOUR
       form.amount = amount.toString()
     }
   }
-  emit('update:modelValue', form)
 }
 
 function submit() {
-  const dataToSave = { ...form }
-  let emitOption = 'set-contribution'
-  if (props.modelValue.id) {
-    dataToSave.id = props.modelValue.id
-    emitOption = 'update-contribution'
-  }
-  emit(emitOption, dataToSave)
-  fullFormReset()
-}
-
-function fullFormReset() {
-  emit('update:modelValue', {
-    id: undefined,
-    date: null,
-    memo: '',
-    hours: '',
-    amount: undefined,
-  })
+  emit('upsert-contribution', toRaw(form))
 }
 </script>
 <style>
diff --git a/frontend/src/components/Contributions/ContributionList.spec.js b/frontend/src/components/Contributions/ContributionList.spec.js
index c878e342e..a2a4382dd 100644
--- a/frontend/src/components/Contributions/ContributionList.spec.js
+++ b/frontend/src/components/Contributions/ContributionList.spec.js
@@ -1,7 +1,9 @@
+import { listAllContributions, listContributions } from '@/graphql/contributions.graphql'
+import { useQuery } from '@vue/apollo-composable'
 import { mount } from '@vue/test-utils'
-import { describe, it, expect, beforeEach, vi } from 'vitest'
-import ContributionList from './ContributionList'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { createI18n } from 'vue-i18n'
+import ContributionList from './ContributionList'
 
 const i18n = createI18n({
   legacy: false,
@@ -15,6 +17,10 @@ vi.mock('@/components/Contributions/ContributionListItem.vue', () => ({
   },
 }))
 
+vi.mock('@vue/apollo-composable', () => ({
+  useQuery: vi.fn(),
+}))
+
 describe('ContributionList', () => {
   let wrapper
 
@@ -30,10 +36,38 @@ describe('ContributionList', () => {
     },
   }
 
+  const contributionsList = {
+    contributionCount: 3,
+    contributionList: [
+      {
+        id: 0,
+        date: '07/06/2022',
+        memo: 'Ich habe 10 Stunden die Elbwiesen von Müll befreit.',
+        amount: '200',
+        status: 'IN_PROGRESS',
+      },
+      {
+        id: 1,
+        date: '06/22/2022',
+        memo: 'Ich habe 30 Stunden Frau Müller beim Einkaufen und im Haushalt geholfen.',
+        amount: '600',
+        status: 'CONFIRMED',
+      },
+      {
+        id: 2,
+        date: '05/04/2022',
+        memo: 'Ich habe 50 Stunden den Nachbarkindern bei ihren Hausaufgaben geholfen und Nachhilfeunterricht gegeben.',
+        amount: '1000',
+        status: 'DENIED',
+      },
+    ],
+  }
+
   const propsData = {
     contributionCount: 3,
     showPagination: true,
     pageSize: 25,
+    allContribution: false,
     items: [
       {
         id: 0,
@@ -45,7 +79,7 @@ describe('ContributionList', () => {
       {
         id: 1,
         date: '06/22/2022',
-        memo: 'Ich habe 30 Stunden Frau Müller beim EInkaufen und im Haushalt geholfen.',
+        memo: 'Ich habe 30 Stunden Frau Müller beim Einkaufen und im Haushalt geholfen.',
         amount: '600',
         status: 'CONFIRMED',
       },
@@ -67,10 +101,44 @@ describe('ContributionList', () => {
   }
 
   describe('mount', () => {
+    const mockListContributionsQuery = vi.fn()
+    const mockListAllContributionsQuery = vi.fn()
+
     beforeEach(() => {
+      vi.mocked(useQuery).mockImplementation((query) => {
+        if (query === listContributions) {
+          return { onResult: mockListContributionsQuery, refetch: vi.fn() }
+        }
+        if (query === listAllContributions) {
+          return { onResult: mockListAllContributionsQuery, refetch: vi.fn() }
+        }
+      })
+
       wrapper = mountWrapper()
     })
 
+    afterEach(() => {
+      vi.clearAllMocks()
+    })
+
+    describe('mount as user contributions list', () => {
+      beforeEach(() => {
+        propsData.allContribution = false
+      })
+      it('fetches initial data', () => {
+        expect(mockListContributionsQuery).toHaveBeenCalled()
+      })
+    })
+
+    describe('mount as all contributions list', () => {
+      beforeEach(() => {
+        propsData.allContribution = true
+      })
+      it('fetches initial data', () => {
+        expect(mockListAllContributionsQuery).toHaveBeenCalled()
+      })
+    })
+
     it('has a DIV .contribution-list', () => {
       expect(wrapper.find('div.contribution-list').exists()).toBe(true)
     })
diff --git a/frontend/src/components/Contributions/ContributionList.vue b/frontend/src/components/Contributions/ContributionList.vue
index ec4cc6cbb..be4702a09 100644
--- a/frontend/src/components/Contributions/ContributionList.vue
+++ b/frontend/src/components/Contributions/ContributionList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="items.length === 0 && !loading.value">
+  <div v-if="items.length === 0 && !loading">
     {{ emptyText }}
   </div>
   <div v-else class="contribution-list">
@@ -8,9 +8,10 @@
         v-bind="item"
         :contribution-id="item.id"
         :all-contribution="allContribution"
-        @close-all-open-collapse="$emit('close-all-open-collapse')"
+        :messages-visible="openMessagesListId === item.id"
+        @toggle-messages-visible="toggleMessagesVisible(item.id)"
         @update-contribution-form="updateContributionForm"
-        @delete-contribution="deleteContribution"
+        @contribution-changed="refetch()"
       />
     </div>
     <BPagination
@@ -33,6 +34,8 @@ import ContributionListItem from '@/components/Contributions/ContributionListIte
 import { listContributions, listAllContributions } from '@/graphql/contributions.graphql'
 import { useQuery } from '@vue/apollo-composable'
 import { PAGE_SIZE } from '@/constants'
+import { useAppToast } from '@/composables/useToast'
+import { useI18n } from 'vue-i18n'
 
 const props = defineProps({
   allContribution: {
@@ -47,45 +50,65 @@ const props = defineProps({
   },
 })
 
-const emit = defineEmits([
-  'close-all-open-collapse',
-  'update-contribution-form',
-  'delete-contribution',
-])
+// composables
+const { toastError, toastSuccess } = useAppToast()
+const { t } = useI18n()
 
+// constants
+const pageSize = PAGE_SIZE
+
+// refs
 const currentPage = ref(1)
+const openMessagesListId = ref(null)
 
+// queries
+const { result, loading, refetch } = useQuery(
+  props.allContribution ? listAllContributions : listContributions,
+  () => ({
+    pagination: {
+      currentPage: currentPage.value,
+      pageSize,
+      order: 'DESC',
+    },
+    messagePagination: !props.allContribution
+      ? {
+          currentPage: 1,
+          pageSize: 10,
+          order: 'ASC',
+        }
+      : undefined,
+  }),
+  { fetchPolicy: 'cache-and-network' },
+)
+
+// events
+const emit = defineEmits(['update-contribution-form'])
+
+// computed
 const contributionListResult = computed(() => {
   return props.allContribution
     ? result.value?.listAllContributions
     : result.value?.listContributions
 })
-
 const contributionCount = computed(() => {
   return contributionListResult.value?.contributionCount || 0
 })
 const items = computed(() => {
   return contributionListResult.value?.contributionList || []
 })
-
 const isPaginationVisible = computed(() => {
-  return PAGE_SIZE < contributionCount.value
+  return contributionCount.value > pageSize
 })
+const toggleMessagesVisible = (contributionId) => {
+  if (openMessagesListId.value === contributionId) {
+    openMessagesListId.value = 0
+  } else {
+    openMessagesListId.value = contributionId
+  }
+}
 
-const { result, loading } = useQuery(
-  props.allContribution ? listAllContributions : listContributions,
-  () => ({
-    currentPage: currentPage.value,
-    pageSize: PAGE_SIZE,
-  }),
-  { fetchPolicy: 'cache-and-network' },
-)
-
+// methods
 const updateContributionForm = (item) => {
   emit('update-contribution-form', item)
 }
-
-const deleteContribution = (item) => {
-  emit('delete-contribution', item)
-}
 </script>
diff --git a/frontend/src/components/Contributions/ContributionListItem.spec.js b/frontend/src/components/Contributions/ContributionListItem.spec.js
index 300076060..4c0fa5c79 100644
--- a/frontend/src/components/Contributions/ContributionListItem.spec.js
+++ b/frontend/src/components/Contributions/ContributionListItem.spec.js
@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils'
-import { describe, it, expect, beforeEach, vi } from 'vitest'
-import ContributionListItem from './ContributionListItem'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { createI18n } from 'vue-i18n'
+import ContributionListItem from './ContributionListItem'
 
 const i18n = createI18n({
   legacy: false,
@@ -169,5 +169,14 @@ describe('ContributionListItem', () => {
         expect(wrapper.emitted('close-all-open-collapse')).toBeTruthy()
       })
     })
+    describe('updateStatus', () => {
+      it('updates status of a contribution', async () => {
+        wrapper.vm.items[0] = { id: 1, status: 'IN_PROGRESS' }
+
+        wrapper.vm.updateStatus(1)
+
+        expect(wrapper.vm.items[0].status).toBe('PENDING')
+      })
+    })
   })
 })
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 9c2c164d3..cb2c70f0f 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -6,16 +6,8 @@
     >
       <BRow>
         <BCol cols="3" lg="2" md="2">
-          <!--          <avatar-->
-          <!--            v-if="firstName"-->
-          <!--            :name="username.username"-->
-          <!--            :initials="username.initials"-->
-          <!--            :border="false"-->
-          <!--            color="#fff"-->
-          <!--            class="vue3-avatar fw-bold"-->
-          <!--          />-->
           <app-avatar
-            v-if="firstName"
+            v-if="username.username"
             :name="username.username"
             :initials="username.initials"
             color="#fff"
@@ -26,8 +18,8 @@
           </BAvatar>
         </BCol>
         <BCol>
-          <div v-if="firstName" class="me-3 fw-bold">
-            {{ firstName }} {{ lastName }}
+          <div v-if="username.username" class="me-3 fw-bold">
+            {{ username.username }}
             <variant-icon :icon="icon" :variant="variant" />
           </div>
           <div class="small">
@@ -41,7 +33,7 @@
           <div
             v-if="localStatus === 'IN_PROGRESS' && !allContribution"
             class="text-danger pointer hover-font-bold"
-            @click="visible = !visible"
+            @click="emit('toggle-messages-visible')"
           >
             {{ $t('contribution.alert.answerQuestion') }}
           </div>
@@ -60,8 +52,8 @@
           <div v-else class="fw-bold">{{ $filters.GDD(amount) }}</div>
         </BCol>
         <BCol cols="12" md="1" lg="1" class="text-end align-items-center">
-          <div v-if="messagesCount > 0 && !moderatorId" @click="visible = !visible">
-            <collapse-icon class="text-end" :visible="visible" />
+          <div v-if="messagesCount > 0 && !moderatorId" @click="emit('toggle-messages-visible')">
+            <collapse-icon class="text-end" :visible="messagesVisible" />
           </div>
         </BCol>
       </BRow>
@@ -77,7 +69,7 @@
               !['CONFIRMED', 'DELETED'].includes(localStatus) && !allContribution && !moderatorId
             "
             class="test-delete-contribution pointer me-3"
-            @click="deleteContribution({ id })"
+            @click="processDeleteContribution({ id })"
           >
             <IBiTrash />
 
@@ -92,10 +84,10 @@
             class="test-edit-contribution pointer me-3"
             @click="
               $emit('update-contribution-form', {
-                id: id,
-                contributionDate: contributionDate,
-                memo: memo,
-                amount: amount,
+                id,
+                contributionDate,
+                memo,
+                amount,
               })
             "
           >
@@ -104,20 +96,23 @@
           </div>
         </BCol>
         <BCol cols="6" class="text-center">
-          <div v-if="messagesCount > 0 && !moderatorId" class="pointer" @click="visible = !visible">
+          <div
+            v-if="messagesCount > 0 && !moderatorId"
+            class="pointer"
+            @click="emit('toggle-messages-visible')"
+          >
             <IBiChatDots />
             <div>{{ $t('moderatorChat') }}</div>
           </div>
         </BCol>
       </BRow>
-      <BCollapse :model-value="visible">
+      <BCollapse :model-value="messagesVisible">
         <contribution-messages-list
-          :messages="messagesGet"
+          v-if="messagesCount > 0"
+          :messages="localMessages"
           :status="localStatus"
           :contribution-id="contributionId"
-          @get-list-contribution-messages="getListContributionMessages"
-          @update-status="updateStatus"
-          @close-all-open-collapse="visible = false"
+          @close-messages-list="emit('toggle-messages-visible')"
           @add-contribution-message="addContributionMessage"
         />
       </BCollapse>
@@ -130,12 +125,12 @@
 import { ref, computed, watch } from 'vue'
 import CollapseIcon from '../TransactionRows/CollapseIcon'
 import ContributionMessagesList from '@/components/ContributionMessages/ContributionMessagesList'
-import { listContributionMessages } from '@/graphql/queries'
 import { useAppToast } from '@/composables/useToast'
 import { useI18n } from 'vue-i18n'
-import { useLazyQuery } from '@vue/apollo-composable'
+import { useMutation } from '@vue/apollo-composable'
 import AppAvatar from '@/components/AppAvatar.vue'
 import { GDD_PER_HOUR } from '../../constants'
+import { deleteContribution } from '@/graphql/contributions.graphql'
 
 const props = defineProps({
   id: {
@@ -150,13 +145,10 @@ const props = defineProps({
   messages: {
     type: Array,
     required: false,
+    default: () => [],
   },
-  firstName: {
-    type: String,
-    required: false,
-  },
-  lastName: {
-    type: String,
+  user: {
+    type: Object,
     required: false,
   },
   createdAt: {
@@ -189,7 +181,7 @@ const props = defineProps({
     type: Number,
     required: false,
   },
-  status: {
+  contributionStatus: {
     type: String,
     required: false,
     default: '',
@@ -212,103 +204,89 @@ const props = defineProps({
     required: false,
     default: 0,
   },
+  messagesVisible: {
+    type: Boolean,
+    required: false,
+    default: false,
+  },
 })
 
-const { toastError } = useAppToast()
+const { toastError, toastSuccess } = useAppToast()
 const { t } = useI18n()
 
-const messagesGet = ref([])
-const visible = ref(false)
-const localStatus = ref(props.status)
+const { mutate: deleteContributionMutation } = useMutation(deleteContribution)
 
+const localMessages = ref([])
+const localStatus = ref(props.contributionStatus)
+
+// if parent reload messages, update local messages copy
 watch(
   () => props.messages,
   () => {
-    messagesGet.value = props.messages
+    if (props.messages?.length > 0) {
+      localMessages.value = [...props.messages]
+    }
   },
-  // parent is loading messages already
-  { immediate: false },
+  { immediate: true },
 )
 
+const statusMapping = {
+  CONFIRMED: { variant: 'success', icon: 'check' },
+  DELETED: { variant: 'danger', icon: 'trash' },
+  DENIED: { variant: 'warning', icon: 'x-circle' },
+  IN_PROGRESS: { variant: '205', icon: 'question' },
+  default: { variant: 'primary', icon: 'bell-fill' },
+}
+
 const variant = computed(() => {
-  if (props.deletedAt) return 'danger'
-  if (props.deniedAt) return 'warning'
-  if (props.confirmedAt) return 'success'
-  if (props.status === 'IN_PROGRESS') return '205'
-  return 'primary'
+  return (statusMapping[localStatus.value] || statusMapping.default).variant
 })
 
 const icon = computed(() => {
-  if (props.deletedAt) return 'trash'
-  if (props.deniedAt) return 'x-circle'
-  if (props.confirmedAt) return 'check'
-  if (props.status === 'IN_PROGRESS') return 'question'
-  return 'bell-fill'
+  return (statusMapping[localStatus.value] || statusMapping.default).icon
 })
 
-const collapseId = computed(() => 'collapse' + String(props.id))
-
-const username = computed(() => ({
-  username: `${props.firstName} ${props.lastName}`,
-  initials: `${props.firstName[0]}${props.lastName[0]}`,
-}))
+const username = computed(() => {
+  if (!props.user) return {}
+  return {
+    username: props.user.alias
+      ? props.user.alias
+      : `${props.user.firstName} ${props.user.lastName}`,
+    initials: `${props.user.firstName[0]}${props.user.lastName[0]}`,
+  }
+})
 
 const hours = computed(() => parseFloat((props.amount / GDD_PER_HOUR).toFixed(2)))
 
-watch(
-  () => visible.value,
-  () => {
-    if (visible.value) getListContributionMessages()
-  },
-)
-
-function deleteContribution(item) {
+async function processDeleteContribution(item) {
+  if (props.allContribution) {
+    // eslint-disable-next-line no-console
+    console.warn('tried to delete contribution from all contributions')
+    return
+  }
   if (window.confirm(t('contribution.delete'))) {
-    emit('delete-contribution', item)
-  }
-}
-
-const { onResult, onError, load, refetch } = useLazyQuery(listContributionMessages, {
-  contributionId: props.contributionId,
-})
-
-function getListContributionMessages(closeCollapse = true) {
-  if (closeCollapse) {
-    emit('close-all-open-collapse')
-  }
-  const variables = {
-    contributionId: props.contributionId,
-  }
-  // load works only once and return false on second call
-  if (!load(listContributionMessages, variables)) {
-    // update list data every time getListContributionMessages is called
-    // because it could be added new messages
-    refetch(variables)
+    try {
+      await deleteContributionMutation(item)
+      toastSuccess(t('contribution.deleted'))
+      localStatus.value = 'DELETED'
+      emit('contribution-changed')
+    } catch (err) {
+      toastError(err.message)
+    }
   }
 }
 
 function addContributionMessage(message) {
-  messagesGet.value.push(message)
-}
-
-onResult((resultValue) => {
-  if (resultValue.data) {
-    messagesGet.value.length = 0
-    resultValue.data.listContributionMessages.messages.forEach((message) => {
-      messagesGet.value.push(message)
-    })
-  }
-})
-
-onError((err) => {
-  toastError(err.message)
-})
-
-const updateStatus = (id) => {
+  localMessages.value.push(message)
   localStatus.value = 'PENDING'
+  emit('contribution-changed')
 }
 
-const emit = defineEmits(['delete-contribution', 'close-all-open-collapse'])
+const emit = defineEmits([
+  'toggle-messages-visible',
+  'update-contribution-form',
+  'contribution-changed',
+])
 </script>
 
 <style lang="scss" scoped>
diff --git a/frontend/src/components/Inputs/InputAmount.vue b/frontend/src/components/Inputs/InputAmount.vue
index cf04a5d58..2c4171ca7 100644
--- a/frontend/src/components/Inputs/InputAmount.vue
+++ b/frontend/src/components/Inputs/InputAmount.vue
@@ -60,9 +60,7 @@ const props = defineProps({
 const emit = defineEmits(['update:modelValue'])
 
 const route = useRoute()
-
 const { n } = useI18n()
-
 const { value, meta, errorMessage } = useField(props.name, props.rules)
 
 const amountFocused = ref(false)
diff --git a/frontend/src/components/Inputs/LabeledInput.vue b/frontend/src/components/Inputs/LabeledInput.vue
index 920fceacd..486510d28 100644
--- a/frontend/src/components/Inputs/LabeledInput.vue
+++ b/frontend/src/components/Inputs/LabeledInput.vue
@@ -2,7 +2,7 @@
   <div :class="wrapperClassName">
     <BFormGroup :label="label" :label-for="labelFor">
       <BFormTextarea
-        v-if="textarea"
+        v-if="textarea === 'true'"
         v-bind="{ ...$attrs, id: labelFor, name }"
         v-model="model"
         trim
@@ -17,7 +17,7 @@
 </template>
 
 <script setup>
-import { computed, defineOptions, defineModel } from 'vue'
+import { computed, defineOptions, defineModel, watch } from 'vue'
 defineOptions({
   inheritAttrs: false,
 })
@@ -32,9 +32,9 @@ const props = defineProps({
     required: true,
   },
   textarea: {
-    type: Boolean,
+    type: String,
     required: false,
-    default: false,
+    default: 'false',
   },
 })
 
diff --git a/frontend/src/graphql/contributions.graphql b/frontend/src/graphql/contributions.graphql
index c35021fed..c38449fca 100644
--- a/frontend/src/graphql/contributions.graphql
+++ b/frontend/src/graphql/contributions.graphql
@@ -1,14 +1,19 @@
+#import './user.graphql'
 
-fragment contributionFields on Contribution {
+fragment unconfirmedContributionFields on Contribution {
   id
   amount
   memo
-  createdAt
   contributionDate
+  contributionStatus
+  messagesCount
+}
+
+fragment contributionFields on Contribution {
+  ...unconfirmedContributionFields
+  createdAt
   confirmedAt
   confirmedBy
-  status
-  messagesCount
   deniedAt
   deniedBy
   updatedBy
@@ -26,34 +31,77 @@ fragment contributionMessageFields on ContributionMessage {
   userId
 }
 
-query listContributions ($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC) {
-  listContributions(currentPage: $currentPage, pageSize: $pageSize, order: $order) {
+query listContributions ($pagination: Paginated!, $messagePagination: Paginated!) {
+  listContributions(pagination: $pagination, messagePagination: $messagePagination) {
     contributionCount
     contributionList {
       ...contributionFields
       deletedAt
       moderatorId
-      messages(pagination: { currentPage: 1, pageSize: 10, order: DESC }) {
+      messages(pagination: $messagePagination) {
         ...contributionMessageFields
       }
     }
   }
 }
 
+query listAllContributions ($pagination: Paginated!) {
+  listAllContributions(pagination: $pagination) {
+    contributionCount
+    contributionList {
+      user {
+        ...userFields
+      }
+      ...contributionFields
+    }
+  }
+}
+
 query countContributionsInProgress {
   countContributionsInProgress
 }
 
-
-query listAllContributions ($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC) {
-  listAllContributions(currentPage: $currentPage, pageSize: $pageSize, order: $order) {
-    contributionCount
-    contributionList {
-      firstName
-      lastName
-      ...contributionFields
-    }
+query openCreations {
+  openCreations {
+    year
+    month
+    amount
   }
 }
 
+query openCreationsAmounts {
+  openCreations {
+    amount
+  }
+}
+
+# return unconfirmedContributionFields
+mutation createContribution ($amount: Decimal!, $memo: String!, $contributionDate: String!) {
+  createContribution(amount: $amount, memo: $memo, contributionDate: $contributionDate)  {
+    id
+  }
+}
+
+# return unconfirmedContributionFields
+mutation updateContribution (
+  $contributionId: Int!,
+  $amount: Decimal!,
+  $memo: String!,
+  $contributionDate: String!
+) {
+  updateContribution(
+    contributionId: $contributionId,
+    amount: $amount,
+    memo: $memo,
+    contributionDate: $contributionDate
+  ) {
+    id
+  }
+}
+
+mutation deleteContribution($id: Int!) {
+  deleteContribution(id: $id)
+}
+
+
 
diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js
index 9a62e7cde..1476284f0 100644
--- a/frontend/src/graphql/mutations.js
+++ b/frontend/src/graphql/mutations.js
@@ -134,36 +134,6 @@ export const redeemTransactionLink = gql`
   }
 `
 
-export const createContribution = gql`
-  mutation ($creationDate: String!, $memo: String!, $amount: Decimal!) {
-    createContribution(creationDate: $creationDate, memo: $memo, amount: $amount) {
-      amount
-      memo
-    }
-  }
-`
-
-export const updateContribution = gql`
-  mutation ($contributionId: Int!, $amount: Decimal!, $memo: String!, $creationDate: String!) {
-    updateContribution(
-      contributionId: $contributionId
-      amount: $amount
-      memo: $memo
-      creationDate: $creationDate
-    ) {
-      id
-      amount
-      memo
-    }
-  }
-`
-
-export const deleteContribution = gql`
-  mutation ($id: Int!) {
-    deleteContribution(id: $id)
-  }
-`
-
 export const createContributionMessage = gql`
   mutation ($contributionId: Int!, $message: String!) {
     createContributionMessage(contributionId: $contributionId, message: $message) {
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index 9fd971661..89cc43e4b 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -187,56 +187,6 @@ export const listContributionLinks = gql`
   }
 `
 
-export const listContributions = gql`
-  query ($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC) {
-    listContributions(currentPage: $currentPage, pageSize: $pageSize, order: $order) {
-      contributionCount
-      contributionList {
-        id
-        amount
-        memo
-        createdAt
-        contributionDate
-        confirmedAt
-        confirmedBy
-        deletedAt
-        status
-        messagesCount
-        deniedAt
-        deniedBy
-        updatedBy
-        updatedAt
-        moderatorId
-      }
-    }
-  }
-`
-
-export const listAllContributions = gql`
-  query ($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC) {
-    listAllContributions(currentPage: $currentPage, pageSize: $pageSize, order: $order) {
-      contributionCount
-      contributionList {
-        id
-        firstName
-        lastName
-        amount
-        memo
-        createdAt
-        contributionDate
-        confirmedAt
-        confirmedBy
-        status
-        messagesCount
-        deniedAt
-        deniedBy
-        updatedBy
-        updatedAt
-      }
-    }
-  }
-`
-
 export const communityStatistics = gql`
   query {
     communityStatistics {
@@ -281,16 +231,6 @@ export const listContributionMessages = gql`
   }
 `
 
-export const openCreations = gql`
-  query {
-    openCreations {
-      year
-      month
-      amount
-    }
-  }
-`
-
 export const user = gql`
   query ($identifier: String!, $communityIdentifier: String!) {
     user(identifier: $identifier, communityIdentifier: $communityIdentifier) {
diff --git a/frontend/src/graphql/user.graphql b/frontend/src/graphql/user.graphql
new file mode 100644
index 000000000..c8617172f
--- /dev/null
+++ b/frontend/src/graphql/user.graphql
@@ -0,0 +1,6 @@
+fragment userFields on User {
+  id
+  firstName
+  lastName
+  alias
+}
\ No newline at end of file
diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index 4ecb6c251..c5d99921f 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -1,13 +1,14 @@
-import { mount } from '@vue/test-utils'
-import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest'
-import Community from './Community'
-import { createContribution, updateContribution, deleteContribution } from '@/graphql/mutations'
-import { listContributions, listAllContributions, openCreations } from '@/graphql/queries'
-import { useRoute, useRouter } from 'vue-router'
 import { useAppToast } from '@/composables/useToast'
+import { countContributionsInProgress } from '@/graphql/contributions.graphql'
+import { createContribution, deleteContribution, updateContribution } from '@/graphql/mutations'
+import { listAllContributions, listContributions, openCreations } from '@/graphql/queries'
 import { useMutation, useQuery } from '@vue/apollo-composable'
+import { mount } from '@vue/test-utils'
 import { BTab, BTabs } from 'bootstrap-vue-next'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { reactive, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import Community from './Community'
 
 // Mock external dependencies
 vi.mock('vue-router', () => ({
@@ -80,9 +81,8 @@ describe('Community', () => {
   let mockRouter
   let mockToast
 
+  const mockCountContributionsInProgress = vi.fn()
   const mockOpenCreationsQuery = vi.fn()
-  const mockListContributionsQuery = vi.fn()
-  const mockListAllContributionsQuery = vi.fn()
   const mockCreateContributionMutation = vi.fn()
   const mockUpdateContributionMutation = vi.fn()
   const mockDeleteContributionMutation = vi.fn()
@@ -99,17 +99,34 @@ describe('Community', () => {
     vi.mocked(useAppToast).mockReturnValue(mockToast)
 
     vi.mocked(useQuery).mockImplementation((query) => {
-      if (query === openCreations) return { onResult: mockOpenCreationsQuery, refetch: vi.fn() }
-      if (query === listContributions)
-        return { onResult: mockListContributionsQuery, refetch: vi.fn() }
-      if (query === listAllContributions)
-        return { onResult: mockListAllContributionsQuery, refetch: vi.fn() }
+      if (query === openCreations) {
+        return {
+          onResult: mockOpenCreationsQuery,
+          refetch: vi.fn(),
+        }
+      }
+
+      if (query === countContributionsInProgress) {
+        return { onResult: mockCountContributionsInProgress }
+      }
     })
 
     vi.mocked(useMutation).mockImplementation((mutation) => {
-      if (mutation === createContribution) return { mutate: mockCreateContributionMutation }
-      if (mutation === updateContribution) return { mutate: mockUpdateContributionMutation }
-      if (mutation === deleteContribution) return { mutate: mockDeleteContributionMutation }
+      if (mutation === createContribution) {
+        return {
+          mutate: mockCreateContributionMutation,
+        }
+      }
+      if (mutation === updateContribution) {
+        return {
+          mutate: mockUpdateContributionMutation,
+        }
+      }
+      if (mutation === deleteContribution) {
+        return {
+          mutate: mockDeleteContributionMutation,
+        }
+      }
     })
 
     const { defineRule } = require('vee-validate')
@@ -138,14 +155,11 @@ describe('Community', () => {
   describe('mount', () => {
     it('initializes with correct data', () => {
       expect(wrapper.vm.tabIndex).toBe(0)
-      expect(wrapper.vm.items).toEqual([])
-      expect(wrapper.vm.itemsAll).toEqual([])
     })
 
     it('fetches initial data', () => {
       expect(mockOpenCreationsQuery).toHaveBeenCalled()
-      expect(mockListContributionsQuery).toHaveBeenCalled()
-      expect(mockListAllContributionsQuery).toHaveBeenCalled()
+      expect(mockCountContributionsInProgress).toHaveBeenCalled()
     })
   })
 
@@ -266,14 +280,4 @@ describe('Community', () => {
       expect(mockRouter.push).toHaveBeenCalledWith({ params: { tab: 'contribute' } })
     })
   })
-
-  describe('updateStatus', () => {
-    it('updates status of a contribution', async () => {
-      wrapper.vm.items[0] = { id: 1, status: 'IN_PROGRESS' }
-
-      wrapper.vm.updateStatus(1)
-
-      expect(wrapper.vm.items[0].status).toBe('PENDING')
-    })
-  })
 })
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index fe5e260a7..9a658f095 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -3,26 +3,18 @@
     <div>
       <BTabs :model-value="tabIndex" no-nav-style borderless align="center">
         <BTab no-body lazy>
-          <open-creations-amount
-            :minimal-date="minimalDate"
-            :max-gdd-last-month="maxForMonths[0]"
-            :max-gdd-this-month="maxForMonths[1]"
-          />
-          <div class="mb-3"></div>
-          <contribution-form
-            v-model="form"
-            :minimal-date="minimalDate"
-            :max-gdd-last-month="maxForMonths[0]"
-            :max-gdd-this-month="maxForMonths[1]"
-            @set-contribution="handleSaveContribution"
-            @update-contribution="handleUpdateContribution"
+          <contribution-edit
+            v-if="itemToEdit"
+            v-model="itemToEdit"
+            @contribution-updated="handleContributionUpdated"
+            @reset-form="itemToEdit = null"
           />
+          <contribution-create v-else />
         </BTab>
         <BTab no-body lazy>
           <contribution-list
             :empty-text="$t('contribution.noContributions.myContributions')"
             @update-contribution-form="handleUpdateContributionForm"
-            @delete-contribution="handleDeleteContribution"
           />
         </BTab>
         <BTab no-body lazy>
@@ -39,12 +31,11 @@
 <script setup>
 import { ref, computed, watch, onMounted } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { useQuery, useMutation } from '@vue/apollo-composable'
+import { useQuery } from '@vue/apollo-composable'
 import OpenCreationsAmount from '@/components/Contributions/OpenCreationsAmount'
-import ContributionForm from '@/components/Contributions/ContributionForm'
+import ContributionEdit from '@/components/Contributions/ContributionEdit'
+import ContributionCreate from '@/components/Contributions/ContributionCreate'
 import ContributionList from '@/components/Contributions/ContributionList'
-import { createContribution, updateContribution, deleteContribution } from '@/graphql/mutations'
-import { openCreations } from '@/graphql/queries'
 import { countContributionsInProgress } from '@/graphql/contributions.graphql'
 import { useAppToast } from '@/composables/useToast'
 import { useI18n } from 'vue-i18n'
@@ -52,8 +43,6 @@ import { GDD_PER_HOUR } from '../constants'
 
 const COMMUNITY_TABS = ['contribute', 'contributions', 'community']
 
-const emit = defineEmits(['update-transactions'])
-
 const route = useRoute()
 const router = useRouter()
 
@@ -61,59 +50,8 @@ const { toastError, toastSuccess, toastInfo } = useAppToast()
 const { t } = useI18n()
 
 const tabIndex = ref(0)
-const items = ref([])
-const itemsAll = ref([])
-const currentPage = ref(1)
-const pageSize = ref(25)
-const currentPageAll = ref(1)
-const pageSizeAll = ref(25)
-const contributionCount = ref(0)
-const contributionCountAll = ref(0)
-const form = ref({
-  id: null,
-  date: undefined,
-  memo: '',
-  hours: '',
-  amount: GDD_PER_HOUR,
-})
-const originalContributionDate = ref('')
-const updateAmount = ref('')
-const maximalDate = ref(new Date())
-const openCreationsData = ref([])
 
-const minimalDate = computed(() => {
-  const date = new Date(maximalDate.value)
-  return new Date(date.setMonth(date.getMonth() - 1, 1))
-})
-
-const amountToAdd = computed(() => (form.value.id ? parseFloat(updateAmount.value) : 0.0))
-
-const maxForMonths = computed(() => {
-  const originalDate = new Date(originalContributionDate.value)
-  if (openCreationsData.value && openCreationsData.value.length) {
-    return openCreationsData.value.slice(1).map((creation) => {
-      if (
-        creation.year === originalDate.getFullYear() &&
-        creation.month === originalDate.getMonth()
-      ) {
-        return parseFloat(creation.amount) + amountToAdd.value
-      }
-      return parseFloat(creation.amount)
-    })
-  }
-  return [0, 0]
-})
-const { onResult: onOpenCreationsResult, refetch: refetchOpenCreations } = useQuery(
-  openCreations,
-  () => ({}),
-  {
-    fetchPolicy: 'network-only',
-  },
-)
-
-const { mutate: createContributionMutation } = useMutation(createContribution)
-const { mutate: updateContributionMutation } = useMutation(updateContribution)
-const { mutate: deleteContributionMutation } = useMutation(deleteContribution)
+const itemToEdit = ref(null)
 
 const { onResult: handleInProgressContributionFound } = useQuery(
   countContributionsInProgress,
@@ -122,18 +60,10 @@ const { onResult: handleInProgressContributionFound } = useQuery(
     fetchPolicy: 'network-only',
   },
 )
-
-onOpenCreationsResult(({ data }) => {
-  if (data) {
-    openCreationsData.value = data.openCreations
-  }
-})
-
 // jump to my contributions if in progress contribution found
 handleInProgressContributionFound(({ data }) => {
   if (data) {
-    const count = data.countContributionsInProgress
-    if (count > 0) {
+    if (data.countContributionsInProgress > 0) {
       tabIndex.value = 1
       if (route.params.tab !== 'contributions') {
         router.push({ params: { tab: 'contributions' } })
@@ -147,63 +77,15 @@ const updateTabIndex = () => {
   const index = COMMUNITY_TABS.indexOf(route.params.tab)
   tabIndex.value = index > -1 ? index : 0
 }
-
-const refetchData = () => {
-  refetchOpenCreations()
-  handleInProgressContributionFound()
+// after a edit contribution was saved, jump to contributions tab
+function handleContributionUpdated() {
+  itemToEdit.value = null
+  tabIndex.value = 1
+  router.push({ params: { tab: 'contributions' } })
 }
-
-const handleSaveContribution = async (data) => {
-  try {
-    await createContributionMutation({
-      creationDate: data.date,
-      memo: data.memo,
-      amount: data.amount,
-    })
-    toastSuccess(t('contribution.submitted'))
-    refetchData()
-  } catch (err) {
-    toastError(err.message)
-  }
-}
-
-const handleUpdateContribution = async (data) => {
-  try {
-    await updateContributionMutation({
-      contributionId: data.id,
-      creationDate: data.date,
-      memo: data.memo,
-      amount: data.amount,
-    })
-    toastSuccess(t('contribution.updated'))
-    refetchData()
-  } catch (err) {
-    toastError(err.message)
-  }
-}
-
-const handleDeleteContribution = async (data) => {
-  try {
-    await deleteContributionMutation({
-      id: data.id,
-    })
-    toastSuccess(t('contribution.deleted'))
-    refetchData()
-  } catch (err) {
-    toastError(err.message)
-  }
-}
-
+// if user clicks on edit contribution in contributions tab, jump to contribute tab and populate form with contribution data
 const handleUpdateContributionForm = (item) => {
-  form.value = {
-    id: item.id,
-    date: new Date(item.contributionDate).toISOString().slice(0, 10),
-    memo: item.memo,
-    amount: item.amount,
-    hours: item.amount / 20,
-  } //* /
-  originalContributionDate.value = item.contributionDate
-  updateAmount.value = item.amount
+  itemToEdit.value = item
   tabIndex.value = 0
   router.push({ params: { tab: 'contribute' } })
 }

From 72936ba70df143367c937d98ee52be33fdfa58ab Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Tue, 13 May 2025 11:45:19 +0200
Subject: [PATCH 05/36] update contributionStatus attribute

---
 .../ContributionMessagesList.spec.js          |  4 +--
 .../ContributionMessagesList.vue              |  2 +-
 .../components/CreationTransactionList.vue    |  2 +-
 .../Tables/OpenCreationsTable.spec.js         |  6 ++---
 .../components/Tables/OpenCreationsTable.vue  | 26 +++++++++----------
 .../components/TransactionLinkList.spec.js    |  2 +-
 admin/src/components/TransactionLinkList.vue  |  2 +-
 admin/src/pages/UserSearch.vue                |  2 +-
 8 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
index a47c78601..d737a32c9 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
@@ -108,7 +108,7 @@ describe('ContributionMessagesList', () => {
           id: 42,
           memo: 'test memo',
           userId: 108,
-          status: 'PENDING',
+          contributionStatus: 'PENDING',
           user: defaultUser,
         },
         hideResubmission: true,
@@ -153,7 +153,7 @@ describe('ContributionMessagesList', () => {
   it('does not render the ContributionMessagesFormular when status is not PENDING or IN_PROGRESS', async () => {
     await wrapper.setProps({
       contribution: {
-        status: 'COMPLETED',
+        contributionStatus: 'COMPLETED',
         user: defaultUser,
       },
     })
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index 09b5a69ac..2175c73ed 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -41,7 +41,7 @@
         />
       </div>
     </BContainer>
-    <div v-if="contribution.status === 'PENDING' || contribution.status === 'IN_PROGRESS'">
+    <div v-if="contribution.contributionStatus === 'PENDING' || contribution.contributionStatus === 'IN_PROGRESS'">
       <contribution-messages-formular
         :contribution-id="contribution.id"
         :contribution-memo="contribution.memo"
diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index 7cc8acbcb..079075f1e 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -80,7 +80,7 @@ const fields = [
     },
   },
   {
-    key: 'status',
+    key: 'contributionStatus',
     label: t('transactionlist.status'),
   },
   {
diff --git a/admin/src/components/Tables/OpenCreationsTable.spec.js b/admin/src/components/Tables/OpenCreationsTable.spec.js
index e2749329a..1578f99a7 100644
--- a/admin/src/components/Tables/OpenCreationsTable.spec.js
+++ b/admin/src/components/Tables/OpenCreationsTable.spec.js
@@ -14,12 +14,12 @@ describe('OpenCreationsTable', () => {
   let store
 
   const mockItems = [
-    { id: 1, status: 'PENDING', userId: 2, moderatorId: null, messagesCount: 0 },
-    { id: 2, status: 'CONFIRMED', userId: 3, moderatorId: 1, messagesCount: 2 },
+    { id: 1, contributionStatus: 'PENDING', userId: 2, moderatorId: null, messagesCount: 0 },
+    { id: 2, contributionStatus: 'CONFIRMED', userId: 3, moderatorId: 1, messagesCount: 2 },
   ]
 
   const mockFields = [
-    { key: 'status', label: 'Status' },
+    { key: 'contributionStatus', label: 'Status' },
     { key: 'bookmark', label: 'Bookmark' },
     { key: 'memo', label: 'Memo' },
     { key: 'editCreation', label: 'Edit' },
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 5bce1bfb7..d94f85bae 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -9,12 +9,12 @@
       stacked="md"
       :tbody-tr-class="rowClass"
     >
-      <template #cell(status)="row">
-        <IBiQuestionSquare v-if="row.item.status === 'IN_PROGRESS'" />
-        <IBiBellFill v-else-if="row.item.status === 'PENDING'" />
-        <IBiCheck v-else-if="row.item.status === 'CONFIRMED'" />
-        <IBiXCircle v-else-if="row.item.status === 'DENIED'" />
-        <IBiTrash v-else-if="row.item.status === 'DELETED'" />
+      <template #cell(contributionStatus)="row">
+        <IBiQuestionSquare v-if="row.item.contributionStatus === 'IN_PROGRESS'" />
+        <IBiBellFill v-else-if="row.item.contributionStatus === 'PENDING'" />
+        <IBiCheck v-else-if="row.item.contributionStatus === 'CONFIRMED'" />
+        <IBiXCircle v-else-if="row.item.contributionStatus === 'DENIED'" />
+        <IBiTrash v-else-if="row.item.contributionStatus === 'DELETED'" />
       </template>
       <template #cell(bookmark)="row">
         <div v-if="!myself(row.item)">
@@ -51,11 +51,11 @@
           <BButton v-else @click="rowToggleDetails(row, 0)">
             <IBiChatDots />
             <IBiExclamationCircleFill
-              v-if="row.item.status === 'PENDING' && row.item.messagesCount > 0"
+              v-if="row.item.contributionStatus === 'PENDING' && row.item.messagesCount > 0"
               style="color: #ffc107"
             />
             <IBiQuestionDiamond
-              v-if="row.item.status === 'IN_PROGRESS' && row.item.messagesCount > 0"
+              v-if="row.item.contributionStatus === 'IN_PROGRESS' && row.item.messagesCount > 0"
               variant="warning"
               style="color: #ffc107"
               class="ps-1"
@@ -197,11 +197,11 @@ export default {
     },
     rowClass(item, type) {
       if (!item || type !== 'row') return
-      if (item.status === 'CONFIRMED') return 'table-success'
-      if (item.status === 'DENIED') return 'table-warning'
-      if (item.status === 'DELETED') return 'table-danger'
-      if (item.status === 'IN_PROGRESS') return 'table-primary'
-      if (item.status === 'PENDING') return 'table-primary'
+      if (item.contributionStatus === 'CONFIRMED') return 'table-success'
+      if (item.contributionStatus === 'DENIED') return 'table-warning'
+      if (item.contributionStatus === 'DELETED') return 'table-danger'
+      if (item.contributionStatus === 'IN_PROGRESS') return 'table-primary'
+      if (item.contributionStatus === 'PENDING') return 'table-primary'
     },
     updateStatus(id) {
       this.$emit('update-status', id)
diff --git a/admin/src/components/TransactionLinkList.spec.js b/admin/src/components/TransactionLinkList.spec.js
index 9f374c542..612ca5085 100644
--- a/admin/src/components/TransactionLinkList.spec.js
+++ b/admin/src/components/TransactionLinkList.spec.js
@@ -116,7 +116,7 @@ describe('TransactionLinkList', () => {
   })
 
   it('formats status correctly for different scenarios', () => {
-    const statusField = wrapper.vm.fields.find((f) => f.key === 'status')
+    const statusField = wrapper.vm.fields.find((f) => f.key === 'contributionStatus')
 
     // Open transaction
     expect(statusField.formatter(null, null, mockLinks[0])).toBe('open')
diff --git a/admin/src/components/TransactionLinkList.vue b/admin/src/components/TransactionLinkList.vue
index e967fdc81..19c23880b 100644
--- a/admin/src/components/TransactionLinkList.vue
+++ b/admin/src/components/TransactionLinkList.vue
@@ -54,7 +54,7 @@ const fields = computed(() => [
     formatter: (value) => d(new Date(value)),
   },
   {
-    key: 'status',
+    key: 'contributionStatus',
     label: 'status',
     formatter: (value, key, item) => {
       if (item.deletedAt) return `${t('deleted')}: ${d(new Date(item.deletedAt))}`
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index 78bfc7e90..9d2b572a7 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -129,7 +129,7 @@ const fields = computed(() => [
   // { key: 'confirm_mail', label: t('confirmed') },
   // { key: 'has_elopage', label: 'elopage' },
   // { key: 'transactions_list', label: t('transaction') },
-  { key: 'status', label: t('status') },
+  { key: 'contributionStatus', label: t('status') },
 ])
 
 watch(

From 7c991efbb8b75e821afdc0c095984cc5161eb6fa Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Tue, 13 May 2025 11:46:13 +0200
Subject: [PATCH 06/36] add auto polling in frontend for contributions list,
 default off

---
 .../src/components/Contributions/ContributionList.vue     | 8 +++++---
 .../src/components/Contributions/ContributionListItem.vue | 7 +++++++
 frontend/src/config/index.js                              | 1 +
 frontend/src/config/schema.js                             | 7 +++++++
 frontend/vite.config.js                                   | 1 +
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionList.vue b/frontend/src/components/Contributions/ContributionList.vue
index be4702a09..7abc786c1 100644
--- a/frontend/src/components/Contributions/ContributionList.vue
+++ b/frontend/src/components/Contributions/ContributionList.vue
@@ -29,13 +29,14 @@
   </div>
 </template>
 <script setup>
-import { ref, computed, watch, watchEffect, onMounted } from 'vue'
+import { ref, computed } from 'vue'
 import ContributionListItem from '@/components/Contributions/ContributionListItem.vue'
 import { listContributions, listAllContributions } from '@/graphql/contributions.graphql'
 import { useQuery } from '@vue/apollo-composable'
 import { PAGE_SIZE } from '@/constants'
 import { useAppToast } from '@/composables/useToast'
 import { useI18n } from 'vue-i18n'
+import CONFIG from '@/config'
 
 const props = defineProps({
   allContribution: {
@@ -56,6 +57,7 @@ const { t } = useI18n()
 
 // constants
 const pageSize = PAGE_SIZE
+const pollInterval = CONFIG.AUTO_POLL_INTERVAL || undefined
 
 // refs
 const currentPage = ref(1)
@@ -78,7 +80,7 @@ const { result, loading, refetch } = useQuery(
         }
       : undefined,
   }),
-  { fetchPolicy: 'cache-and-network' },
+  { fetchPolicy: 'cache-and-network', pollInterval },
 )
 
 // events
@@ -94,7 +96,7 @@ const contributionCount = computed(() => {
   return contributionListResult.value?.contributionCount || 0
 })
 const items = computed(() => {
-  return contributionListResult.value?.contributionList || []
+  return [...(contributionListResult.value?.contributionList || [])]
 })
 const isPaginationVisible = computed(() => {
   return contributionCount.value > pageSize
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index cb2c70f0f..e579d6280 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -230,6 +230,13 @@ watch(
   { immediate: true },
 )
 
+watch(
+  () => props.contributionStatus,
+  () => {
+    localStatus.value = props.contributionStatus
+  },
+)
+
 const statusMapping = {
   CONFIRMED: { variant: 'success', icon: 'check' },
   DELETED: { variant: 'danger', icon: 'trash' },
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 78bc49c72..77a5d5f34 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -40,6 +40,7 @@ if (process.env.FRONTEND_HOSTING === 'nodejs') {
 const features = {
   GMS_ACTIVE: process.env.GMS_ACTIVE === 'true',
   HUMHUB_ACTIVE: process.env.HUMHUB_ACTIVE === 'true',
+  AUTO_POLL_INTERVAL: Number.parseInt(process.env.AUTO_POLL_INTERVAL) ?? 0,
 }
 
 const environment = {
diff --git a/frontend/src/config/schema.js b/frontend/src/config/schema.js
index dc5a22c43..214e5ef69 100644
--- a/frontend/src/config/schema.js
+++ b/frontend/src/config/schema.js
@@ -42,6 +42,13 @@ module.exports = Joi.object({
     .default('http://0.0.0.0/admin/authenticate?token=')
     .required(),
 
+  AUTO_POLL_INTERVAL: Joi.number()
+    .integer()
+    .min(0)
+    .max(600000)
+    .description('Auto Polling for new data in ms. 0 = disabled = default. Experimental!')
+    .default(0),
+
   COMMUNITY_REGISTER_URL: Joi.string()
     .uri({ scheme: ['http', 'https'] })
     .description('URL for Register a new Account in frontend.')
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index 28a222388..bf4b003e3 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -97,6 +97,7 @@ export default defineConfig(async ({ command }) => {
         autoInstall: true,
       }),
       EnvironmentPlugin({
+        AUTO_POLL_INTERVAL: CONFIG.AUTO_POLL_INTERVAL,
         GMS_ACTIVE: CONFIG.GMS_ACTIVE,
         HUMHUB_ACTIVE: CONFIG.HUMHUB_ACTIVE,
         DEFAULT_PUBLISHER_ID: null,

From 9d5eb5f2390ea394aecbbde5cb3a7bc2091bc711 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Tue, 13 May 2025 20:34:23 +0200
Subject: [PATCH 07/36] fix reset, animated fade out on create contribution

---
 .../ContributionMessagesList.vue              |  7 +++-
 .../Contributions/ContributionCreate.vue      | 37 +++++++++++++------
 .../Contributions/ContributionEdit.vue        |  3 +-
 .../Contributions/ContributionForm.vue        | 26 ++++++++-----
 4 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index 2175c73ed..343bc7ad6 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -41,7 +41,12 @@
         />
       </div>
     </BContainer>
-    <div v-if="contribution.contributionStatus === 'PENDING' || contribution.contributionStatus === 'IN_PROGRESS'">
+    <div
+      v-if="
+        contribution.contributionStatus === 'PENDING' ||
+        contribution.contributionStatus === 'IN_PROGRESS'
+      "
+    >
       <contribution-messages-formular
         :contribution-id="contribution.id"
         :contribution-memo="contribution.memo"
diff --git a/frontend/src/components/Contributions/ContributionCreate.vue b/frontend/src/components/Contributions/ContributionCreate.vue
index cd67622e4..3dd5a8ca5 100644
--- a/frontend/src/components/Contributions/ContributionCreate.vue
+++ b/frontend/src/components/Contributions/ContributionCreate.vue
@@ -1,12 +1,15 @@
 <template>
-  <contribution-form
-    v-if="maxForMonths"
-    :model-value="form"
-    :max-gdd-last-month="parseFloat(maxForMonths.openCreations[1].amount)"
-    :max-gdd-this-month="parseFloat(maxForMonths.openCreations[2].amount)"
-    @upsert-contribution="handleCreateContribution"
-    @reset-form="resetForm"
-  />
+  <transition name="fade-out" @after-leave="resetForm">
+    <div v-if="showForm">
+      <contribution-form
+        v-if="maxForMonths"
+        :model-value="form"
+        :max-gdd-last-month="parseFloat(maxForMonths.openCreations[1].amount)"
+        :max-gdd-this-month="parseFloat(maxForMonths.openCreations[2].amount)"
+        @upsert-contribution="handleCreateContribution"
+      />
+    </div>
+  </transition>
 </template>
 
 <script setup>
@@ -29,6 +32,7 @@ const { result: maxForMonths, refetch } = useQuery(
 const { mutate: createContributionMutation } = useMutation(createContribution)
 
 const form = ref(emptyForm())
+const showForm = ref(true)
 
 function emptyForm() {
   return {
@@ -43,14 +47,25 @@ async function handleCreateContribution(contribution) {
   try {
     await createContributionMutation({ ...contribution })
     toastSuccess(t('contribution.submitted'))
-    resetForm()
-    refetch()
+    showForm.value = false
   } catch (err) {
     toastError(err.message)
   }
 }
 
 function resetForm() {
-  form.value = emptyForm()
+  refetch()
+  showForm.value = true
 }
 </script>
+<style scoped>
+.fade-out-enter-active,
+.fade-out-leave-active {
+  transition: opacity 0.5s ease;
+}
+
+.fade-out-enter-from,
+.fade-out-leave-to {
+  opacity: 0;
+}
+</style>
diff --git a/frontend/src/components/Contributions/ContributionEdit.vue b/frontend/src/components/Contributions/ContributionEdit.vue
index ed2b7c012..4ae5fc8c8 100644
--- a/frontend/src/components/Contributions/ContributionEdit.vue
+++ b/frontend/src/components/Contributions/ContributionEdit.vue
@@ -4,7 +4,6 @@
     :max-gdd-last-month="maxForMonths[0]"
     :max-gdd-this-month="maxForMonths[1]"
     @upsert-contribution="handleUpdateContribution"
-    @reset-form="emit('reset-form')"
   />
 </template>
 
@@ -19,7 +18,7 @@ import { useI18n } from 'vue-i18n'
 const { toastError, toastSuccess } = useAppToast()
 const { t } = useI18n()
 
-const emit = defineEmits(['contribution-updated', 'reset-form'])
+const emit = defineEmits(['contribution-updated'])
 
 const props = defineProps({
   modelValue: { type: Object, required: true },
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 18d28c0f5..b25d858a9 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -63,7 +63,7 @@
               type="reset"
               variant="secondary"
               data-test="button-cancel"
-              @click="emit('reset-form')"
+              @click="resetForm"
             >
               {{ $t('form.cancel') }}
             </BButton>
@@ -84,7 +84,6 @@
     </BForm>
   </div>
 </template>
-
 <script setup>
 import { reactive, computed, watch, ref, onMounted, onUnmounted, toRaw } from 'vue'
 import { useI18n } from 'vue-i18n'
@@ -96,13 +95,6 @@ import { GDD_PER_HOUR } from '../../constants'
 
 const amountToHours = (amount) => parseFloat(amount / GDD_PER_HOUR).toFixed(2)
 const hoursToAmount = (hours) => parseFloat(hours * GDD_PER_HOUR).toFixed(2)
-const entityDataToForm = (entityData) => ({
-  ...entityData,
-  hours: entityData.hours !== undefined ? entityData.hours : amountToHours(entityData.amount),
-  contributionDate: entityData.contributionDate
-    ? new Date(entityData.contributionDate).toISOString().slice(0, 10)
-    : undefined,
-})
 
 const props = defineProps({
   modelValue: { type: Object, required: true },
@@ -114,7 +106,18 @@ const emit = defineEmits(['upsert-contribution', 'update:modelValue', 'reset-for
 
 const { t } = useI18n()
 
-const form = reactive(entityDataToForm(props.modelValue))
+const entityDataToForm = computed(() => ({
+  ...props.modelValue,
+  hours:
+    props.modelValue.hours !== undefined
+      ? props.modelValue.hours
+      : amountToHours(props.modelValue.amount),
+  contributionDate: props.modelValue.contributionDate
+    ? new Date(props.modelValue.contributionDate).toISOString().slice(0, 10)
+    : undefined,
+}))
+
+const form = reactive({ ...entityDataToForm.value })
 
 const now = ref(new Date()) // checked every minute, updated if day, month or year changed
 
@@ -209,6 +212,9 @@ const updateField = (newValue, name) => {
 function submit() {
   emit('upsert-contribution', toRaw(form))
 }
+function resetForm() {
+  Object.assign(form, entityDataToForm.value)
+}
 </script>
 <style>
 .form-style {

From 76f9fe56f06a6a5720b3fa12effd59fe48bdb5da Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Wed, 14 May 2025 12:24:53 +0200
Subject: [PATCH 08/36] fix missing user data on confirmation, use anchor links
 to jump to specific contribution in list

---
 admin/src/components/Overlay.vue              |  4 +-
 admin/src/components/RowDetails.vue           |  2 +-
 .../Contributions/ContributionEdit.vue        |  1 +
 .../Contributions/ContributionForm.vue        |  7 +-
 .../Contributions/ContributionList.vue        | 84 ++++++++++++-------
 .../Template/ContentHeader/NavCommunity.vue   | 21 +++--
 frontend/src/locales/de.json                  |  3 +-
 frontend/src/locales/en.json                  |  3 +-
 frontend/src/pages/Community.vue              | 23 +++--
 frontend/src/routes/routes.js                 |  2 +-
 10 files changed, 95 insertions(+), 55 deletions(-)

diff --git a/admin/src/components/Overlay.vue b/admin/src/components/Overlay.vue
index d6d905e00..60f9b4373 100644
--- a/admin/src/components/Overlay.vue
+++ b/admin/src/components/Overlay.vue
@@ -23,11 +23,11 @@
       </BRow>
       <BRow class="mt-3">
         <BCol class="col-3">{{ $t('name') }}</BCol>
-        <BCol>{{ item.firstName }} {{ item.lastName }}</BCol>
+        <BCol>{{ item.user.firstName }} {{ item.user.lastName }}</BCol>
       </BRow>
       <BRow>
         <BCol class="col-3">{{ $t('e_mail') }}</BCol>
-        <BCol>{{ item.email }}</BCol>
+        <BCol>{{ item.user.emailContact.email }}</BCol>
       </BRow>
 
       <hr class="my-4" />
diff --git a/admin/src/components/RowDetails.vue b/admin/src/components/RowDetails.vue
index 91c32c73c..9715ef158 100644
--- a/admin/src/components/RowDetails.vue
+++ b/admin/src/components/RowDetails.vue
@@ -6,7 +6,7 @@
         :icon="type === 'PageCreationConfirm' ? 'x' : 'eye-slash-fill'"
         aria-label="Help"
       ></b-icon>
-      {{ $t('hide_details') }} {{ row.item.firstName }} {{ row.item.lastName }}
+      {{ $t('hide_details') }} {{ row.item.user.firstName }} {{ row.item.user.lastName }}
     </b-button>
   </b-card>
 </template>
diff --git a/frontend/src/components/Contributions/ContributionEdit.vue b/frontend/src/components/Contributions/ContributionEdit.vue
index 4ae5fc8c8..98f4e111c 100644
--- a/frontend/src/components/Contributions/ContributionEdit.vue
+++ b/frontend/src/components/Contributions/ContributionEdit.vue
@@ -4,6 +4,7 @@
     :max-gdd-last-month="maxForMonths[0]"
     :max-gdd-this-month="maxForMonths[1]"
     @upsert-contribution="handleUpdateContribution"
+    @abort="emit('contribution-updated')"
   />
 </template>
 
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index b25d858a9..997cdd084 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -63,7 +63,7 @@
               type="reset"
               variant="secondary"
               data-test="button-cancel"
-              @click="resetForm"
+              @click="emit('abort')"
             >
               {{ $t('form.cancel') }}
             </BButton>
@@ -102,7 +102,7 @@ const props = defineProps({
   maxGddThisMonth: { type: Number, required: true },
 })
 
-const emit = defineEmits(['upsert-contribution', 'update:modelValue', 'reset-form'])
+const emit = defineEmits(['upsert-contribution', 'update:modelValue', 'abort'])
 
 const { t } = useI18n()
 
@@ -212,9 +212,6 @@ const updateField = (newValue, name) => {
 function submit() {
   emit('upsert-contribution', toRaw(form))
 }
-function resetForm() {
-  Object.assign(form, entityDataToForm.value)
-}
 </script>
 <style>
 .form-style {
diff --git a/frontend/src/components/Contributions/ContributionList.vue b/frontend/src/components/Contributions/ContributionList.vue
index 7abc786c1..23c13e400 100644
--- a/frontend/src/components/Contributions/ContributionList.vue
+++ b/frontend/src/components/Contributions/ContributionList.vue
@@ -1,35 +1,42 @@
 <template>
   <div v-if="items.length === 0 && !loading">
-    {{ emptyText }}
+    <div v-if="currentPage === 1">
+      {{ emptyText }}
+    </div>
+    <div v-else>
+      {{ t('contribution.noContributions.emptyPage') }}
+    </div>
   </div>
   <div v-else class="contribution-list">
     <div v-for="item in items" :key="item.id + 'a'" class="mb-3">
-      <contribution-list-item
-        v-bind="item"
-        :contribution-id="item.id"
-        :all-contribution="allContribution"
-        :messages-visible="openMessagesListId === item.id"
-        @toggle-messages-visible="toggleMessagesVisible(item.id)"
-        @update-contribution-form="updateContributionForm"
-        @contribution-changed="refetch()"
-      />
+      <div :id="`contributionListItem-${item.id}`">
+        <contribution-list-item
+          v-bind="item"
+          :contribution-id="item.id"
+          :all-contribution="allContribution"
+          :messages-visible="openMessagesListId === item.id"
+          @toggle-messages-visible="toggleMessagesVisible(item.id)"
+          @update-contribution-form="updateContributionForm"
+          @contribution-changed="refetch()"
+        />
+      </div>
     </div>
-    <BPagination
-      v-if="isPaginationVisible"
-      :model-value="currentPage"
-      class="mt-3"
-      pills
-      size="lg"
-      :per-page="pageSize"
-      :total-rows="contributionCount"
-      align="center"
-      :hide-ellipsis="true"
-      @update:model-value="currentPage = $event"
-    />
   </div>
+  <BPagination
+    v-if="isPaginationVisible"
+    :model-value="currentPage"
+    class="mt-3"
+    pills
+    size="lg"
+    :per-page="pageSize"
+    :total-rows="contributionCount"
+    align="center"
+    :hide-ellipsis="true"
+    @update:model-value="updatePage"
+  />
 </template>
 <script setup>
-import { ref, computed } from 'vue'
+import { ref, computed, nextTick } from 'vue'
 import ContributionListItem from '@/components/Contributions/ContributionListItem.vue'
 import { listContributions, listAllContributions } from '@/graphql/contributions.graphql'
 import { useQuery } from '@vue/apollo-composable'
@@ -37,6 +44,7 @@ import { PAGE_SIZE } from '@/constants'
 import { useAppToast } from '@/composables/useToast'
 import { useI18n } from 'vue-i18n'
 import CONFIG from '@/config'
+import { useRoute, useRouter } from 'vue-router'
 
 const props = defineProps({
   allContribution: {
@@ -54,17 +62,19 @@ const props = defineProps({
 // composables
 const { toastError, toastSuccess } = useAppToast()
 const { t } = useI18n()
+const route = useRoute()
+const router = useRouter()
 
 // constants
 const pageSize = PAGE_SIZE
 const pollInterval = CONFIG.AUTO_POLL_INTERVAL || undefined
 
 // refs
-const currentPage = ref(1)
+const currentPage = computed(() => Number(route.params.page) || 1)
 const openMessagesListId = ref(null)
 
 // queries
-const { result, loading, refetch } = useQuery(
+const { result, loading, refetch, onResult } = useQuery(
   props.allContribution ? listAllContributions : listContributions,
   () => ({
     pagination: {
@@ -99,8 +109,23 @@ const items = computed(() => {
   return [...(contributionListResult.value?.contributionList || [])]
 })
 const isPaginationVisible = computed(() => {
-  return contributionCount.value > pageSize
+  return (contributionCount.value > pageSize || currentPage.value > 1) && !loading.value
 })
+
+// callbacks
+onResult(({ data }) => {
+  nextTick(() => {
+    if (!route.hash) {
+      return
+    }
+    const el = document.querySelector(route.hash)
+    if (el) {
+      el.scrollIntoView({ behavior: 'smooth', block: 'start' })
+    }
+  })
+})
+
+// methods
 const toggleMessagesVisible = (contributionId) => {
   if (openMessagesListId.value === contributionId) {
     openMessagesListId.value = 0
@@ -108,9 +133,10 @@ const toggleMessagesVisible = (contributionId) => {
     openMessagesListId.value = contributionId
   }
 }
-
-// methods
 const updateContributionForm = (item) => {
-  emit('update-contribution-form', item)
+  emit('update-contribution-form', { item, page: currentPage.value })
+}
+const updatePage = (page) => {
+  router.push({ params: { page } })
 }
 </script>
diff --git a/frontend/src/components/Template/ContentHeader/NavCommunity.vue b/frontend/src/components/Template/ContentHeader/NavCommunity.vue
index ddae5e1d0..d2c706cf6 100644
--- a/frontend/src/components/Template/ContentHeader/NavCommunity.vue
+++ b/frontend/src/components/Template/ContentHeader/NavCommunity.vue
@@ -4,8 +4,8 @@
       class="nav-community-btn-wrapper bg-209 rounded-26 d-flex bd-highlight mx-xl-6 mx-lg-5 shadow justify-content-between"
     >
       <BButton
-        to="contribute"
-        active-class="btn-active svg-icon-active"
+        :to="{ path: '/community/contribute' }"
+        :class="stateClasses('/community/contribute')"
         block
         variant="link"
         class="nav-community__btn"
@@ -14,8 +14,8 @@
         {{ $t('community.submitContribution') }}
       </BButton>
       <BButton
-        to="contributions"
-        active-class="btn-active svg-icon-active"
+        :to="{ path: '/community/contributions' }"
+        :class="stateClasses('/community/contributions')"
         block
         variant="link"
         class="nav-community__btn"
@@ -24,8 +24,8 @@
         {{ $t('community.myContributions') }}
       </BButton>
       <BButton
-        to="community"
-        active-class="btn-active svg-icon-active"
+        :to="{ path: '/community/community' }"
+        :class="stateClasses('/community/community')"
         block
         variant="link"
         class="nav-community__btn"
@@ -39,6 +39,15 @@
 <script>
 export default {
   name: 'NavCommunity',
+
+  methods: {
+    stateClasses(path) {
+      if (this.$route.path.includes(path)) {
+        return 'router-link-active router-link-exact-active'
+      }
+      return ''
+    },
+  },
 }
 </script>
 <style scoped lang="scss">
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index afde3e2c6..0c56feb59 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -91,7 +91,8 @@
     "lastContribution": "Letzte Beiträge",
     "noContributions": {
       "allContributions": "Es wurden noch keine Beiträge eingereicht.",
-      "myContributions": "Du hast noch keine Beiträge eingereicht."
+      "myContributions": "Du hast noch keine Beiträge eingereicht.",
+      "emptyPage": "Diese Seite ist leer."
     },
     "noOpenCreation": {
       "allMonth": "Für alle beiden Monate ist dein Schöpfungslimit erreicht. Den Nächsten Monat kannst du wieder 1000 GDD Schöpfen.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index daeaa59a4..1c500015a 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -91,7 +91,8 @@
     "lastContribution": "Last Contributions",
     "noContributions": {
       "allContributions": "No contributions have been submitted yet.",
-      "myContributions": "You have not submitted any entries yet."
+      "myContributions": "You have not submitted any entries yet.",
+      "emptyPage": "This page is empty."
     },
     "noOpenCreation": {
       "allMonth": "For all two months your creation limit is reached. The next month you can create 1000 GDD again.",
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index 9a658f095..cba744604 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -4,10 +4,9 @@
       <BTabs :model-value="tabIndex" no-nav-style borderless align="center">
         <BTab no-body lazy>
           <contribution-edit
-            v-if="itemToEdit"
-            v-model="itemToEdit"
+            v-if="itemData"
+            v-model="itemData"
             @contribution-updated="handleContributionUpdated"
-            @reset-form="itemToEdit = null"
           />
           <contribution-create v-else />
         </BTab>
@@ -51,7 +50,8 @@ const { t } = useI18n()
 
 const tabIndex = ref(0)
 
-const itemToEdit = ref(null)
+const itemData = ref(null)
+const editContributionPage = ref(1)
 
 const { onResult: handleInProgressContributionFound } = useQuery(
   countContributionsInProgress,
@@ -79,15 +79,20 @@ const updateTabIndex = () => {
 }
 // after a edit contribution was saved, jump to contributions tab
 function handleContributionUpdated() {
-  itemToEdit.value = null
+  const contributionItemId = itemData.value.id
+  itemData.value = null
   tabIndex.value = 1
-  router.push({ params: { tab: 'contributions' } })
+  router.push({
+    params: { tab: 'contributions', page: editContributionPage.value },
+    hash: `#contributionListItem-${contributionItemId}`,
+  })
 }
 // if user clicks on edit contribution in contributions tab, jump to contribute tab and populate form with contribution data
-const handleUpdateContributionForm = (item) => {
-  itemToEdit.value = item
+const handleUpdateContributionForm = (data) => {
+  itemData.value = data.item
+  editContributionPage.value = data.page
   tabIndex.value = 0
-  router.push({ params: { tab: 'contribute' } })
+  router.push({ params: { tab: 'contribute', page: undefined } })
 }
 
 watch(() => route.params.tab, updateTabIndex)
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index caabbcfc1..5ece70ecd 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -68,7 +68,7 @@ const routes = [
     },
   },
   {
-    path: '/community/:tab',
+    path: '/community/:tab/:page?',
     component: () => import('@/pages/Community.vue'),
     meta: {
       requiresAuth: true,

From bdea98ef943f59d79ffcdac67155b90551e87b88 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Wed, 14 May 2025 12:33:54 +0200
Subject: [PATCH 09/36] fix admin tests and linting

---
 admin/src/components/CreationTransactionList.spec.js   |  2 +-
 admin/src/components/CreationTransactionList.vue       |  4 ++--
 admin/src/components/Overlay.spec.js                   | 10 +++++++---
 admin/src/components/Tables/OpenCreationsTable.spec.js |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/admin/src/components/CreationTransactionList.spec.js b/admin/src/components/CreationTransactionList.spec.js
index 4b6b43b66..fc915cbf3 100644
--- a/admin/src/components/CreationTransactionList.spec.js
+++ b/admin/src/components/CreationTransactionList.spec.js
@@ -92,7 +92,7 @@ describe('CreationTransactionList', () => {
     expect(fields[0].key).toBe('createdAt')
     expect(fields[1].key).toBe('contributionDate')
     expect(fields[2].key).toBe('confirmedAt')
-    expect(fields[3].key).toBe('status')
+    expect(fields[3].key).toBe('contributionStatus')
     expect(fields[4].key).toBe('amount')
     expect(fields[5].key).toBe('memo')
   })
diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index 079075f1e..fe26bacd2 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -34,8 +34,8 @@
           {{ t('help.transactionlist.confirmed') }}
         </div>
         <div>
-          {{ t('transactionlist.contributionStatus') }} {{ t('math.equals') }}
-          {{ t('help.transactionlist.contributionStatus') }}
+          {{ t('transactionlist.status') }} {{ t('math.equals') }}
+          {{ t('help.transactionlist.status') }}
         </div>
       </BCollapse>
     </div>
diff --git a/admin/src/components/Overlay.spec.js b/admin/src/components/Overlay.spec.js
index 32053572d..77df17623 100644
--- a/admin/src/components/Overlay.spec.js
+++ b/admin/src/components/Overlay.spec.js
@@ -19,9 +19,13 @@ describe('Overlay', () => {
     amount: '100',
     contributionDate: '2023-01-15T00:00:00.000Z',
     memo: 'Test memo',
-    firstName: 'John',
-    lastName: 'Doe',
-    email: 'john.doe@example.com',
+    user: {
+      firstName: 'John',
+      lastName: 'Doe',
+      emailContact: {
+        email: 'john.doe@example.com',
+      },
+    },
   }
 
   beforeEach(() => {
diff --git a/admin/src/components/Tables/OpenCreationsTable.spec.js b/admin/src/components/Tables/OpenCreationsTable.spec.js
index 1578f99a7..055f5bed6 100644
--- a/admin/src/components/Tables/OpenCreationsTable.spec.js
+++ b/admin/src/components/Tables/OpenCreationsTable.spec.js
@@ -72,7 +72,7 @@ describe('OpenCreationsTable', () => {
   })
 
   it('applies correct row class based on status', () => {
-    const rowClass = wrapper.vm.rowClass({ status: 'CONFIRMED' }, 'row')
+    const rowClass = wrapper.vm.rowClass({ contributionStatus: 'CONFIRMED' }, 'row')
     expect(rowClass).toBe('table-success')
   })
 

From 8feb2a1a22e35c343b9524c3715bb83d975c5f26 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Wed, 14 May 2025 14:15:00 +0200
Subject: [PATCH 10/36] fix backend tests and lint

---
 backend/src/graphql/model/Contribution.ts     |   4 +-
 .../graphql/model/UnconfirmedContribution.ts  |   2 +-
 .../ContributionMessageResolver.test.ts       |   4 +-
 .../resolver/ContributionResolver.test.ts     | 688 +++---------------
 .../graphql/resolver/ContributionResolver.ts  |  14 +-
 .../resolver/TransactionLinkResolver.test.ts  |   4 +-
 .../resolver/TransactionResolver.test.ts      |   2 +-
 .../src/graphql/resolver/UserResolver.test.ts |   6 +-
 .../src/graphql/resolver/semaphore.test.ts    |   8 +-
 .../graphql/resolver/util/creations.test.ts   |   4 +-
 .../src/graphql/resolver/util/creations.ts    |   1 -
 .../resolver/util/loadContributions.ts        |   6 +-
 .../src/seeds/creation/CreationInterface.ts   |   2 +-
 backend/src/seeds/creation/index.ts           |   8 +-
 backend/src/seeds/factory/creation.ts         |   2 +-
 backend/src/seeds/graphql/mutations.ts        |   8 +-
 backend/src/seeds/graphql/queries.ts          |  39 +-
 17 files changed, 154 insertions(+), 648 deletions(-)

diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index 209ebf4f8..5614f355f 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -12,7 +12,7 @@ export class Contribution extends UnconfirmedContribution {
     this.confirmedAt = contribution.confirmedAt
     this.confirmedBy = contribution.confirmedBy
     this.contributionDate = contribution.contributionDate
-    
+
     this.deniedAt = contribution.deniedAt
     this.deniedBy = contribution.deniedBy
     this.deletedAt = contribution.deletedAt
@@ -50,7 +50,7 @@ export class Contribution extends UnconfirmedContribution {
   updatedBy: number | null
 
   @Field(() => Date)
-  contributionDate: Date 
+  contributionDate: Date
 
   @Field(() => Date, { nullable: true })
   resubmissionAt: Date | null
diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts
index e3d0e3152..3be48f774 100644
--- a/backend/src/graphql/model/UnconfirmedContribution.ts
+++ b/backend/src/graphql/model/UnconfirmedContribution.ts
@@ -5,7 +5,7 @@ import { Decimal } from 'decimal.js-light'
 import { Field, Int, ObjectType } from 'type-graphql'
 
 import { ContributionMessage } from './ContributionMessage'
-import { User } from './User' 
+import { User } from './User'
 
 @ObjectType()
 export class UnconfirmedContribution {
diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
index 5bcc8143a..c0893d7de 100644
--- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts
@@ -86,7 +86,7 @@ describe('ContributionMessageResolver', () => {
           variables: {
             amount: 100.0,
             memo: 'Test env contribution',
-            creationDate: new Date().toString(),
+            contributionDate: new Date().toString(),
           },
         })
         await mutate({
@@ -139,7 +139,7 @@ describe('ContributionMessageResolver', () => {
             variables: {
               amount: 100.0,
               memo: 'Test env contribution',
-              creationDate: new Date().toString(),
+              contributionDate: new Date().toString(),
             },
           })
           const mutationResult = await mutate({
diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index ab409b4cc..5eff51f15 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -107,7 +107,7 @@ describe('ContributionResolver', () => {
       variables: {
         amount: 100.0,
         memo: 'Test PENDING contribution',
-        creationDate: new Date().toString(),
+        contributionDate: new Date().toString(),
       },
     })
     inProgressContribution = await mutate({
@@ -115,7 +115,7 @@ describe('ContributionResolver', () => {
       variables: {
         amount: 100.0,
         memo: 'Test IN_PROGRESS contribution',
-        creationDate: new Date().toString(),
+        contributionDate: new Date().toString(),
       },
     })
     contributionToConfirm = await mutate({
@@ -123,7 +123,7 @@ describe('ContributionResolver', () => {
       variables: {
         amount: 100.0,
         memo: 'Test contribution to confirm',
-        creationDate: new Date().toString(),
+        contributionDate: new Date().toString(),
       },
     })
     contributionToDeny = await mutate({
@@ -131,7 +131,7 @@ describe('ContributionResolver', () => {
       variables: {
         amount: 100.0,
         memo: 'Test contribution to deny',
-        creationDate: new Date().toString(),
+        contributionDate: new Date().toString(),
       },
     })
     contributionToDelete = await mutate({
@@ -139,7 +139,7 @@ describe('ContributionResolver', () => {
       variables: {
         amount: 100.0,
         memo: 'Test contribution to delete',
-        creationDate: new Date().toString(),
+        contributionDate: new Date().toString(),
       },
     })
     await mutate({
@@ -177,7 +177,7 @@ describe('ContributionResolver', () => {
       it('returns an error', async () => {
         const { errors: errorObjects } = await mutate({
           mutation: createContribution,
-          variables: { amount: 100.0, memo: 'Test Contribution', creationDate: 'not-valid' },
+          variables: { amount: 100.0, memo: 'Test Contribution', contributionDate: 'not-valid' },
         })
 
         expect(errorObjects).toEqual([new GraphQLError('401 Unauthorized')])
@@ -206,7 +206,7 @@ describe('ContributionResolver', () => {
             variables: {
               amount: 100.0,
               memo: 'Test',
-              creationDate: date.toString(),
+              contributionDate: date.toString(),
             },
           })
           expect(errorObjects).toMatchObject([
@@ -236,7 +236,7 @@ describe('ContributionResolver', () => {
             variables: {
               amount: 100.0,
               memo: 'Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test',
-              creationDate: date.toString(),
+              contributionDate: date.toString(),
             },
           })
           expect(errorObjects).toMatchObject([
@@ -265,7 +265,7 @@ describe('ContributionResolver', () => {
             variables: {
               amount: 100.0,
               memo: 'Test env contribution',
-              creationDate: 'not-valid',
+              contributionDate: 'not-valid',
             },
           })
           expect(errorObjects).toMatchObject([
@@ -275,9 +275,10 @@ describe('ContributionResolver', () => {
                 exception: {
                   validationErrors: [
                     {
-                      property: 'creationDate',
+                      property: 'contributionDate',
                       constraints: {
-                        isValidDateString: 'creationDate must be a valid date string, creationDate',
+                        isValidDateString:
+                          'contributionDate must be a valid date string, contributionDate',
                       },
                     },
                   ],
@@ -295,7 +296,7 @@ describe('ContributionResolver', () => {
             variables: {
               amount: 100.0,
               memo: 'Test env contribution',
-              creationDate: date.toString(),
+              contributionDate: date.toString(),
             },
           })
           expect(errorObjects).toEqual([
@@ -344,7 +345,7 @@ describe('ContributionResolver', () => {
             contributionId: 1,
             amount: 100.0,
             memo: 'Test Contribution',
-            creationDate: 'not-valid',
+            contributionDate: 'not-valid',
           },
         })
         expect(errorObjects).toEqual([new GraphQLError('401 Unauthorized')])
@@ -373,7 +374,7 @@ describe('ContributionResolver', () => {
               contributionId: pendingContribution.data.createContribution.id,
               amount: 100.0,
               memo: 'Test',
-              creationDate: date.toString(),
+              contributionDate: date.toString(),
             },
           })
           expect(errorObjects).toMatchObject([
@@ -406,7 +407,7 @@ describe('ContributionResolver', () => {
               contributionId: pendingContribution.data.createContribution.id,
               amount: 100.0,
               memo: 'Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test Test',
-              creationDate: date.toString(),
+              contributionDate: date.toString(),
             },
           })
           expect(errorObjects).toMatchObject([
@@ -439,7 +440,7 @@ describe('ContributionResolver', () => {
                 contributionId: -1,
                 amount: 100.0,
                 memo: 'Test env contribution',
-                creationDate: new Date().toString(),
+                contributionDate: new Date().toString(),
               },
             }),
           ).resolves.toEqual(
@@ -470,7 +471,7 @@ describe('ContributionResolver', () => {
               contributionId: pendingContribution.data.createContribution.id,
               amount: 10.0,
               memo: 'Test env contribution',
-              creationDate: new Date().toString(),
+              contributionDate: new Date().toString(),
             },
           })
           expect(errorObjects).toEqual([
@@ -525,7 +526,7 @@ describe('ContributionResolver', () => {
                   contributionId: pendingContribution.data.createContribution.id,
                   amount: 10.0,
                   memo: 'Test env contribution',
-                  creationDate: new Date().toString(),
+                  contributionDate: new Date().toString(),
                 },
               }),
             ).resolves.toEqual(
@@ -560,7 +561,7 @@ describe('ContributionResolver', () => {
               contributionId: pendingContribution.data.createContribution.id,
               amount: 1019.0,
               memo: 'Test env contribution',
-              creationDate: new Date().toString(),
+              contributionDate: new Date().toString(),
             },
           })
           expect(errorObjects).toEqual([
@@ -589,7 +590,7 @@ describe('ContributionResolver', () => {
               contributionId: pendingContribution.data.createContribution.id,
               amount: 10.0,
               memo: 'Test env contribution',
-              creationDate: date.toString(),
+              contributionDate: date.toString(),
             },
           })
           expect(errorObjects).toEqual([
@@ -612,7 +613,7 @@ describe('ContributionResolver', () => {
               contributionId: pendingContribution.data.createContribution.id,
               amount: 10.0,
               memo: 'Test PENDING contribution update',
-              creationDate: new Date().toString(),
+              contributionDate: new Date().toString(),
             },
           })
           expect(contribution).toMatchObject({
@@ -721,7 +722,7 @@ describe('ContributionResolver', () => {
             variables: {
               amount: 166.0,
               memo: 'Whatever contribution',
-              creationDate: new Date().toString(),
+              contributionDate: new Date().toString(),
             },
           })
 
@@ -766,7 +767,7 @@ describe('ContributionResolver', () => {
             variables: {
               amount: 166.0,
               memo: 'Whatever contribution',
-              creationDate: new Date().toString(),
+              contributionDate: new Date().toString(),
             },
           })
 
@@ -811,7 +812,7 @@ describe('ContributionResolver', () => {
             variables: {
               amount: 166.0,
               memo: 'Whatever contribution',
-              creationDate: new Date().toString(),
+              contributionDate: new Date().toString(),
             },
           })
 
@@ -1043,9 +1044,11 @@ describe('ContributionResolver', () => {
         const { errors: errorObjects } = await query({
           query: listContributions,
           variables: {
-            currentPage: 1,
-            pageSize: 25,
-            order: 'DESC',
+            pagination: {
+              currentPage: 1,
+              pageSize: 25,
+              order: 'DESC',
+            },
           },
         })
         expect(errorObjects).toEqual([new GraphQLError('401 Unauthorized')])
@@ -1071,10 +1074,11 @@ describe('ContributionResolver', () => {
           } = await query({
             query: listContributions,
             variables: {
-              currentPage: 1,
-              pageSize: 25,
-              order: 'DESC',
-              filterConfirmed: false,
+              pagination: {
+                currentPage: 1,
+                pageSize: 25,
+                order: 'DESC',
+              },
             },
           })
           expect(contributionListResult).toMatchObject({
@@ -1121,59 +1125,6 @@ describe('ContributionResolver', () => {
           expect(contributionListResult.contributionList).toHaveLength(6)
         })
       })
-
-      describe('with status filter [PENDING, IN_PROGRESS, DENIED, DELETED]', () => {
-        it('returns only unconfirmed creations', async () => {
-          const {
-            data: { listContributions: contributionListResult },
-          } = await query({
-            query: listContributions,
-            variables: {
-              currentPage: 1,
-              pageSize: 25,
-              order: 'DESC',
-              statusFilter: ['PENDING', 'IN_PROGRESS', 'DENIED', 'DELETED'],
-            },
-          })
-          expect(contributionListResult).toMatchObject({
-            contributionCount: 4,
-            contributionList: expect.arrayContaining([
-              expect.not.objectContaining({
-                status: 'CONFIRMED',
-              }),
-              expect.objectContaining({
-                id: pendingContribution.data.createContribution.id,
-                status: 'PENDING',
-                memo: 'Test PENDING contribution update',
-                amount: '10',
-                messagesCount: 1,
-              }),
-              expect.objectContaining({
-                id: contributionToDeny.data.createContribution.id,
-                status: 'DENIED',
-                memo: 'Test contribution to deny',
-                amount: '100',
-                messagesCount: 0,
-              }),
-              expect.objectContaining({
-                id: contributionToDelete.data.createContribution.id,
-                status: 'DELETED',
-                memo: 'Test contribution to delete',
-                amount: '100',
-                messagesCount: 0,
-              }),
-              expect.objectContaining({
-                id: inProgressContribution.data.createContribution.id,
-                status: 'IN_PROGRESS',
-                memo: 'Test IN_PROGRESS contribution',
-                amount: '100',
-                messagesCount: 1,
-              }),
-            ]),
-          })
-          expect(contributionListResult.contributionList).toHaveLength(4)
-        })
-      })
     })
   })
 
@@ -1183,10 +1134,11 @@ describe('ContributionResolver', () => {
         const { errors: errorObjects } = await query({
           query: listAllContributions,
           variables: {
-            currentPage: 1,
-            pageSize: 25,
-            order: 'DESC',
-            statusFilter: null,
+            pagination: {
+              currentPage: 1,
+              pageSize: 25,
+              order: 'DESC',
+            },
           },
         })
         expect(errorObjects).toEqual([new GraphQLError('401 Unauthorized')])
@@ -1205,122 +1157,70 @@ describe('ContributionResolver', () => {
         resetToken()
       })
 
-      it('throws an error with "NOT_VALID" in statusFilter', async () => {
-        const { errors: errorObjects } = await query({
-          query: listAllContributions,
-          variables: {
-            currentPage: 1,
-            pageSize: 25,
-            order: 'DESC',
-            statusFilter: ['NOT_VALID'],
-          },
-        })
-        expect(errorObjects).toEqual([
-          new UserInputError(
-            'Variable "$statusFilter" got invalid value "NOT_VALID" at "statusFilter[0]"; Value "NOT_VALID" does not exist in "ContributionStatus" enum.',
-          ),
-        ])
-      })
-
-      it('throws an error with a null in statusFilter', async () => {
-        const { errors: errorObjects } = await query({
-          query: listAllContributions,
-          variables: {
-            currentPage: 1,
-            pageSize: 25,
-            order: 'DESC',
-            statusFilter: [null],
-          },
-        })
-        expect(errorObjects).toEqual([
-          new UserInputError(
-            'Variable "$statusFilter" got invalid value null at "statusFilter[0]"; Expected non-nullable type "ContributionStatus!" not to be null.',
-          ),
-        ])
-      })
-
-      it('throws an error with null and "NOT_VALID" in statusFilter', async () => {
-        const { errors: errorObjects } = await query({
-          query: listAllContributions,
-          variables: {
-            currentPage: 1,
-            pageSize: 25,
-            order: 'DESC',
-            statusFilter: [null, 'NOT_VALID'],
-          },
-        })
-        expect(errorObjects).toEqual([
-          new UserInputError(
-            'Variable "$statusFilter" got invalid value null at "statusFilter[0]"; Expected non-nullable type "ContributionStatus!" not to be null.',
-          ),
-          new UserInputError(
-            'Variable "$statusFilter" got invalid value "NOT_VALID" at "statusFilter[1]"; Value "NOT_VALID" does not exist in "ContributionStatus" enum.',
-          ),
-        ])
-      })
-
       it('returns all contributions without statusFilter', async () => {
         const {
           data: { listAllContributions: contributionListObject },
         } = await query({
           query: listAllContributions,
           variables: {
-            currentPage: 1,
-            pageSize: 25,
-            order: 'DESC',
+            pagination: {
+              currentPage: 1,
+              pageSize: 25,
+              order: 'DESC',
+            },
           },
         })
         expect(contributionListObject).toMatchObject({
           contributionCount: 7,
           contributionList: expect.arrayContaining([
             expect.not.objectContaining({
-              status: 'DELETED',
+              contributionStatus: 'DELETED',
             }),
             expect.objectContaining({
               amount: '100',
-              status: 'CONFIRMED',
+              contributionStatus: 'CONFIRMED',
               id: contributionToConfirm.data.createContribution.id,
               memo: 'Test contribution to confirm',
               messagesCount: 0,
             }),
             expect.objectContaining({
               id: pendingContribution.data.createContribution.id,
-              status: 'PENDING',
+              contributionStatus: 'PENDING',
               memo: 'Test PENDING contribution update',
               amount: '10',
               messagesCount: 0,
             }),
             expect.objectContaining({
               id: contributionToDeny.data.createContribution.id,
-              status: 'DENIED',
+              contributionStatus: 'DENIED',
               memo: 'Test contribution to deny',
               amount: '100',
               messagesCount: 0,
             }),
             expect.objectContaining({
               id: inProgressContribution.data.createContribution.id,
-              status: 'IN_PROGRESS',
+              contributionStatus: 'IN_PROGRESS',
               memo: 'Test IN_PROGRESS contribution',
               amount: '100',
               messagesCount: 0,
             }),
             expect.objectContaining({
               id: bibiCreatedContribution.id,
-              status: 'CONFIRMED',
+              contributionStatus: 'CONFIRMED',
               memo: 'Herzlich Willkommen bei Gradido!',
               amount: '1000',
               messagesCount: 0,
             }),
             expect.objectContaining({
               id: expect.any(Number),
-              status: 'CONFIRMED',
+              contributionStatus: 'CONFIRMED',
               memo: 'Whatever contribution',
               amount: '166',
               messagesCount: 0,
             }),
             expect.objectContaining({
               id: expect.any(Number),
-              status: 'DENIED',
+              contributionStatus: 'DENIED',
               memo: 'Whatever contribution',
               amount: '166',
               messagesCount: 0,
@@ -1329,402 +1229,6 @@ describe('ContributionResolver', () => {
         })
         expect(contributionListObject.contributionList).toHaveLength(7)
       })
-
-      it('returns all contributions for statusFilter = null', async () => {
-        const {
-          data: { listAllContributions: contributionListObject },
-        } = await query({
-          query: listAllContributions,
-          variables: {
-            currentPage: 1,
-            pageSize: 25,
-            order: 'DESC',
-            statusFilter: null,
-          },
-        })
-        expect(contributionListObject).toMatchObject({
-          contributionCount: 7,
-          contributionList: expect.arrayContaining([
-            expect.not.objectContaining({
-              status: 'DELETED',
-            }),
-            expect.objectContaining({
-              amount: '100',
-              status: 'CONFIRMED',
-              id: contributionToConfirm.data.createContribution.id,
-              memo: 'Test contribution to confirm',
-              messagesCount: 0,
-            }),
-            expect.objectContaining({
-              id: pendingContribution.data.createContribution.id,
-              status: 'PENDING',
-              memo: 'Test PENDING contribution update',
-              amount: '10',
-              messagesCount: 0,
-            }),
-            expect.objectContaining({
-              id: contributionToDeny.data.createContribution.id,
-              status: 'DENIED',
-              memo: 'Test contribution to deny',
-              amount: '100',
-              messagesCount: 0,
-            }),
-            expect.objectContaining({
-              id: inProgressContribution.data.createContribution.id,
-              status: 'IN_PROGRESS',
-              memo: 'Test IN_PROGRESS contribution',
-              amount: '100',
-              messagesCount: 0,
-            }),
-            expect.objectContaining({
-              id: bibiCreatedContribution.id,
-              status: 'CONFIRMED',
-              memo: 'Herzlich Willkommen bei Gradido!',
-              amount: '1000',
-              messagesCount: 0,
-            }),
-            expect.objectContaining({
-              id: expect.any(Number),
-              status: 'CONFIRMED',
-              memo: 'Whatever contribution',
-              amount: '166',
-              messagesCount: 0,
-            }),
-            expect.objectContaining({
-              id: expect.any(Number),
-              status: 'DENIED',
-              memo: 'Whatever contribution',
-              amount: '166',
-              messagesCount: 0,
-            }),
-          ]),
-        })
-        expect(contributionListObject.contributionList).toHaveLength(7)
-      })
-
-      it('returns all contributions for statusFilter = []', async () => {
-        const {
-          data: { listAllContributions: contributionListObject },
-        } = await query({
-          query: listAllContributions,
-          variables: {
-            currentPage: 1,
-            pageSize: 25,
-            order: 'DESC',
-            statusFilter: [],
-          },
-        })
-        expect(contributionListObject).toMatchObject({
-          contributionCount: 7,
-          contributionList: expect.arrayContaining([
-            expect.not.objectContaining({
-              status: 'DELETED',
-            }),
-            expect.objectContaining({
-              amount: '100',
-              status: 'CONFIRMED',
-              id: contributionToConfirm.data.createContribution.id,
-              memo: 'Test contribution to confirm',
-              messagesCount: 0,
-            }),
-            expect.objectContaining({
-              id: pendingContribution.data.createContribution.id,
-              status: 'PENDING',
-              memo: 'Test PENDING contribution update',
-              amount: '10',
-              messagesCount: 0,
-            }),
-            expect.objectContaining({
-              id: contributionToDeny.data.createContribution.id,
-              status: 'DENIED',
-              memo: 'Test contribution to deny',
-              amount: '100',
-              messagesCount: 0,
-            }),
-            expect.objectContaining({
-              id: inProgressContribution.data.createContribution.id,
-              status: 'IN_PROGRESS',
-              memo: 'Test IN_PROGRESS contribution',
-              amount: '100',
-              messagesCount: 0,
-            }),
-            expect.objectContaining({
-              id: bibiCreatedContribution.id,
-              status: 'CONFIRMED',
-              memo: 'Herzlich Willkommen bei Gradido!',
-              amount: '1000',
-              messagesCount: 0,
-            }),
-            expect.objectContaining({
-              id: expect.any(Number),
-              status: 'CONFIRMED',
-              memo: 'Whatever contribution',
-              amount: '166',
-              messagesCount: 0,
-            }),
-            expect.objectContaining({
-              id: expect.any(Number),
-              status: 'DENIED',
-              memo: 'Whatever contribution',
-              amount: '166',
-              messagesCount: 0,
-            }),
-          ]),
-        })
-        expect(contributionListObject.contributionList).toHaveLength(7)
-      })
-
-      it('returns all CONFIRMED contributions', async () => {
-        const {
-          data: { listAllContributions: contributionListObject },
-        } = await query({
-          query: listAllContributions,
-          variables: {
-            currentPage: 1,
-            pageSize: 25,
-            order: 'DESC',
-            statusFilter: ['CONFIRMED'],
-          },
-        })
-        expect(contributionListObject).toMatchObject({
-          contributionCount: 3,
-          contributionList: expect.arrayContaining([
-            expect.objectContaining({
-              amount: '100',
-              status: 'CONFIRMED',
-              id: contributionToConfirm.data.createContribution.id,
-              memo: 'Test contribution to confirm',
-              messagesCount: 0,
-            }),
-            expect.objectContaining({
-              id: bibiCreatedContribution.id,
-              status: 'CONFIRMED',
-              memo: 'Herzlich Willkommen bei Gradido!',
-              amount: '1000',
-              messagesCount: 0,
-            }),
-            expect.objectContaining({
-              id: expect.any(Number),
-              status: 'CONFIRMED',
-              memo: 'Whatever contribution',
-              amount: '166',
-              messagesCount: 0,
-            }),
-            expect.not.objectContaining({
-              status: 'PENDING',
-            }),
-            expect.not.objectContaining({
-              status: 'DENIED',
-            }),
-            expect.not.objectContaining({
-              status: 'DELETED',
-            }),
-            expect.not.objectContaining({
-              status: 'IN_PROGRESS',
-            }),
-          ]),
-        })
-        expect(contributionListObject.contributionList).toHaveLength(3)
-      })
-
-      it('returns all PENDING contributions', async () => {
-        const {
-          data: { listAllContributions: contributionListObject },
-        } = await query({
-          query: listAllContributions,
-          variables: {
-            currentPage: 1,
-            pageSize: 25,
-            order: 'DESC',
-            statusFilter: ['PENDING'],
-          },
-        })
-        expect(contributionListObject).toMatchObject({
-          contributionCount: 1,
-          contributionList: expect.arrayContaining([
-            expect.not.objectContaining({
-              status: 'CONFIRMED',
-            }),
-            expect.not.objectContaining({
-              status: 'DENIED',
-            }),
-            expect.not.objectContaining({
-              status: 'DELETED',
-            }),
-            expect.not.objectContaining({
-              status: 'IN_PROGRESS',
-            }),
-            expect.objectContaining({
-              id: pendingContribution.data.createContribution.id,
-              status: 'PENDING',
-              memo: 'Test PENDING contribution update',
-              amount: '10',
-              messagesCount: 0,
-            }),
-          ]),
-        })
-        expect(contributionListObject.contributionList).toHaveLength(1)
-      })
-
-      it('returns all IN_PROGRESS Creation', async () => {
-        const {
-          data: { listAllContributions: contributionListObject },
-        } = await query({
-          query: listAllContributions,
-          variables: {
-            currentPage: 1,
-            pageSize: 25,
-            order: 'DESC',
-            statusFilter: ['IN_PROGRESS'],
-          },
-        })
-        expect(contributionListObject).toMatchObject({
-          contributionCount: 1,
-          contributionList: expect.arrayContaining([
-            expect.not.objectContaining({
-              status: 'CONFIRMED',
-            }),
-            expect.not.objectContaining({
-              status: 'PENDING',
-            }),
-            expect.not.objectContaining({
-              status: 'DENIED',
-            }),
-            expect.not.objectContaining({
-              status: 'DELETED',
-            }),
-            expect.objectContaining({
-              id: inProgressContribution.data.createContribution.id,
-              status: 'IN_PROGRESS',
-              memo: 'Test IN_PROGRESS contribution',
-              amount: '100',
-              messagesCount: 0,
-            }),
-          ]),
-        })
-        expect(contributionListObject.contributionList).toHaveLength(1)
-      })
-
-      it('returns all DENIED Creation', async () => {
-        const {
-          data: { listAllContributions: contributionListObject },
-        } = await query({
-          query: listAllContributions,
-          variables: {
-            currentPage: 1,
-            pageSize: 25,
-            order: 'DESC',
-            statusFilter: ['DENIED'],
-          },
-        })
-        expect(contributionListObject).toMatchObject({
-          contributionCount: 2,
-          contributionList: expect.arrayContaining([
-            expect.objectContaining({
-              id: contributionToDeny.data.createContribution.id,
-              status: 'DENIED',
-              memo: 'Test contribution to deny',
-              amount: '100',
-            }),
-            expect.objectContaining({
-              id: expect.any(Number),
-              status: 'DENIED',
-              memo: 'Whatever contribution',
-              amount: '166',
-              messagesCount: 0,
-            }),
-            expect.not.objectContaining({
-              status: 'CONFIRMED',
-            }),
-            expect.not.objectContaining({
-              status: 'DELETED',
-            }),
-            expect.not.objectContaining({
-              status: 'IN_PROGRESS',
-            }),
-            expect.not.objectContaining({
-              status: 'PENDING',
-            }),
-          ]),
-        })
-        expect(contributionListObject.contributionList).toHaveLength(2)
-      })
-
-      it('does not return any DELETED Creation', async () => {
-        const {
-          data: { listAllContributions: contributionListObject },
-        } = await query({
-          query: listAllContributions,
-          variables: {
-            currentPage: 1,
-            pageSize: 25,
-            order: 'DESC',
-            statusFilter: ['DELETED'],
-          },
-        })
-        expect(contributionListObject).toEqual({
-          contributionCount: 0,
-          contributionList: [],
-        })
-        expect(contributionListObject.contributionList).toHaveLength(0)
-      })
-
-      it('returns all CONFIRMED and PENDING Creation', async () => {
-        const {
-          data: { listAllContributions: contributionListObject },
-        } = await query({
-          query: listAllContributions,
-          variables: {
-            currentPage: 1,
-            pageSize: 25,
-            order: 'DESC',
-            statusFilter: ['CONFIRMED', 'PENDING'],
-          },
-        })
-        expect(contributionListObject).toMatchObject({
-          contributionCount: 4,
-          contributionList: expect.arrayContaining([
-            expect.objectContaining({
-              amount: '100',
-              status: 'CONFIRMED',
-              id: contributionToConfirm.data.createContribution.id,
-              memo: 'Test contribution to confirm',
-              messagesCount: 0,
-            }),
-            expect.objectContaining({
-              id: pendingContribution.data.createContribution.id,
-              status: 'PENDING',
-              memo: 'Test PENDING contribution update',
-              amount: '10',
-              messagesCount: 0,
-            }),
-            expect.objectContaining({
-              id: bibiCreatedContribution.id,
-              status: 'CONFIRMED',
-              memo: 'Herzlich Willkommen bei Gradido!',
-              amount: '1000',
-              messagesCount: 0,
-            }),
-            expect.objectContaining({
-              id: expect.any(Number),
-              status: 'CONFIRMED',
-              memo: 'Whatever contribution',
-              amount: '166',
-              messagesCount: 0,
-            }),
-            expect.not.objectContaining({
-              status: 'DENIED',
-            }),
-            expect.not.objectContaining({
-              status: 'DELETED',
-            }),
-            expect.not.objectContaining({
-              status: 'IN_PROGRESS',
-            }),
-          ]),
-        })
-        expect(contributionListObject.contributionList).toHaveLength(4)
-      })
     })
   })
 
@@ -2167,7 +1671,7 @@ describe('ContributionResolver', () => {
                         contributionId: adminContribution?.id ?? -1,
                         amount: 100.0,
                         memo: 'Test Test Test',
-                        creationDate: new Date().toString(),
+                        contributionDate: new Date().toString(),
                       },
                     }),
                   ).resolves.toMatchObject({
@@ -2394,7 +1898,7 @@ describe('ContributionResolver', () => {
                 variables: {
                   amount: 100.0,
                   memo: 'Test env contribution',
-                  creationDate: contributionDateFormatter(new Date()),
+                  contributionDate: contributionDateFormatter(new Date()),
                 },
               })
             })
@@ -2471,7 +1975,7 @@ describe('ContributionResolver', () => {
                 variables: {
                   amount: 100.0,
                   memo: 'Confirmed Contribution',
-                  creationDate: contributionDateFormatter(new Date()),
+                  contributionDate: contributionDateFormatter(new Date()),
                 },
               })
               await query({
@@ -2531,7 +2035,7 @@ describe('ContributionResolver', () => {
                 email: 'peter@lustig.de',
                 amount: 400,
                 memo: 'Herzlich Willkommen bei Gradido!',
-                creationDate: contributionDateFormatter(
+                contributionDate: contributionDateFormatter(
                   new Date(now.getFullYear(), now.getMonth() - 1, 1),
                 ),
               })
@@ -2565,7 +2069,7 @@ describe('ContributionResolver', () => {
                 email: 'bibi@bloxberg.de',
                 amount: 450,
                 memo: 'Herzlich Willkommen bei Gradido liebe Bibi!',
-                creationDate: contributionDateFormatter(
+                contributionDate: contributionDateFormatter(
                   new Date(now.getFullYear(), now.getMonth() - 2, 1),
                 ),
               })
@@ -2666,7 +2170,7 @@ describe('ContributionResolver', () => {
                 email: 'bibi@bloxberg.de',
                 amount: 50,
                 memo: 'Herzlich Willkommen bei Gradido liebe Bibi!',
-                creationDate: contributionDateFormatter(
+                contributionDate: contributionDateFormatter(
                   new Date(now.getFullYear(), now.getMonth() - 2, 1),
                 ),
               })
@@ -2674,7 +2178,7 @@ describe('ContributionResolver', () => {
                 email: 'bibi@bloxberg.de',
                 amount: 50,
                 memo: 'Herzlich Willkommen bei Gradido liebe Bibi!',
-                creationDate: contributionDateFormatter(
+                contributionDate: contributionDateFormatter(
                   new Date(now.getFullYear(), now.getMonth() - 2, 1),
                 ),
               })
@@ -2765,7 +2269,7 @@ describe('ContributionResolver', () => {
           variables: {
             amount: 100.0,
             memo: '#firefighters',
-            creationDate: new Date().toString(),
+            contributionDate: new Date().toString(),
           },
         })
       })
@@ -2811,7 +2315,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: '#firefighters',
               messagesCount: 0,
-              status: 'PENDING',
+              contributionStatus: 'PENDING',
               user: expect.objectContaining({
                 firstName: 'Peter',
                 lastName: 'Lustig',
@@ -2825,7 +2329,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Herzlich Willkommen bei Gradido liebe Bibi!',
               messagesCount: 0,
-              status: 'CONFIRMED',
+              contributionStatus: 'CONFIRMED',
               user: expect.objectContaining({
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
@@ -2839,7 +2343,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Herzlich Willkommen bei Gradido liebe Bibi!',
               messagesCount: 0,
-              status: 'CONFIRMED',
+              contributionStatus: 'CONFIRMED',
               user: expect.objectContaining({
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
@@ -2853,7 +2357,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Herzlich Willkommen bei Gradido liebe Bibi!',
               messagesCount: 0,
-              status: 'CONFIRMED',
+              contributionStatus: 'CONFIRMED',
               user: expect.objectContaining({
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
@@ -2867,7 +2371,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Herzlich Willkommen bei Gradido!',
               messagesCount: 0,
-              status: 'PENDING',
+              contributionStatus: 'PENDING',
               user: expect.objectContaining({
                 firstName: 'Peter',
                 lastName: 'Lustig',
@@ -2881,7 +2385,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Confirmed Contribution',
               messagesCount: 0,
-              status: 'CONFIRMED',
+              contributionStatus: 'CONFIRMED',
               user: expect.objectContaining({
                 firstName: 'Bob',
                 lastName: 'der Baumeister',
@@ -2895,7 +2399,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Test env contribution',
               messagesCount: 0,
-              status: 'PENDING',
+              contributionStatus: 'PENDING',
               user: expect.objectContaining({
                 firstName: 'Peter',
                 lastName: 'Lustig',
@@ -2909,7 +2413,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Aktives Grundeinkommen',
               messagesCount: 0,
-              status: 'PENDING',
+              contributionStatus: 'PENDING',
               user: expect.objectContaining({
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
@@ -2923,7 +2427,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Das war leider zu Viel!',
               messagesCount: 1,
-              status: 'DELETED',
+              contributionStatus: 'DELETED',
               user: expect.objectContaining({
                 firstName: 'Peter',
                 lastName: 'Lustig',
@@ -2937,7 +2441,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Whatever contribution',
               messagesCount: 0,
-              status: 'DENIED',
+              contributionStatus: 'DENIED',
               user: expect.objectContaining({
                 firstName: 'Räuber',
                 lastName: 'Hotzenplotz',
@@ -2951,7 +2455,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Whatever contribution',
               messagesCount: 0,
-              status: 'DELETED',
+              contributionStatus: 'DELETED',
               user: expect.objectContaining({
                 firstName: 'Räuber',
                 lastName: 'Hotzenplotz',
@@ -2965,7 +2469,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Whatever contribution',
               messagesCount: 0,
-              status: 'CONFIRMED',
+              contributionStatus: 'CONFIRMED',
               user: expect.objectContaining({
                 firstName: 'Räuber',
                 lastName: 'Hotzenplotz',
@@ -2979,7 +2483,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Test contribution to delete',
               messagesCount: 0,
-              status: 'DELETED',
+              contributionStatus: 'DELETED',
               user: expect.objectContaining({
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
@@ -2993,7 +2497,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Test contribution to deny',
               messagesCount: 0,
-              status: 'DENIED',
+              contributionStatus: 'DENIED',
               user: expect.objectContaining({
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
@@ -3007,7 +2511,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Test contribution to confirm',
               messagesCount: 0,
-              status: 'CONFIRMED',
+              contributionStatus: 'CONFIRMED',
               user: expect.objectContaining({
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
@@ -3021,7 +2525,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Test IN_PROGRESS contribution',
               messagesCount: 1,
-              status: 'IN_PROGRESS',
+              contributionStatus: 'IN_PROGRESS',
               user: expect.objectContaining({
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
@@ -3035,7 +2539,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Test PENDING contribution update',
               messagesCount: 2,
-              status: 'PENDING',
+              contributionStatus: 'PENDING',
               user: expect.objectContaining({
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
@@ -3049,7 +2553,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Herzlich Willkommen bei Gradido!',
               messagesCount: 0,
-              status: 'CONFIRMED',
+              contributionStatus: 'CONFIRMED',
               user: expect.objectContaining({
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
@@ -3087,7 +2591,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: '#firefighters',
               messagesCount: 0,
-              status: 'PENDING',
+              contributionStatus: 'PENDING',
               user: expect.objectContaining({
                 firstName: 'Peter',
                 lastName: 'Lustig',
@@ -3101,7 +2605,7 @@ describe('ContributionResolver', () => {
               id: expect.any(Number),
               memo: 'Herzlich Willkommen bei Gradido!',
               messagesCount: 0,
-              status: 'PENDING',
+              contributionStatus: 'PENDING',
               user: expect.objectContaining({
                 firstName: 'Peter',
                 lastName: 'Lustig',
@@ -3111,16 +2615,16 @@ describe('ContributionResolver', () => {
               }),
             }),
             expect.not.objectContaining({
-              status: 'DENIED',
+              contributionStatus: 'DENIED',
             }),
             expect.not.objectContaining({
-              status: 'DELETED',
+              contributionStatus: 'DELETED',
             }),
             expect.not.objectContaining({
-              status: 'CONFIRMED',
+              contributionStatus: 'CONFIRMED',
             }),
             expect.not.objectContaining({
-              status: 'IN_PROGRESS',
+              contributionStatus: 'IN_PROGRESS',
             }),
           ]),
         })
@@ -3148,7 +2652,7 @@ describe('ContributionResolver', () => {
                 id: expect.any(Number),
                 memo: '#firefighters',
                 messagesCount: 0,
-                status: 'PENDING',
+                contributionStatus: 'PENDING',
                 user: expect.objectContaining({
                   firstName: 'Peter',
                   lastName: 'Lustig',
@@ -3162,7 +2666,7 @@ describe('ContributionResolver', () => {
                 id: expect.any(Number),
                 memo: 'Herzlich Willkommen bei Gradido!',
                 messagesCount: 0,
-                status: 'PENDING',
+                contributionStatus: 'PENDING',
                 user: expect.objectContaining({
                   firstName: 'Peter',
                   lastName: 'Lustig',
@@ -3176,7 +2680,7 @@ describe('ContributionResolver', () => {
                 id: expect.any(Number),
                 memo: 'Test env contribution',
                 messagesCount: 0,
-                status: 'PENDING',
+                contributionStatus: 'PENDING',
                 user: expect.objectContaining({
                   firstName: 'Peter',
                   lastName: 'Lustig',
@@ -3190,7 +2694,7 @@ describe('ContributionResolver', () => {
                 id: expect.any(Number),
                 memo: 'Das war leider zu Viel!',
                 messagesCount: 1,
-                status: 'DELETED',
+                contributionStatus: 'DELETED',
                 user: expect.objectContaining({
                   firstName: 'Peter',
                   lastName: 'Lustig',
@@ -3225,7 +2729,7 @@ describe('ContributionResolver', () => {
                 id: expect.any(Number),
                 memo: 'Herzlich Willkommen bei Gradido!',
                 messagesCount: 0,
-                status: 'PENDING',
+                contributionStatus: 'PENDING',
                 user: expect.objectContaining({
                   firstName: 'Peter',
                   lastName: 'Lustig',
@@ -3239,7 +2743,7 @@ describe('ContributionResolver', () => {
                 id: expect.any(Number),
                 memo: 'Test env contribution',
                 messagesCount: 0,
-                status: 'PENDING',
+                contributionStatus: 'PENDING',
                 user: expect.objectContaining({
                   firstName: 'Peter',
                   lastName: 'Lustig',
@@ -3253,7 +2757,7 @@ describe('ContributionResolver', () => {
                 id: expect.any(Number),
                 memo: 'Das war leider zu Viel!',
                 messagesCount: 1,
-                status: 'DELETED',
+                contributionStatus: 'DELETED',
                 user: expect.objectContaining({
                   firstName: 'Peter',
                   lastName: 'Lustig',
@@ -3286,7 +2790,7 @@ describe('ContributionResolver', () => {
                 id: expect.any(Number),
                 memo: '#firefighters',
                 messagesCount: 0,
-                status: 'PENDING',
+                contributionStatus: 'PENDING',
                 user: expect.objectContaining({
                   firstName: 'Peter',
                   lastName: 'Lustig',
@@ -3339,7 +2843,7 @@ describe('ContributionResolver', () => {
                 id: expect.any(Number),
                 memo: 'Whatever contribution',
                 messagesCount: 0,
-                status: 'DENIED',
+                contributionStatus: 'DENIED',
                 user: expect.objectContaining({
                   firstName: 'Räuber',
                   lastName: 'Hotzenplotz',
@@ -3353,7 +2857,7 @@ describe('ContributionResolver', () => {
                 id: expect.any(Number),
                 memo: 'Whatever contribution',
                 messagesCount: 0,
-                status: 'DELETED',
+                contributionStatus: 'DELETED',
                 user: expect.objectContaining({
                   firstName: 'Räuber',
                   lastName: 'Hotzenplotz',
@@ -3367,7 +2871,7 @@ describe('ContributionResolver', () => {
                 id: expect.any(Number),
                 memo: 'Whatever contribution',
                 messagesCount: 0,
-                status: 'CONFIRMED',
+                contributionStatus: 'CONFIRMED',
                 user: expect.objectContaining({
                   firstName: 'Räuber',
                   lastName: 'Hotzenplotz',
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 8d77f462d..f576877ec 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -145,11 +145,15 @@ export class ContributionResolver {
   async listContributions(
     @Ctx() context: Context,
     @Arg('pagination') pagination: Paginated,
-    @Arg('messagePagination') messagePagination: Paginated,
+    @Arg('messagePagination', { nullable: true }) messagePagination?: Paginated,
   ): Promise<ContributionListResult> {
     const user = getUser(context)
-    const [dbContributions, count] = await loadUserContributions(user.id, pagination, messagePagination)
-    
+    const [dbContributions, count] = await loadUserContributions(
+      user.id,
+      pagination,
+      messagePagination,
+    )
+
     // show contributions in progress first
     const inProgressContributions = dbContributions.filter(
       (contribution) => contribution.contributionStatus === ContributionStatus.IN_PROGRESS,
@@ -163,10 +167,10 @@ export class ContributionResolver {
       [...inProgressContributions, ...notInProgressContributions].map((contribution) => {
         // we currently expect not much contribution messages for needing pagination
         // but if we get more than expected, we should get warned
-        if ((contribution.messages?.length || 0) > messagePagination.pageSize) {
+        if ((contribution.messages?.length || 0) > (messagePagination?.pageSize || 10)) {
           logger.warn('more contribution messages as expected, consider pagination', {
             contributionId: contribution.id,
-            expected: messagePagination.pageSize,
+            expected: messagePagination?.pageSize || 10,
             actual: contribution.messages?.length || 0,
           })
         }
diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
index 6f432ce61..05aeef300 100644
--- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts
@@ -467,7 +467,7 @@ describe('TransactionLinkResolver', () => {
                 variables: {
                   amount: new Decimal(1000),
                   memo: 'I was brewing potions for the community the whole month',
-                  creationDate: now.toISOString(),
+                  contributionDate: now.toISOString(),
                 },
               })
               contribution = result.data.createContribution
@@ -510,7 +510,7 @@ describe('TransactionLinkResolver', () => {
                   contributionId: contribution ? contribution.id : -1,
                   amount: new Decimal(800),
                   memo: 'I was brewing potions for the community the whole month',
-                  creationDate: now.toISOString(),
+                  contributionDate: now.toISOString(),
                 },
               })
             })
diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts
index 9b50c7925..533bd06b7 100644
--- a/backend/src/graphql/resolver/TransactionResolver.test.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.test.ts
@@ -342,7 +342,7 @@ describe('send coins', () => {
       // create contribution as user bob
       const contribution = await mutate({
         mutation: createContribution,
-        variables: { amount: 1000, memo: 'testing', creationDate: new Date().toISOString() },
+        variables: { amount: 1000, memo: 'testing', contributionDate: new Date().toISOString() },
       })
 
       // login as admin
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index a9dfc2874..2c2cf5fa0 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -456,7 +456,11 @@ describe('UserResolver', () => {
           // create contribution as user bob
           contribution = await mutate({
             mutation: createContribution,
-            variables: { amount: 1000, memo: 'testing', creationDate: new Date().toISOString() },
+            variables: {
+              amount: 1000,
+              memo: 'testing',
+              contributionDate: new Date().toISOString(),
+            },
           })
 
           // login as admin
diff --git a/backend/src/graphql/resolver/semaphore.test.ts b/backend/src/graphql/resolver/semaphore.test.ts
index d12db9eb2..cbe046fd9 100644
--- a/backend/src/graphql/resolver/semaphore.test.ts
+++ b/backend/src/graphql/resolver/semaphore.test.ts
@@ -72,14 +72,14 @@ describe('semaphore', () => {
       email: 'bibi@bloxberg.de',
       amount: 1000,
       memo: 'Herzlich Willkommen bei Gradido!',
-      creationDate: nMonthsBefore(new Date()),
+      contributionDate: nMonthsBefore(new Date()),
       confirmed: true,
     })
     await creationFactory(testEnv, {
       email: 'bob@baumeister.de',
       amount: 1000,
       memo: 'Herzlich Willkommen bei Gradido!',
-      creationDate: nMonthsBefore(new Date()),
+      contributionDate: nMonthsBefore(new Date()),
       confirmed: true,
     })
     await mutate({
@@ -121,7 +121,7 @@ describe('semaphore', () => {
     } = await mutate({
       mutation: createContribution,
       variables: {
-        creationDate: contributionDateFormatter(new Date()),
+        contributionDate: contributionDateFormatter(new Date()),
         amount: 200,
         memo: 'Bobs Contribution',
       },
@@ -144,7 +144,7 @@ describe('semaphore', () => {
     } = await mutate({
       mutation: createContribution,
       variables: {
-        creationDate: contributionDateFormatter(new Date()),
+        contributionDate: contributionDateFormatter(new Date()),
         amount: 200,
         memo: 'Bibis Contribution',
       },
diff --git a/backend/src/graphql/resolver/util/creations.test.ts b/backend/src/graphql/resolver/util/creations.test.ts
index 0d538a75d..5c5524f0b 100644
--- a/backend/src/graphql/resolver/util/creations.test.ts
+++ b/backend/src/graphql/resolver/util/creations.test.ts
@@ -98,7 +98,7 @@ describe('util/creation', () => {
         variables: {
           amount: 400.0,
           memo: 'Contribution for this month',
-          creationDate: contributionDateFormatter(now),
+          contributionDate: contributionDateFormatter(now),
         },
       })
       await mutate({
@@ -106,7 +106,7 @@ describe('util/creation', () => {
         variables: {
           amount: 500.0,
           memo: 'Contribution for the last month',
-          creationDate: contributionDateFormatter(
+          contributionDate: contributionDateFormatter(
             new Date(now.getFullYear(), now.getMonth() - 1, 1),
           ),
         },
diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts
index 719c86b9b..694d3a867 100644
--- a/backend/src/graphql/resolver/util/creations.ts
+++ b/backend/src/graphql/resolver/util/creations.ts
@@ -73,7 +73,6 @@ export const getUserCreations = async (
     await sumAmountContributionPerUserAndLast3MonthQuery.getRawMany()
 
   logger.trace(sumAmountContributionPerUserAndLast3Month)
-  console.log(JSON.stringify(sumAmountContributionPerUserAndLast3Month, null, 2))
 
   await queryRunner.release()
 
diff --git a/backend/src/graphql/resolver/util/loadContributions.ts b/backend/src/graphql/resolver/util/loadContributions.ts
index 2cc44bc47..0bf18aece 100644
--- a/backend/src/graphql/resolver/util/loadContributions.ts
+++ b/backend/src/graphql/resolver/util/loadContributions.ts
@@ -18,10 +18,10 @@ function buildBaseOptions(paginated: Paginated): FindManyOptions<DbContribution>
 export const loadUserContributions = async (
   userId: number,
   paginated: Paginated,
-  messagePagination: Paginated,
+  messagePagination?: Paginated,
 ): Promise<[DbContribution[], number]> => {
   const { order } = paginated
-  const { order: messageOrder } = messagePagination
+  const { order: messageOrder } = messagePagination || { order: 'ASC' }
   return DbContribution.findAndCount({
     where: { userId },
     withDeleted: true,
@@ -41,7 +41,7 @@ export const loadAllContributions = async (
   const { order } = paginated
   return DbContribution.findAndCount({
     relations: { user: { emailContact: true } },
-    order: { createdAt: order, id: order},
+    order: { createdAt: order, id: order },
     ...buildBaseOptions(paginated),
   })
 }
diff --git a/backend/src/seeds/creation/CreationInterface.ts b/backend/src/seeds/creation/CreationInterface.ts
index 3e0f3cf6c..ee450bd93 100644
--- a/backend/src/seeds/creation/CreationInterface.ts
+++ b/backend/src/seeds/creation/CreationInterface.ts
@@ -2,7 +2,7 @@ export interface CreationInterface {
   email: string
   amount: number
   memo: string
-  creationDate: string
+  contributionDate: string
   confirmed?: boolean
   // number of months to move the confirmed creation to the past
   moveCreationDate?: number
diff --git a/backend/src/seeds/creation/index.ts b/backend/src/seeds/creation/index.ts
index c22a99b0c..1499f663b 100644
--- a/backend/src/seeds/creation/index.ts
+++ b/backend/src/seeds/creation/index.ts
@@ -122,7 +122,7 @@ bobsSendings.forEach((sending) => {
     email: 'bob@baumeister.de',
     amount: sending.amount,
     memo: sending.memo,
-    creationDate: nMonthsBefore(new Date()),
+    contributionDate: nMonthsBefore(new Date()),
     confirmed: true,
   })
 })
@@ -132,7 +132,7 @@ export const creations: CreationInterface[] = [
     email: 'bibi@bloxberg.de',
     amount: 1000,
     memo: 'Herzlich Willkommen bei Gradido!',
-    creationDate: nMonthsBefore(new Date()),
+    contributionDate: nMonthsBefore(new Date()),
     confirmed: true,
     moveCreationDate: 12,
   },
@@ -140,7 +140,7 @@ export const creations: CreationInterface[] = [
     email: 'bibi@bloxberg.de',
     amount: 1000,
     memo: '#Hexen',
-    creationDate: nMonthsBefore(new Date()),
+    contributionDate: nMonthsBefore(new Date()),
     confirmed: true,
     moveCreationDate: 12,
   },
@@ -149,7 +149,7 @@ export const creations: CreationInterface[] = [
     email: 'raeuber@hotzenplotz.de',
     amount: 1000,
     memo: 'Herzlich Willkommen bei Gradido!',
-    creationDate: nMonthsBefore(new Date()),
+    contributionDate: nMonthsBefore(new Date()),
     confirmed: true,
   },
 ]
diff --git a/backend/src/seeds/factory/creation.ts b/backend/src/seeds/factory/creation.ts
index 4fce38206..478ce0c4a 100644
--- a/backend/src/seeds/factory/creation.ts
+++ b/backend/src/seeds/factory/creation.ts
@@ -34,7 +34,7 @@ export const creationFactory = async (
 
     if (creation.moveCreationDate) {
       const transaction = await Transaction.findOneOrFail({
-        where: { userId: user.id, creationDate: new Date(creation.creationDate) },
+        where: { userId: user.id, creationDate: new Date(creation.contributionDate) },
         order: { balanceDate: 'DESC' },
       })
 
diff --git a/backend/src/seeds/graphql/mutations.ts b/backend/src/seeds/graphql/mutations.ts
index f41c47e90..ec0a966a8 100644
--- a/backend/src/seeds/graphql/mutations.ts
+++ b/backend/src/seeds/graphql/mutations.ts
@@ -265,8 +265,8 @@ export const deleteContributionLink = gql`
 `
 
 export const createContribution = gql`
-  mutation ($amount: Decimal!, $memo: String!, $creationDate: String!) {
-    createContribution(amount: $amount, memo: $memo, creationDate: $creationDate) {
+  mutation ($amount: Decimal!, $memo: String!, $contributionDate: String!) {
+    createContribution(amount: $amount, memo: $memo, contributionDate: $contributionDate) {
       id
       amount
       memo
@@ -276,12 +276,12 @@ export const createContribution = gql`
 `
 
 export const updateContribution = gql`
-  mutation ($contributionId: Int!, $amount: Decimal!, $memo: String!, $creationDate: String!) {
+  mutation ($contributionId: Int!, $amount: Decimal!, $memo: String!, $contributionDate: String!) {
     updateContribution(
       contributionId: $contributionId
       amount: $amount
       memo: $memo
-      creationDate: $creationDate
+      contributionDate: $contributionDate
     ) {
       id
       amount
diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts
index e242a6083..5a8e06cc0 100644
--- a/backend/src/seeds/graphql/queries.ts
+++ b/backend/src/seeds/graphql/queries.ts
@@ -244,52 +244,47 @@ export const queryTransactionLink = gql`
 `
 
 export const listContributions = gql`
-  query (
-    $currentPage: Int = 1
-    $pageSize: Int = 5
-    $order: Order
-    $statusFilter: [ContributionStatus!]
-  ) {
-    listContributions(
-      currentPage: $currentPage
-      pageSize: $pageSize
-      order: $order
-      statusFilter: $statusFilter
-    ) {
+  query ($pagination: Paginated!) {
+    listContributions(pagination: $pagination) {
       contributionCount
       contributionList {
         id
         amount
         memo
-        createdAt
         contributionDate
+        contributionStatus
+        messagesCount
+        createdAt
         confirmedAt
         confirmedBy
-        deletedAt
-        status
-        messagesCount
         deniedAt
         deniedBy
+        updatedBy
+        updatedAt
+        deletedAt
+        moderatorId
       }
     }
   }
 `
 
 export const listAllContributions = `
-query ($currentPage: Int = 1, $pageSize: Int = 5, $order: Order = DESC, $statusFilter: [ContributionStatus!]) {
-  listAllContributions(currentPage: $currentPage, pageSize: $pageSize, order: $order, statusFilter: $statusFilter) {
+query ($pagination: Paginated!) {
+  listAllContributions(pagination: $pagination) {
   	contributionCount
     contributionList {
       id
-      firstName
-      lastName
+      user {
+        firstName
+        lastName
+      }
       amount
       memo
       createdAt
       confirmedAt
       confirmedBy
       contributionDate
-      status
+      contributionStatus
       messagesCount
       deniedAt
       deniedBy
@@ -318,7 +313,7 @@ export const adminListContributions = gql`
         confirmedAt
         confirmedBy
         contributionDate
-        status
+        contributionStatus
         messagesCount
         deniedAt
         deniedBy

From 7aeac5690f3dd4c50905de851b28ec304ed04e7b Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Thu, 15 May 2025 11:23:30 +0200
Subject: [PATCH 11/36] fix warnings and tests for ContributionListItem

---
 .../ContributionListItem.spec.js              | 105 ++++++++++++------
 1 file changed, 70 insertions(+), 35 deletions(-)

diff --git a/frontend/src/components/Contributions/ContributionListItem.spec.js b/frontend/src/components/Contributions/ContributionListItem.spec.js
index 4c0fa5c79..ae901dddb 100644
--- a/frontend/src/components/Contributions/ContributionListItem.spec.js
+++ b/frontend/src/components/Contributions/ContributionListItem.spec.js
@@ -2,10 +2,40 @@ import { mount } from '@vue/test-utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { createI18n } from 'vue-i18n'
 import ContributionListItem from './ContributionListItem'
+import { BRow, BCol, BCollapse, BButton, BForm, BTextArea, BFormTextarea } from 'bootstrap-vue-next'
+import VariantIcon from '@/components/VariantIcon.vue'
 
 const i18n = createI18n({
   legacy: false,
   locale: 'en',
+  messages: {
+    en: {
+      short: 'Short format date',
+      contribution: {
+        deleted: 'Deleted contribution',
+        delete: 'Delete contribution',
+        confirmed: 'Confirmed contribution',
+      },
+      form: {
+        reply: 'Reply',
+        memo: 'Memo',
+      },
+      edit: 'Edit',
+      delete: 'Delete',
+      moderatorChat: 'Chat',
+    },
+  },
+  datetimeFormats: {
+    en: {
+      short: {
+        year: 'numeric',
+        month: 'short',
+        day: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
+      },
+    },
+  },
 })
 
 vi.mock('@vue/apollo-composable', () => ({
@@ -26,6 +56,8 @@ vi.mock('@vue/apollo-composable', () => ({
 vi.mock('@/composables/useToast', () => ({
   useAppToast: vi.fn(() => ({
     addToast: vi.fn(),
+    toastError: vi.fn(),
+    toastSuccess: vi.fn(),
   })),
 }))
 
@@ -36,11 +68,13 @@ describe('ContributionListItem', () => {
     $filters: {
       GDD: vi.fn((val) => val),
     },
+    $t: vi.fn((key) => key),
+    $d: (date, format) => date.toISOString(),
   }
 
   const propsData = {
     contributionId: 42,
-    status: 'PENDING',
+    contributionStatus: 'PENDING',
     messagesCount: 2,
     id: 1,
     createdAt: '26/07/2022',
@@ -54,6 +88,27 @@ describe('ContributionListItem', () => {
       global: {
         plugins: [i18n],
         mocks,
+        stubs: [
+          'IBiPencil',
+          'IBiTrash',
+          'IBiChatDots',
+          'BAvatar',
+          'VariantIcon',
+          'BButton',
+          'IBiArrowDownCircle',
+          'IBiArrowUpCircle',
+          'IBiArrowUpShort',
+          'ContributionMessagesListItem',
+        ],
+        components: {
+          BRow,
+          BCol,
+          BCollapse,
+          BButton,
+          BForm,
+          BTextArea,
+          BFormTextarea,
+        },
       },
       props: propsData,
     })
@@ -74,13 +129,13 @@ describe('ContributionListItem', () => {
         expect(wrapper.vm.icon).toBe('bell-fill')
       })
 
-      it('is x-circle when deletedAt is present', async () => {
-        await wrapper.setProps({ deletedAt: new Date().toISOString() })
+      it('is x-circle when contributionStatus is DELETED', async () => {
+        await wrapper.setProps({ contributionStatus: 'DELETED' })
         expect(wrapper.vm.icon).toBe('trash')
       })
 
-      it('is check when confirmedAt is present', async () => {
-        await wrapper.setProps({ confirmedAt: new Date().toISOString() })
+      it('is check when contributionStatus is CONFIRMED', async () => {
+        await wrapper.setProps({ contributionStatus: 'CONFIRMED' })
         expect(wrapper.vm.icon).toBe('check')
       })
     })
@@ -90,18 +145,18 @@ describe('ContributionListItem', () => {
         expect(wrapper.vm.variant).toBe('primary')
       })
 
-      it('is danger when deletedAt is present', async () => {
-        await wrapper.setProps({ deletedAt: new Date().toISOString() })
+      it('is danger when contributionStatus is DELETED', async () => {
+        await wrapper.setProps({ contributionStatus: 'DELETED' })
         expect(wrapper.vm.variant).toBe('danger')
       })
 
-      it('is success at when confirmedAt is present', async () => {
-        await wrapper.setProps({ confirmedAt: new Date().toISOString() })
+      it('is success at when contributionStatus is CONFIRMED', async () => {
+        await wrapper.setProps({ contributionStatus: 'CONFIRMED' })
         expect(wrapper.vm.variant).toBe('success')
       })
 
-      it('is warning at when status is IN_PROGRESS', async () => {
-        await wrapper.setProps({ status: 'IN_PROGRESS' })
+      it('is warning at when contributionStatus is IN_PROGRESS', async () => {
+        await wrapper.setProps({ contributionStatus: 'IN_PROGRESS' })
         expect(wrapper.vm.variant).toBe('205')
       })
     })
@@ -133,7 +188,7 @@ describe('ContributionListItem', () => {
         })
 
         it('emits delete contribution', () => {
-          expect(wrapper.emitted('delete-contribution')).toEqual([[{ id: 1 }]])
+          expect(wrapper.emitted('contribution-changed')).toBeTruthy()
         })
       })
 
@@ -147,35 +202,15 @@ describe('ContributionListItem', () => {
           expect(wrapper.emitted('delete-contribution')).toBeFalsy()
         })
       })
-
-      describe('updateStatus', () => {
-        beforeEach(async () => {
-          await wrapper.vm.updateStatus()
-        })
-
-        it('emit update-status', () => {
-          expect(wrapper.emitted('update-status')).toBeTruthy()
-        })
-      })
     })
 
-    describe('getListContributionMessages', () => {
-      beforeEach(() => {
-        wrapper
-          .findComponent({ name: 'ContributionMessagesList' })
-          .vm.$emit('get-list-contribution-messages')
-      })
-      it('emits close-all-open-collapse', () => {
-        expect(wrapper.emitted('close-all-open-collapse')).toBeTruthy()
-      })
-    })
     describe('updateStatus', () => {
       it('updates status of a contribution', async () => {
-        wrapper.vm.items[0] = { id: 1, status: 'IN_PROGRESS' }
+        wrapper.vm.contributionStatus = 'IN_PROGRESS'
 
-        wrapper.vm.updateStatus(1)
+        wrapper.vm.addContributionMessage({})
 
-        expect(wrapper.vm.items[0].status).toBe('PENDING')
+        expect(wrapper.vm.localStatus).toBe('PENDING')
       })
     })
   })

From 813caa1fac61bd302732cda130dfe692e809fc96 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Thu, 15 May 2025 13:29:45 +0200
Subject: [PATCH 12/36] decouple all and user contributions for better code
 readability and testability

---
 .../Contributions/ContributionList.spec.js    |  55 +++++++--
 .../Contributions/ContributionList.vue        |  93 ++++++----------
 .../Contributions/ContributionListAll.vue     |  61 ++++++++++
 .../Contributions/ContributionListAllItem.vue | 101 +++++++++++++++++
 .../Contributions/ContributionListItem.vue    | 105 ++----------------
 .../components/PaginatorRouteParamsPage.vue   |  54 +++++++++
 .../src/composables/useContributionStatus.js  |  22 ++++
 frontend/src/graphql/contributions.graphql    |  19 +++-
 frontend/src/pages/Community.vue              |  17 +--
 9 files changed, 342 insertions(+), 185 deletions(-)
 create mode 100644 frontend/src/components/Contributions/ContributionListAll.vue
 create mode 100644 frontend/src/components/Contributions/ContributionListAllItem.vue
 create mode 100644 frontend/src/components/PaginatorRouteParamsPage.vue
 create mode 100644 frontend/src/composables/useContributionStatus.js

diff --git a/frontend/src/components/Contributions/ContributionList.spec.js b/frontend/src/components/Contributions/ContributionList.spec.js
index a2a4382dd..439252de6 100644
--- a/frontend/src/components/Contributions/ContributionList.spec.js
+++ b/frontend/src/components/Contributions/ContributionList.spec.js
@@ -4,12 +4,29 @@ import { mount } from '@vue/test-utils'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { createI18n } from 'vue-i18n'
 import ContributionList from './ContributionList'
+import { createRouter, createWebHistory } from 'vue-router'
 
 const i18n = createI18n({
   legacy: false,
   locale: 'en',
 })
 
+const router = createRouter({
+  history: createWebHistory(),
+  routes: [
+    {
+      path: '/',
+      name: 'home',
+      component: { template: '<div>Home</div>' },
+    },
+    {
+      path: '/test',
+      name: 'test',
+      component: ContributionList,
+    },
+  ],
+})
+
 vi.mock('@/components/Contributions/ContributionListItem.vue', () => ({
   default: {
     name: 'ContributionListItem',
@@ -25,7 +42,7 @@ describe('ContributionList', () => {
   let wrapper
 
   const global = {
-    plugins: [i18n],
+    plugins: [i18n, router],
     mocks: {
       $filters: {
         GDD: vi.fn((val) => val),
@@ -36,9 +53,9 @@ describe('ContributionList', () => {
     },
   }
 
-  const contributionsList = {
+  const contributions = {
     contributionCount: 3,
-    contributionList: [
+    listContributions: [
       {
         id: 0,
         date: '07/06/2022',
@@ -64,11 +81,13 @@ describe('ContributionList', () => {
   }
 
   const propsData = {
-    contributionCount: 3,
-    showPagination: true,
-    pageSize: 25,
     allContribution: false,
-    items: [
+    emptyText: '',
+  }
+
+  const allContributions = {
+    contributionCount: 3,
+    listAllContributions: [
       {
         id: 0,
         date: '07/06/2022',
@@ -95,7 +114,7 @@ describe('ContributionList', () => {
 
   const mountWrapper = () => {
     return mount(ContributionList, {
-      props: propsData,
+      propsData,
       global,
     })
   }
@@ -107,10 +126,20 @@ describe('ContributionList', () => {
     beforeEach(() => {
       vi.mocked(useQuery).mockImplementation((query) => {
         if (query === listContributions) {
-          return { onResult: mockListContributionsQuery, refetch: vi.fn() }
+          return {
+            result: contributions,
+            loading: vi.fn(),
+            onResult: mockListContributionsQuery,
+            refetch: vi.fn(),
+          }
         }
         if (query === listAllContributions) {
-          return { onResult: mockListAllContributionsQuery, refetch: vi.fn() }
+          return {
+            result: allContributions,
+            loading: vi.fn(),
+            onResult: mockListAllContributionsQuery,
+            refetch: vi.fn(),
+          }
         }
       })
 
@@ -152,7 +181,8 @@ describe('ContributionList', () => {
 
       describe('list count greater than page size', () => {
         beforeEach(async () => {
-          await wrapper.setProps({ contributionCount: 33 })
+          contributions.contributionCount = 33
+          // await wrapper.setProps({ contributionCount: 33 })
         })
 
         it('has pagination buttons', () => {
@@ -165,7 +195,8 @@ describe('ContributionList', () => {
         window.scrollTo = scrollToMock
 
         beforeEach(async () => {
-          await wrapper.setProps({ contributionCount: 33 })
+          contributions.contributionCount = 33
+          // await wrapper.setProps({ contributionCount: 33 })
           await wrapper.findComponent({ name: 'BPagination' }).vm.$emit('update:modelValue', 2)
         })
 
diff --git a/frontend/src/components/Contributions/ContributionList.vue b/frontend/src/components/Contributions/ContributionList.vue
index 23c13e400..c43e7bc77 100644
--- a/frontend/src/components/Contributions/ContributionList.vue
+++ b/frontend/src/components/Contributions/ContributionList.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="items.length === 0 && !loading">
     <div v-if="currentPage === 1">
-      {{ emptyText }}
+      {{ t('contribution.noContributions.myContributions') }}
     </div>
     <div v-else>
       {{ t('contribution.noContributions.emptyPage') }}
@@ -13,7 +13,6 @@
         <contribution-list-item
           v-bind="item"
           :contribution-id="item.id"
-          :all-contribution="allContribution"
           :messages-visible="openMessagesListId === item.id"
           @toggle-messages-visible="toggleMessagesVisible(item.id)"
           @update-contribution-form="updateContributionForm"
@@ -22,98 +21,71 @@
       </div>
     </div>
   </div>
-  <BPagination
-    v-if="isPaginationVisible"
-    :model-value="currentPage"
-    class="mt-3"
-    pills
-    size="lg"
-    :per-page="pageSize"
-    :total-rows="contributionCount"
-    align="center"
-    :hide-ellipsis="true"
-    @update:model-value="updatePage"
+  <paginator-route-params-page
+    v-model="currentPage"
+    :page-size="pageSize"
+    :total-count="contributionCount"
+    :loading="loading"
   />
 </template>
 <script setup>
 import { ref, computed, nextTick } from 'vue'
 import ContributionListItem from '@/components/Contributions/ContributionListItem.vue'
-import { listContributions, listAllContributions } from '@/graphql/contributions.graphql'
+import { listContributions } from '@/graphql/contributions.graphql'
 import { useQuery } from '@vue/apollo-composable'
 import { PAGE_SIZE } from '@/constants'
-import { useAppToast } from '@/composables/useToast'
 import { useI18n } from 'vue-i18n'
 import CONFIG from '@/config'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute } from 'vue-router'
+import PaginatorRouteParamsPage from '@/components/PaginatorRouteParamsPage.vue'
 
-const props = defineProps({
-  allContribution: {
-    type: Boolean,
-    required: false,
-    default: false,
-  },
-  emptyText: {
-    type: String,
-    required: false,
-    default: '',
-  },
-})
+const route = useRoute()
 
 // composables
-const { toastError, toastSuccess } = useAppToast()
 const { t } = useI18n()
-const route = useRoute()
-const router = useRouter()
 
 // constants
 const pageSize = PAGE_SIZE
 const pollInterval = CONFIG.AUTO_POLL_INTERVAL || undefined
 
+// events
+const emit = defineEmits(['update-contribution-form'])
+
 // refs
-const currentPage = computed(() => Number(route.params.page) || 1)
+const currentPage = ref(1)
+
+// computed
 const openMessagesListId = ref(null)
 
-// queries
 const { result, loading, refetch, onResult } = useQuery(
-  props.allContribution ? listAllContributions : listContributions,
-  () => ({
+  listContributions,
+  {
     pagination: {
       currentPage: currentPage.value,
       pageSize,
       order: 'DESC',
     },
-    messagePagination: !props.allContribution
-      ? {
-          currentPage: 1,
-          pageSize: 10,
-          order: 'ASC',
-        }
-      : undefined,
-  }),
-  { fetchPolicy: 'cache-and-network', pollInterval },
+    messagePagination: {
+      currentPage: 1,
+      pageSize: 10,
+      order: 'ASC',
+    },
+  },
+  {
+    fetchPolicy: 'cache-and-network',
+    pollInterval,
+  },
 )
 
-// events
-const emit = defineEmits(['update-contribution-form'])
-
-// computed
-const contributionListResult = computed(() => {
-  return props.allContribution
-    ? result.value?.listAllContributions
-    : result.value?.listContributions
-})
 const contributionCount = computed(() => {
-  return contributionListResult.value?.contributionCount || 0
+  return result.value?.listContributions.contributionCount || 0
 })
 const items = computed(() => {
-  return [...(contributionListResult.value?.contributionList || [])]
-})
-const isPaginationVisible = computed(() => {
-  return (contributionCount.value > pageSize || currentPage.value > 1) && !loading.value
+  return [...(result.value?.listContributions.contributionList || [])]
 })
 
 // callbacks
-onResult(({ data }) => {
+onResult(({ _data }) => {
   nextTick(() => {
     if (!route.hash) {
       return
@@ -136,7 +108,4 @@ const toggleMessagesVisible = (contributionId) => {
 const updateContributionForm = (item) => {
   emit('update-contribution-form', { item, page: currentPage.value })
 }
-const updatePage = (page) => {
-  router.push({ params: { page } })
-}
 </script>
diff --git a/frontend/src/components/Contributions/ContributionListAll.vue b/frontend/src/components/Contributions/ContributionListAll.vue
new file mode 100644
index 000000000..f46d8762c
--- /dev/null
+++ b/frontend/src/components/Contributions/ContributionListAll.vue
@@ -0,0 +1,61 @@
+<template>
+  <div v-if="items.length === 0 && !loading">
+    <div v-if="currentPage === 1">
+      {{ $t('contribution.noContributions.allContributions') }}
+    </div>
+    <div v-else>
+      {{ $t('contribution.noContributions.emptyPage') }}
+    </div>
+  </div>
+  <div v-else class="all-contribution-list">
+    <div v-for="item in items" :key="item.id + 'a'" class="mb-3">
+      <div :id="`contributionListItem-${item.id}`">
+        <contribution-list-all-item v-bind="item" />
+      </div>
+    </div>
+  </div>
+  <paginator-route-params-page
+    v-model="currentPage"
+    :total-count="contributionCount"
+    :loading="loading"
+    :page-size="pageSize"
+  />
+</template>
+<script setup>
+import { computed, ref } from 'vue'
+import ContributionListAllItem from '@/components/Contributions/ContributionListAllItem.vue'
+import { listAllContributions } from '@/graphql/contributions.graphql'
+import { useQuery } from '@vue/apollo-composable'
+import CONFIG from '@/config'
+import PaginatorRouteParamsPage from '@/components/PaginatorRouteParamsPage.vue'
+import { PAGE_SIZE } from '@/constants'
+
+// constants
+const pollInterval = CONFIG.AUTO_POLL_INTERVAL || undefined
+const pageSize = PAGE_SIZE
+
+// computed
+const currentPage = ref(1)
+
+const { result, loading } = useQuery(
+  listAllContributions,
+  {
+    pagination: {
+      currentPage: currentPage.value,
+      pageSize,
+      order: 'DESC',
+    },
+  },
+  {
+    fetchPolicy: 'cache-and-network',
+    pollInterval,
+  },
+)
+
+const contributionCount = computed(() => {
+  return result.value?.listAllContributions.contributionCount || 0
+})
+const items = computed(() => {
+  return [...(result.value?.listAllContributions.contributionList || [])]
+})
+</script>
diff --git a/frontend/src/components/Contributions/ContributionListAllItem.vue b/frontend/src/components/Contributions/ContributionListAllItem.vue
new file mode 100644
index 000000000..b6f4dcba9
--- /dev/null
+++ b/frontend/src/components/Contributions/ContributionListAllItem.vue
@@ -0,0 +1,101 @@
+<template>
+  <div>
+    <div class="contribution-list-item bg-white app-box-shadow gradido-border-radius pt-3 px-3">
+      <BRow>
+        <BCol cols="3" lg="2" md="2">
+          <app-avatar
+            v-if="username.username"
+            :name="username.username"
+            :initials="username.initials"
+            color="#fff"
+            class="vue3-avatar fw-bold"
+          />
+        </BCol>
+        <BCol>
+          <div v-if="username.username" class="me-3 fw-bold">
+            {{ username.username }}
+            <variant-icon :icon="icon" :variant="variant" />
+          </div>
+          <div class="small">
+            {{ $d(new Date(contributionDate), 'short') }}
+          </div>
+          <div class="mt-3 fw-bold">{{ $t('contributionText') }}</div>
+          <div class="mb-3 text-break word-break">{{ memo }}</div>
+          <div v-if="updatedBy > 0" class="mt-2 mb-2 small">
+            {{ $t('moderatorChangedMemo') }}
+          </div>
+        </BCol>
+        <BCol cols="9" lg="3" offset="3" offset-md="0" offset-lg="0">
+          <div class="small">
+            {{ $t('creation') }} {{ $t('(') }}{{ hours }} {{ $t('h') }}{{ $t(')') }}
+          </div>
+          <div v-if="contributionStatus === 'DENIED'" class="fw-bold">
+            <variant-icon icon="x-circle" variant="danger" />
+            {{ $t('contribution.alert.denied') }}
+          </div>
+          <div v-if="contributionStatus === 'DELETED'" class="small">
+            {{ $t('contribution.deleted') }}
+          </div>
+          <div v-else class="fw-bold">{{ $filters.GDD(amount) }}</div>
+        </BCol>
+        <BCol cols="12" md="1" lg="1" class="text-end align-items-center" />
+      </BRow>
+      <div class="pb-3"></div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import AppAvatar from '@/components/AppAvatar.vue'
+import { GDD_PER_HOUR } from '../../constants'
+import { useContributionStatus } from '@/composables/useContributionStatus'
+
+const props = defineProps({
+  amount: {
+    type: String,
+  },
+  memo: {
+    type: String,
+  },
+  user: {
+    type: Object,
+    required: false,
+  },
+  contributionDate: {
+    type: String,
+  },
+  updatedBy: {
+    type: Number,
+    required: false,
+  },
+  contributionStatus: {
+    type: String,
+    required: false,
+    default: '',
+  },
+})
+
+const { getVariant, getIcon } = useContributionStatus()
+const variant = computed(() => getVariant(props.contributionStatus))
+const icon = computed(() => getIcon(props.contributionStatus))
+
+const username = computed(() => {
+  if (!props.user) return {}
+  return {
+    username: props.user.alias
+      ? props.user.alias
+      : `${props.user.firstName} ${props.user.lastName}`,
+    initials: `${props.user.firstName[0]}${props.user.lastName[0]}`,
+  }
+})
+
+const hours = computed(() => parseFloat((props.amount / GDD_PER_HOUR).toFixed(2)))
+</script>
+
+<style lang="scss" scoped>
+:deep(.b-avatar-custom > svg) {
+  width: 2.5em;
+  height: 2.5em;
+}
+</style>
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index e579d6280..be0d2a31b 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -2,26 +2,15 @@
   <div>
     <div
       class="contribution-list-item bg-white app-box-shadow gradido-border-radius pt-3 px-3"
-      :class="localStatus === 'IN_PROGRESS' && !allContribution ? 'pulse border border-205' : ''"
+      :class="localStatus === 'IN_PROGRESS' ? 'pulse border border-205' : ''"
     >
       <BRow>
         <BCol cols="3" lg="2" md="2">
-          <app-avatar
-            v-if="username.username"
-            :name="username.username"
-            :initials="username.initials"
-            color="#fff"
-            class="vue3-avatar fw-bold"
-          />
-          <BAvatar v-else rounded="lg" :variant="variant" size="4.55em">
+          <BAvatar rounded="lg" :variant="variant" size="4.55em">
             <variant-icon :icon="icon" variant="white" />
           </BAvatar>
         </BCol>
         <BCol>
-          <div v-if="username.username" class="me-3 fw-bold">
-            {{ username.username }}
-            <variant-icon :icon="icon" :variant="variant" />
-          </div>
           <div class="small">
             {{ $d(new Date(contributionDate), 'short') }}
           </div>
@@ -31,7 +20,7 @@
             {{ $t('moderatorChangedMemo') }}
           </div>
           <div
-            v-if="localStatus === 'IN_PROGRESS' && !allContribution"
+            v-if="localStatus === 'IN_PROGRESS'"
             class="text-danger pointer hover-font-bold"
             @click="emit('toggle-messages-visible')"
           >
@@ -42,10 +31,6 @@
           <div class="small">
             {{ $t('creation') }} {{ $t('(') }}{{ hours }} {{ $t('h') }}{{ $t(')') }}
           </div>
-          <div v-if="localStatus === 'DENIED' && allContribution" class="fw-bold">
-            <variant-icon icon="x-circle" variant="danger" />
-            {{ $t('contribution.alert.denied') }}
-          </div>
           <div v-if="localStatus === 'DELETED'" class="small">
             {{ $t('contribution.deleted') }}
           </div>
@@ -57,17 +42,10 @@
           </div>
         </BCol>
       </BRow>
-      <BRow
-        v-if="
-          (!['CONFIRMED', 'DELETED'].includes(localStatus) && !allContribution) || messagesCount > 0
-        "
-        class="p-2"
-      >
+      <BRow v-if="!['CONFIRMED', 'DELETED'].includes(localStatus) || messagesCount > 0" class="p-2">
         <BCol cols="3" class="me-auto text-center">
           <div
-            v-if="
-              !['CONFIRMED', 'DELETED'].includes(localStatus) && !allContribution && !moderatorId
-            "
+            v-if="!['CONFIRMED', 'DELETED'].includes(localStatus) && !moderatorId"
             class="test-delete-contribution pointer me-3"
             @click="processDeleteContribution({ id })"
           >
@@ -78,9 +56,7 @@
         </BCol>
         <BCol cols="3" class="text-center">
           <div
-            v-if="
-              !['CONFIRMED', 'DELETED'].includes(localStatus) && !allContribution && !moderatorId
-            "
+            v-if="!['CONFIRMED', 'DELETED'].includes(localStatus) && !moderatorId"
             class="test-edit-contribution pointer me-3"
             @click="
               $emit('update-contribution-form', {
@@ -111,7 +87,7 @@
           v-if="messagesCount > 0"
           :messages="localMessages"
           :status="localStatus"
-          :contribution-id="contributionId"
+          :contribution-id="id"
           @close-messages-list="emit('toggle-messages-visible')"
           @add-contribution-message="addContributionMessage"
         />
@@ -128,9 +104,9 @@ import ContributionMessagesList from '@/components/ContributionMessages/Contribu
 import { useAppToast } from '@/composables/useToast'
 import { useI18n } from 'vue-i18n'
 import { useMutation } from '@vue/apollo-composable'
-import AppAvatar from '@/components/AppAvatar.vue'
 import { GDD_PER_HOUR } from '../../constants'
 import { deleteContribution } from '@/graphql/contributions.graphql'
+import { useContributionStatus } from '@/composables/useContributionStatus'
 
 const props = defineProps({
   id: {
@@ -147,36 +123,9 @@ const props = defineProps({
     required: false,
     default: () => [],
   },
-  user: {
-    type: Object,
-    required: false,
-  },
-  createdAt: {
-    type: String,
-  },
   contributionDate: {
     type: String,
   },
-  deletedAt: {
-    type: String,
-    required: false,
-  },
-  confirmedBy: {
-    type: Number,
-    required: false,
-  },
-  confirmedAt: {
-    type: String,
-    required: false,
-  },
-  deniedBy: {
-    type: Number,
-    required: false,
-  },
-  deniedAt: {
-    type: String,
-    required: false,
-  },
   updatedBy: {
     type: Number,
     required: false,
@@ -190,15 +139,6 @@ const props = defineProps({
     type: Number,
     required: false,
   },
-  contributionId: {
-    type: Number,
-    required: true,
-  },
-  allContribution: {
-    type: Boolean,
-    required: false,
-    default: false,
-  },
   moderatorId: {
     type: Number,
     required: false,
@@ -213,11 +153,14 @@ const props = defineProps({
 
 const { toastError, toastSuccess } = useAppToast()
 const { t } = useI18n()
+const { getVariant, getIcon } = useContributionStatus()
 
 const { mutate: deleteContributionMutation } = useMutation(deleteContribution)
 
 const localMessages = ref([])
 const localStatus = ref(props.contributionStatus)
+const variant = computed(() => getVariant(props.contributionStatus))
+const icon = computed(() => getIcon(props.contributionStatus))
 
 // if parent reload messages, update local messages copy
 watch(
@@ -237,32 +180,6 @@ watch(
   },
 )
 
-const statusMapping = {
-  CONFIRMED: { variant: 'success', icon: 'check' },
-  DELETED: { variant: 'danger', icon: 'trash' },
-  DENIED: { variant: 'warning', icon: 'x-circle' },
-  IN_PROGRESS: { variant: '205', icon: 'question' },
-  default: { variant: 'primary', icon: 'bell-fill' },
-}
-
-const variant = computed(() => {
-  return (statusMapping[localStatus.value] || statusMapping.default).variant
-})
-
-const icon = computed(() => {
-  return (statusMapping[localStatus.value] || statusMapping.default).icon
-})
-
-const username = computed(() => {
-  if (!props.user) return {}
-  return {
-    username: props.user.alias
-      ? props.user.alias
-      : `${props.user.firstName} ${props.user.lastName}`,
-    initials: `${props.user.firstName[0]}${props.user.lastName[0]}`,
-  }
-})
-
 const hours = computed(() => parseFloat((props.amount / GDD_PER_HOUR).toFixed(2)))
 
 async function processDeleteContribution(item) {
diff --git a/frontend/src/components/PaginatorRouteParamsPage.vue b/frontend/src/components/PaginatorRouteParamsPage.vue
new file mode 100644
index 000000000..1f41cc54a
--- /dev/null
+++ b/frontend/src/components/PaginatorRouteParamsPage.vue
@@ -0,0 +1,54 @@
+<template>
+  <BPagination
+    v-if="isPaginationVisible"
+    :model-value="currentPage"
+    class="mt-3"
+    pills
+    size="lg"
+    :per-page="pageSize"
+    :total-rows="totalCount"
+    align="center"
+    :hide-ellipsis="true"
+    @update:model-value="updatePage"
+  />
+</template>
+<script setup>
+import { computed } from 'vue'
+import CONFIG from '@/config'
+import { useRouter, useRoute } from 'vue-router'
+
+const router = useRouter()
+const route = useRoute()
+
+const props = defineProps({
+  modelValue: {
+    type: Number,
+    required: true,
+  },
+  pageSize: {
+    type: Number,
+    required: false,
+    default: CONFIG.PAGE_SIZE,
+  },
+  totalCount: {
+    type: Number,
+    required: true,
+  },
+  loading: {
+    type: Boolean,
+    required: false,
+    default: false,
+  },
+})
+
+const emit = defineEmits(['update:model-value'])
+
+const isPaginationVisible = computed(() => {
+  return (props.totalCount > props.pageSize || props.modelValue > 1) && !props.loading
+})
+const currentPage = computed(() => Number(route.params.page) || props.modelValue)
+const updatePage = (page) => {
+  router.push({ params: { page } })
+  emit('update:model-value', page)
+}
+</script>
diff --git a/frontend/src/composables/useContributionStatus.js b/frontend/src/composables/useContributionStatus.js
new file mode 100644
index 000000000..5ca07f9cc
--- /dev/null
+++ b/frontend/src/composables/useContributionStatus.js
@@ -0,0 +1,22 @@
+export const useContributionStatus = () => {
+  const statusMapping = {
+    CONFIRMED: { variant: 'success', icon: 'check' },
+    DELETED: { variant: 'danger', icon: 'trash' },
+    DENIED: { variant: 'warning', icon: 'x-circle' },
+    IN_PROGRESS: { variant: '205', icon: 'question' },
+    default: { variant: 'primary', icon: 'bell-fill' },
+  }
+
+  const getVariant = (status) => {
+    return (statusMapping[status] || statusMapping.default).variant
+  }
+
+  const getIcon = (status) => {
+    return (statusMapping[status] || statusMapping.default).icon
+  }
+
+  return {
+    getVariant,
+    getIcon,
+  }
+}
diff --git a/frontend/src/graphql/contributions.graphql b/frontend/src/graphql/contributions.graphql
index c38449fca..0fe4a46f1 100644
--- a/frontend/src/graphql/contributions.graphql
+++ b/frontend/src/graphql/contributions.graphql
@@ -35,12 +35,17 @@ query listContributions ($pagination: Paginated!, $messagePagination: Paginated!
   listContributions(pagination: $pagination, messagePagination: $messagePagination) {
     contributionCount
     contributionList {
-      ...contributionFields
-      deletedAt
-      moderatorId
+      id
+      amount
+      memo
+      contributionDate
+      contributionStatus
+      messagesCount
       messages(pagination: $messagePagination) {
         ...contributionMessageFields
       }
+      updatedBy
+      moderatorId
     }
   }
 }
@@ -49,10 +54,14 @@ query listAllContributions ($pagination: Paginated!) {
   listAllContributions(pagination: $pagination) {
     contributionCount
     contributionList {
+      amount
+      memo
       user {
         ...userFields
-      }
-      ...contributionFields
+      }      
+      contributionDate
+      updatedBy
+      contributionStatus
     }
   }
 }
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index cba744604..86d2a2486 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -11,16 +11,10 @@
           <contribution-create v-else />
         </BTab>
         <BTab no-body lazy>
-          <contribution-list
-            :empty-text="$t('contribution.noContributions.myContributions')"
-            @update-contribution-form="handleUpdateContributionForm"
-          />
+          <contribution-list @update-contribution-form="handleUpdateContributionForm" />
         </BTab>
         <BTab no-body lazy>
-          <contribution-list
-            :empty-text="$t('contribution.noContributions.allContributions')"
-            :all-contribution="true"
-          />
+          <contribution-list-all />
         </BTab>
       </BTabs>
     </div>
@@ -28,24 +22,23 @@
 </template>
 
 <script setup>
-import { ref, computed, watch, onMounted } from 'vue'
+import { ref, watch, onMounted } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { useQuery } from '@vue/apollo-composable'
-import OpenCreationsAmount from '@/components/Contributions/OpenCreationsAmount'
 import ContributionEdit from '@/components/Contributions/ContributionEdit'
 import ContributionCreate from '@/components/Contributions/ContributionCreate'
 import ContributionList from '@/components/Contributions/ContributionList'
+import ContributionListAll from '@/components/Contributions/ContributionListAll'
 import { countContributionsInProgress } from '@/graphql/contributions.graphql'
 import { useAppToast } from '@/composables/useToast'
 import { useI18n } from 'vue-i18n'
-import { GDD_PER_HOUR } from '../constants'
 
 const COMMUNITY_TABS = ['contribute', 'contributions', 'community']
 
 const route = useRoute()
 const router = useRouter()
 
-const { toastError, toastSuccess, toastInfo } = useAppToast()
+const { toastInfo } = useAppToast()
 const { t } = useI18n()
 
 const tabIndex = ref(0)

From b8fd965f5029f6283d3775c5ad85b9b7de0f777d Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 07:04:06 +0200
Subject: [PATCH 13/36] fix frontend test, decouple some more

---
 .../ContributionMessagesFormular.spec.js      |  15 +-
 .../ContributionMessagesList.spec.js          |  12 -
 .../Contributions/ContributionForm.spec.js    | 123 +++++-----
 .../Contributions/ContributionForm.vue        |   3 +-
 .../Contributions/ContributionList.spec.js    | 178 +++++---------
 .../Contributions/ContributionListAll.spec.js | 158 +++++++++++++
 .../Contributions/ContributionListAll.vue     |   2 +-
 .../ContributionListAllItem.spec.js           | 217 ++++++++++++++++++
 frontend/src/pages/Community.spec.js          | 122 ++--------
 9 files changed, 529 insertions(+), 301 deletions(-)
 create mode 100644 frontend/src/components/Contributions/ContributionListAll.spec.js
 create mode 100644 frontend/src/components/Contributions/ContributionListAllItem.spec.js

diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
index 1f182218c..a582a0284 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@@ -52,7 +52,7 @@ describe('ContributionMessagesFormular', () => {
   }
 
   beforeEach(() => {
-    mockMutate.mockResolvedValue({})
+    mockMutate.mockResolvedValue({ data: { createContributionMessage: {} } })
     wrapper = createWrapper()
   })
 
@@ -66,7 +66,7 @@ describe('ContributionMessagesFormular', () => {
 
   it('resets the form on reset event', async () => {
     await wrapper.find('form').trigger('reset')
-    expect(wrapper.vm.form.text).toBe('')
+    expect(wrapper.vm.formText).toBe('')
   })
 
   describe('form submission', () => {
@@ -82,19 +82,14 @@ describe('ContributionMessagesFormular', () => {
       })
     })
 
-    it('emits get-list-contribution-messages event', async () => {
+    it('emits add-contribution-message event', async () => {
       await nextTick()
-      expect(wrapper.emitted('get-list-contribution-messages')).toEqual([[false]])
-    })
-
-    it('emits update-status event', async () => {
-      await nextTick()
-      expect(wrapper.emitted('update-status')).toEqual([[42]])
+      expect(wrapper.emitted('add-contribution-message')).toEqual([[{}]])
     })
 
     it('resets the form text', async () => {
       await nextTick()
-      expect(wrapper.vm.form.text).toBe('')
+      expect(wrapper.vm.formText).toBe('')
     })
 
     it('shows success toast', async () => {
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js
index 12079a1f7..030ce0af5 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js
@@ -77,16 +77,4 @@ describe('ContributionMessagesList', () => {
       expect(wrapper.find('button').text()).toContain('form.close')
     })
   })
-
-  describe('events', () => {
-    beforeEach(() => {
-      wrapper = createWrapper()
-    })
-
-    it('emits update-status event when updateStatus method is called', async () => {
-      await wrapper.vm.updateStatus(42)
-      expect(wrapper.emitted('update-status')).toBeTruthy()
-      expect(wrapper.emitted('update-status')[0]).toEqual([42])
-    })
-  })
 })
diff --git a/frontend/src/components/Contributions/ContributionForm.spec.js b/frontend/src/components/Contributions/ContributionForm.spec.js
index 626d5e062..40a15c855 100644
--- a/frontend/src/components/Contributions/ContributionForm.spec.js
+++ b/frontend/src/components/Contributions/ContributionForm.spec.js
@@ -1,7 +1,6 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { mount } from '@vue/test-utils'
 import ContributionForm from './ContributionForm.vue'
-import { useForm } from 'vee-validate'
 
 // Mock external components and dependencies
 vi.mock('@/components/Inputs/InputAmount', () => ({
@@ -37,12 +36,16 @@ vi.mock('vee-validate', () => ({
   })),
 }))
 
+const global = {
+  stubs: ['BForm', 'BFormInput', 'BRow', 'BCol', 'BButton'],
+}
+
 describe('ContributionForm', () => {
   let wrapper
 
   const defaultProps = {
     modelValue: {
-      date: '2024-09-12',
+      contributionDate: '2024-09-12',
       memo: 'Test memo',
       hours: 2,
       amount: 40,
@@ -51,12 +54,26 @@ describe('ContributionForm', () => {
     maxGddThisMonth: 200,
   }
 
+  const createWrapperWithDate = (date) => {
+    return mount(ContributionForm, {
+      props: {
+        ...defaultProps,
+        modelValue: {
+          ...defaultProps.modelValue,
+          contributionDate: date.toISOString(),
+        },
+      },
+      global,
+    })
+  }
+  const thisMonth = new Date()
+  const lastMonth = new Date()
+  lastMonth.setMonth(lastMonth.getMonth() - 1, 1)
+
   beforeEach(() => {
     wrapper = mount(ContributionForm, {
       props: defaultProps,
-      global: {
-        stubs: ['BForm', 'BFormInput', 'BRow', 'BCol', 'BButton'],
-      },
+      global,
     })
   })
 
@@ -65,19 +82,17 @@ describe('ContributionForm', () => {
   })
 
   describe('compute isThisMonth', () => {
-    it('return true', async () => {
-      await wrapper.setProps({
-        modelValue: { date: new Date().toISOString() },
-      })
-      expect(wrapper.vm.isThisMonth).toBe(true)
-    })
-    it('return false', async () => {
-      const now = new Date()
-      const lastMonth = new Date(now.setMonth(now.getMonth() - 1, 1))
-      await wrapper.setProps({
-        modelValue: { date: lastMonth.toISOString() },
-      })
-      expect(wrapper.vm.isThisMonth).toBe(false)
+    it.each([
+      [thisMonth, true, 'should return true for current month'],
+      [lastMonth, false, 'should return false for last month'],
+      [
+        new Date(new Date().setFullYear(new Date().getFullYear() + 1)),
+        false,
+        'should return false for next year',
+      ],
+    ])('%s => %s (%s)', (date, expected, desc) => {
+      const wrapper = createWrapperWithDate(date)
+      expect(wrapper.vm.isThisMonth).toBe(expected)
     })
   })
 
@@ -85,21 +100,39 @@ describe('ContributionForm', () => {
     it('if both max gdd are > 0', () => {
       expect(wrapper.vm.noOpenCreation).toBeUndefined()
     })
-    it('if max gdd for this month is 0, and form.date is in last month', async () => {
-      const now = new Date()
-      const lastMonth = new Date(now.setMonth(now.getMonth() - 1, 1))
-      await wrapper.setProps({
-        maxGddThisMonth: 0,
-        modelValue: { date: lastMonth.toISOString() },
+    describe('if form.date is in last month', () => {
+      beforeEach(() => {
+        wrapper = createWrapperWithDate(lastMonth)
+      })
+      it('if max gdd for this month is 0', async () => {
+        await wrapper.setProps({
+          maxGddThisMonth: 0,
+        })
+        expect(wrapper.vm.noOpenCreation).toBeUndefined()
+      })
+      it('if max gdd last month is 0', async () => {
+        await wrapper.setProps({
+          maxGddLastMonth: 0,
+        })
+        expect(wrapper.vm.noOpenCreation).toBe('contribution.noOpenCreation.lastMonth')
       })
-      expect(wrapper.vm.noOpenCreation).toBeUndefined()
     })
-    it('if max gdd for last month is 0, and form.date is in this month', async () => {
-      await wrapper.setProps({
-        maxGddLastMonth: 0,
-        modelValue: { date: new Date().toISOString() },
+    describe('if form.date is in this month', () => {
+      beforeEach(() => {
+        wrapper = createWrapperWithDate(thisMonth)
+      })
+      it('if max gdd for last month is 0', async () => {
+        await wrapper.setProps({
+          maxGddLastMonth: 0,
+        })
+        expect(wrapper.vm.noOpenCreation).toBeUndefined()
+      })
+      it('if max gdd this month is 0', async () => {
+        await wrapper.setProps({
+          maxGddThisMonth: 0,
+        })
+        expect(wrapper.vm.noOpenCreation).toBe('contribution.noOpenCreation.thisMonth')
       })
-      expect(wrapper.vm.noOpenCreation).toBeUndefined()
     })
     it('if max gdd is 0 for both months', async () => {
       await wrapper.setProps({
@@ -108,30 +141,12 @@ describe('ContributionForm', () => {
       })
       expect(wrapper.vm.noOpenCreation).toBe('contribution.noOpenCreation.allMonth')
     })
-    it('if max gdd this month is zero and form.date is inside this month', async () => {
-      await wrapper.setProps({
-        maxGddThisMonth: 0,
-        modelValue: { date: new Date().toISOString() },
-      })
-      expect(wrapper.vm.noOpenCreation).toBe('contribution.noOpenCreation.thisMonth')
-    })
-    it('if max gdd last month is zero and form.date is inside last month', async () => {
-      const now = new Date()
-      const lastMonth = new Date(now.setMonth(now.getMonth() - 1, 1))
-      await wrapper.setProps({
-        maxGddLastMonth: 0,
-        modelValue: { date: lastMonth.toISOString() },
-      })
-      expect(wrapper.vm.noOpenCreation).toBe('contribution.noOpenCreation.lastMonth')
-    })
   })
 
   it('computes disabled correctly', async () => {
     expect(wrapper.vm.disabled).toBe(true)
 
-    await wrapper.setProps({
-      modelValue: { date: new Date().toISOString().slice(0, 10) },
-    })
+    wrapper = createWrapperWithDate(thisMonth)
 
     wrapper.vm.form.amount = 100
 
@@ -154,7 +169,7 @@ describe('ContributionForm', () => {
     expect(wrapper.vm.form.amount).toBe('60.00')
   })
 
-  it('emits update-contribution event on submit for existing contribution', async () => {
+  it('emits upsert-contribution event on submit for existing contribution', async () => {
     const existingContribution = {
       ...defaultProps.modelValue,
       id: '123',
@@ -174,17 +189,17 @@ describe('ContributionForm', () => {
 
     wrapper.vm.submit()
 
-    expect(wrapper.emitted('update-contribution')).toBeTruthy()
-    expect(wrapper.emitted('update-contribution')[0][0]).toEqual(
+    expect(wrapper.emitted('upsert-contribution')).toBeTruthy()
+    expect(wrapper.emitted('upsert-contribution')[0][0]).toEqual(
       expect.objectContaining({
         id: '123',
       }),
     )
   })
 
-  it('emits set-contribution event on submit for new contribution', async () => {
+  it('emits upsert-contribution event on submit for new contribution', async () => {
     wrapper.vm.submit()
 
-    expect(wrapper.emitted('set-contribution')).toBeTruthy()
+    expect(wrapper.emitted('upsert-contribution')).toBeTruthy()
   })
 })
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 997cdd084..237d38c66 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -85,11 +85,12 @@
   </div>
 </template>
 <script setup>
-import { reactive, computed, watch, ref, onMounted, onUnmounted, toRaw } from 'vue'
+import { reactive, computed, ref, onMounted, onUnmounted, toRaw } from 'vue'
 import { useI18n } from 'vue-i18n'
 import ValidatedInput from '@/components/Inputs/ValidatedInput'
 import LabeledInput from '@/components/Inputs/LabeledInput'
 import { memo as memoSchema } from '@/validationSchemas'
+import OpenCreationsAmount from './OpenCreationsAmount.vue'
 import { object, date as dateSchema, number } from 'yup'
 import { GDD_PER_HOUR } from '../../constants'
 
diff --git a/frontend/src/components/Contributions/ContributionList.spec.js b/frontend/src/components/Contributions/ContributionList.spec.js
index 439252de6..e71a08cd0 100644
--- a/frontend/src/components/Contributions/ContributionList.spec.js
+++ b/frontend/src/components/Contributions/ContributionList.spec.js
@@ -1,14 +1,24 @@
-import { listAllContributions, listContributions } from '@/graphql/contributions.graphql'
 import { useQuery } from '@vue/apollo-composable'
 import { mount } from '@vue/test-utils'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { createI18n } from 'vue-i18n'
 import ContributionList from './ContributionList'
 import { createRouter, createWebHistory } from 'vue-router'
+import { ref } from 'vue'
 
 const i18n = createI18n({
   legacy: false,
   locale: 'en',
+  messages: {
+    en: {
+      contribution: {
+        noContributions: {
+          myContributions: 'No contributions',
+          emptyPage: 'No contributions',
+        },
+      },
+    },
+  },
 })
 
 const router = createRouter({
@@ -53,93 +63,53 @@ describe('ContributionList', () => {
     },
   }
 
-  const contributions = {
-    contributionCount: 3,
-    listContributions: [
-      {
-        id: 0,
-        date: '07/06/2022',
-        memo: 'Ich habe 10 Stunden die Elbwiesen von Müll befreit.',
-        amount: '200',
-        status: 'IN_PROGRESS',
-      },
-      {
-        id: 1,
-        date: '06/22/2022',
-        memo: 'Ich habe 30 Stunden Frau Müller beim Einkaufen und im Haushalt geholfen.',
-        amount: '600',
-        status: 'CONFIRMED',
-      },
-      {
-        id: 2,
-        date: '05/04/2022',
-        memo: 'Ich habe 50 Stunden den Nachbarkindern bei ihren Hausaufgaben geholfen und Nachhilfeunterricht gegeben.',
-        amount: '1000',
-        status: 'DENIED',
-      },
-    ],
-  }
-
-  const propsData = {
-    allContribution: false,
-    emptyText: '',
-  }
-
-  const allContributions = {
-    contributionCount: 3,
-    listAllContributions: [
-      {
-        id: 0,
-        date: '07/06/2022',
-        memo: 'Ich habe 10 Stunden die Elbwiesen von Müll befreit.',
-        amount: '200',
-        status: 'IN_PROGRESS',
-      },
-      {
-        id: 1,
-        date: '06/22/2022',
-        memo: 'Ich habe 30 Stunden Frau Müller beim Einkaufen und im Haushalt geholfen.',
-        amount: '600',
-        status: 'CONFIRMED',
-      },
-      {
-        id: 2,
-        date: '05/04/2022',
-        memo: 'Ich habe 50 Stunden den Nachbarkindern bei ihren Hausaufgaben geholfen und Nachhilfeunterricht gegeben.',
-        amount: '1000',
-        status: 'DENIED',
-      },
-    ],
-  }
+  const contributions = ref({
+    listContributions: {
+      contributionCount: 3,
+      contributionList: [
+        {
+          id: 0,
+          date: '07/06/2022',
+          memo: 'Ich habe 10 Stunden die Elbwiesen von Müll befreit.',
+          amount: '200',
+          status: 'IN_PROGRESS',
+        },
+        {
+          id: 1,
+          date: '06/22/2022',
+          memo: 'Ich habe 30 Stunden Frau Müller beim Einkaufen und im Haushalt geholfen.',
+          amount: '600',
+          status: 'CONFIRMED',
+        },
+        {
+          id: 2,
+          date: '05/04/2022',
+          memo: 'Ich habe 50 Stunden den Nachbarkindern bei ihren Hausaufgaben geholfen und Nachhilfeunterricht gegeben.',
+          amount: '1000',
+          status: 'DENIED',
+        },
+      ],
+    },
+  })
 
   const mountWrapper = () => {
     return mount(ContributionList, {
-      propsData,
       global,
     })
   }
 
+  const loading = ref(false)
+
   describe('mount', () => {
     const mockListContributionsQuery = vi.fn()
-    const mockListAllContributionsQuery = vi.fn()
 
     beforeEach(() => {
       vi.mocked(useQuery).mockImplementation((query) => {
-        if (query === listContributions) {
-          return {
-            result: contributions,
-            loading: vi.fn(),
-            onResult: mockListContributionsQuery,
-            refetch: vi.fn(),
-          }
-        }
-        if (query === listAllContributions) {
-          return {
-            result: allContributions,
-            loading: vi.fn(),
-            onResult: mockListAllContributionsQuery,
-            refetch: vi.fn(),
-          }
+        return {
+          result: contributions,
+          loading,
+          onResult: mockListContributionsQuery,
+          refetch: vi.fn(),
         }
       })
 
@@ -151,23 +121,11 @@ describe('ContributionList', () => {
     })
 
     describe('mount as user contributions list', () => {
-      beforeEach(() => {
-        propsData.allContribution = false
-      })
       it('fetches initial data', () => {
         expect(mockListContributionsQuery).toHaveBeenCalled()
       })
     })
 
-    describe('mount as all contributions list', () => {
-      beforeEach(() => {
-        propsData.allContribution = true
-      })
-      it('fetches initial data', () => {
-        expect(mockListAllContributionsQuery).toHaveBeenCalled()
-      })
-    })
-
     it('has a DIV .contribution-list', () => {
       expect(wrapper.find('div.contribution-list').exists()).toBe(true)
     })
@@ -181,8 +139,7 @@ describe('ContributionList', () => {
 
       describe('list count greater than page size', () => {
         beforeEach(async () => {
-          contributions.contributionCount = 33
-          // await wrapper.setProps({ contributionCount: 33 })
+          contributions.value.listContributions.contributionCount = 33
         })
 
         it('has pagination buttons', () => {
@@ -195,18 +152,17 @@ describe('ContributionList', () => {
         window.scrollTo = scrollToMock
 
         beforeEach(async () => {
-          contributions.contributionCount = 33
-          // await wrapper.setProps({ contributionCount: 33 })
-          await wrapper.findComponent({ name: 'BPagination' }).vm.$emit('update:modelValue', 2)
+          contributions.value.listContributions.contributionCount = 33
+          await wrapper
+            .findComponent({ name: 'PaginatorRouteParamsPage' })
+            .vm.$emit('update:modelValue', 2)
         })
 
-        it('emits update contribution list', () => {
-          expect(wrapper.emitted('update-list-contributions')).toEqual([
-            [{ currentPage: 2, pageSize: 25 }],
-          ])
+        it('updates current page', () => {
+          expect(wrapper.vm.currentPage).toBe(2)
         })
 
-        it('scrolls to top', () => {
+        it.skip('scrolls to top', () => {
           expect(scrollToMock).toHaveBeenCalledWith(0, 0)
         })
       })
@@ -220,31 +176,7 @@ describe('ContributionList', () => {
       })
 
       it('emits update contribution form', () => {
-        expect(wrapper.emitted('update-contribution-form')).toEqual([['item']])
-      })
-    })
-
-    describe('delete contribution', () => {
-      beforeEach(async () => {
-        await wrapper
-          .findComponent({ name: 'ContributionListItem' })
-          .vm.$emit('delete-contribution', { id: 2 })
-      })
-
-      it('emits delete contribution', () => {
-        expect(wrapper.emitted('delete-contribution')).toEqual([[{ id: 2 }]])
-      })
-    })
-
-    describe('update status', () => {
-      beforeEach(async () => {
-        await wrapper
-          .findComponent({ name: 'ContributionListItem' })
-          .vm.$emit('update-status', { id: 2 })
-      })
-
-      it('emits update status', () => {
-        expect(wrapper.emitted('update-status')).toEqual([[{ id: 2 }]])
+        expect(wrapper.emitted('update-contribution-form')).toEqual([[{ item: 'item', page: 1 }]])
       })
     })
   })
diff --git a/frontend/src/components/Contributions/ContributionListAll.spec.js b/frontend/src/components/Contributions/ContributionListAll.spec.js
new file mode 100644
index 000000000..7fe9b9423
--- /dev/null
+++ b/frontend/src/components/Contributions/ContributionListAll.spec.js
@@ -0,0 +1,158 @@
+import { listAllContributions } from '@/graphql/contributions.graphql'
+import { useQuery } from '@vue/apollo-composable'
+import { mount } from '@vue/test-utils'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+import ContributionListAll from './ContributionListAll.vue'
+import { createRouter, createWebHistory } from 'vue-router'
+import { ref } from 'vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+})
+
+const router = createRouter({
+  history: createWebHistory(),
+  routes: [
+    {
+      path: '/',
+      name: 'home',
+      component: { template: '<div>Home</div>' },
+    },
+    {
+      path: '/test',
+      name: 'test',
+      component: ContributionListAll,
+    },
+  ],
+})
+
+vi.mock('@/components/Contributions/ContributionListAllItem.vue', () => ({
+  default: {
+    name: 'ContributionListAllItem',
+    template: '<div></div>',
+  },
+}))
+
+vi.mock('@vue/apollo-composable', () => ({
+  useQuery: vi.fn(),
+}))
+
+describe('ContributionListAll', () => {
+  let wrapper
+
+  const global = {
+    plugins: [i18n, router],
+    mocks: {
+      $filters: {
+        GDD: vi.fn((val) => val),
+      },
+    },
+    stubs: {
+      BPagination: true,
+    },
+  }
+
+  const allContributions = ref({
+    listAllContributions: {
+      contributionCount: 3,
+      contributionList: [
+        {
+          id: 0,
+          date: '07/06/2022',
+          memo: 'Ich habe 10 Stunden die Elbwiesen von Müll befreit.',
+          amount: '200',
+          status: 'IN_PROGRESS',
+        },
+        {
+          id: 1,
+          date: '06/22/2022',
+          memo: 'Ich habe 30 Stunden Frau Müller beim Einkaufen und im Haushalt geholfen.',
+          amount: '600',
+          status: 'CONFIRMED',
+        },
+        {
+          id: 2,
+          date: '05/04/2022',
+          memo: 'Ich habe 50 Stunden den Nachbarkindern bei ihren Hausaufgaben geholfen und Nachhilfeunterricht gegeben.',
+          amount: '1000',
+          status: 'DENIED',
+        },
+      ],
+    },
+  })
+
+  const mountWrapper = () => {
+    return mount(ContributionListAll, {
+      global,
+    })
+  }
+
+  const loading = ref(false)
+
+  describe('mount', () => {
+    beforeEach(() => {
+      vi.mocked(useQuery).mockImplementation((query) => {
+        return {
+          result: allContributions,
+          loading,
+        }
+      })
+
+      wrapper = mountWrapper()
+    })
+
+    afterEach(() => {
+      vi.clearAllMocks()
+    })
+
+    describe('mount as all contributions list', () => {
+      it('fetches initial data', () => {
+        expect(useQuery).toHaveBeenCalled()
+      })
+    })
+
+    it('has a DIV .contribution-list-all', () => {
+      expect(wrapper.find('div.contribution-list-all').exists()).toBe(true)
+    })
+
+    describe('pagination', () => {
+      describe('list count smaller than page size', () => {
+        it('has no pagination buttons', () => {
+          expect(wrapper.find('b-pagination-stub').exists()).toBe(false)
+        })
+      })
+
+      describe('list count greater than page size', () => {
+        beforeEach(async () => {
+          allContributions.value.listAllContributions.contributionCount = 33
+        })
+
+        it('has pagination buttons', () => {
+          expect(wrapper.find('b-pagination-stub').exists()).toBe(true)
+        })
+      })
+
+      describe('switch page', () => {
+        const scrollToMock = vi.fn()
+        window.scrollTo = scrollToMock
+
+        beforeEach(async () => {
+          allContributions.value.listAllContributions.contributionCount = 33
+          await wrapper
+            .findComponent({ name: 'PaginatorRouteParamsPage' })
+            .vm.$emit('update:modelValue', 2)
+        })
+
+        it('updates current page', () => {
+          expect(wrapper.vm.currentPage).toBe(2)
+        })
+
+        it.skip('scrolls to top', () => {
+          expect(scrollToMock).toHaveBeenCalledWith(0, 0)
+        })
+      })
+    })
+  })
+})
diff --git a/frontend/src/components/Contributions/ContributionListAll.vue b/frontend/src/components/Contributions/ContributionListAll.vue
index f46d8762c..6e1f1a849 100644
--- a/frontend/src/components/Contributions/ContributionListAll.vue
+++ b/frontend/src/components/Contributions/ContributionListAll.vue
@@ -7,7 +7,7 @@
       {{ $t('contribution.noContributions.emptyPage') }}
     </div>
   </div>
-  <div v-else class="all-contribution-list">
+  <div v-else class="contribution-list-all">
     <div v-for="item in items" :key="item.id + 'a'" class="mb-3">
       <div :id="`contributionListItem-${item.id}`">
         <contribution-list-all-item v-bind="item" />
diff --git a/frontend/src/components/Contributions/ContributionListAllItem.spec.js b/frontend/src/components/Contributions/ContributionListAllItem.spec.js
new file mode 100644
index 000000000..ae901dddb
--- /dev/null
+++ b/frontend/src/components/Contributions/ContributionListAllItem.spec.js
@@ -0,0 +1,217 @@
+import { mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createI18n } from 'vue-i18n'
+import ContributionListItem from './ContributionListItem'
+import { BRow, BCol, BCollapse, BButton, BForm, BTextArea, BFormTextarea } from 'bootstrap-vue-next'
+import VariantIcon from '@/components/VariantIcon.vue'
+
+const i18n = createI18n({
+  legacy: false,
+  locale: 'en',
+  messages: {
+    en: {
+      short: 'Short format date',
+      contribution: {
+        deleted: 'Deleted contribution',
+        delete: 'Delete contribution',
+        confirmed: 'Confirmed contribution',
+      },
+      form: {
+        reply: 'Reply',
+        memo: 'Memo',
+      },
+      edit: 'Edit',
+      delete: 'Delete',
+      moderatorChat: 'Chat',
+    },
+  },
+  datetimeFormats: {
+    en: {
+      short: {
+        year: 'numeric',
+        month: 'short',
+        day: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit',
+      },
+    },
+  },
+})
+
+vi.mock('@vue/apollo-composable', () => ({
+  useQuery: vi.fn(),
+  useLazyQuery: vi.fn(() => ({
+    onResult: vi.fn(),
+    onError: vi.fn(),
+    load: vi.fn(),
+    refetch: vi.fn(),
+  })),
+  useMutation: vi.fn(() => ({
+    mutate: vi.fn(),
+    onDone: vi.fn(),
+    onError: vi.fn(),
+  })),
+}))
+
+vi.mock('@/composables/useToast', () => ({
+  useAppToast: vi.fn(() => ({
+    addToast: vi.fn(),
+    toastError: vi.fn(),
+    toastSuccess: vi.fn(),
+  })),
+}))
+
+describe('ContributionListItem', () => {
+  let wrapper
+
+  const mocks = {
+    $filters: {
+      GDD: vi.fn((val) => val),
+    },
+    $t: vi.fn((key) => key),
+    $d: (date, format) => date.toISOString(),
+  }
+
+  const propsData = {
+    contributionId: 42,
+    contributionStatus: 'PENDING',
+    messagesCount: 2,
+    id: 1,
+    createdAt: '26/07/2022',
+    contributionDate: '07/06/2022',
+    memo: 'Ich habe 10 Stunden die Elbwiesen von Müll befreit.',
+    amount: '200',
+  }
+
+  const mountWrapper = () => {
+    return mount(ContributionListItem, {
+      global: {
+        plugins: [i18n],
+        mocks,
+        stubs: [
+          'IBiPencil',
+          'IBiTrash',
+          'IBiChatDots',
+          'BAvatar',
+          'VariantIcon',
+          'BButton',
+          'IBiArrowDownCircle',
+          'IBiArrowUpCircle',
+          'IBiArrowUpShort',
+          'ContributionMessagesListItem',
+        ],
+        components: {
+          BRow,
+          BCol,
+          BCollapse,
+          BButton,
+          BForm,
+          BTextArea,
+          BFormTextarea,
+        },
+      },
+      props: propsData,
+    })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      vi.clearAllMocks()
+      wrapper = mountWrapper()
+    })
+
+    it('has a DIV .contribution-list-item', () => {
+      expect(wrapper.find('div.contribution-list-item').exists()).toBe(true)
+    })
+
+    describe('contribution icon', () => {
+      it('is bell-fill by default', () => {
+        expect(wrapper.vm.icon).toBe('bell-fill')
+      })
+
+      it('is x-circle when contributionStatus is DELETED', async () => {
+        await wrapper.setProps({ contributionStatus: 'DELETED' })
+        expect(wrapper.vm.icon).toBe('trash')
+      })
+
+      it('is check when contributionStatus is CONFIRMED', async () => {
+        await wrapper.setProps({ contributionStatus: 'CONFIRMED' })
+        expect(wrapper.vm.icon).toBe('check')
+      })
+    })
+
+    describe('contribution variant', () => {
+      it('is primary by default', () => {
+        expect(wrapper.vm.variant).toBe('primary')
+      })
+
+      it('is danger when contributionStatus is DELETED', async () => {
+        await wrapper.setProps({ contributionStatus: 'DELETED' })
+        expect(wrapper.vm.variant).toBe('danger')
+      })
+
+      it('is success at when contributionStatus is CONFIRMED', async () => {
+        await wrapper.setProps({ contributionStatus: 'CONFIRMED' })
+        expect(wrapper.vm.variant).toBe('success')
+      })
+
+      it('is warning at when contributionStatus is IN_PROGRESS', async () => {
+        await wrapper.setProps({ contributionStatus: 'IN_PROGRESS' })
+        expect(wrapper.vm.variant).toBe('205')
+      })
+    })
+
+    describe('delete contribution', () => {
+      describe('edit contribution', () => {
+        beforeEach(() => {
+          wrapper.find('div.test-edit-contribution').trigger('click')
+        })
+
+        it('emits update contribution form', () => {
+          expect(wrapper.emitted('update-contribution-form')).toEqual([
+            [
+              {
+                id: 1,
+                contributionDate: '07/06/2022',
+                memo: 'Ich habe 10 Stunden die Elbwiesen von Müll befreit.',
+                amount: '200',
+              },
+            ],
+          ])
+        })
+      })
+
+      describe('confirm deletion', () => {
+        beforeEach(() => {
+          vi.spyOn(window, 'confirm').mockImplementation(() => true)
+          wrapper.find('div.test-delete-contribution').trigger('click')
+        })
+
+        it('emits delete contribution', () => {
+          expect(wrapper.emitted('contribution-changed')).toBeTruthy()
+        })
+      })
+
+      describe('cancel deletion', () => {
+        beforeEach(async () => {
+          vi.spyOn(window, 'confirm').mockImplementation(() => false)
+          await wrapper.find('div.test-delete-contribution').trigger('click')
+        })
+
+        it('does not emit delete contribution', () => {
+          expect(wrapper.emitted('delete-contribution')).toBeFalsy()
+        })
+      })
+    })
+
+    describe('updateStatus', () => {
+      it('updates status of a contribution', async () => {
+        wrapper.vm.contributionStatus = 'IN_PROGRESS'
+
+        wrapper.vm.addContributionMessage({})
+
+        expect(wrapper.vm.localStatus).toBe('PENDING')
+      })
+    })
+  })
+})
diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index c5d99921f..4d1050a52 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -62,9 +62,16 @@ vi.mock('@/components/Contributions/OpenCreationsAmount', () => ({
   },
 }))
 
-vi.mock('@/components/Contributions/ContributionForm', () => ({
+vi.mock('@/components/Contributions/ContributionEdit', () => ({
   default: {
-    name: 'ContributionForm',
+    name: 'ContributionEdit',
+    template: '<div></div>',
+  },
+}))
+
+vi.mock('@/components/Contributions/ContributionCreate', () => ({
+  default: {
+    name: 'ContributionCreate',
     template: '<div></div>',
   },
 }))
@@ -76,6 +83,13 @@ vi.mock('@/components/Contributions/ContributionList', () => ({
   },
 }))
 
+vi.mock('@/components/Contributions/ContributionListAll', () => ({
+  default: {
+    name: 'ContributionListAll',
+    template: '<div></div>',
+  },
+}))
+
 describe('Community', () => {
   let wrapper
   let mockRouter
@@ -140,9 +154,7 @@ describe('Community', () => {
         },
         components: {
           BTabs,
-        },
-        stub: {
-          BTab: true,
+          BTab,
         },
       },
     })
@@ -156,17 +168,12 @@ describe('Community', () => {
     it('initializes with correct data', () => {
       expect(wrapper.vm.tabIndex).toBe(0)
     })
-
-    it('fetches initial data', () => {
-      expect(mockOpenCreationsQuery).toHaveBeenCalled()
-      expect(mockCountContributionsInProgress).toHaveBeenCalled()
-    })
   })
 
   describe('tabs', () => {
     it('has three tabs', () => {
       expect(wrapper.findAll('.tabs')).toHaveLength(1)
-      expect(wrapper.findAll('btab')).toHaveLength(3)
+      expect(wrapper.findAllComponents(BTab)).toHaveLength(3)
     })
 
     it.skip('updates tab index when route changes', async () => {
@@ -176,105 +183,20 @@ describe('Community', () => {
     })
   })
 
-  describe('handleSaveContribution', () => {
-    it('calls createContributionMutation and shows success toast on success', async () => {
-      const contributionData = { date: '2023-09-12', memo: 'Test contribution', amount: '100' }
-      mockCreateContributionMutation.mockResolvedValue({ data: { createContribution: true } })
-
-      await wrapper.vm.handleSaveContribution(contributionData)
-
-      expect(mockCreateContributionMutation).toHaveBeenCalledWith({
-        creationDate: contributionData.date,
-        memo: contributionData.memo,
-        amount: contributionData.amount,
-      })
-      expect(mockToast.toastSuccess).toHaveBeenCalledWith('contribution.submitted')
-    })
-
-    it('shows error toast on failure', async () => {
-      const contributionData = { date: '2023-09-12', memo: 'Test contribution', amount: '100' }
-      mockCreateContributionMutation.mockRejectedValue(new Error('Create Contribution failed!'))
-
-      await wrapper.vm.handleSaveContribution(contributionData)
-
-      expect(mockToast.toastError).toHaveBeenCalledWith('Create Contribution failed!')
-    })
-  })
-
-  describe('handleUpdateContribution', () => {
-    it('calls updateContributionMutation and shows success toast on success', async () => {
-      const contributionData = {
-        id: 1,
-        date: '2023-09-12',
-        memo: 'Updated contribution',
-        amount: '200',
-      }
-      mockUpdateContributionMutation.mockResolvedValue({ data: { updateContribution: true } })
-
-      await wrapper.vm.handleUpdateContribution(contributionData)
-
-      expect(mockUpdateContributionMutation).toHaveBeenCalledWith({
-        contributionId: contributionData.id,
-        creationDate: contributionData.date,
-        memo: contributionData.memo,
-        amount: contributionData.amount,
-      })
-      expect(mockToast.toastSuccess).toHaveBeenCalledWith('contribution.updated')
-    })
-
-    it('shows error toast on failure', async () => {
-      const contributionData = {
-        id: 1,
-        date: '2023-09-12',
-        memo: 'Updated contribution',
-        amount: '200',
-      }
-      mockUpdateContributionMutation.mockRejectedValue(new Error('Update Contribution failed!'))
-
-      await wrapper.vm.handleUpdateContribution(contributionData)
-
-      expect(mockToast.toastError).toHaveBeenCalledWith('Update Contribution failed!')
-    })
-  })
-
-  describe('handleDeleteContribution', () => {
-    it('calls deleteContributionMutation and shows success toast on success', async () => {
-      const contributionData = { id: 1 }
-      mockDeleteContributionMutation.mockResolvedValue({ data: { deleteContribution: true } })
-
-      await wrapper.vm.handleDeleteContribution(contributionData)
-
-      expect(mockDeleteContributionMutation).toHaveBeenCalledWith({ id: contributionData.id })
-      expect(mockToast.toastSuccess).toHaveBeenCalledWith('contribution.deleted')
-    })
-
-    it('shows error toast on failure', async () => {
-      const contributionData = { id: 1 }
-      mockDeleteContributionMutation.mockRejectedValue(new Error('Delete Contribution failed!'))
-
-      await wrapper.vm.handleDeleteContribution(contributionData)
-
-      expect(mockToast.toastError).toHaveBeenCalledWith('Delete Contribution failed!')
-    })
-  })
-
   describe('handleUpdateContributionForm', () => {
     it('updates form data and changes tab', () => {
       const contributionData = {
-        id: 2,
-        contributionDate: '2023-09-12',
-        memo: 'Test contribution',
-        amount: '300',
+        item: { id: 2, contributionDate: '2023-09-12', memo: 'Test contribution', amount: '300' },
+        page: 2,
       }
 
       wrapper.vm.handleUpdateContributionForm(contributionData)
 
-      expect(wrapper.vm.form).toEqual({
+      expect(wrapper.vm.itemData).toEqual({
         id: 2,
-        date: '2023-09-12',
+        contributionDate: '2023-09-12',
         memo: 'Test contribution',
         amount: '300',
-        hours: 15, // 300 / 20
       })
       expect(wrapper.vm.tabIndex).toBe(0)
       expect(mockRouter.push).toHaveBeenCalledWith({ params: { tab: 'contribute' } })

From 58b0362efb8d8d678be190d24d9dd4ee777300ad Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 07:11:45 +0200
Subject: [PATCH 14/36] fix default value for new env var

---
 frontend/src/config/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 77a5d5f34..854e0667b 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -40,7 +40,7 @@ if (process.env.FRONTEND_HOSTING === 'nodejs') {
 const features = {
   GMS_ACTIVE: process.env.GMS_ACTIVE === 'true',
   HUMHUB_ACTIVE: process.env.HUMHUB_ACTIVE === 'true',
-  AUTO_POLL_INTERVAL: Number.parseInt(process.env.AUTO_POLL_INTERVAL) ?? 0,
+  AUTO_POLL_INTERVAL: Number.parseInt(process.env.AUTO_POLL_INTERVAL ?? 0),
 }
 
 const environment = {

From 4b4bb15912e4e1a66514dfd4643999f72f512d2a Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 07:45:42 +0200
Subject: [PATCH 15/36] fix some syntax error

---
 backend/src/graphql/model/Contribution.ts            |  4 +++-
 backend/src/graphql/model/UnconfirmedContribution.ts |  5 ++++-
 backend/src/graphql/resolver/ContributionResolver.ts | 12 +++---------
 .../src/graphql/resolver/util/loadContributions.ts   |  4 ++--
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index 458d64e7d..49a3c0be4 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -59,7 +59,9 @@ export class Contribution extends UnconfirmedContribution {
 export class ContributionListResult {
   constructor(count: number, list: DbContribution[]) {
     this.contributionCount = count
-    this.contributionList = list.map((dbContribution: DbContribution) => new Contribution(dbContribution))
+    this.contributionList = list.map(
+      (dbContribution: DbContribution) => new Contribution(dbContribution),
+    )
   }
 
   @Field(() => Int)
diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts
index 435fbcdf2..48f40ea85 100644
--- a/backend/src/graphql/model/UnconfirmedContribution.ts
+++ b/backend/src/graphql/model/UnconfirmedContribution.ts
@@ -1,4 +1,7 @@
-import { Contribution as DbContribution, ContributionMessage as DbContributionMessage } from 'database'
+import {
+  Contribution as DbContribution,
+  ContributionMessage as DbContributionMessage,
+} from 'database'
 import { Decimal } from 'decimal.js-light'
 import { Field, Int, ObjectType } from 'type-graphql'
 
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 2f4e45b12..49077bdbd 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -179,7 +179,7 @@ export class ContributionResolver {
         contribution.messages = contribution.messages?.filter(
           (message) => message.type !== ContributionMessageType.MODERATOR,
         )
-        return new Contribution(contribution)
+        return contribution
       }),
     )
   }
@@ -201,10 +201,7 @@ export class ContributionResolver {
   ): Promise<ContributionListResult> {
     const [dbContributions, count] = await loadAllContributions(pagination)
 
-    return new ContributionListResult(
-      count,
-      dbContributions.map((contribution) => new Contribution(contribution)),
-    )
+    return new ContributionListResult(count, dbContributions)
   }
 
   @Authorized([RIGHTS.UPDATE_CONTRIBUTION])
@@ -388,10 +385,7 @@ export class ContributionResolver {
       countOnly,
     )
 
-    return new ContributionListResult(
-      count,
-      dbContributions.map((contribution) => new Contribution(contribution)),
-    )
+    return new ContributionListResult(count, dbContributions)
   }
 
   @Authorized([RIGHTS.ADMIN_DELETE_CONTRIBUTION])
diff --git a/backend/src/graphql/resolver/util/loadContributions.ts b/backend/src/graphql/resolver/util/loadContributions.ts
index 0bf18aece..17ba3d17f 100644
--- a/backend/src/graphql/resolver/util/loadContributions.ts
+++ b/backend/src/graphql/resolver/util/loadContributions.ts
@@ -1,6 +1,6 @@
 import { Paginated } from '@arg/Paginated'
-import { FindManyOptions } from '@dbTools/typeorm'
-import { Contribution as DbContribution } from '@entity/Contribution'
+import { Contribution as DbContribution } from 'database'
+import { FindManyOptions } from 'typeorm'
 
 function buildBaseOptions(paginated: Paginated): FindManyOptions<DbContribution> {
   const { currentPage, pageSize } = paginated

From a5cda86610fd99fa7ddacd95df327e868e6fc680 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 07:54:20 +0200
Subject: [PATCH 16/36] move into contributions

---
 .../graphql/resolver/ContributionResolver.ts  |  9 ++--
 .../graphql/resolver/util/contributions.ts    | 49 +++++++++++++++++--
 .../resolver/util/loadContributions.ts        | 47 ------------------
 3 files changed, 50 insertions(+), 55 deletions(-)
 delete mode 100644 backend/src/graphql/resolver/util/loadContributions.ts

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 49077bdbd..0a0e40f51 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -63,13 +63,12 @@ import { fullName } from '@/util/utilities'
 
 import { ContributionMessage } from '@model/ContributionMessage'
 import { ContributionMessageType } from '../enum/ContributionMessageType'
-import { findContribution } from './util/contributions'
 import { getOpenCreations, getUserCreation, validateContribution } from './util/creations'
 import { extractGraphQLFields, extractGraphQLFieldsForSelect } from './util/extractGraphQLFields'
 import { findContributionMessages } from './util/findContributionMessages'
 import { findContributions } from './util/findContributions'
 import { getLastTransaction } from './util/getLastTransaction'
-import { loadAllContributions, loadUserContributions } from './util/loadContributions'
+import { loadAllContributions, loadUserContributions } from './util/contributions'
 import { sendTransactionsToDltConnector } from './util/sendTransactionsToDltConnector'
 
 @Resolver(() => Contribution)
@@ -77,11 +76,11 @@ export class ContributionResolver {
   @Authorized([RIGHTS.ADMIN_LIST_CONTRIBUTIONS])
   @Query(() => Contribution)
   async contribution(@Arg('id', () => Int) id: number): Promise<Contribution> {
-    const contribution = await findContribution(id)
-    if (!contribution) {
+    const dbContribution = await DbContribution.findOne({ where: { id } })
+    if (!dbContribution) {
       throw new LogError('Contribution not found', id)
     }
-    return new Contribution(contribution)
+    return new Contribution(dbContribution)
   }
 
   @Authorized([RIGHTS.CREATE_CONTRIBUTION])
diff --git a/backend/src/graphql/resolver/util/contributions.ts b/backend/src/graphql/resolver/util/contributions.ts
index bd4169b44..826da1ab6 100644
--- a/backend/src/graphql/resolver/util/contributions.ts
+++ b/backend/src/graphql/resolver/util/contributions.ts
@@ -1,5 +1,48 @@
-import { Contribution } from 'database'
+import { Paginated } from '@arg/Paginated'
+import { Contribution as DbContribution } from 'database'
+import { FindManyOptions } from 'typeorm'
 
-export const findContribution = async (id: number): Promise<Contribution | null> => {
-  return Contribution.findOne({ where: { id } })
+
+function buildBaseOptions(paginated: Paginated): FindManyOptions<DbContribution> {
+  const { currentPage, pageSize } = paginated
+  return {
+    skip: (currentPage - 1) * pageSize,
+    take: pageSize,
+  }
+}
+
+/*
+ * Load user contributions with messages
+ * @param userId if userId is set, load all contributions of the user, with messages
+ * @param paginated pagination, see {@link Paginated}
+ */
+export const loadUserContributions = async (
+  userId: number,
+  paginated: Paginated,
+  messagePagination?: Paginated,
+): Promise<[DbContribution[], number]> => {
+  const { order } = paginated
+  const { order: messageOrder } = messagePagination || { order: 'ASC' }
+  return DbContribution.findAndCount({
+    where: { userId },
+    withDeleted: true,
+    relations: { messages: { user: true } },
+    order: { createdAt: order, id: order, messages: { createdAt: messageOrder } },
+    ...buildBaseOptions(paginated),
+  })
+}
+
+/*
+ * Load all contributions
+ * @param paginated pagination, see {@link Paginated}
+ */
+export const loadAllContributions = async (
+  paginated: Paginated,
+): Promise<[DbContribution[], number]> => {
+  const { order } = paginated
+  return DbContribution.findAndCount({
+    relations: { user: { emailContact: true } },
+    order: { createdAt: order, id: order },
+    ...buildBaseOptions(paginated),
+  })
 }
diff --git a/backend/src/graphql/resolver/util/loadContributions.ts b/backend/src/graphql/resolver/util/loadContributions.ts
deleted file mode 100644
index 17ba3d17f..000000000
--- a/backend/src/graphql/resolver/util/loadContributions.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Paginated } from '@arg/Paginated'
-import { Contribution as DbContribution } from 'database'
-import { FindManyOptions } from 'typeorm'
-
-function buildBaseOptions(paginated: Paginated): FindManyOptions<DbContribution> {
-  const { currentPage, pageSize } = paginated
-  return {
-    skip: (currentPage - 1) * pageSize,
-    take: pageSize,
-  }
-}
-
-/*
- * Load user contributions with messages
- * @param userId if userId is set, load all contributions of the user, with messages
- * @param paginated pagination, see {@link Paginated}
- */
-export const loadUserContributions = async (
-  userId: number,
-  paginated: Paginated,
-  messagePagination?: Paginated,
-): Promise<[DbContribution[], number]> => {
-  const { order } = paginated
-  const { order: messageOrder } = messagePagination || { order: 'ASC' }
-  return DbContribution.findAndCount({
-    where: { userId },
-    withDeleted: true,
-    relations: { messages: { user: true } },
-    order: { createdAt: order, id: order, messages: { createdAt: messageOrder } },
-    ...buildBaseOptions(paginated),
-  })
-}
-
-/*
- * Load all contributions
- * @param paginated pagination, see {@link Paginated}
- */
-export const loadAllContributions = async (
-  paginated: Paginated,
-): Promise<[DbContribution[], number]> => {
-  const { order } = paginated
-  return DbContribution.findAndCount({
-    relations: { user: { emailContact: true } },
-    order: { createdAt: order, id: order },
-    ...buildBaseOptions(paginated),
-  })
-}

From 2a4951898cadedd79c7648d6025d031ab6a6f924 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 07:55:32 +0200
Subject: [PATCH 17/36] fix lint

---
 backend/src/graphql/resolver/ContributionResolver.ts | 2 +-
 backend/src/graphql/resolver/util/contributions.ts   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 0a0e40f51..feae157c7 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -63,12 +63,12 @@ import { fullName } from '@/util/utilities'
 
 import { ContributionMessage } from '@model/ContributionMessage'
 import { ContributionMessageType } from '../enum/ContributionMessageType'
+import { loadAllContributions, loadUserContributions } from './util/contributions'
 import { getOpenCreations, getUserCreation, validateContribution } from './util/creations'
 import { extractGraphQLFields, extractGraphQLFieldsForSelect } from './util/extractGraphQLFields'
 import { findContributionMessages } from './util/findContributionMessages'
 import { findContributions } from './util/findContributions'
 import { getLastTransaction } from './util/getLastTransaction'
-import { loadAllContributions, loadUserContributions } from './util/contributions'
 import { sendTransactionsToDltConnector } from './util/sendTransactionsToDltConnector'
 
 @Resolver(() => Contribution)
diff --git a/backend/src/graphql/resolver/util/contributions.ts b/backend/src/graphql/resolver/util/contributions.ts
index 826da1ab6..17ba3d17f 100644
--- a/backend/src/graphql/resolver/util/contributions.ts
+++ b/backend/src/graphql/resolver/util/contributions.ts
@@ -2,7 +2,6 @@ import { Paginated } from '@arg/Paginated'
 import { Contribution as DbContribution } from 'database'
 import { FindManyOptions } from 'typeorm'
 
-
 function buildBaseOptions(paginated: Paginated): FindManyOptions<DbContribution> {
   const { currentPage, pageSize } = paginated
   return {

From e1c2ff6d232ae9b17791a7c4ed0803ab8e335552 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 08:20:23 +0200
Subject: [PATCH 18/36] rename function

---
 backend/src/graphql/resolver/util/contributions.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/src/graphql/resolver/util/contributions.ts b/backend/src/graphql/resolver/util/contributions.ts
index 17ba3d17f..7225f4bc6 100644
--- a/backend/src/graphql/resolver/util/contributions.ts
+++ b/backend/src/graphql/resolver/util/contributions.ts
@@ -1,8 +1,10 @@
 import { Paginated } from '@arg/Paginated'
 import { Contribution as DbContribution } from 'database'
 import { FindManyOptions } from 'typeorm'
+import { GraphQLResolveInfo } from 'graphql'
 
-function buildBaseOptions(paginated: Paginated): FindManyOptions<DbContribution> {
+// TODO: combine with Pagination class for all queries to use
+function buildPaginationOptions(paginated: Paginated): FindManyOptions<DbContribution> {
   const { currentPage, pageSize } = paginated
   return {
     skip: (currentPage - 1) * pageSize,
@@ -27,7 +29,7 @@ export const loadUserContributions = async (
     withDeleted: true,
     relations: { messages: { user: true } },
     order: { createdAt: order, id: order, messages: { createdAt: messageOrder } },
-    ...buildBaseOptions(paginated),
+    ...buildPaginationOptions(paginated),
   })
 }
 
@@ -42,6 +44,6 @@ export const loadAllContributions = async (
   return DbContribution.findAndCount({
     relations: { user: { emailContact: true } },
     order: { createdAt: order, id: order },
-    ...buildBaseOptions(paginated),
+    ...buildPaginationOptions(paginated),
   })
 }

From 175c3b4ebffa8390f10a32e71a6fb3b54fe1ba69 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 08:21:59 +0200
Subject: [PATCH 19/36] rollback

---
 backend/src/graphql/resolver/util/contributions.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/graphql/resolver/util/contributions.ts b/backend/src/graphql/resolver/util/contributions.ts
index 7225f4bc6..13721744f 100644
--- a/backend/src/graphql/resolver/util/contributions.ts
+++ b/backend/src/graphql/resolver/util/contributions.ts
@@ -1,7 +1,6 @@
 import { Paginated } from '@arg/Paginated'
 import { Contribution as DbContribution } from 'database'
 import { FindManyOptions } from 'typeorm'
-import { GraphQLResolveInfo } from 'graphql'
 
 // TODO: combine with Pagination class for all queries to use
 function buildPaginationOptions(paginated: Paginated): FindManyOptions<DbContribution> {

From 99c7f7ef3cba2e6eb47d7c501d7d356ea977fe80 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 08:26:08 +0200
Subject: [PATCH 20/36] formatting

---
 backend/src/graphql/resolver/ContributionResolver.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index feae157c7..68a62b34a 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -188,6 +188,7 @@ export class ContributionResolver {
   async countContributionsInProgress(@Ctx() context: Context): Promise<number> {
     const user = getUser(context)
     const count = await DbContribution.count({
+      select: { id: true },
       where: { userId: user.id, contributionStatus: ContributionStatus.IN_PROGRESS },
     })
     return count

From ca6b9279c3d30eb32e1c4d3cd9f03f03ffa54a93 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 08:26:36 +0200
Subject: [PATCH 21/36] formatting

---
 backend/src/graphql/resolver/ContributionResolver.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 68a62b34a..f0a6ca74c 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -200,7 +200,6 @@ export class ContributionResolver {
     @Arg('pagination') pagination: Paginated,
   ): Promise<ContributionListResult> {
     const [dbContributions, count] = await loadAllContributions(pagination)
-
     return new ContributionListResult(count, dbContributions)
   }
 

From d9b408e56d97ee385279d4b9e27b7988b2f58f51 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 08:32:32 +0200
Subject: [PATCH 22/36] add accidently removed comment back

---
 backend/src/graphql/resolver/ContributionResolver.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index f0a6ca74c..ac6addba3 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -175,6 +175,7 @@ export class ContributionResolver {
             actual: contribution.messages?.length || 0,
           })
         }
+        // remove moderator messages
         contribution.messages = contribution.messages?.filter(
           (message) => message.type !== ContributionMessageType.MODERATOR,
         )

From 49d89667562440b6b413cbaa83849b4174d24193 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 08:34:33 +0200
Subject: [PATCH 23/36] rollback unnecessary changes

---
 backend/src/graphql/resolver/ContributionResolver.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index ac6addba3..3fe28c5e5 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -175,9 +175,9 @@ export class ContributionResolver {
             actual: contribution.messages?.length || 0,
           })
         }
-        // remove moderator messages
+        // filter out moderator messages for this call
         contribution.messages = contribution.messages?.filter(
-          (message) => message.type !== ContributionMessageType.MODERATOR,
+          (message) => (message.type as ContributionMessageType) !== ContributionMessageType.MODERATOR,
         )
         return contribution
       }),

From 1b10ce7f0948b8025a1fc3d3604b9c211e31d716 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 10:09:31 +0200
Subject: [PATCH 24/36] update some missing turbo config, remove unused code

---
 .gitignore                                    |  1 +
 admin/package.json                            |  5 +-
 admin/turbo.json                              |  5 ++
 backend/package.json                          |  1 +
 .../graphql/resolver/ContributionResolver.ts  |  3 +-
 backend/turbo.json                            |  4 +
 frontend/package.json                         |  3 +
 .../ContributionMessagesFormular.vue          | 11 +--
 .../Contributions/ContributionForm.vue        |  2 +-
 .../Contributions/ContributionList.vue        |  5 +-
 frontend/src/pages/Community.spec.js          | 79 +------------------
 frontend/turbo.json                           |  5 ++
 12 files changed, 35 insertions(+), 89 deletions(-)

diff --git a/.gitignore b/.gitignore
index 149d8d245..3d7f34078 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.log
 *.bak
 .turbo
+vite.config.mjs.timestamp-*
 /node_modules/*
 messages.pot
 nbproject
diff --git a/admin/package.json b/admin/package.json
index 82528c3a2..fd2d0bddc 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -11,12 +11,15 @@
     "start": "vite preview",
     "postbuild": "uname | grep -q Linux && find build -type f -regex '.*\\.\\(html\\|js\\|css\\|svg\\|json\\)' -exec gzip -9 -k {} + || echo 'Skip precompress on non-Linux'",
     "lint": "eslint --max-warnings=0 --ext .js,.vue,.json .",
+    "lint:fix": "eslint --max-warnings=0 --ext .js,.vue,.json . --fix",
     "stylelint": "stylelint --max-warnings=0 '**/*.{scss,vue}'",
+    "stylelint:fix": "stylelint --max-warnings=0 '**/*.{scss,vue}' --fix",
     "test": "cross-env TZ=UTC vitest run",
     "test:coverage": "cross-env TZ=UTC vitest run --coverage",
     "test:debug": "cross-env TZ=UTC node --inspect-brk ./node_modules/vitest/vitest.mjs",
     "test:watch": "cross-env TZ=UTC vitest",
-    "locales": "scripts/sort.sh"
+    "locales": "scripts/sort.sh",
+    "locales:fix": "scripts/sort.sh --fix"
   },
   "dependencies": {
     "@iconify/json": "^2.2.228",
diff --git a/admin/turbo.json b/admin/turbo.json
index 27b122712..d6a0194e5 100644
--- a/admin/turbo.json
+++ b/admin/turbo.json
@@ -5,6 +5,11 @@
     "locales": {},
     "lint": {
       "dependsOn": ["stylelint", "locales"]
+    },
+    "stylelint:fix": {},
+    "locales:fix": {},
+    "lint:fix": {
+      "dependsOn": ["stylelint:fix", "locales:fix"]
     }
   }
 }
diff --git a/backend/package.json b/backend/package.json
index 490f7aa0c..4dcd55f50 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -20,6 +20,7 @@
     "lint:fix": "biome check --error-on-warnings . --write",
     "lint:fix:unsafe": "biome check --fix --unsafe",
     "locales": "scripts/sort.sh",
+    "locales:fix": "scripts/sort.sh --fix",
     "start": "cross-env TZ=UTC NODE_ENV=production node build/index.js",
     "typecheck": "tsc --noEmit"
   },
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 3fe28c5e5..0fc5a2a09 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -177,7 +177,8 @@ export class ContributionResolver {
         }
         // filter out moderator messages for this call
         contribution.messages = contribution.messages?.filter(
-          (message) => (message.type as ContributionMessageType) !== ContributionMessageType.MODERATOR,
+          (message) =>
+            (message.type as ContributionMessageType) !== ContributionMessageType.MODERATOR,
         )
         return contribution
       }),
diff --git a/backend/turbo.json b/backend/turbo.json
index 7427fa978..e4dfea9a8 100644
--- a/backend/turbo.json
+++ b/backend/turbo.json
@@ -6,9 +6,13 @@
       "cache": false
     },    
     "locales": {},
+    "locales:fix": {},
     "lint": {
       "dependsOn": ["locales", "database#build"]
     },
+    "lint:fix": {
+      "dependsOn": ["locales:fix", "database#build"]
+    },
     "typecheck": {
       "dependsOn": ["database#build", "config-schema#build"]
     },
diff --git a/frontend/package.json b/frontend/package.json
index bd27fea29..429f14a11 100755
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -9,12 +9,15 @@
     "postbuild": "uname | grep -q Linux && find build -type f -regex '.*\\.\\(html\\|js\\|css\\|svg\\|json\\)' -exec gzip -9 -k {} + || echo 'Skip precompress on non-Linux'",
     "analyse-bundle": "yarn build && webpack-bundle-analyzer build/webpack.stats.json",
     "lint": "eslint --max-warnings=0 --ext .js,.vue,.json .",
+    "lint:fix": "eslint --max-warnings=0 --ext .js,.vue,.json . --fix",
     "stylelint": "stylelint --max-warnings=0 '**/*.{scss,vue}'",
+    "stylelint:fix": "stylelint --max-warnings=0 '**/*.{scss,vue}' --fix",
     "test": "cross-env TZ=UTC vitest run",
     "test:coverage": "cross-env TZ=UTC vitest run --coverage",
     "test:debug": "cross-env TZ=UTC node --inspect-brk ./node_modules/vitest/vitest.mjs",
     "test:watch": "cross-env TZ=UTC vitest",
     "locales": "scripts/sort.sh",
+    "locales:fix": "scripts/sort.sh --fix",
     "compile-scss": "sass --load-path=../node_modules --load-path=src/assets/scss src/assets/scss/gradido.scss src/assets/css/gradido.css",
     "watch-scss": "sass --watch --load-path=../node_modules --load-path=src/assets/scss src/assets/scss/gradido.scss src/assets/css/gradido.css"
   },
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 6738d84a9..69edcc5dc 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -3,13 +3,7 @@
     <small class="ps-2 pt-3">{{ $t('form.reply') }}</small>
     <div>
       <BForm @submit.prevent="onSubmit" @reset="onReset">
-        <BFormTextarea
-          id="textarea"
-          :model-value="formText"
-          :placeholder="$t('form.memo')"
-          :rows="3"
-          @update:model-value="formText = $event"
-        />
+        <BFormTextarea id="textarea" v-model="formText" :placeholder="$t('form.memo')" :rows="3" />
         <BRow class="mt-4 mb-4">
           <BCol>
             <BButton type="reset" variant="secondary">{{ $t('form.cancel') }}</BButton>
@@ -39,7 +33,7 @@ const props = defineProps({
   },
 })
 
-const emit = defineEmits(['get-list-contribution-messages', 'add-contribution-message'])
+const emit = defineEmits(['add-contribution-message'])
 
 const { t } = useI18n()
 const { toastSuccess, toastError } = useAppToast()
@@ -62,7 +56,6 @@ async function onSubmit() {
       message: formText.value,
     })
 
-    // emit('get-list-contribution-messages', false)
     formText.value = ''
     emit('add-contribution-message', result.data.createContributionMessage)
     toastSuccess(t('message.reply'))
diff --git a/frontend/src/components/Contributions/ContributionForm.vue b/frontend/src/components/Contributions/ContributionForm.vue
index 237d38c66..cb2a31c09 100644
--- a/frontend/src/components/Contributions/ContributionForm.vue
+++ b/frontend/src/components/Contributions/ContributionForm.vue
@@ -103,7 +103,7 @@ const props = defineProps({
   maxGddThisMonth: { type: Number, required: true },
 })
 
-const emit = defineEmits(['upsert-contribution', 'update:modelValue', 'abort'])
+const emit = defineEmits(['upsert-contribution', 'abort'])
 
 const { t } = useI18n()
 
diff --git a/frontend/src/components/Contributions/ContributionList.vue b/frontend/src/components/Contributions/ContributionList.vue
index c43e7bc77..6badabbf9 100644
--- a/frontend/src/components/Contributions/ContributionList.vue
+++ b/frontend/src/components/Contributions/ContributionList.vue
@@ -53,10 +53,9 @@ const emit = defineEmits(['update-contribution-form'])
 
 // refs
 const currentPage = ref(1)
-
-// computed
 const openMessagesListId = ref(null)
 
+// queries
 const { result, loading, refetch, onResult } = useQuery(
   listContributions,
   {
@@ -77,6 +76,7 @@ const { result, loading, refetch, onResult } = useQuery(
   },
 )
 
+// computed
 const contributionCount = computed(() => {
   return result.value?.listContributions.contributionCount || 0
 })
@@ -85,6 +85,7 @@ const items = computed(() => {
 })
 
 // callbacks
+// scroll to anchor, if hash ist present in url and after data where loaded
 onResult(({ _data }) => {
   nextTick(() => {
     if (!route.hash) {
diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index 4d1050a52..f39bc2725 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -1,12 +1,8 @@
 import { useAppToast } from '@/composables/useToast'
-import { countContributionsInProgress } from '@/graphql/contributions.graphql'
-import { createContribution, deleteContribution, updateContribution } from '@/graphql/mutations'
-import { listAllContributions, listContributions, openCreations } from '@/graphql/queries'
-import { useMutation, useQuery } from '@vue/apollo-composable'
+import { useQuery } from '@vue/apollo-composable'
 import { mount } from '@vue/test-utils'
 import { BTab, BTabs } from 'bootstrap-vue-next'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { reactive, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import Community from './Community'
 
@@ -18,13 +14,10 @@ vi.mock('vue-router', () => ({
 
 vi.mock('@vue/apollo-composable', () => ({
   useQuery: vi.fn(),
-  useMutation: vi.fn(),
 }))
 
 vi.mock('@/composables/useToast', () => ({
   useAppToast: vi.fn(() => ({
-    toastError: vi.fn(),
-    toastSuccess: vi.fn(),
     toastInfo: vi.fn(),
   })),
 }))
@@ -35,33 +28,6 @@ vi.mock('vue-i18n', () => ({
   })),
 }))
 
-vi.mock('vee-validate', () => ({
-  useField: vi.fn(() => ({
-    value: ref(''),
-    errorMessage: ref(''),
-    handleChange: vi.fn(),
-    meta: reactive({
-      valid: true,
-      touched: false,
-      dirty: false,
-    }),
-  })),
-  useForm: vi.fn(() => ({
-    handleSubmit: vi.fn(),
-    errors: reactive({}),
-    resetForm: vi.fn(),
-  })),
-  defineRule: vi.fn(),
-}))
-
-// Mock child components
-vi.mock('@/components/Contributions/OpenCreationsAmount', () => ({
-  default: {
-    name: 'OpenCreationsAmount',
-    template: '<div></div>',
-  },
-}))
-
 vi.mock('@/components/Contributions/ContributionEdit', () => ({
   default: {
     name: 'ContributionEdit',
@@ -96,61 +62,24 @@ describe('Community', () => {
   let mockToast
 
   const mockCountContributionsInProgress = vi.fn()
-  const mockOpenCreationsQuery = vi.fn()
-  const mockCreateContributionMutation = vi.fn()
-  const mockUpdateContributionMutation = vi.fn()
-  const mockDeleteContributionMutation = vi.fn()
 
   beforeEach(() => {
     mockRouter = { push: vi.fn() }
     vi.mocked(useRouter).mockReturnValue(mockRouter)
 
     mockToast = {
-      toastError: vi.fn(),
-      toastSuccess: vi.fn(),
       toastInfo: vi.fn(),
     }
     vi.mocked(useAppToast).mockReturnValue(mockToast)
 
-    vi.mocked(useQuery).mockImplementation((query) => {
-      if (query === openCreations) {
-        return {
-          onResult: mockOpenCreationsQuery,
-          refetch: vi.fn(),
-        }
-      }
-
-      if (query === countContributionsInProgress) {
-        return { onResult: mockCountContributionsInProgress }
-      }
-    })
-
-    vi.mocked(useMutation).mockImplementation((mutation) => {
-      if (mutation === createContribution) {
-        return {
-          mutate: mockCreateContributionMutation,
-        }
-      }
-      if (mutation === updateContribution) {
-        return {
-          mutate: mockUpdateContributionMutation,
-        }
-      }
-      if (mutation === deleteContribution) {
-        return {
-          mutate: mockDeleteContributionMutation,
-        }
-      }
-    })
-
-    const { defineRule } = require('vee-validate')
-    defineRule('required', (value) => !!value)
+    vi.mocked(useQuery).mockImplementation((query) => ({
+      onResult: mockCountContributionsInProgress,
+    }))
 
     wrapper = mount(Community, {
       global: {
         mocks: {
           $t: (key) => key, // Mock $t function
-          $d: (date) => date.toISOString(), // Mock $d function if needed
         },
         components: {
           BTabs,
diff --git a/frontend/turbo.json b/frontend/turbo.json
index 434acaba2..77b247f01 100644
--- a/frontend/turbo.json
+++ b/frontend/turbo.json
@@ -6,6 +6,11 @@
     "lint": {
       "dependsOn": ["stylelint", "locales"]
     },
+    "stylelint:fix": {},
+    "locales:fix": {},
+    "lint:fix": {
+      "dependsOn": ["stylelint:fix", "locales:fix"]
+    },
     "compile-scss": {},
     "watch-scss": {
       "cache": false,

From 3dda798ad11eca78a41a66932ff938d1960afc20 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 10:32:23 +0200
Subject: [PATCH 25/36] make sure it is really relative path, even when started
 from root folder

---
 backend/src/typeorm/connection.ts    | 3 ++-
 dht-node/src/typeorm/connection.ts   | 6 +++---
 federation/src/typeorm/connection.ts | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/backend/src/typeorm/connection.ts b/backend/src/typeorm/connection.ts
index 0bb1b76bf..2793ec14e 100644
--- a/backend/src/typeorm/connection.ts
+++ b/backend/src/typeorm/connection.ts
@@ -3,6 +3,7 @@
 import { entities } from 'database'
 import { Connection as DbConnection, FileLogger, createConnection } from 'typeorm'
 
+import path from 'node:path'
 import { CONFIG } from '@/config'
 
 export class Connection {
@@ -38,7 +39,7 @@ export class Connection {
         synchronize: false,
         logging: true,
         logger: new FileLogger('all', {
-          logPath: CONFIG.TYPEORM_LOGGING_RELATIVE_PATH,
+          logPath: path.resolve(__dirname, CONFIG.TYPEORM_LOGGING_RELATIVE_PATH),
         }),
         extra: {
           charset: 'utf8mb4_unicode_ci',
diff --git a/dht-node/src/typeorm/connection.ts b/dht-node/src/typeorm/connection.ts
index ea349655d..6348f38da 100644
--- a/dht-node/src/typeorm/connection.ts
+++ b/dht-node/src/typeorm/connection.ts
@@ -1,10 +1,10 @@
+import path from 'node:path'
+import { CONFIG } from '@/config'
 // TODO This is super weird - since the entities are defined in another project they have their own globals.
 //      We cannot use our connection here, but must use the external typeorm installation
 import { entities } from 'database'
 import { Connection, FileLogger, createConnection } from 'typeorm'
 
-import { CONFIG } from '@/config'
-
 export const connection = async (): Promise<Connection | null> => {
   try {
     return createConnection({
@@ -19,7 +19,7 @@ export const connection = async (): Promise<Connection | null> => {
       synchronize: false,
       logging: true,
       logger: new FileLogger('all', {
-        logPath: CONFIG.TYPEORM_LOGGING_RELATIVE_PATH,
+        logPath: path.resolve(__dirname, CONFIG.TYPEORM_LOGGING_RELATIVE_PATH),
       }),
       extra: {
         charset: 'utf8mb4_unicode_ci',
diff --git a/federation/src/typeorm/connection.ts b/federation/src/typeorm/connection.ts
index f76628767..d5ff19179 100644
--- a/federation/src/typeorm/connection.ts
+++ b/federation/src/typeorm/connection.ts
@@ -1,3 +1,4 @@
+import path from 'node:path'
 import { CONFIG } from '@/config'
 // TODO This is super weird - since the entities are defined in another project they have their own globals.
 //      We cannot use our connection here, but must use the external typeorm installation
@@ -18,7 +19,7 @@ const connection = async (): Promise<Connection | null> => {
       synchronize: false,
       logging: true,
       logger: new FileLogger('all', {
-        logPath: CONFIG.TYPEORM_LOGGING_RELATIVE_PATH,
+        logPath: path.resolve(__dirname, CONFIG.TYPEORM_LOGGING_RELATIVE_PATH),
       }),
       extra: {
         charset: 'utf8mb4_unicode_ci',

From 5ff8009df1b14614f7f728ea5dc545709ab5eabb Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 10:36:29 +0200
Subject: [PATCH 26/36] use process path

---
 backend/src/typeorm/connection.ts    | 2 +-
 dht-node/src/typeorm/connection.ts   | 2 +-
 federation/src/typeorm/connection.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/typeorm/connection.ts b/backend/src/typeorm/connection.ts
index 2793ec14e..25c47b8dc 100644
--- a/backend/src/typeorm/connection.ts
+++ b/backend/src/typeorm/connection.ts
@@ -39,7 +39,7 @@ export class Connection {
         synchronize: false,
         logging: true,
         logger: new FileLogger('all', {
-          logPath: path.resolve(__dirname, CONFIG.TYPEORM_LOGGING_RELATIVE_PATH),
+          logPath: path.resolve(process.cwd(), CONFIG.TYPEORM_LOGGING_RELATIVE_PATH),
         }),
         extra: {
           charset: 'utf8mb4_unicode_ci',
diff --git a/dht-node/src/typeorm/connection.ts b/dht-node/src/typeorm/connection.ts
index 6348f38da..abac05b38 100644
--- a/dht-node/src/typeorm/connection.ts
+++ b/dht-node/src/typeorm/connection.ts
@@ -19,7 +19,7 @@ export const connection = async (): Promise<Connection | null> => {
       synchronize: false,
       logging: true,
       logger: new FileLogger('all', {
-        logPath: path.resolve(__dirname, CONFIG.TYPEORM_LOGGING_RELATIVE_PATH),
+        logPath: path.resolve(process.cwd(), CONFIG.TYPEORM_LOGGING_RELATIVE_PATH),
       }),
       extra: {
         charset: 'utf8mb4_unicode_ci',
diff --git a/federation/src/typeorm/connection.ts b/federation/src/typeorm/connection.ts
index d5ff19179..91449d4de 100644
--- a/federation/src/typeorm/connection.ts
+++ b/federation/src/typeorm/connection.ts
@@ -19,7 +19,7 @@ const connection = async (): Promise<Connection | null> => {
       synchronize: false,
       logging: true,
       logger: new FileLogger('all', {
-        logPath: path.resolve(__dirname, CONFIG.TYPEORM_LOGGING_RELATIVE_PATH),
+        logPath: path.resolve(process.cwd(), CONFIG.TYPEORM_LOGGING_RELATIVE_PATH),
       }),
       extra: {
         charset: 'utf8mb4_unicode_ci',

From 3d8a66eeaa09cbab37bc63df6ea45ac997d332cf Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 10:43:17 +0200
Subject: [PATCH 27/36] rollback database logger path changes, rollback start
 script using yarn for staring instead of turbo to keep behaviour

---
 backend/src/typeorm/connection.ts    | 3 +--
 deployment/bare_metal/start.sh       | 6 +++---
 dht-node/src/typeorm/connection.ts   | 3 +--
 federation/src/typeorm/connection.ts | 3 +--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/backend/src/typeorm/connection.ts b/backend/src/typeorm/connection.ts
index 25c47b8dc..0bb1b76bf 100644
--- a/backend/src/typeorm/connection.ts
+++ b/backend/src/typeorm/connection.ts
@@ -3,7 +3,6 @@
 import { entities } from 'database'
 import { Connection as DbConnection, FileLogger, createConnection } from 'typeorm'
 
-import path from 'node:path'
 import { CONFIG } from '@/config'
 
 export class Connection {
@@ -39,7 +38,7 @@ export class Connection {
         synchronize: false,
         logging: true,
         logger: new FileLogger('all', {
-          logPath: path.resolve(process.cwd(), CONFIG.TYPEORM_LOGGING_RELATIVE_PATH),
+          logPath: CONFIG.TYPEORM_LOGGING_RELATIVE_PATH,
         }),
         extra: {
           charset: 'utf8mb4_unicode_ci',
diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index c8985bca6..878cb470f 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -307,12 +307,12 @@ else
 fi
 
 # start after building all to use up less ressources
-pm2 start --name gradido-backend "turbo backend#start --env-mode=loose" -l $GRADIDO_LOG_PATH/pm2.backend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
+pm2 start --name gradido-backend "yarn --cwd $PROJECT_ROOT/backend start" -l $GRADIDO_LOG_PATH/pm2.backend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
 #pm2 start --name gradido-frontend "yarn --cwd $PROJECT_ROOT/frontend start" -l $GRADIDO_LOG_PATH/pm2.frontend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
 #pm2 start --name gradido-admin "yarn --cwd $PROJECT_ROOT/admin start" -l $GRADIDO_LOG_PATH/pm2.admin.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
 pm2 save
 if [ ! -z $FEDERATION_DHT_TOPIC ]; then
-  pm2 start --name gradido-dht-node "turbo dht-node#start --env-mode=loose" -l $GRADIDO_LOG_PATH/pm2.dht-node.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
+  pm2 start --name gradido-dht-node "yarn --cwd $PROJECT_ROOT/dht-node start" -l $GRADIDO_LOG_PATH/pm2.dht-node.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
   pm2 save
 else
   log_step "====================================================================="
@@ -336,7 +336,7 @@ do
   log_step "===================================================="
   log_step " start $MODULENAME listening on port=$FEDERATION_PORT"
   log_step "===================================================="
-  pm2 start --name $MODULENAME "turbo federation#start --env-mode=loose" -l $GRADIDO_LOG_PATH/pm2.$MODULENAME.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
+  pm2 start --name $MODULENAME "yarn --cwd $PROJECT_ROOT/federation start" -l $GRADIDO_LOG_PATH/pm2.$MODULENAME.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
   pm2 save
 done
 
diff --git a/dht-node/src/typeorm/connection.ts b/dht-node/src/typeorm/connection.ts
index abac05b38..9df511455 100644
--- a/dht-node/src/typeorm/connection.ts
+++ b/dht-node/src/typeorm/connection.ts
@@ -1,4 +1,3 @@
-import path from 'node:path'
 import { CONFIG } from '@/config'
 // TODO This is super weird - since the entities are defined in another project they have their own globals.
 //      We cannot use our connection here, but must use the external typeorm installation
@@ -19,7 +18,7 @@ export const connection = async (): Promise<Connection | null> => {
       synchronize: false,
       logging: true,
       logger: new FileLogger('all', {
-        logPath: path.resolve(process.cwd(), CONFIG.TYPEORM_LOGGING_RELATIVE_PATH),
+        logPath: CONFIG.TYPEORM_LOGGING_RELATIVE_PATH,
       }),
       extra: {
         charset: 'utf8mb4_unicode_ci',
diff --git a/federation/src/typeorm/connection.ts b/federation/src/typeorm/connection.ts
index 91449d4de..f76628767 100644
--- a/federation/src/typeorm/connection.ts
+++ b/federation/src/typeorm/connection.ts
@@ -1,4 +1,3 @@
-import path from 'node:path'
 import { CONFIG } from '@/config'
 // TODO This is super weird - since the entities are defined in another project they have their own globals.
 //      We cannot use our connection here, but must use the external typeorm installation
@@ -19,7 +18,7 @@ const connection = async (): Promise<Connection | null> => {
       synchronize: false,
       logging: true,
       logger: new FileLogger('all', {
-        logPath: path.resolve(process.cwd(), CONFIG.TYPEORM_LOGGING_RELATIVE_PATH),
+        logPath: CONFIG.TYPEORM_LOGGING_RELATIVE_PATH,
       }),
       extra: {
         charset: 'utf8mb4_unicode_ci',

From 58d0e7f16066402099a722c2f1874a124a2d2688 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 10:47:26 +0200
Subject: [PATCH 28/36] workaround

---
 backend/src/typeorm/connection.ts    | 3 ++-
 deployment/bare_metal/start.sh       | 6 +++---
 dht-node/src/typeorm/connection.ts   | 3 ++-
 federation/src/typeorm/connection.ts | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/backend/src/typeorm/connection.ts b/backend/src/typeorm/connection.ts
index 0bb1b76bf..c2e2e5558 100644
--- a/backend/src/typeorm/connection.ts
+++ b/backend/src/typeorm/connection.ts
@@ -38,7 +38,8 @@ export class Connection {
         synchronize: false,
         logging: true,
         logger: new FileLogger('all', {
-          logPath: CONFIG.TYPEORM_LOGGING_RELATIVE_PATH,
+          // workaround to let previous path working, because with esbuild the script root path has changed
+          logPath: '../' + CONFIG.TYPEORM_LOGGING_RELATIVE_PATH,
         }),
         extra: {
           charset: 'utf8mb4_unicode_ci',
diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index 878cb470f..c8985bca6 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -307,12 +307,12 @@ else
 fi
 
 # start after building all to use up less ressources
-pm2 start --name gradido-backend "yarn --cwd $PROJECT_ROOT/backend start" -l $GRADIDO_LOG_PATH/pm2.backend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
+pm2 start --name gradido-backend "turbo backend#start --env-mode=loose" -l $GRADIDO_LOG_PATH/pm2.backend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
 #pm2 start --name gradido-frontend "yarn --cwd $PROJECT_ROOT/frontend start" -l $GRADIDO_LOG_PATH/pm2.frontend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
 #pm2 start --name gradido-admin "yarn --cwd $PROJECT_ROOT/admin start" -l $GRADIDO_LOG_PATH/pm2.admin.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
 pm2 save
 if [ ! -z $FEDERATION_DHT_TOPIC ]; then
-  pm2 start --name gradido-dht-node "yarn --cwd $PROJECT_ROOT/dht-node start" -l $GRADIDO_LOG_PATH/pm2.dht-node.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
+  pm2 start --name gradido-dht-node "turbo dht-node#start --env-mode=loose" -l $GRADIDO_LOG_PATH/pm2.dht-node.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
   pm2 save
 else
   log_step "====================================================================="
@@ -336,7 +336,7 @@ do
   log_step "===================================================="
   log_step " start $MODULENAME listening on port=$FEDERATION_PORT"
   log_step "===================================================="
-  pm2 start --name $MODULENAME "yarn --cwd $PROJECT_ROOT/federation start" -l $GRADIDO_LOG_PATH/pm2.$MODULENAME.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
+  pm2 start --name $MODULENAME "turbo federation#start --env-mode=loose" -l $GRADIDO_LOG_PATH/pm2.$MODULENAME.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
   pm2 save
 done
 
diff --git a/dht-node/src/typeorm/connection.ts b/dht-node/src/typeorm/connection.ts
index 9df511455..14c6195f9 100644
--- a/dht-node/src/typeorm/connection.ts
+++ b/dht-node/src/typeorm/connection.ts
@@ -18,7 +18,8 @@ export const connection = async (): Promise<Connection | null> => {
       synchronize: false,
       logging: true,
       logger: new FileLogger('all', {
-        logPath: CONFIG.TYPEORM_LOGGING_RELATIVE_PATH,
+        // workaround to let previous path working, because with esbuild the script root path has changed
+        logPath: '../' + CONFIG.TYPEORM_LOGGING_RELATIVE_PATH,
       }),
       extra: {
         charset: 'utf8mb4_unicode_ci',
diff --git a/federation/src/typeorm/connection.ts b/federation/src/typeorm/connection.ts
index f76628767..827e8d430 100644
--- a/federation/src/typeorm/connection.ts
+++ b/federation/src/typeorm/connection.ts
@@ -18,7 +18,8 @@ const connection = async (): Promise<Connection | null> => {
       synchronize: false,
       logging: true,
       logger: new FileLogger('all', {
-        logPath: CONFIG.TYPEORM_LOGGING_RELATIVE_PATH,
+        // workaround to let previous path working, because with esbuild the script root path has changed
+        logPath: '../' + CONFIG.TYPEORM_LOGGING_RELATIVE_PATH,
       }),
       extra: {
         charset: 'utf8mb4_unicode_ci',

From 1d19ff784b910431f095a6f6184eb325014eaa64 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 10:56:27 +0200
Subject: [PATCH 29/36] update error treatment for nginx not restart after
 running deploy script to oft in short amount of time

---
 deployment/bare_metal/start.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index c8985bca6..208463537 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -173,7 +173,14 @@ onError() {
   log_error "( x.x )  Exit Code: $exit_code"
   log_error " >   <   Offending command: '$BASH_COMMAND'"
   log_error ""
-  exit 1
+  if [ '$BASH_COMMAND' == 'sudo /etc/init.d/nginx restart' ]; then
+    log_warn "nginx restart failed, this can occur if updating to often in short time span"
+    log_warn "will try to fix with 'sudo systemctl reset-failed nginx' and 'sudo systemctl start nginx'"
+    sudo systemctl reset-failed nginx
+    sudo systemctl start nginx
+  else 
+    exit 1
+  fi
 }
 trap onError ERR
 

From 2f7b76b7dd1eb2fae089b7bb4447f734a80fe45a Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 11:01:34 +0200
Subject: [PATCH 30/36] use in on both restart nginx places

---
 deployment/bare_metal/start.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index 208463537..c1dfe0927 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -139,8 +139,16 @@ exec > >(tee -a $UPDATE_HTML) 2>&1
 
 # configure nginx for the update-page
 echo 'Configuring nginx to serve the update-page'
+nginx_restart() {
+  sudo /etc/init.d/nginx restart || {
+    echo "\e[33mwarn: nginx restart failed, will try to fix with 'sudo systemctl reset-failed nginx' and 'sudo systemctl start nginx'\e[0m" > /dev/tty
+    sudo systemctl reset-failed nginx
+    sudo systemctl start nginx
+  }
+}
+nginx_restart
 ln -sf $SCRIPT_DIR/nginx/sites-available/update-page.conf $SCRIPT_DIR/nginx/sites-enabled/default
-sudo /etc/init.d/nginx restart
+
 
 # helper functions
 log_step() {
@@ -173,14 +181,7 @@ onError() {
   log_error "( x.x )  Exit Code: $exit_code"
   log_error " >   <   Offending command: '$BASH_COMMAND'"
   log_error ""
-  if [ '$BASH_COMMAND' == 'sudo /etc/init.d/nginx restart' ]; then
-    log_warn "nginx restart failed, this can occur if updating to often in short time span"
-    log_warn "will try to fix with 'sudo systemctl reset-failed nginx' and 'sudo systemctl start nginx'"
-    sudo systemctl reset-failed nginx
-    sudo systemctl start nginx
-  else 
-    exit 1
-  fi
+  exit 1  
 }
 trap onError ERR
 
@@ -350,7 +351,7 @@ done
 # let nginx showing gradido
 log_step 'Configuring nginx to serve gradido again'
 ln -sf $SCRIPT_DIR/nginx/sites-available/gradido.conf $SCRIPT_DIR/nginx/sites-enabled/default
-sudo /etc/init.d/nginx restart
+nginx_restart
 
 # keep the update log
 cat $UPDATE_HTML >> $GRADIDO_LOG_PATH/update.$TODAY.log

From 3803f4f73f80a8692b6a35314e3e901a90245d0e Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 11:03:10 +0200
Subject: [PATCH 31/36] correct color

---
 deployment/bare_metal/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index c1dfe0927..46e979dfd 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -141,7 +141,7 @@ exec > >(tee -a $UPDATE_HTML) 2>&1
 echo 'Configuring nginx to serve the update-page'
 nginx_restart() {
   sudo /etc/init.d/nginx restart || {
-    echo "\e[33mwarn: nginx restart failed, will try to fix with 'sudo systemctl reset-failed nginx' and 'sudo systemctl start nginx'\e[0m" > /dev/tty
+    echo -e "\e[33mwarn: nginx restart failed, will try to fix with 'sudo systemctl reset-failed nginx' and 'sudo systemctl start nginx'\e[0m" > /dev/tty
     sudo systemctl reset-failed nginx
     sudo systemctl start nginx
   }

From d030d957ff2d5874859a997f088759ff1a4e2fb7 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 11:59:13 +0200
Subject: [PATCH 32/36] replace experimental with beta

---
 frontend/src/locales/de.json | 2 +-
 frontend/src/locales/en.json | 2 +-
 frontend/src/locales/es.json | 2 +-
 frontend/src/locales/fr.json | 2 +-
 frontend/src/locales/nl.json | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index cf2b388e7..b541f31e9 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -324,7 +324,7 @@
     "settings": "Einstellungen",
     "circles": "Gradido Kreise",
     "transactions": "Deine Transaktionen",
-    "usersearch": "Geografische Mitgliedssuche (experimentell)"
+    "usersearch": "Geografische Mitgliedssuche (beta)"
   },
   "qrCode": "QR Code",
   "send_gdd": "GDD versenden",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 193c4661c..b6440379d 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -324,7 +324,7 @@
     "settings": "Settings",
     "transactions": "Your transactions",
     "circles": "Gradido Circles",
-    "usersearch": "Geographic member search (experimental)"
+    "usersearch": "Geographic member search (beta)"
   },
   "qrCode": "QR Code",
   "send_gdd": "Send GDD",
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index 3b383db64..48352d6e7 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -284,7 +284,7 @@
     "settings": "Soporte",
     "transactions": "Tu Transacciones",
     "circles": "Círculos Gradido",
-    "usersearch": "Búsqueda geográfica de miembros (experimental)"
+    "usersearch": "Búsqueda geográfica de miembros (beta)"
   },
   "qrCode": "Código QR",
   "send_gdd": "Enviar GDD",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index 5f54dc5f3..0df789075 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -292,7 +292,7 @@
     "settings": "Configuration",
     "transactions": "Vos transactions",
     "circles": "Cercles Gradido",
-    "usersearch": "Recherche géographique de membres (expérimentale)"
+    "usersearch": "Recherche géographique de membres (bèta)"
   },
   "qrCode": "QR Code",
   "send_gdd": "Envoyer GDD",
diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json
index fd00cdb7a..c27eebc6f 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -284,7 +284,7 @@
     "settings": "Settings",
     "transactions": "Your transactions",
     "circles": "Gradido Kringen",
-    "usersearch": "Geografisch leden zoeken (experimenteel)"
+    "usersearch": "Geografisch leden zoeken (bèta)"
   },
   "qrCode": "QR Code",
   "send_gdd": "GDD sturen",

From f737c9d4a06e10cd5275d09ae80d6dbfcb35b512 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Fri, 16 May 2025 12:05:12 +0200
Subject: [PATCH 33/36] fix publish workflow

---
 .github/workflows/publish.yml | 58 +++++++++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index e225fa99b..86979751d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -35,7 +35,7 @@ jobs:
       ##########################################################################
       - name: Frontend | Build `production` image
         run: |
-          docker build --target production -t "gradido/frontend:latest" -t "gradido/frontend:production" -t "gradido/frontend:${VERSION}" -t "gradido/frontend:${BUILD_VERSION}" frontend/
+          docker build -f ./frontend/Dockerfile --target production -t "gradido/frontend:latest" -t "gradido/frontend:production" -t "gradido/frontend:${VERSION}" -t "gradido/frontend:${BUILD_VERSION}" .
           docker save "gradido/frontend" > /tmp/frontend.tar
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
@@ -43,6 +43,43 @@ jobs:
           name: docker-frontend-production
           path: /tmp/frontend.tar
 
+  ##############################################################################
+  # JOB: DOCKER BUILD PRODUCTION ADMIN #########################################
+  ##############################################################################
+  build_production_admin:
+    name: Docker Build Production - Admin
+    runs-on: ubuntu-latest
+    #needs: [nothing]
+    steps:
+      ##########################################################################
+      # CHECKOUT CODE ##########################################################
+      ##########################################################################
+      - name: Checkout code
+        uses: actions/checkout@v4
+      ##########################################################################
+      # SET ENVS ###############################################################
+      ##########################################################################
+      - name: ENV - VERSION
+        run: echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV
+      - name: ENV - BUILD_DATE
+        run: echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
+      - name: ENV - BUILD_VERSION
+        run: echo "BUILD_VERSION=${VERSION}.${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
+      - name: ENV - BUILD_COMMIT
+        run: echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
+      ##########################################################################
+      # ADMIN ##################################################################
+      ##########################################################################
+      - name: Admin | Build `production` image
+        run: |
+          docker build -f ./admin/Dockerfile --target production -t "gradido/admin:latest" -t "gradido/admin:production" -t "gradido/admin:${VERSION}" -t "gradido/admin:${BUILD_VERSION}" .
+          docker save "gradido/admin" > /tmp/admin.tar
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: docker-admin-production
+          path: /tmp/admin.tar
+
   ##############################################################################
   # JOB: DOCKER BUILD PRODUCTION BACKEND #######################################
   ##############################################################################
@@ -170,14 +207,14 @@ jobs:
       ##########################################################################
       # DATABASE UP ############################################################
       ##########################################################################
-      - name: Database | Build `production_up` image
+      - name: Database | Build `up` image
         run: |
-          docker build --target production_up -t "gradido/database:production_up" database/
-          docker save "gradido/database:production_up" > /tmp/database_up.tar
+          docker build --target up -t "gradido/database:up" database/
+          docker save "gradido/database:up" > /tmp/database_up.tar
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: docker-database-production_up
+          name: docker-database-up
           path: /tmp/database_up.tar
 
   ##############################################################################
@@ -243,6 +280,13 @@ jobs:
           path: /tmp
       - name: Load Docker Image
         run: docker load < /tmp/frontend.tar
+      - name: Download Docker Image (Admin)
+        uses: actions/download-artifact@v4
+        with:
+          name: docker-admin-production
+          path: /tmp
+      - name: Load Docker Image
+        run: docker load < /tmp/admin.tar
       - name: Download Docker Image (Backend)
         uses: actions/download-artifact@v4
         with:
@@ -267,7 +311,7 @@ jobs:
       - name: Download Docker Image (Database)
         uses: actions/download-artifact@v4
         with:
-          name: docker-database-production_up
+          name: docker-database-up
           path: /tmp
       - name: Load Docker Image
         run: docker load < /tmp/database_up.tar
@@ -287,6 +331,8 @@ jobs:
         run: echo "${DOCKERHUB_TOKEN}" | docker login -u "${DOCKERHUB_USERNAME}" --password-stdin
       - name: Push frontend
         run: docker push --all-tags gradido/frontend
+      - name: Push admin
+        run: docker push --all-tags gradido/admin
       - name: Push backend
         run: docker push --all-tags gradido/backend
       - name: Push dht-node

From ee831cc65c92e12ee8bb97dc03210505e45f1d27 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Mon, 19 May 2025 14:39:45 +0200
Subject: [PATCH 34/36] fix bug, improve performance

---
 .../graphql/resolver/ContributionResolver.ts  | 86 ++-----------------
 .../graphql/resolver/util/contributions.ts    | 53 +++++++++++-
 backend/src/typeorm/connection.ts             |  2 +-
 .../Contributions/ContributionList.vue        | 11 +--
 .../Contributions/ContributionListAll.vue     |  9 +-
 frontend/src/graphql/contributions.graphql    |  6 +-
 6 files changed, 68 insertions(+), 99 deletions(-)

diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 0fc5a2a09..319678157 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -6,19 +6,7 @@ import {
 } from 'database'
 import { Decimal } from 'decimal.js-light'
 import { GraphQLResolveInfo } from 'graphql'
-import {
-  Arg,
-  Args,
-  Authorized,
-  Ctx,
-  FieldResolver,
-  Info,
-  Int,
-  Mutation,
-  Query,
-  Resolver,
-  Root,
-} from 'type-graphql'
+import { Arg, Args, Authorized, Ctx, Info, Int, Mutation, Query, Resolver } from 'type-graphql'
 import { EntityManager, IsNull, getConnection } from 'typeorm'
 
 import { AdminCreateContributionArgs } from '@arg/AdminCreateContributionArgs'
@@ -34,7 +22,6 @@ import { Contribution, ContributionListResult } from '@model/Contribution'
 import { Decay } from '@model/Decay'
 import { OpenCreation } from '@model/OpenCreation'
 import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
-import { User } from '@model/User'
 
 import { RIGHTS } from '@/auth/RIGHTS'
 import {
@@ -61,12 +48,11 @@ import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 import { calculateDecay } from '@/util/decay'
 import { fullName } from '@/util/utilities'
 
-import { ContributionMessage } from '@model/ContributionMessage'
+import { start } from 'repl'
 import { ContributionMessageType } from '../enum/ContributionMessageType'
 import { loadAllContributions, loadUserContributions } from './util/contributions'
 import { getOpenCreations, getUserCreation, validateContribution } from './util/creations'
-import { extractGraphQLFields, extractGraphQLFieldsForSelect } from './util/extractGraphQLFields'
-import { findContributionMessages } from './util/findContributionMessages'
+import { extractGraphQLFields } from './util/extractGraphQLFields'
 import { findContributions } from './util/findContributions'
 import { getLastTransaction } from './util/getLastTransaction'
 import { sendTransactionsToDltConnector } from './util/sendTransactionsToDltConnector'
@@ -140,20 +126,14 @@ export class ContributionResolver {
     const res = await contribution.softRemove()
     return !!res
   }
-
   @Authorized([RIGHTS.LIST_CONTRIBUTIONS])
   @Query(() => ContributionListResult)
   async listContributions(
     @Ctx() context: Context,
     @Arg('pagination') pagination: Paginated,
-    @Arg('messagePagination', { nullable: true }) messagePagination?: Paginated,
   ): Promise<ContributionListResult> {
     const user = getUser(context)
-    const [dbContributions, count] = await loadUserContributions(
-      user.id,
-      pagination,
-      messagePagination,
-    )
+    const [dbContributions, count] = await loadUserContributions(user.id, pagination)
 
     // show contributions in progress first
     const inProgressContributions = dbContributions.filter(
@@ -163,18 +143,9 @@ export class ContributionResolver {
       (contribution) => contribution.contributionStatus !== ContributionStatus.IN_PROGRESS,
     )
 
-    return new ContributionListResult(
+    const result = new ContributionListResult(
       count,
       [...inProgressContributions, ...notInProgressContributions].map((contribution) => {
-        // we currently expect not much contribution messages for needing pagination
-        // but if we get more than expected, we should get warned
-        if ((contribution.messages?.length || 0) > (messagePagination?.pageSize || 10)) {
-          logger.warn('more contribution messages as expected, consider pagination', {
-            contributionId: contribution.id,
-            expected: messagePagination?.pageSize || 10,
-            actual: contribution.messages?.length || 0,
-          })
-        }
         // filter out moderator messages for this call
         contribution.messages = contribution.messages?.filter(
           (message) =>
@@ -183,6 +154,7 @@ export class ContributionResolver {
         return contribution
       }),
     )
+    return result
   }
 
   @Authorized([RIGHTS.LIST_CONTRIBUTIONS])
@@ -625,50 +597,4 @@ export class ContributionResolver {
 
     return !!res
   }
-
-  // Field resolvers
-  @Authorized([RIGHTS.USER])
-  @FieldResolver(() => User, { nullable: true })
-  async user(
-    @Root() contribution: DbContribution,
-    @Info() info: GraphQLResolveInfo,
-  ): Promise<User | null> {
-    let user: DbUser | null = contribution.user
-    if (!user) {
-      const queryBuilder = DbUser.createQueryBuilder('user')
-      queryBuilder.where('user.id = :userId', { userId: contribution.userId })
-      extractGraphQLFieldsForSelect(info, queryBuilder, 'user')
-      user = await queryBuilder.getOne()
-    }
-    if (user) {
-      return new User(user)
-    }
-    return null
-  }
-
-  @Authorized([RIGHTS.LIST_ALL_CONTRIBUTION_MESSAGES])
-  @FieldResolver(() => [ContributionMessage], { nullable: true })
-  async messages(
-    @Root() contribution: UnconfirmedContribution,
-    @Arg('pagination', () => Paginated) pagination: Paginated,
-  ): Promise<ContributionMessage[] | null> {
-    if (contribution.messagesCount === 0) {
-      return null
-    }
-    const [contributionMessages] = await findContributionMessages({
-      contributionId: contribution.id,
-      pagination,
-    })
-    // we currently expect not much contribution messages for needing pagination
-    // but if we get more than expected, we should get warned
-    if (contributionMessages.length > pagination.pageSize) {
-      logger.warn('more contribution messages as expected, consider pagination', {
-        contributionId: contribution.id,
-        expected: pagination.pageSize,
-        actual: contributionMessages.length,
-      })
-    }
-
-    return contributionMessages.map((message) => new ContributionMessage(message))
-  }
 }
diff --git a/backend/src/graphql/resolver/util/contributions.ts b/backend/src/graphql/resolver/util/contributions.ts
index 13721744f..58e0914ba 100644
--- a/backend/src/graphql/resolver/util/contributions.ts
+++ b/backend/src/graphql/resolver/util/contributions.ts
@@ -1,6 +1,7 @@
+import { Order } from '@/graphql/enum/Order'
 import { Paginated } from '@arg/Paginated'
 import { Contribution as DbContribution } from 'database'
-import { FindManyOptions } from 'typeorm'
+import { FindManyOptions, In } from 'typeorm'
 
 // TODO: combine with Pagination class for all queries to use
 function buildPaginationOptions(paginated: Paginated): FindManyOptions<DbContribution> {
@@ -19,17 +20,41 @@ function buildPaginationOptions(paginated: Paginated): FindManyOptions<DbContrib
 export const loadUserContributions = async (
   userId: number,
   paginated: Paginated,
-  messagePagination?: Paginated,
 ): Promise<[DbContribution[], number]> => {
   const { order } = paginated
-  const { order: messageOrder } = messagePagination || { order: 'ASC' }
+  // manual, faster and simpler queries as auto generated from typeorm
+  const countPromise = DbContribution.count({
+    select: { id: true },
+    where: { userId },
+    withDeleted: true,
+  })
+  // we collect all contributions, ignoring if user exist or not
+  const contributionIds = await DbContribution.find({
+    select: { id: true },
+    where: { userId },
+    withDeleted: true,
+    order: { createdAt: order, id: order },
+    ...buildPaginationOptions(paginated),
+  })
+  const contributionsPromise = DbContribution.find({
+    relations: { messages: { user: true } },
+    withDeleted: true,
+    order: { createdAt: order, id: order, messages: { createdAt: Order.ASC } },
+    where: { id: In(contributionIds.map((c) => c.id)) },
+  })
+  return [await contributionsPromise, await countPromise]
+
+  // original code
+  // note: typeorm will create similar queries as above, but more complex and slower
+  /*
   return DbContribution.findAndCount({
     where: { userId },
     withDeleted: true,
     relations: { messages: { user: true } },
-    order: { createdAt: order, id: order, messages: { createdAt: messageOrder } },
+    order: { createdAt: order, id: order, messages: { createdAt: Order.ASC } },
     ...buildPaginationOptions(paginated),
   })
+  */
 }
 
 /*
@@ -40,9 +65,29 @@ export const loadAllContributions = async (
   paginated: Paginated,
 ): Promise<[DbContribution[], number]> => {
   const { order } = paginated
+  // manual, faster queries as auto generated from typeorm
+  const countPromise = DbContribution.count({ select: { id: true } })
+  // console.log('loadAllContributions', { count })
+
+  const contributionIds = await DbContribution.find({
+    select: { id: true },
+    order: { createdAt: order, id: order },
+    ...buildPaginationOptions(paginated),
+  })
+  const contributionsPromise = DbContribution.find({
+    relations: { user: { emailContact: true } },
+    order: { createdAt: order, id: order },
+    where: { id: In(contributionIds.map((c) => c.id)) },
+  })
+  return [await contributionsPromise, await countPromise]
+
+  // original code
+  // note: typeorm will create similar queries as above, but more complex and slower
+  /*
   return DbContribution.findAndCount({
     relations: { user: { emailContact: true } },
     order: { createdAt: order, id: order },
     ...buildPaginationOptions(paginated),
   })
+  */
 }
diff --git a/backend/src/typeorm/connection.ts b/backend/src/typeorm/connection.ts
index c2e2e5558..16e5674ab 100644
--- a/backend/src/typeorm/connection.ts
+++ b/backend/src/typeorm/connection.ts
@@ -39,7 +39,7 @@ export class Connection {
         logging: true,
         logger: new FileLogger('all', {
           // workaround to let previous path working, because with esbuild the script root path has changed
-          logPath: '../' + CONFIG.TYPEORM_LOGGING_RELATIVE_PATH,
+          logPath: CONFIG.PRODUCTION ? '../' : '' + CONFIG.TYPEORM_LOGGING_RELATIVE_PATH,
         }),
         extra: {
           charset: 'utf8mb4_unicode_ci',
diff --git a/frontend/src/components/Contributions/ContributionList.vue b/frontend/src/components/Contributions/ContributionList.vue
index 6badabbf9..3abee7056 100644
--- a/frontend/src/components/Contributions/ContributionList.vue
+++ b/frontend/src/components/Contributions/ContributionList.vue
@@ -52,24 +52,19 @@ const pollInterval = CONFIG.AUTO_POLL_INTERVAL || undefined
 const emit = defineEmits(['update-contribution-form'])
 
 // refs
-const currentPage = ref(1)
+const currentPage = ref(Number(route.params.page) || 1)
 const openMessagesListId = ref(null)
 
 // queries
 const { result, loading, refetch, onResult } = useQuery(
   listContributions,
-  {
+  () => ({
     pagination: {
       currentPage: currentPage.value,
       pageSize,
       order: 'DESC',
     },
-    messagePagination: {
-      currentPage: 1,
-      pageSize: 10,
-      order: 'ASC',
-    },
-  },
+  }),
   {
     fetchPolicy: 'cache-and-network',
     pollInterval,
diff --git a/frontend/src/components/Contributions/ContributionListAll.vue b/frontend/src/components/Contributions/ContributionListAll.vue
index 6e1f1a849..c519d0d27 100644
--- a/frontend/src/components/Contributions/ContributionListAll.vue
+++ b/frontend/src/components/Contributions/ContributionListAll.vue
@@ -29,23 +29,26 @@ import { useQuery } from '@vue/apollo-composable'
 import CONFIG from '@/config'
 import PaginatorRouteParamsPage from '@/components/PaginatorRouteParamsPage.vue'
 import { PAGE_SIZE } from '@/constants'
+import { useRoute } from 'vue-router'
+
+const route = useRoute()
 
 // constants
 const pollInterval = CONFIG.AUTO_POLL_INTERVAL || undefined
 const pageSize = PAGE_SIZE
 
 // computed
-const currentPage = ref(1)
+const currentPage = ref(Number(route.params.page) || 1)
 
 const { result, loading } = useQuery(
   listAllContributions,
-  {
+  () => ({
     pagination: {
       currentPage: currentPage.value,
       pageSize,
       order: 'DESC',
     },
-  },
+  }),
   {
     fetchPolicy: 'cache-and-network',
     pollInterval,
diff --git a/frontend/src/graphql/contributions.graphql b/frontend/src/graphql/contributions.graphql
index 0fe4a46f1..842f742bf 100644
--- a/frontend/src/graphql/contributions.graphql
+++ b/frontend/src/graphql/contributions.graphql
@@ -31,8 +31,8 @@ fragment contributionMessageFields on ContributionMessage {
   userId
 }
 
-query listContributions ($pagination: Paginated!, $messagePagination: Paginated!) {
-  listContributions(pagination: $pagination, messagePagination: $messagePagination) {
+query listContributions ($pagination: Paginated!) {
+  listContributions(pagination: $pagination) {
     contributionCount
     contributionList {
       id
@@ -41,7 +41,7 @@ query listContributions ($pagination: Paginated!, $messagePagination: Paginated!
       contributionDate
       contributionStatus
       messagesCount
-      messages(pagination: $messagePagination) {
+      messages {
         ...contributionMessageFields
       }
       updatedBy

From b23183197beb0c9bb13b85356d075571f4045478 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Mon, 19 May 2025 14:44:41 +0200
Subject: [PATCH 35/36] fix

---
 backend/src/typeorm/connection.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/typeorm/connection.ts b/backend/src/typeorm/connection.ts
index 16e5674ab..d56a95778 100644
--- a/backend/src/typeorm/connection.ts
+++ b/backend/src/typeorm/connection.ts
@@ -39,7 +39,7 @@ export class Connection {
         logging: true,
         logger: new FileLogger('all', {
           // workaround to let previous path working, because with esbuild the script root path has changed
-          logPath: CONFIG.PRODUCTION ? '../' : '' + CONFIG.TYPEORM_LOGGING_RELATIVE_PATH,
+          logPath: (CONFIG.PRODUCTION ? '../' : '') + CONFIG.TYPEORM_LOGGING_RELATIVE_PATH,
         }),
         extra: {
           charset: 'utf8mb4_unicode_ci',

From bc0b3c0722059f5a3a3faecab9d50a33d0f672ea Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Mon, 19 May 2025 15:13:42 +0200
Subject: [PATCH 36/36] fix installer script

---
 deployment/bare_metal/start.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
index c8985bca6..5b9d2476a 100755
--- a/deployment/bare_metal/start.sh
+++ b/deployment/bare_metal/start.sh
@@ -12,8 +12,9 @@ then
         sudo apt-get install -y unzip
     fi
     echo "'bun' is missing, will be installed now!"
-    curl -fsSL https://bun.sh/install | BUN_INSTALL=/usr/local bash
-    export PATH="/root/.bun/bin:${PATH}"
+    curl -fsSL https://bun.sh/install | bash
+    export BUN_INSTALL="$HOME/.bun"
+    export PATH="$BUN_INSTALL/bin:$PATH"
 fi
 # turbo https://turborepo.com/docs/getting-started
 if ! command -v turbo &> /dev/null