From 1626f28f2063d680c0c29d0d7da5d3634f34376a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 10 Dec 2021 00:39:57 +0100
Subject: [PATCH 01/74] an incorrect login should always result in an error not
 in a request to reset the password

---
 frontend/src/views/Pages/Login.vue | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index d5d3e25a4..0d51cc4c6 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -104,13 +104,8 @@ export default {
           this.$router.push('/overview')
           loader.hide()
         })
-        .catch((error) => {
-          if (error.message.includes('No user with this credentials')) {
-            this.$toasted.global.error(this.$t('error.no-account'))
-          } else {
-            // : this.$t('error.no-email-verify')
-            this.$router.push('/reset/login')
-          }
+        .catch(() => {
+          this.$toasted.global.error(this.$t('error.no-account'))
           loader.hide()
         })
     },

From 83a2269a42c413e68efd8d4c63e88464f526c389 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 10 Dec 2021 14:51:10 +0100
Subject: [PATCH 02/74] Update frontend/src/views/Pages/Login.vue

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 frontend/src/views/Pages/Login.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index 0d51cc4c6..8364f15ab 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -104,8 +104,11 @@ export default {
           this.$router.push('/overview')
           loader.hide()
         })
-        .catch(() => {
+        .catch((error) => {
           this.$toasted.global.error(this.$t('error.no-account'))
+          if (error.message.uncludes('User email not validated')) {
+            this.$router.push('/reset/login')
+          }
           loader.hide()
         })
     },

From 508bb774def07ba8381d942b8e60523cadd7eb79 Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Sat, 11 Dec 2021 06:17:45 +0100
Subject: [PATCH 03/74] Update Login.vue

Correct own typo
---
 frontend/src/views/Pages/Login.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index 8364f15ab..3f434268a 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -106,7 +106,7 @@ export default {
         })
         .catch((error) => {
           this.$toasted.global.error(this.$t('error.no-account'))
-          if (error.message.uncludes('User email not validated')) {
+          if (error.message.includes('User email not validated')) {
             this.$router.push('/reset/login')
           }
           loader.hide()

From 7b8426593eead482a43046ec50dd00f0e2b78267 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 13 Dec 2021 10:38:05 +0100
Subject: [PATCH 04/74] Test redirect when no password is present

---
 frontend/src/views/Pages/Login.spec.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/frontend/src/views/Pages/Login.spec.js b/frontend/src/views/Pages/Login.spec.js
index 34175d8b3..9e8be9342 100644
--- a/frontend/src/views/Pages/Login.spec.js
+++ b/frontend/src/views/Pages/Login.spec.js
@@ -251,6 +251,25 @@ describe('Login', () => {
           it('toasts an error message', () => {
             expect(toastErrorMock).toBeCalledWith('error.no-account')
           })
+
+          describe('login fails with "User email not validated"', () => {
+            beforeEach(async () => {
+              apolloQueryMock.mockRejectedValue({
+                message: 'User email not validated',
+              })
+              wrapper = Wrapper()
+              jest.clearAllMocks()
+              await wrapper.find('input[placeholder="Email"]').setValue('user@example.org')
+              await wrapper.find('input[placeholder="form.password"]').setValue('1234')
+              await flushPromises()
+              await wrapper.find('form').trigger('submit')
+              await flushPromises()
+            })
+
+            it('redirects to /reset/login', () => {
+              expect(mockRouterPush).toBeCalledWith('/reset/login')
+            })
+          })
         })
       })
     })

From 7341515dad84839c62ac9694d33ebcec32139e54 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 13 Dec 2021 12:02:21 +0100
Subject: [PATCH 05/74] Send to /thx/login not /reset/login so the user get's a
 message to check to validate his account.

---
 frontend/src/views/Pages/Login.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index 3f434268a..d7f09ea4c 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -107,7 +107,7 @@ export default {
         .catch((error) => {
           this.$toasted.global.error(this.$t('error.no-account'))
           if (error.message.includes('User email not validated')) {
-            this.$router.push('/reset/login')
+            this.$router.push('/thx/login')
           }
           loader.hide()
         })

From f1b28a640e5d27e2e51903165cec5a5fc10ad98b Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 14 Dec 2021 08:09:47 +0100
Subject: [PATCH 06/74] In case where their is no password set now we need to
 send the user to a page to change his password.

---
 frontend/src/views/Pages/Login.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index d7f09ea4c..4d2b75d2a 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -108,6 +108,8 @@ export default {
           this.$toasted.global.error(this.$t('error.no-account'))
           if (error.message.includes('User email not validated')) {
             this.$router.push('/thx/login')
+          } else if (error.message.includes('User has no password set yet')) {
+            this.$router.push('/reset/login')
           }
           loader.hide()
         })

From ab5baf00d4bb815f889bc6495b393e2aa40c035e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 16 Dec 2021 17:06:02 +0100
Subject: [PATCH 07/74] unused elements removed

---
 admin/src/components/NavBar.vue | 22 +++++++++++++---------
 admin/src/pages/Creation.vue    |  1 -
 admin/src/pages/Overview.vue    | 22 ----------------------
 3 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue
index aaff9d61d..e99307f3e 100644
--- a/admin/src/components/NavBar.vue
+++ b/admin/src/components/NavBar.vue
@@ -1,30 +1,34 @@
 <template>
   <div class="component-nabvar">
-    <b-navbar toggleable="sm" type="dark" variant="success">
+    <b-navbar toggleable="md" type="dark" variant="success" class="p-3">
       <b-navbar-brand to="/">
         <img src="img/brand/green.png" class="navbar-brand-img" alt="..." />
       </b-navbar-brand>
 
       <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
 
-      <b-collapse id="nav-collapse" is-nav>
+      <b-collapse id="nav-collapse" class="h4" is-nav>
         <b-navbar-nav>
-          <b-nav-item to="/">Übersicht |</b-nav-item>
-          <b-nav-item to="/user">Usersuche |</b-nav-item>
+          <b-nav-item to="/">Übersicht</b-nav-item>
+          <b-nav-item to="/user">Usersuche</b-nav-item>
           <b-nav-item to="/creation">Mehrfachschöpfung</b-nav-item>
           <b-nav-item
             v-show="$store.state.openCreations > 0"
-            class="h5 bg-danger"
+            class="bg-danger p-2"
             to="/creation-confirm"
           >
-            | {{ $store.state.openCreations }} offene Schöpfungen
+            {{ $store.state.openCreations }} offene Schöpfungen
           </b-nav-item>
-          <b-nav-item @click="wallet">Wallet</b-nav-item>
-          <b-nav-item @click="logout">Logout</b-nav-item>
-          <!-- <b-nav-item v-show="open < 1" to="/creation-confirm">| keine offene Schöpfungen</b-nav-item> -->
+            <b-nav-item @click="wallet" >Wallet</b-nav-item>
+          <b-nav-item @click="logout" >Logout</b-nav-item>
         </b-navbar-nav>
+       
+    
       </b-collapse>
+      
+       
     </b-navbar>
+   
   </div>
 </template>
 <script>
diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue
index 820f6382e..e8651357e 100644
--- a/admin/src/pages/Creation.vue
+++ b/admin/src/pages/Creation.vue
@@ -40,7 +40,6 @@
           :items="itemsMassCreation"
           @remove-all-bookmark="removeAllBookmark"
         />
-        {{ itemsMassCreation }}
       </b-col>
     </b-row>
   </div>
diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue
index 524e03f07..9b609c3ef 100644
--- a/admin/src/pages/Overview.vue
+++ b/admin/src/pages/Overview.vue
@@ -28,28 +28,6 @@
         </b-link>
       </b-card-text>
     </b-card>
-    <br />
-    <hr />
-    <br />
-    <b-list-group>
-      <b-list-group-item class="bg-secondary text-light" href="user">
-        zur Usersuche
-      </b-list-group-item>
-      <b-list-group-item class="d-flex justify-content-between align-items-center">
-        Mitglieder
-        <b-badge class="bg-success" pill>2400</b-badge>
-      </b-list-group-item>
-
-      <b-list-group-item class="d-flex justify-content-between align-items-center">
-        aktive Mitglieder
-        <b-badge class="bg-primary" pill>2201</b-badge>
-      </b-list-group-item>
-
-      <b-list-group-item class="d-flex justify-content-between align-items-center">
-        nicht bestätigte Mitglieder
-        <b-badge class="bg-warning text-dark" pill>120</b-badge>
-      </b-list-group-item>
-    </b-list-group>
   </div>
 </template>
 <script>

From a4a51fbf9dd9084e68c796e43cfc4920288b2650 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 16 Dec 2021 17:08:02 +0100
Subject: [PATCH 08/74] yarn lint --fix

---
 admin/src/components/NavBar.vue | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue
index e99307f3e..9c656db6d 100644
--- a/admin/src/components/NavBar.vue
+++ b/admin/src/components/NavBar.vue
@@ -19,16 +19,11 @@
           >
             {{ $store.state.openCreations }} offene Schöpfungen
           </b-nav-item>
-            <b-nav-item @click="wallet" >Wallet</b-nav-item>
-          <b-nav-item @click="logout" >Logout</b-nav-item>
+          <b-nav-item @click="wallet">Wallet</b-nav-item>
+          <b-nav-item @click="logout">Logout</b-nav-item>
         </b-navbar-nav>
-       
-    
       </b-collapse>
-      
-       
     </b-navbar>
-   
   </div>
 </template>
 <script>

From 8545e27a23b9dee024b10c79da2d904fba96b43a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 16 Dec 2021 17:14:48 +0100
Subject: [PATCH 09/74] change color in navbar for open creations

---
 admin/src/components/NavBar.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue
index 9c656db6d..24286f01c 100644
--- a/admin/src/components/NavBar.vue
+++ b/admin/src/components/NavBar.vue
@@ -7,14 +7,14 @@
 
       <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
 
-      <b-collapse id="nav-collapse" class="h4" is-nav>
+      <b-collapse id="nav-collapse" is-nav>
         <b-navbar-nav>
           <b-nav-item to="/">Übersicht</b-nav-item>
           <b-nav-item to="/user">Usersuche</b-nav-item>
           <b-nav-item to="/creation">Mehrfachschöpfung</b-nav-item>
           <b-nav-item
             v-show="$store.state.openCreations > 0"
-            class="bg-danger p-2"
+            class="bg-color-creation p-1"
             to="/creation-confirm"
           >
             {{ $store.state.openCreations }} offene Schöpfungen
@@ -48,4 +48,7 @@ export default {
   height: 2rem;
   padding-left: 10px;
 }
+.bg-color-creation {
+  background-color: #cf1010dc;
+}
 </style>

From 8c5fff73ef375cbc308d67bbafd538d775345d25 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 17 Dec 2021 09:49:45 +0100
Subject: [PATCH 10/74] Refactoring of the sendActivationEmail so that we can
 send another email with a new activation link.

---
 backend/src/graphql/resolver/UserResolver.ts | 111 ++++++++++++++-----
 1 file changed, 84 insertions(+), 27 deletions(-)

diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index bebc32e1e..7a9f10bb0 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -3,7 +3,7 @@
 
 import fs from 'fs'
 import { Resolver, Query, Args, Arg, Authorized, Ctx, UseMiddleware, Mutation } from 'type-graphql'
-import { getConnection, getCustomRepository, getRepository } from 'typeorm'
+import { getConnection, getCustomRepository, getRepository, QueryRunner } from 'typeorm'
 import CONFIG from '../../config'
 import { User } from '../model/User'
 import { User as DbUser } from '@entity/User'
@@ -383,37 +383,18 @@ export class UserResolver {
 
       // Store EmailOptIn in DB
       // TODO: this has duplicate code with sendResetPasswordEmail
-      const emailOptIn = new LoginEmailOptIn()
-      emailOptIn.userId = loginUserId
-      emailOptIn.verificationCode = random(64)
-      emailOptIn.emailOptInTypeId = EMAIL_OPT_IN_REGISTER
+      const emailOptIn = await this.createEmailOptIn(loginUserId, queryRunner)
 
-      await queryRunner.manager.save(emailOptIn).catch((error) => {
-        // eslint-disable-next-line no-console
-        console.log('Error while saving emailOptIn', error)
-        throw new Error('error saving email opt in')
-      })
-
-      // Send EMail to user
       const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(
         /\$1/g,
         emailOptIn.verificationCode.toString(),
       )
-      const emailSent = await sendEMail({
-        from: `Gradido (nicht antworten) <${CONFIG.EMAIL_SENDER}>`,
-        to: `${firstName} ${lastName} <${email}>`,
-        subject: 'Gradido: E-Mail Überprüfung',
-        text: `Hallo ${firstName} ${lastName},
-        
-        Deine EMail wurde soeben bei Gradido registriert.
-        
-        Klicke bitte auf diesen Link, um die Registrierung abzuschließen und dein Gradido-Konto zu aktivieren:
-        ${activationLink}
-        oder kopiere den obigen Link in dein Browserfenster.
-        
-        Mit freundlichen Grüßen,
-        dein Gradido-Team`,
-      })
+      const emailSent = await this.sendAccountActivationEmail(
+        activationLink,
+        firstName,
+        lastName,
+        email,
+      )
 
       // In case EMails are disabled log the activation link for the user
       if (!emailSent) {
@@ -430,6 +411,82 @@ export class UserResolver {
     return 'success'
   }
 
+  private async sendAccountActivationEmail(
+    activationLink: string,
+    firstName: string,
+    lastName: string,
+    email: string,
+  ) {
+    const emailSent = await sendEMail({
+      from: `Gradido (nicht antworten) <${CONFIG.EMAIL_SENDER}>`,
+      to: `${firstName} ${lastName} <${email}>`,
+      subject: 'Gradido: E-Mail Überprüfung',
+      text: `Hallo ${firstName} ${lastName},
+        
+        Deine EMail wurde soeben bei Gradido registriert.
+        
+        Klicke bitte auf diesen Link, um die Registrierung abzuschließen und dein Gradido-Konto zu aktivieren:
+        ${activationLink}
+        oder kopiere den obigen Link in dein Browserfenster.
+        
+        Mit freundlichen Grüßen,
+        dein Gradido-Team`,
+    })
+    return emailSent
+  }
+
+  @Mutation(() => Boolean)
+  async sendActivationEmail(@Arg('email') email: string): Promise<boolean> {
+    const loginUserRepository = getCustomRepository(LoginUserRepository)
+    const loginUser = await loginUserRepository.findOneOrFail({ email: email })
+
+    const queryRunner = getConnection().createQueryRunner()
+    await queryRunner.connect()
+    await queryRunner.startTransaction('READ UNCOMMITTED')
+
+    try {
+      const emailOptIn = await this.createEmailOptIn(loginUser.id, queryRunner)
+
+      const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(
+        /\$1/g,
+        emailOptIn.verificationCode.toString(),
+      )
+      const emailSent = await this.sendAccountActivationEmail(
+        activationLink,
+        loginUser.firstName,
+        loginUser.lastName,
+        email,
+      )
+
+      // In case EMails are disabled log the activation link for the user
+      if (!emailSent) {
+        // eslint-disable-next-line no-console
+        console.log(`Account confirmation link: ${activationLink}`)
+      }
+      await queryRunner.commitTransaction()
+    } catch (e) {
+      await queryRunner.rollbackTransaction()
+      throw e
+    } finally {
+      await queryRunner.release()
+    }
+    return true
+  }
+
+  private async createEmailOptIn(loginUserId: number, queryRunner: QueryRunner) {
+    const emailOptIn = new LoginEmailOptIn()
+    emailOptIn.userId = loginUserId
+    emailOptIn.verificationCode = random(64)
+    emailOptIn.emailOptInTypeId = EMAIL_OPT_IN_REGISTER
+
+    await queryRunner.manager.save(emailOptIn).catch((error) => {
+      // eslint-disable-next-line no-console
+      console.log('Error while saving emailOptIn', error)
+      throw new Error('error saving email opt in')
+    })
+    return emailOptIn
+  }
+
   @Authorized([RIGHTS.SEND_RESET_PASSWORD_EMAIL])
   @Query(() => Boolean)
   async sendResetPasswordEmail(@Arg('email') email: string): Promise<boolean> {

From 7f650b975591f9649f732e0043849401db86ac19 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 17 Dec 2021 11:01:23 +0100
Subject: [PATCH 11/74] Adding a configurable resend_time in minutes.

---
 backend/.env.dist           | 3 +++
 backend/src/config/index.ts | 1 +
 2 files changed, 4 insertions(+)

diff --git a/backend/.env.dist b/backend/.env.dist
index ed9b26102..f38e31be5 100644
--- a/backend/.env.dist
+++ b/backend/.env.dist
@@ -15,6 +15,9 @@ DB_DATABASE=gradido_community
 #EMAIL_PASSWORD=
 #EMAIL_SMTP_URL=
 #EMAIL_SMTP_PORT=587
+#RESEND_TIME=1 minute, 60 => 1hour, 1440 (60 minutes * 24 hours) => 24 hours 
+#RESEND_TIME=
+RESEND_TIME=10
 
 #EMAIL_LINK_VERIFICATION=http://localhost/vue/checkEmail/$1
 
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index a12524a78..4adc21b41 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -52,6 +52,7 @@ const email = {
   EMAIL_LINK_VERIFICATION:
     process.env.EMAIL_LINK_VERIFICATION || 'http://localhost/vue/checkEmail/$1',
   EMAIL_LINK_SETPASSWORD: process.env.EMAIL_LINK_SETPASSWORD || 'http://localhost/vue/reset/$1',
+  RESEND_TIME: process.env.RESEND_TIME || 10,
 }
 
 const webhook = {

From da527dd162865f64852753132ced20217e5bf753 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 17 Dec 2021 11:04:12 +0100
Subject: [PATCH 12/74] Database logics when resending activation link

---
 backend/src/graphql/resolver/UserResolver.ts | 29 ++++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 7a9f10bb0..f33c902ce 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -451,6 +451,7 @@ export class UserResolver {
         /\$1/g,
         emailOptIn.verificationCode.toString(),
       )
+
       const emailSent = await this.sendAccountActivationEmail(
         activationLink,
         loginUser.firstName,
@@ -474,11 +475,29 @@ export class UserResolver {
   }
 
   private async createEmailOptIn(loginUserId: number, queryRunner: QueryRunner) {
-    const emailOptIn = new LoginEmailOptIn()
-    emailOptIn.userId = loginUserId
-    emailOptIn.verificationCode = random(64)
-    emailOptIn.emailOptInTypeId = EMAIL_OPT_IN_REGISTER
-
+    const loginEmailOptInRepository = await getRepository(LoginEmailOptIn)
+    let emailOptIn = await loginEmailOptInRepository.findOne({
+      userId: loginUserId,
+      emailOptInTypeId: EMAIL_OPT_IN_REGISTER,
+    })
+    if (emailOptIn) {
+      const timeElapsed = Date.now() - new Date(emailOptIn.updatedAt).getTime()
+      if (timeElapsed <= parseInt(CONFIG.RESEND_TIME.toString()) * 60 * 1000) {
+        throw new Error(
+          'email already sent less than ' +
+            parseInt(CONFIG.RESEND_TIME.toString()) +
+            ' minutes ago',
+        )
+      } else {
+        emailOptIn.updatedAt = new Date()
+        emailOptIn.resendCount++
+      }
+    } else {
+      emailOptIn = new LoginEmailOptIn()
+      emailOptIn.verificationCode = random(64)
+      emailOptIn.userId = loginUserId
+      emailOptIn.emailOptInTypeId = EMAIL_OPT_IN_REGISTER
+    }
     await queryRunner.manager.save(emailOptIn).catch((error) => {
       // eslint-disable-next-line no-console
       console.log('Error while saving emailOptIn', error)

From ffe3cdf700bf6fe8f71274ac9cf66f18b39d9ed9 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Fri, 17 Dec 2021 11:12:52 +0100
Subject: [PATCH 13/74] Config of resendTime to resendPassword logic

---
 backend/src/graphql/resolver/UserResolver.ts | 44 +++++++++++---------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index f33c902ce..00a50f97e 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -506,43 +506,49 @@ export class UserResolver {
     return emailOptIn
   }
 
-  @Authorized([RIGHTS.SEND_RESET_PASSWORD_EMAIL])
-  @Query(() => Boolean)
-  async sendResetPasswordEmail(@Arg('email') email: string): Promise<boolean> {
-    // TODO: this has duplicate code with createUser
-    // TODO: Moriz: I think we do not need this variable.
-    let emailAlreadySend = false
-
-    const loginUserRepository = await getCustomRepository(LoginUserRepository)
-    const loginUser = await loginUserRepository.findOneOrFail({ email })
-
+  private async getOptInCode(loginUser: LoginUser) {
     const loginEmailOptInRepository = await getRepository(LoginEmailOptIn)
     let optInCode = await loginEmailOptInRepository.findOne({
       userId: loginUser.id,
       emailOptInTypeId: EMAIL_OPT_IN_RESET_PASSWORD,
     })
     if (optInCode) {
-      emailAlreadySend = true
+      const timeElapsed = Date.now() - new Date(optInCode.updatedAt).getTime()
+      if (timeElapsed <= parseInt(CONFIG.RESEND_TIME.toString()) * 60 * 1000) {
+        throw new Error(
+          'email already sent less than ' +
+            parseInt(CONFIG.RESEND_TIME.toString()) +
+            ' minutes ago',
+        )
+      } else {
+        optInCode.updatedAt = new Date()
+        optInCode.resendCount++
+      }
     } else {
       optInCode = new LoginEmailOptIn()
       optInCode.verificationCode = random(64)
       optInCode.userId = loginUser.id
       optInCode.emailOptInTypeId = EMAIL_OPT_IN_RESET_PASSWORD
-      await loginEmailOptInRepository.save(optInCode)
     }
+    await loginEmailOptInRepository.save(optInCode)
+    return optInCode
+  }
+
+  @Authorized([RIGHTS.SEND_RESET_PASSWORD_EMAIL])
+  @Query(() => Boolean)
+  async sendResetPasswordEmail(@Arg('email') email: string): Promise<boolean> {
+    // TODO: this has duplicate code with createUser
+
+    const loginUserRepository = await getCustomRepository(LoginUserRepository)
+    const loginUser = await loginUserRepository.findOneOrFail({ email })
+
+    const optInCode = await this.getOptInCode(loginUser)
 
     const link = CONFIG.EMAIL_LINK_SETPASSWORD.replace(
       /\$1/g,
       optInCode.verificationCode.toString(),
     )
 
-    if (emailAlreadySend) {
-      const timeElapsed = Date.now() - new Date(optInCode.updatedAt).getTime()
-      if (timeElapsed <= 10 * 60 * 1000) {
-        throw new Error('email already sent less than 10 minutes before')
-      }
-    }
-
     const emailSent = await sendEMail({
       from: `Gradido (nicht antworten) <${CONFIG.EMAIL_SENDER}>`,
       to: `${loginUser.firstName} ${loginUser.lastName} <${email}>`,

From 6e9b65b6e0c20958f5f5add1303cdf8de4564144 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 17 Dec 2021 13:22:16 +0100
Subject: [PATCH 14/74] close all showDetails prepared

---
 admin/src/components/UserTable.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 4a8ca8e84..85d10238b 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -244,6 +244,10 @@ export default {
         })
     },
     editCreationUserTable(row, rowItem) {
+      this.currentItems.forEach(item => {
+            this.$set(item, '_showDetails', false)
+          })
+          
       if (!row.detailsShowing) {
         this.creationUserData = rowItem
       } else {

From a46d1acce7b2f995460d565465c018690810202d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 18 Dec 2021 17:15:11 +0100
Subject: [PATCH 15/74] show details of a user only once in the table. close
 open details automatically

---
 admin/src/components/UserTable.vue | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 85d10238b..3fba8cc80 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -40,7 +40,8 @@
         <b-button
           variant="info"
           size="md"
-          @click="editCreationUserTable(row, row.item)"
+          :class="'details_' + row.detailsShowing"
+          @click="editCreationUserTable(row)"
           class="mr-2"
         >
           <b-icon v-if="row.detailsShowing" icon="x" aria-label="Help"></b-icon>
@@ -49,7 +50,13 @@
       </template>
 
       <template #cell(show_details)="row">
-        <b-button variant="info" size="md" @click="row.toggleDetails" class="mr-2">
+        <b-button
+          variant="info"
+          size="md"
+          :ref="'showing_detals_' + row.detailsShowing"
+          @click="rowDetailsToogle(row, row.item)"
+          class="mr-2"
+        >
           <b-icon v-if="row.detailsShowing" icon="eye-slash-fill" aria-label="Help"></b-icon>
           <b-icon v-else icon="eye-fill" aria-label="Help"></b-icon>
         </b-button>
@@ -181,6 +188,12 @@ export default {
     }
   },
   methods: {
+    rowDetailsToogle(row) {
+      if (this.$refs.showing_detals_true) {
+        this.$refs.showing_detals_true.click()
+      }
+      row.toggleDetails()
+    },
     overlayShow(bookmarkType, item) {
       this.overlay = true
       this.overlayBookmarkType = bookmarkType
@@ -244,10 +257,6 @@ export default {
         })
     },
     editCreationUserTable(row, rowItem) {
-      this.currentItems.forEach(item => {
-            this.$set(item, '_showDetails', false)
-          })
-          
       if (!row.detailsShowing) {
         this.creationUserData = rowItem
       } else {

From 147e3c18b921021101c734a584787e9623317f8a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sat, 18 Dec 2021 21:36:40 +0100
Subject: [PATCH 16/74] row.detailsShowing clearing, remove console.logs

---
 admin/src/components/CreationFormular.vue | 4 ----
 admin/src/components/UserTable.vue        | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index d73ea3c81..2074da857 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -204,8 +204,6 @@ export default {
         // Die anzahl der Mitglieder aus der Mehrfachschöpfung
         const i = Object.keys(this.itemsMassCreation).length
         // hinweis das eine Mehrfachschöpfung ausgeführt wird an (Anzahl der MItgleider an die geschöpft wird)
-        // eslint-disable-next-line no-console
-        console.log('SUBMIT CREATION => ' + this.type + ' >> für VIELE ' + i + ' Mitglieder')
         this.submitObj = [
           {
             item: this.itemsMassCreation,
@@ -216,8 +214,6 @@ export default {
             moderator: this.$store.state.moderator.id,
           },
         ]
-        // eslint-disable-next-line no-console
-        console.log('MehrfachSCHÖPFUNG ABSENDEN FÜR >> ' + i + ' Mitglieder')
 
         // $store - offene Schöpfungen hochzählen
         this.$store.commit('openCreationsPlus', i)
diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 3fba8cc80..bb56c10c5 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -189,10 +189,12 @@ export default {
   },
   methods: {
     rowDetailsToogle(row) {
+      if (this.$refs.showing_detals_false) {
+        row.toggleDetails()
+      }
       if (this.$refs.showing_detals_true) {
         this.$refs.showing_detals_true.click()
       }
-      row.toggleDetails()
     },
     overlayShow(bookmarkType, item) {
       this.overlay = true

From 49fa943063cd71285ba53676b12420f446f06998 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 19 Dec 2021 10:44:38 +0100
Subject: [PATCH 17/74] only have one creation form box open at a time.

---
 admin/src/components/UserTable.vue | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index bb56c10c5..35867f137 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -54,7 +54,7 @@
           variant="info"
           size="md"
           :ref="'showing_detals_' + row.detailsShowing"
-          @click="rowDetailsToogle(row, row.item)"
+          @click="rowDetailsToogle(row, row.detailsShowing)"
           class="mr-2"
         >
           <b-icon v-if="row.detailsShowing" icon="eye-slash-fill" aria-label="Help"></b-icon>
@@ -188,13 +188,25 @@ export default {
     }
   },
   methods: {
-    rowDetailsToogle(row) {
-      if (this.$refs.showing_detals_false) {
+    rowDetailsToogle(row, details) {
+      console.log('row', row)
+      console.log('details', details)
+    
+      if (details) {
         row.toggleDetails()
       }
-      if (this.$refs.showing_detals_true) {
-        this.$refs.showing_detals_true.click()
-      }
+       if (!details) {
+        row.toggleDetails()
+        if ( this.$refs.showing_detals_true !== undefined) {
+         this.$refs.showing_detals_true.click()
+        }
+      } 
+      //else {
+      //  if (this.$refs.showing_detals_true) {
+      //    this.$refs.showing_detals_true.click()
+      //  }
+      //  row.toggleDetails()
+      //}
     },
     overlayShow(bookmarkType, item) {
       this.overlay = true

From 02a211a7fe6fee8dba8891d7ddfeaec4fc3ee11a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 19 Dec 2021 10:45:58 +0100
Subject: [PATCH 18/74] code tidy, yarn lint

---
 admin/src/components/UserTable.vue | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 35867f137..d60c5a52d 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -189,24 +189,15 @@ export default {
   },
   methods: {
     rowDetailsToogle(row, details) {
-      console.log('row', row)
-      console.log('details', details)
-    
       if (details) {
         row.toggleDetails()
       }
-       if (!details) {
+      if (!details) {
         row.toggleDetails()
-        if ( this.$refs.showing_detals_true !== undefined) {
-         this.$refs.showing_detals_true.click()
+        if (this.$refs.showing_detals_true !== undefined) {
+          this.$refs.showing_detals_true.click()
         }
-      } 
-      //else {
-      //  if (this.$refs.showing_detals_true) {
-      //    this.$refs.showing_detals_true.click()
-      //  }
-      //  row.toggleDetails()
-      //}
+      }
     },
     overlayShow(bookmarkType, item) {
       this.overlay = true

From cfc502593ddeccffd329bcc20dade9d1ead752d7 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 19 Dec 2021 11:59:37 +0100
Subject: [PATCH 19/74] add cell confirm_mail, mail icon in Usertabel
 Usersearch

---
 admin/src/components/UserTable.vue | 6 ++++++
 admin/src/pages/UserSearch.vue     | 1 +
 2 files changed, 7 insertions(+)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 4a8ca8e84..01d3dc5ae 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -55,6 +55,12 @@
         </b-button>
       </template>
 
+      <template #cell(confirm_mail)="row">
+        <b-button :variant="row.item.firstName === 'Peter' ? 'success' : 'danger' " size="md" @click="row.toggleDetails" class="mr-2">
+          <b-icon  :icon="row.item.firstName === 'Peter' ? 'envelope-open' : 'envelope' " aria-label="Help"></b-icon>
+        </b-button>
+      </template>
+
       <template #row-details="row">
         <b-card class="shadow-lg p-3 mb-5 bg-white rounded">
           <b-row class="mb-2">
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index 7fae2cdcd..4d8e046f6 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -40,6 +40,7 @@ export default {
           },
         },
         { key: 'show_details', label: 'Details' },
+        { key: 'confirm_mail', label: 'Mail' },
       ],
       searchResult: [],
       massCreation: [],

From 2ea0a18075907be5f021a04bafd131664e32f692 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 19 Dec 2021 12:56:58 +0100
Subject: [PATCH 20/74] show an hide creation or confirm registermail formular

---
 .../ConfirmRegisterMailFormular.vue           |  21 +++
 admin/src/components/UserTable.vue            | 121 ++++++++++++++----
 2 files changed, 118 insertions(+), 24 deletions(-)
 create mode 100644 admin/src/components/ConfirmRegisterMailFormular.vue

diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
new file mode 100644
index 000000000..859cca881
--- /dev/null
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -0,0 +1,21 @@
+<template>
+  <div class="component-confirm-register-mail">
+    <div class="shadow p-3 mb-5 bg-white rounded">
+      admin/src/components/ConfirmRegisterMailFormular.vue
+    </div>
+  </div>
+</template>
+<script>
+// import { verifyLogin } from '../graphql/verifyLogin'
+// import { createPendingCreation } from '../graphql/createPendingCreation'
+export default {
+  name: 'ConfirmRegisterMail',
+  props: {},
+  data() {
+    return {}
+  },
+
+  methods: {},
+  created() {},
+}
+</script>
diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 01d3dc5ae..7560a0215 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -49,15 +49,34 @@
       </template>
 
       <template #cell(show_details)="row">
-        <b-button variant="info" size="md" @click="row.toggleDetails" class="mr-2">
+        <b-button
+          variant="info"
+          size="md"
+          :ref="'showing_detals_' + row.detailsShowing"
+          @click="rowDetailsToogle(row, row.detailsShowing)"
+          class="mr-2"
+        >
           <b-icon v-if="row.detailsShowing" icon="eye-slash-fill" aria-label="Help"></b-icon>
           <b-icon v-else icon="eye-fill" aria-label="Help"></b-icon>
         </b-button>
       </template>
 
       <template #cell(confirm_mail)="row">
-        <b-button :variant="row.item.firstName === 'Peter' ? 'success' : 'danger' " size="md" @click="row.toggleDetails" class="mr-2">
-          <b-icon  :icon="row.item.firstName === 'Peter' ? 'envelope-open' : 'envelope' " aria-label="Help"></b-icon>
+        <b-button
+          :variant="row.item.firstName === 'Peter' ? 'success' : 'danger'"
+          size="md"
+          :ref="'showing_registermail_detals_' + row.detailsShowing"
+          @click="
+            row.item.firstName !== 'Peter'
+              ? rowDetailsToogleRegisterMail(row, row.detailsShowing)
+              : ''
+          "
+          class="mr-2"
+        >
+          <b-icon
+            :icon="row.item.firstName === 'Peter' ? 'envelope-open' : 'envelope'"
+            aria-label="Help"
+          ></b-icon>
         </b-button>
       </template>
 
@@ -67,27 +86,30 @@
             <b-col></b-col>
           </b-row>
           {{ type }}
-          <creation-formular
-            v-if="type === 'PageUserSearch'"
-            type="singleCreation"
-            :pagetype="type"
-            :creation="row.item.creation"
-            :item="row.item"
-            :creationUserData="creationUserData"
-            @update-creation-data="updateCreationData"
-            @update-user-data="updateUserData"
-          />
-          <edit-creation-formular
-            v-else
-            type="singleCreation"
-            :pagetype="type"
-            :creation="row.item.creation"
-            :item="row.item"
-            :row="row"
-            :creationUserData="creationUserData"
-            @update-creation-data="updateCreationData"
-            @update-user-data="updateUserData"
-          />
+          <div v-if="showCreationFormular">
+            <creation-formular
+              v-if="type === 'PageUserSearch'"
+              type="singleCreation"
+              :pagetype="type"
+              :creation="row.item.creation"
+              :item="row.item"
+              :creationUserData="creationUserData"
+              @update-creation-data="updateCreationData"
+              @update-user-data="updateUserData"
+            />
+            <edit-creation-formular
+              v-else
+              type="singleCreation"
+              :pagetype="type"
+              :creation="row.item.creation"
+              :item="row.item"
+              :row="row"
+              :creationUserData="creationUserData"
+              @update-creation-data="updateCreationData"
+              @update-user-data="updateUserData"
+            />
+          </div>
+          <confirm-register-mail-formular />
 
           <b-button size="sm" @click="row.toggleDetails">
             <b-icon
@@ -138,6 +160,7 @@
 <script>
 import CreationFormular from '../components/CreationFormular.vue'
 import EditCreationFormular from '../components/EditCreationFormular.vue'
+import ConfirmRegisterMailFormular from '../components/ConfirmRegisterMailFormular.vue'
 import { confirmPendingCreation } from '../graphql/confirmPendingCreation'
 
 export default {
@@ -168,9 +191,11 @@ export default {
   components: {
     CreationFormular,
     EditCreationFormular,
+    ConfirmRegisterMailFormular,
   },
   data() {
     return {
+      showCreationFormular: null,
       creationUserData: {},
       overlay: false,
       overlayBookmarkType: '',
@@ -187,6 +212,54 @@ export default {
     }
   },
   methods: {
+    rowDetailsToogle(row, details) {
+      console.log('rowDetailsToogle row', row)
+      console.log('rowDetailsToogle details', details)
+      console.log('this.showCreationFormular', this.showCreationFormular)
+      
+
+     //  if ( this.showCreationFormular === false) {
+     //    this.showCreationFormular = true
+     //    return
+     //  }else {
+
+      if (details) {
+        row.toggleDetails()
+        this.showCreationFormular = null
+        
+      }
+      if (!details) {
+        row.toggleDetails()
+        this.showCreationFormular = true
+        if (this.$refs.showing_detals_true !== undefined) {
+          this.$refs.showing_detals_true.click()
+         
+        }
+      }
+      // }
+    },
+
+    rowDetailsToogleRegisterMail(row, details) {
+      console.log('rowDetailsToogleRegisterMail row', row)
+      console.log('rowDetailsToogleRegisterMail details', details)
+      console.log('this.showCreationFormular', this.showCreationFormular)
+
+       if ( this.showCreationFormular === true) {
+         this.showCreationFormular = false
+         return
+       }
+      if (details) {
+        row.toggleDetails()
+        this.showCreationFormular === null
+      }
+      if (!details) {
+        row.toggleDetails()
+        this.showCreationFormular === false
+        if (this.$refs.showing_registermail_detals_true !== undefined) {
+          this.$refs.showing_registermail_detals_true.click()
+        }
+      }
+    },
     overlayShow(bookmarkType, item) {
       this.overlay = true
       this.overlayBookmarkType = bookmarkType

From bb703f9fa87cbdfd0b27ee8dbbc5d78110098361 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 19 Dec 2021 12:58:22 +0100
Subject: [PATCH 21/74] clean code from creation or confirm registermail
 formular

---
 admin/src/components/UserTable.vue | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 7560a0215..a6e6fa357 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -213,41 +213,24 @@ export default {
   },
   methods: {
     rowDetailsToogle(row, details) {
-      console.log('rowDetailsToogle row', row)
-      console.log('rowDetailsToogle details', details)
-      console.log('this.showCreationFormular', this.showCreationFormular)
-      
-
-     //  if ( this.showCreationFormular === false) {
-     //    this.showCreationFormular = true
-     //    return
-     //  }else {
-
       if (details) {
         row.toggleDetails()
         this.showCreationFormular = null
-        
       }
       if (!details) {
         row.toggleDetails()
         this.showCreationFormular = true
         if (this.$refs.showing_detals_true !== undefined) {
           this.$refs.showing_detals_true.click()
-         
         }
       }
-      // }
     },
 
     rowDetailsToogleRegisterMail(row, details) {
-      console.log('rowDetailsToogleRegisterMail row', row)
-      console.log('rowDetailsToogleRegisterMail details', details)
-      console.log('this.showCreationFormular', this.showCreationFormular)
-
-       if ( this.showCreationFormular === true) {
-         this.showCreationFormular = false
-         return
-       }
+      if (this.showCreationFormular === true) {
+        this.showCreationFormular = false
+        return
+      }
       if (details) {
         row.toggleDetails()
         this.showCreationFormular === null

From d13b341bae85dc3a0d1215a0a33da24a2a0915c3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 19 Dec 2021 13:03:34 +0100
Subject: [PATCH 22/74] Switching between two form additions is clean

---
 admin/src/components/UserTable.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index a6e6fa357..b597c5a1d 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -213,6 +213,10 @@ export default {
   },
   methods: {
     rowDetailsToogle(row, details) {
+      if (this.showCreationFormular === false) {
+        this.showCreationFormular = true
+        return
+      }
       if (details) {
         row.toggleDetails()
         this.showCreationFormular = null
@@ -233,11 +237,10 @@ export default {
       }
       if (details) {
         row.toggleDetails()
-        this.showCreationFormular === null
+        this.showCreationFormular = null
       }
       if (!details) {
         row.toggleDetails()
-        this.showCreationFormular === false
         if (this.$refs.showing_registermail_detals_true !== undefined) {
           this.$refs.showing_registermail_detals_true.click()
         }

From 9bc71d1af02ea74dc3b44740ac35030a7a7aad63 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 19 Dec 2021 13:47:30 +0100
Subject: [PATCH 23/74] register mail send style and function added

---
 .../ConfirmRegisterMailFormular.vue           | 36 ++++++++++++++++---
 admin/src/components/UserTable.vue            |  8 +++--
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
index 859cca881..c9ab36d18 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.vue
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -1,7 +1,18 @@
 <template>
   <div class="component-confirm-register-mail">
     <div class="shadow p-3 mb-5 bg-white rounded">
-      admin/src/components/ConfirmRegisterMailFormular.vue
+      
+      <div class="h5">Die letzte E-Mail wurde am
+      <b>{{ dateLastSend }} Uhr</b>
+      an das Mitglied gesendet.</div>
+
+      <!-- Using components -->
+      <b-input-group prepend="Mail bestätigen, wiederholt senden an:" class="mt-3">
+        <b-form-input readonly :value="email"></b-form-input>
+        <b-input-group-append>
+          <b-button variant="outline-success" @click="sendRegisterMail">jetzt senden</b-button>
+        </b-input-group-append>
+      </b-input-group>
     </div>
   </div>
 </template>
@@ -10,12 +21,29 @@
 // import { createPendingCreation } from '../graphql/createPendingCreation'
 export default {
   name: 'ConfirmRegisterMail',
-  props: {},
+  props: {
+    email: {
+      type: String,
+    },
+    dateLastSend: {
+      type: String,
+    },
+  },
   data() {
     return {}
   },
 
-  methods: {},
-  created() {},
+  methods: {
+    sendRegisterMail() {
+      alert(
+        'sende wiederholt den ConfirmText an die register E-Mail (' + this.email + ') des User!',
+      )
+    },
+  },
 }
 </script>
+<style>
+.input-group-text {
+  background-color: rgb(255, 252, 205);
+}
+</style>
diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 848731a24..8ec9e0f60 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -82,11 +82,10 @@
       </template>
 
       <template #row-details="row">
-        <b-card class="shadow-lg p-3 mb-5 bg-white rounded">
+        <b-card class="shadow-lg pl-3 pr-3 mb-5 bg-white rounded">
           <b-row class="mb-2">
             <b-col></b-col>
           </b-row>
-          {{ type }}
           <div v-if="showCreationFormular">
             <creation-formular
               v-if="type === 'PageUserSearch'"
@@ -110,7 +109,10 @@
               @update-user-data="updateUserData"
             />
           </div>
-          <confirm-register-mail-formular />
+          <confirm-register-mail-formular
+            :email="row.item.email"
+            :dateLastSend="$moment().subtract(1, 'month').format('dddd, DD.MMMM.YYYY HH:mm'),"
+          />
 
           <b-button size="sm" @click="row.toggleDetails">
             <b-icon

From 1ceff2311f7807bb693980eb6392755d5f2ebd4e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 19 Dec 2021 13:48:34 +0100
Subject: [PATCH 24/74] yarn lint --fix

---
 admin/src/components/ConfirmRegisterMailFormular.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
index c9ab36d18..f35b2db25 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.vue
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -1,10 +1,11 @@
 <template>
   <div class="component-confirm-register-mail">
     <div class="shadow p-3 mb-5 bg-white rounded">
-      
-      <div class="h5">Die letzte E-Mail wurde am
-      <b>{{ dateLastSend }} Uhr</b>
-      an das Mitglied gesendet.</div>
+      <div class="h5">
+        Die letzte E-Mail wurde am
+        <b>{{ dateLastSend }} Uhr</b>
+        an das Mitglied gesendet.
+      </div>
 
       <!-- Using components -->
       <b-input-group prepend="Mail bestätigen, wiederholt senden an:" class="mt-3">

From 531bba0391f99e419551def256a2e26e7864a01f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 19 Dec 2021 13:51:46 +0100
Subject: [PATCH 25/74] change text

---
 admin/src/components/ConfirmRegisterMailFormular.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
index f35b2db25..5b24c0f78 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.vue
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -2,16 +2,16 @@
   <div class="component-confirm-register-mail">
     <div class="shadow p-3 mb-5 bg-white rounded">
       <div class="h5">
-        Die letzte E-Mail wurde am
+        Die letzte Email wurde am
         <b>{{ dateLastSend }} Uhr</b>
-        an das Mitglied gesendet.
+        an das Mitglied ({{email}}) gesendet.
       </div>
 
       <!-- Using components -->
-      <b-input-group prepend="Mail bestätigen, wiederholt senden an:" class="mt-3">
+      <b-input-group prepend="Email bestätigen, wiederholt senden an:" class="mt-3">
         <b-form-input readonly :value="email"></b-form-input>
         <b-input-group-append>
-          <b-button variant="outline-success" @click="sendRegisterMail">jetzt senden</b-button>
+          <b-button variant="outline-success" @click="sendRegisterMail">Registrierungs-Email bestätigen, jetzt senden</b-button>
         </b-input-group-append>
       </b-input-group>
     </div>

From d8440a5956ae6868c5e9998f2dea7abab1f0b4ec Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 19 Dec 2021 13:52:05 +0100
Subject: [PATCH 26/74] yarn lint --fix

---
 admin/src/components/ConfirmRegisterMailFormular.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
index 5b24c0f78..494ab7b27 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.vue
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -4,14 +4,16 @@
       <div class="h5">
         Die letzte Email wurde am
         <b>{{ dateLastSend }} Uhr</b>
-        an das Mitglied ({{email}}) gesendet.
+        an das Mitglied ({{ email }}) gesendet.
       </div>
 
       <!-- Using components -->
       <b-input-group prepend="Email bestätigen, wiederholt senden an:" class="mt-3">
         <b-form-input readonly :value="email"></b-form-input>
         <b-input-group-append>
-          <b-button variant="outline-success" @click="sendRegisterMail">Registrierungs-Email bestätigen, jetzt senden</b-button>
+          <b-button variant="outline-success" @click="sendRegisterMail">
+            Registrierungs-Email bestätigen, jetzt senden
+          </b-button>
         </b-input-group-append>
       </b-input-group>
     </div>

From ea4b74e051265ac7b0cf773e8549257f0c4b49d9 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 19 Dec 2021 14:24:29 +0100
Subject: [PATCH 27/74] function unconfirmedRegisterMail added

---
 admin/src/pages/UserSearch.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index 4d8e046f6..494e98949 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -4,16 +4,23 @@
     <b-input
       type="text"
       v-model="criteria"
-      class="shadow p-3 mb-5 bg-white rounded"
+      class="shadow p-3 mb-3 bg-white rounded"
       placeholder="User suche"
       @input="getUsers"
     ></b-input>
+
     <user-table
       type="PageUserSearch"
       :itemsUser="searchResult"
       :fieldsTable="fields"
       :criteria="criteria"
     />
+    <div>
+      <b-button block variant="danger" @click="unconfirmedRegisterMails">
+        <b-icon icon="envelope" variant="light"></b-icon>
+        Anzeigen aller nicht registrierten E-Mails.
+      </b-button>
+    </div>
   </div>
 </template>
 <script>
@@ -49,6 +56,9 @@ export default {
   },
 
   methods: {
+    unconfirmedRegisterMails() {
+      alert('Apollo anfrage, alle Mitglieder, die nicht ihre Register E-Mail bestätigt haben.')
+    },
     getUsers() {
       this.$apollo
         .query({

From 578f4835b1e3692dc7a61ba49def586316897a96 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 19 Dec 2021 18:50:31 +0100
Subject: [PATCH 28/74] add test ConfirmRegisterMailFormular.spec.js

---
 .../ConfirmRegisterMailFormular.spec.js       | 40 +++++++++++++++++++
 .../ConfirmRegisterMailFormular.vue           | 11 ++---
 2 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 admin/src/components/ConfirmRegisterMailFormular.spec.js

diff --git a/admin/src/components/ConfirmRegisterMailFormular.spec.js b/admin/src/components/ConfirmRegisterMailFormular.spec.js
new file mode 100644
index 000000000..a53fcae02
--- /dev/null
+++ b/admin/src/components/ConfirmRegisterMailFormular.spec.js
@@ -0,0 +1,40 @@
+import { mount } from '@vue/test-utils'
+import ConfirmRegisterMailFormular from './ConfirmRegisterMailFormular.vue'
+
+const localVue = global.localVue
+
+const mocks = {
+  $moment: jest.fn(() => {
+    return {
+      format: jest.fn((m) => m),
+      subtract: jest.fn(() => {
+        return {
+          format: jest.fn((m) => m),
+        }
+      }),
+    }
+  }),
+}
+
+const propsData = {
+  email: '',
+  dateLastSend: '',
+}
+
+describe('ConfirmRegisterMailFormular', () => {
+  let wrapper
+
+  const Wrapper = () => {
+    return mount(ConfirmRegisterMailFormular, { localVue, mocks, propsData })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('has a DIV element with the class.component-confirm-register-mail', () => {
+      expect(wrapper.find('.component-confirm-register-mail').exists()).toBeTruthy()
+    })
+  })
+})
diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
index 494ab7b27..5ccf2eb15 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.vue
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -11,7 +11,7 @@
       <b-input-group prepend="Email bestätigen, wiederholt senden an:" class="mt-3">
         <b-form-input readonly :value="email"></b-form-input>
         <b-input-group-append>
-          <b-button variant="outline-success" @click="sendRegisterMail">
+          <b-button variant="outline-success" class="test-button" @click="sendRegisterMail">
             Registrierungs-Email bestätigen, jetzt senden
           </b-button>
         </b-input-group-append>
@@ -32,15 +32,10 @@ export default {
       type: String,
     },
   },
-  data() {
-    return {}
-  },
-
   methods: {
     sendRegisterMail() {
-      alert(
-        'sende wiederholt den ConfirmText an die register E-Mail (' + this.email + ') des User!',
-      )
+      // eslint-disable-next-line no-console
+      console.log('sende wiederholt den ConfirmText an die register E-Mail des User!')
     },
   },
 }

From af39826ce59bfd97bd7efda891df117d29e1f952 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 19 Dec 2021 19:04:35 +0100
Subject: [PATCH 29/74] remove unused function in
 ConfirmRegisterMailFormular.vue button

---
 admin/src/components/ConfirmRegisterMailFormular.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
index 5ccf2eb15..57286b241 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.vue
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -11,7 +11,7 @@
       <b-input-group prepend="Email bestätigen, wiederholt senden an:" class="mt-3">
         <b-form-input readonly :value="email"></b-form-input>
         <b-input-group-append>
-          <b-button variant="outline-success" class="test-button" @click="sendRegisterMail">
+          <b-button variant="outline-success" class="test-button">
             Registrierungs-Email bestätigen, jetzt senden
           </b-button>
         </b-input-group-append>
@@ -32,12 +32,6 @@ export default {
       type: String,
     },
   },
-  methods: {
-    sendRegisterMail() {
-      // eslint-disable-next-line no-console
-      console.log('sende wiederholt den ConfirmText an die register E-Mail des User!')
-    },
-  },
 }
 </script>
 <style>

From 659d966a680de2fb397f75d640fd6bb03c0df82b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 19 Dec 2021 19:12:26 +0100
Subject: [PATCH 30/74] add function sendRegisterMail in
 ConfirmRegisterMailFormular.vue button

---
 admin/src/components/ConfirmRegisterMailFormular.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
index 57286b241..5ccf2eb15 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.vue
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -11,7 +11,7 @@
       <b-input-group prepend="Email bestätigen, wiederholt senden an:" class="mt-3">
         <b-form-input readonly :value="email"></b-form-input>
         <b-input-group-append>
-          <b-button variant="outline-success" class="test-button">
+          <b-button variant="outline-success" class="test-button" @click="sendRegisterMail">
             Registrierungs-Email bestätigen, jetzt senden
           </b-button>
         </b-input-group-append>
@@ -32,6 +32,12 @@ export default {
       type: String,
     },
   },
+  methods: {
+    sendRegisterMail() {
+      // eslint-disable-next-line no-console
+      console.log('sende wiederholt den ConfirmText an die register E-Mail des User!')
+    },
+  },
 }
 </script>
 <style>

From 5f2537b08d6a04ca28b44b80f0674b7ae23a7dc6 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Sun, 19 Dec 2021 20:51:21 +0100
Subject: [PATCH 31/74] add CreationsTransaction List Icon und Component and
 function, example list data

---
 .../CreationTransactionListFormular.vue       | 61 +++++++++++++++++++
 admin/src/components/UserTable.vue            | 57 ++++++++++++++++-
 admin/src/pages/UserSearch.vue                |  1 +
 3 files changed, 117 insertions(+), 2 deletions(-)
 create mode 100644 admin/src/components/CreationTransactionListFormular.vue

diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue
new file mode 100644
index 000000000..fbcc8f808
--- /dev/null
+++ b/admin/src/components/CreationTransactionListFormular.vue
@@ -0,0 +1,61 @@
+<template>
+  <div class="component-creation-transaction-list">
+    Alle Geschöpften Transaktionen für den User
+    <b-table striped hover :items="items"></b-table>
+  </div>
+</template>
+<script>
+// import { verifyLogin } from '../graphql/verifyLogin'
+// import { createPendingCreation } from '../graphql/createPendingCreation'
+export default {
+  name: 'CreationTransactionList',
+  data() {
+    return {
+      items: [
+        {
+          gdd: 700,
+          date: '16.11.2021',
+          memo: 'klaljk jakldasjd lajlaldjalajsd aasj asdl jaljaldj aa jda l jdla jda',
+          moderator: 'Moderator Eins',
+        },
+        {
+          gdd: 800,
+          date: '23.10.2021',
+          memo: 'jij ijdas ijad sa jsd a ijaojodjajd jiaojdja dij  aij doa aojd ao jd',
+          moderator: 'Moderator Eins',
+        },
+        {
+          gdd: 1000,
+          date: '13.09.2021',
+          memo: 'asdd d adad adsdadda dsdadadasds asdadada da dadadad adadada d',
+          moderator: 'Moderator Eins',
+        },
+        {
+          gdd: 400,
+          date: '03.07.2021',
+          memo: 'casc acas ac acacacs cac acacac acc acac ca cacac',
+          moderator: 'Moderator Zwei',
+        },
+        {
+          gdd: 210,
+          date: '04.06.2021',
+          memo: 'asc dfdvdvdf vfvd vdfvdff vdvdfvd vff dvfd vdfv dfv dfvdf vdfvdfv',
+          moderator: 'Moderator Eins',
+        },
+        {
+          gdd: 890,
+          date: '07.05.2021',
+          memo: 'reett ttertt etet et et ertetetet et ert et ertertertet',
+          moderator: 'Moderator Eins',
+        },
+        {
+          gdd: 380,
+          date: '22.04.2021',
+          memo: 'bnnbnbbncvbcv bcbcbc bcb cbc bcb cvb cbccvvbcvb bvbcbcbcbc bcb cb',
+          moderator: 'Moderator Zwei',
+        },
+      ],
+    }
+  },
+}
+</script>
diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 8ec9e0f60..4692cab49 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -81,6 +81,18 @@
         </b-button>
       </template>
 
+      <template #cell(transactions_list)="row">
+        <b-button
+          variant="warning"
+          size="md"
+          :ref="'showing_transactions_list_' + row.detailsShowing"
+          @click="rowDetailsToogleTransactionsList(row, row.detailsShowing)"
+          class="mr-2"
+        >
+          <b-icon icon="list"></b-icon>
+        </b-button>
+      </template>
+
       <template #row-details="row">
         <b-card class="shadow-lg pl-3 pr-3 mb-5 bg-white rounded">
           <b-row class="mb-2">
@@ -110,10 +122,13 @@
             />
           </div>
           <confirm-register-mail-formular
+            v-if="showConfirmRegisterMailFormular"
             :email="row.item.email"
             :dateLastSend="$moment().subtract(1, 'month').format('dddd, DD.MMMM.YYYY HH:mm'),"
           />
 
+          <creation-transaction-list-formular v-if="showCreationTransactionListFormular" />
+
           <b-button size="sm" @click="row.toggleDetails">
             <b-icon
               :icon="type === 'PageCreationConfirm' ? 'x' : 'eye-slash-fill'"
@@ -164,6 +179,8 @@
 import CreationFormular from '../components/CreationFormular.vue'
 import EditCreationFormular from '../components/EditCreationFormular.vue'
 import ConfirmRegisterMailFormular from '../components/ConfirmRegisterMailFormular.vue'
+import CreationTransactionListFormular from '../components/CreationTransactionListFormular.vue'
+
 import { confirmPendingCreation } from '../graphql/confirmPendingCreation'
 
 export default {
@@ -195,10 +212,13 @@ export default {
     CreationFormular,
     EditCreationFormular,
     ConfirmRegisterMailFormular,
+    CreationTransactionListFormular,
   },
   data() {
     return {
       showCreationFormular: null,
+      showConfirmRegisterMailFormular: null,
+      showCreationTransactionListFormular: null,
       creationUserData: {},
       overlay: false,
       overlayBookmarkType: '',
@@ -216,13 +236,20 @@ export default {
   },
   methods: {
     rowDetailsToogle(row, details) {
-      if (this.showCreationFormular === false) {
+      if (
+        this.showConfirmRegisterMailFormular === true ||
+        this.showCreationTransactionListFormular === true
+      ) {
         this.showCreationFormular = true
+        this.showConfirmRegisterMailFormular = false
+        this.showCreationTransactionListFormular = false
         return
       }
       if (details) {
         row.toggleDetails()
         this.showCreationFormular = null
+        this.showConfirmRegisterMailFormular = null
+        this.showCreationTransactionListFormular = null
       }
       if (!details) {
         row.toggleDetails()
@@ -234,21 +261,47 @@ export default {
     },
 
     rowDetailsToogleRegisterMail(row, details) {
-      if (this.showCreationFormular === true) {
+      if (this.showCreationFormular === true || this.showCreationTransactionListFormular === true) {
         this.showCreationFormular = false
+        this.showConfirmRegisterMailFormular = true
+        this.showCreationTransactionListFormular = false
         return
       }
       if (details) {
         row.toggleDetails()
         this.showCreationFormular = null
+        this.showConfirmRegisterMailFormular = null
+        this.showCreationTransactionListFormular = null
       }
       if (!details) {
         row.toggleDetails()
+        this.showConfirmRegisterMailFormular = true
         if (this.$refs.showing_registermail_detals_true !== undefined) {
           this.$refs.showing_registermail_detals_true.click()
         }
       }
     },
+    rowDetailsToogleTransactionsList(row, details) {
+      if (this.showCreationFormular === true || this.showConfirmRegisterMailFormular === true) {
+        this.showCreationFormular = false
+        this.showConfirmRegisterMailFormular = false
+        this.showCreationTransactionListFormular = true
+        return
+      }
+      if (details) {
+        row.toggleDetails()
+        this.showCreationFormular = null
+        this.showConfirmRegisterMailFormular = null
+        this.showCreationTransactionListFormular = null
+      }
+      if (!details) {
+        row.toggleDetails()
+        this.showCreationTransactionListFormular = true
+        if (this.$refs.showing_transactions_list_true !== undefined) {
+          this.$refs.showing_transactions_list_true.click()
+        }
+      }
+    },
     overlayShow(bookmarkType, item) {
       this.overlay = true
       this.overlayBookmarkType = bookmarkType
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index 494e98949..2a8377415 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -48,6 +48,7 @@ export default {
         },
         { key: 'show_details', label: 'Details' },
         { key: 'confirm_mail', label: 'Mail' },
+        { key: 'transactions_list', label: 'Transaction' },
       ],
       searchResult: [],
       massCreation: [],

From 9f6106d4aed88a95c676a1bfab6eab8b904729b1 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 20 Dec 2021 08:37:33 +0100
Subject: [PATCH 32/74] remove unused imported files

---
 admin/src/components/CreationTransactionListFormular.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue
index fbcc8f808..4073a315a 100644
--- a/admin/src/components/CreationTransactionListFormular.vue
+++ b/admin/src/components/CreationTransactionListFormular.vue
@@ -5,8 +5,6 @@
   </div>
 </template>
 <script>
-// import { verifyLogin } from '../graphql/verifyLogin'
-// import { createPendingCreation } from '../graphql/createPendingCreation'
 export default {
   name: 'CreationTransactionList',
   data() {

From 0e896ef7d25d086fe10348a6a88e138517ec2bee Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 20 Dec 2021 09:31:40 +0100
Subject: [PATCH 33/74] SendActivationEmail mutation added to the admin and
 linked to the resendEmailFunction.

---
 .../ConfirmRegisterMailFormular.vue           | 24 +++++++++++++++----
 admin/src/graphql/sendActivationEmail.js      |  7 ++++++
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 admin/src/graphql/sendActivationEmail.js

diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
index 5ccf2eb15..9eaead65c 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.vue
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -20,8 +20,8 @@
   </div>
 </template>
 <script>
-// import { verifyLogin } from '../graphql/verifyLogin'
-// import { createPendingCreation } from '../graphql/createPendingCreation'
+import { sendActivationEmail } from '../graphql/sendActivationEmail'
+
 export default {
   name: 'ConfirmRegisterMail',
   props: {
@@ -34,8 +34,24 @@ export default {
   },
   methods: {
     sendRegisterMail() {
-      // eslint-disable-next-line no-console
-      console.log('sende wiederholt den ConfirmText an die register E-Mail des User!')
+      this.$apollo
+        .mutate({
+          mutation: sendActivationEmail,
+          variables: {
+            email: this.email,
+          },
+        })
+        .then(() => {
+          // eslint-disable-next-line no-console
+          console.log(
+            'Erfolgreich senden der Confirmation Link an die E-Mail des Users!',
+            this.email,
+          )
+        })
+        .catch((error) => {
+          // eslint-disable-next-line no-console
+          console.log('Fehler beim senden des confirmation link an den Benutzer', error)
+        })
     },
   },
 }
diff --git a/admin/src/graphql/sendActivationEmail.js b/admin/src/graphql/sendActivationEmail.js
new file mode 100644
index 000000000..7a6140061
--- /dev/null
+++ b/admin/src/graphql/sendActivationEmail.js
@@ -0,0 +1,7 @@
+import gql from 'graphql-tag'
+
+export const sendActivationEmail = gql`
+  mutation ($email: String!) {
+    sendActivationEmail(email: $email)
+  }
+`

From 16f373c1201db75d2265b340edcbde6c2de7a62c Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 20 Dec 2021 09:38:55 +0100
Subject: [PATCH 34/74] add details_edit_true on editCreationUserTable

---
 admin/src/components/UserTable.vue | 51 ++++++++++++++++++++----------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 4692cab49..ffb696967 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -40,8 +40,8 @@
         <b-button
           variant="info"
           size="md"
-          :class="'details_' + row.detailsShowing"
-          @click="editCreationUserTable(row)"
+          :ref="'details_edit_' + row.detailsShowing"
+          @click="editCreationUserTable(row, row.detailsShowing)"
           class="mr-2"
         >
           <b-icon v-if="row.detailsShowing" icon="x" aria-label="Help"></b-icon>
@@ -247,9 +247,9 @@ export default {
       }
       if (details) {
         row.toggleDetails()
-        this.showCreationFormular = null
-        this.showConfirmRegisterMailFormular = null
-        this.showCreationTransactionListFormular = null
+        // this.showCreationFormular = null
+        // this.showConfirmRegisterMailFormular = null
+        // this.showCreationTransactionListFormular = null
       }
       if (!details) {
         row.toggleDetails()
@@ -269,9 +269,9 @@ export default {
       }
       if (details) {
         row.toggleDetails()
-        this.showCreationFormular = null
-        this.showConfirmRegisterMailFormular = null
-        this.showCreationTransactionListFormular = null
+        // this.showCreationFormular = null
+        // this.showConfirmRegisterMailFormular = null
+        // this.showCreationTransactionListFormular = null
       }
       if (!details) {
         row.toggleDetails()
@@ -290,9 +290,9 @@ export default {
       }
       if (details) {
         row.toggleDetails()
-        this.showCreationFormular = null
-        this.showConfirmRegisterMailFormular = null
-        this.showCreationTransactionListFormular = null
+        // this.showCreationFormular = null
+        // this.showConfirmRegisterMailFormular = null
+        // this.showCreationTransactionListFormular = null
       }
       if (!details) {
         row.toggleDetails()
@@ -364,13 +364,30 @@ export default {
           this.$toasted.error(error.message)
         })
     },
-    editCreationUserTable(row, rowItem) {
-      if (!row.detailsShowing) {
-        this.creationUserData = rowItem
-      } else {
-        this.creationUserData = {}
+    editCreationUserTable(row, details) {
+      if (
+        this.showConfirmRegisterMailFormular === true ||
+        this.showCreationTransactionListFormular === true
+      ) {
+        this.showCreationFormular = true
+        this.showConfirmRegisterMailFormular = false
+        this.showCreationTransactionListFormular = false
+        return
+      }
+      if (details) {
+        row.toggleDetails()
+        // this.showCreationFormular = null
+        // this.showConfirmRegisterMailFormular = null
+        // this.showCreationTransactionListFormular = null
+      }
+      if (!details) {
+        row.toggleDetails()
+        this.showCreationFormular = true
+        this.creationUserData = row.item
+        if (this.$refs.details_edit_true !== undefined) {
+          this.$refs.details_edit_true.click()
+        }
       }
-      row.toggleDetails()
     },
     updateCreationData(data) {
       this.creationUserData.amount = data.amount

From 39a4705ef4d99267530b45cc20dff8eefa98ee25 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 20 Dec 2021 09:40:17 +0100
Subject: [PATCH 35/74] remove unused lines

---
 admin/src/components/UserTable.vue | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index ffb696967..335c65309 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -247,9 +247,6 @@ export default {
       }
       if (details) {
         row.toggleDetails()
-        // this.showCreationFormular = null
-        // this.showConfirmRegisterMailFormular = null
-        // this.showCreationTransactionListFormular = null
       }
       if (!details) {
         row.toggleDetails()
@@ -269,9 +266,6 @@ export default {
       }
       if (details) {
         row.toggleDetails()
-        // this.showCreationFormular = null
-        // this.showConfirmRegisterMailFormular = null
-        // this.showCreationTransactionListFormular = null
       }
       if (!details) {
         row.toggleDetails()
@@ -290,9 +284,6 @@ export default {
       }
       if (details) {
         row.toggleDetails()
-        // this.showCreationFormular = null
-        // this.showConfirmRegisterMailFormular = null
-        // this.showCreationTransactionListFormular = null
       }
       if (!details) {
         row.toggleDetails()
@@ -376,9 +367,6 @@ export default {
       }
       if (details) {
         row.toggleDetails()
-        // this.showCreationFormular = null
-        // this.showConfirmRegisterMailFormular = null
-        // this.showCreationTransactionListFormular = null
       }
       if (!details) {
         row.toggleDetails()

From 8e974bbc22d86069481aef65415524f0726842a5 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 20 Dec 2021 10:01:53 +0100
Subject: [PATCH 36/74] Check for emailChecked in the user search and giving
 the value to the UserTable

---
 admin/src/components/UserTable.vue            | 10 +++-------
 admin/src/graphql/searchUsers.js              |  1 +
 backend/src/graphql/model/UserAdmin.ts        |  3 +++
 backend/src/graphql/resolver/AdminResolver.ts |  9 +++++++++
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 4692cab49..0a7f33ebf 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -64,18 +64,14 @@
 
       <template #cell(confirm_mail)="row">
         <b-button
-          :variant="row.item.firstName === 'Peter' ? 'success' : 'danger'"
+          :variant="row.item.emailChecked ? 'success' : 'danger'"
           size="md"
           :ref="'showing_registermail_detals_' + row.detailsShowing"
-          @click="
-            row.item.firstName !== 'Peter'
-              ? rowDetailsToogleRegisterMail(row, row.detailsShowing)
-              : ''
-          "
+          @click="!row.item.emailChecked ? rowDetailsToogleRegisterMail(row, row.detailsShowing) : ''"
           class="mr-2"
         >
           <b-icon
-            :icon="row.item.firstName === 'Peter' ? 'envelope-open' : 'envelope'"
+            :icon="row.item.emailChecked ? 'envelope-open' : 'envelope'"
             aria-label="Help"
           ></b-icon>
         </b-button>
diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js
index 86e333845..4ef32ee1a 100644
--- a/admin/src/graphql/searchUsers.js
+++ b/admin/src/graphql/searchUsers.js
@@ -7,6 +7,7 @@ export const searchUsers = gql`
       lastName
       email
       creation
+      emailChecked
     }
   }
 `
diff --git a/backend/src/graphql/model/UserAdmin.ts b/backend/src/graphql/model/UserAdmin.ts
index cbf8dd21c..5e7d7f684 100644
--- a/backend/src/graphql/model/UserAdmin.ts
+++ b/backend/src/graphql/model/UserAdmin.ts
@@ -13,4 +13,7 @@ export class UserAdmin {
 
   @Field(() => [Number])
   creation: number[]
+
+  @Field(() => Boolean)
+  emailChecked: boolean
 }
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 416838c1c..fb596870a 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -17,6 +17,7 @@ import { UserTransaction } from '@entity/UserTransaction'
 import { UserTransactionRepository } from '../../typeorm/repository/UserTransaction'
 import { BalanceRepository } from '../../typeorm/repository/Balance'
 import { calculateDecay } from '../../util/decay'
+import { LoginUserRepository } from '../../typeorm/repository/LoginUser'
 
 @Resolver()
 export class AdminResolver {
@@ -32,6 +33,7 @@ export class AdminResolver {
         adminUser.lastName = user.lastName
         adminUser.email = user.email
         adminUser.creation = await getUserCreations(user.id)
+        adminUser.emailChecked = await hasActivatedEmail(user.email)
         return adminUser
       }),
     )
@@ -315,3 +317,10 @@ function isCreationValid(creations: number[], amount: number, creationDate: Date
   }
   return true
 }
+async function hasActivatedEmail(email: string): Promise<boolean> {
+  const repository = getCustomRepository(LoginUserRepository)
+  const user = await repository.findByEmail(email)
+  let emailActivate = false
+  if (user) emailActivate = user.emailChecked
+  return emailActivate
+}

From bc00ddfdc77788582ab145a155ddad9fb9394aaa Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 20 Dec 2021 10:32:17 +0100
Subject: [PATCH 37/74] UserSearch implement the filter on every user that has
 not activate his account yet.

---
 admin/src/pages/UserSearch.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index 2a8377415..f74c6f601 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -26,6 +26,7 @@
 <script>
 import UserTable from '../components/UserTable.vue'
 import { searchUsers } from '../graphql/searchUsers'
+import { searchNotActivatedUsers } from '../graphql/searchNotActivatedUsers'
 
 export default {
   name: 'UserSearch',
@@ -58,7 +59,9 @@ export default {
 
   methods: {
     unconfirmedRegisterMails() {
-      alert('Apollo anfrage, alle Mitglieder, die nicht ihre Register E-Mail bestätigt haben.')
+      this.searchResult = this.searchResult.filter((result) => {
+        return !result.emailChecked
+      })
     },
     getUsers() {
       this.$apollo

From 198657b795aaaf3b704985e92255e0d9c4374b20 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 20 Dec 2021 10:32:51 +0100
Subject: [PATCH 38/74] Fix lint.

---
 admin/src/components/UserTable.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 0a7f33ebf..62f3ab389 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -67,7 +67,9 @@
           :variant="row.item.emailChecked ? 'success' : 'danger'"
           size="md"
           :ref="'showing_registermail_detals_' + row.detailsShowing"
-          @click="!row.item.emailChecked ? rowDetailsToogleRegisterMail(row, row.detailsShowing) : ''"
+          @click="
+            !row.item.emailChecked ? rowDetailsToogleRegisterMail(row, row.detailsShowing) : ''
+          "
           class="mr-2"
         >
           <b-icon

From 021e5d3151a5d3cf781a7b696a9fff8b296f6549 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 20 Dec 2021 10:35:02 +0100
Subject: [PATCH 39/74] removed unused import.

---
 admin/src/pages/UserSearch.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index f74c6f601..e9d2b180f 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -26,7 +26,6 @@
 <script>
 import UserTable from '../components/UserTable.vue'
 import { searchUsers } from '../graphql/searchUsers'
-import { searchNotActivatedUsers } from '../graphql/searchNotActivatedUsers'
 
 export default {
   name: 'UserSearch',

From 75cbea23218d75a3e0d561752e17829ed12b72e8 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 20 Dec 2021 15:15:51 +0100
Subject: [PATCH 40/74] Change the transactionList query so we can get only
 creation and get the list for specific users.

---
 .../CreationTransactionListFormular.vue       | 73 ++++++++-----------
 admin/src/components/UserTable.vue            |  5 +-
 admin/src/graphql/searchUsers.js              |  1 +
 admin/src/graphql/transactionList.js          | 44 +++++++++++
 backend/src/graphql/arg/Paginated.ts          |  6 ++
 backend/src/graphql/model/UserAdmin.ts        |  3 +
 backend/src/graphql/resolver/AdminResolver.ts |  1 +
 .../graphql/resolver/TransactionResolver.ts   | 34 ++++++++-
 frontend/src/graphql/queries.js               | 14 +++-
 9 files changed, 131 insertions(+), 50 deletions(-)
 create mode 100644 admin/src/graphql/transactionList.js

diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue
index 4073a315a..fcf984ea9 100644
--- a/admin/src/components/CreationTransactionListFormular.vue
+++ b/admin/src/components/CreationTransactionListFormular.vue
@@ -5,55 +5,40 @@
   </div>
 </template>
 <script>
+import { transactionList } from '../graphql/transactionList'
 export default {
   name: 'CreationTransactionList',
+  props: {
+    userId: { type: Number, required: true },
+  },
   data() {
     return {
-      items: [
-        {
-          gdd: 700,
-          date: '16.11.2021',
-          memo: 'klaljk jakldasjd lajlaldjalajsd aasj asdl jaljaldj aa jda l jdla jda',
-          moderator: 'Moderator Eins',
-        },
-        {
-          gdd: 800,
-          date: '23.10.2021',
-          memo: 'jij ijdas ijad sa jsd a ijaojodjajd jiaojdja dij  aij doa aojd ao jd',
-          moderator: 'Moderator Eins',
-        },
-        {
-          gdd: 1000,
-          date: '13.09.2021',
-          memo: 'asdd d adad adsdadda dsdadadasds asdadada da dadadad adadada d',
-          moderator: 'Moderator Eins',
-        },
-        {
-          gdd: 400,
-          date: '03.07.2021',
-          memo: 'casc acas ac acacacs cac acacac acc acac ca cacac',
-          moderator: 'Moderator Zwei',
-        },
-        {
-          gdd: 210,
-          date: '04.06.2021',
-          memo: 'asc dfdvdvdf vfvd vdfvdff vdvdfvd vff dvfd vdfv dfv dfvdf vdfvdfv',
-          moderator: 'Moderator Eins',
-        },
-        {
-          gdd: 890,
-          date: '07.05.2021',
-          memo: 'reett ttertt etet et et ertetetet et ert et ertertertet',
-          moderator: 'Moderator Eins',
-        },
-        {
-          gdd: 380,
-          date: '22.04.2021',
-          memo: 'bnnbnbbncvbcv bcbcbc bcb cbc bcb cvb cbccvvbcvb bvbcbcbcbc bcb cb',
-          moderator: 'Moderator Zwei',
-        },
-      ],
+      items: [],
     }
   },
+  methods: {
+    getTransactions() {
+      this.$apollo
+        .query({
+          query: transactionList,
+          variables: {
+            currentPage: 1,
+            pageSize: 25,
+            order: 'DESC',
+            onlyCreations: true,
+            userId: parseInt(this.userId),
+          },
+        })
+        .then((result) => {
+          this.items = result.data.transactionList.transactions
+        })
+        .catch((error) => {
+          console.log('Something went wrong', error)
+        })
+    },
+  },
+  created() {
+    this.getTransactions()
+  },
 }
 </script>
diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index e92c451b1..4c8f2bb67 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -125,7 +125,10 @@
             :dateLastSend="$moment().subtract(1, 'month').format('dddd, DD.MMMM.YYYY HH:mm'),"
           />
 
-          <creation-transaction-list-formular v-if="showCreationTransactionListFormular" />
+          <creation-transaction-list-formular
+            v-if="showCreationTransactionListFormular"
+            :userId="row.item.userId"
+          />
 
           <b-button size="sm" @click="row.toggleDetails">
             <b-icon
diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js
index 4ef32ee1a..cf6225338 100644
--- a/admin/src/graphql/searchUsers.js
+++ b/admin/src/graphql/searchUsers.js
@@ -3,6 +3,7 @@ import gql from 'graphql-tag'
 export const searchUsers = gql`
   query ($searchText: String!) {
     searchUsers(searchText: $searchText) {
+      userId
       firstName
       lastName
       email
diff --git a/admin/src/graphql/transactionList.js b/admin/src/graphql/transactionList.js
new file mode 100644
index 000000000..8ae5cde42
--- /dev/null
+++ b/admin/src/graphql/transactionList.js
@@ -0,0 +1,44 @@
+import gql from 'graphql-tag'
+
+export const transactionList = gql`
+  query (
+    $currentPage: Int = 1
+    $pageSize: Int = 25
+    $order: Order = DESC
+    $onlyCreations: Boolean = false
+    $userId: Int = null
+  ) {
+    transactionList(
+      currentPage: $currentPage
+      pageSize: $pageSize
+      order: $order
+      onlyCreations: $onlyCreations
+      userId: $userId
+    ) {
+      gdtSum
+      count
+      balance
+      decay
+      decayDate
+      transactions {
+        type
+        balance
+        decayStart
+        decayEnd
+        decayDuration
+        memo
+        transactionId
+        name
+        email
+        date
+        decay {
+          balance
+          decayStart
+          decayEnd
+          decayDuration
+          decayStartBlock
+        }
+      }
+    }
+  }
+`
diff --git a/backend/src/graphql/arg/Paginated.ts b/backend/src/graphql/arg/Paginated.ts
index fa6be03b5..85853a1c7 100644
--- a/backend/src/graphql/arg/Paginated.ts
+++ b/backend/src/graphql/arg/Paginated.ts
@@ -11,4 +11,10 @@ export default class Paginated {
 
   @Field(() => Order, { nullable: true })
   order?: Order
+
+  @Field(() => Boolean, { nullable: true })
+  onlyCreations?: boolean
+
+  @Field(() => Int, { nullable: true })
+  userId?: number
 }
diff --git a/backend/src/graphql/model/UserAdmin.ts b/backend/src/graphql/model/UserAdmin.ts
index 5e7d7f684..befc203a5 100644
--- a/backend/src/graphql/model/UserAdmin.ts
+++ b/backend/src/graphql/model/UserAdmin.ts
@@ -2,6 +2,9 @@ import { ObjectType, Field } from 'type-graphql'
 
 @ObjectType()
 export class UserAdmin {
+  @Field(() => Number)
+  userId: number
+
   @Field(() => String)
   email: string
 
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index fb596870a..31c720716 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -29,6 +29,7 @@ export class AdminResolver {
     const adminUsers = await Promise.all(
       users.map(async (user) => {
         const adminUser = new UserAdmin()
+        adminUser.userId = user.id
         adminUser.firstName = user.firstName
         adminUser.lastName = user.lastName
         adminUser.email = user.email
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index b2f4b4db5..40e29cfe6 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -340,6 +340,7 @@ async function listTransactions(
   pageSize: number,
   order: Order,
   user: dbUser,
+  onlyCreations: boolean,
 ): Promise<TransactionList> {
   let limit = pageSize
   let offset = 0
@@ -379,6 +380,14 @@ async function listTransactions(
 
   const transactionList = new TransactionList()
   transactionList.count = userTransactionsCount
+  if (onlyCreations) {
+    console.log('before filtering', transactions)
+    transactions = transactions.filter((transaction) => {
+      console.log('In filter', transaction)
+      return transaction.type === 'creation'
+    })
+    console.log('after filtering', transactions)
+  }
   transactionList.transactions = transactions
   return transactionList
 }
@@ -469,14 +478,33 @@ export class TransactionResolver {
   @Authorized([RIGHTS.TRANSACTION_LIST])
   @Query(() => TransactionList)
   async transactionList(
-    @Args() { currentPage = 1, pageSize = 25, order = Order.DESC }: Paginated,
+    @Args()
+    {
+      currentPage = 1,
+      pageSize = 25,
+      order = Order.DESC,
+      onlyCreations = false,
+      userId,
+    }: Paginated,
     @Ctx() context: any,
   ): Promise<TransactionList> {
     // load user
     const userRepository = getCustomRepository(UserRepository)
-    const userEntity = await userRepository.findByPubkeyHex(context.pubKey)
+    let userEntity: dbUser | undefined
+    if (userId) {
+      console.log('Find by id, ', userId)
+      userEntity = await userRepository.findOneOrFail({ id: userId })
+    } else {
+      userEntity = await userRepository.findByPubkeyHex(context.pubKey)
+    }
 
-    const transactions = await listTransactions(currentPage, pageSize, order, userEntity)
+    const transactions = await listTransactions(
+      currentPage,
+      pageSize,
+      order,
+      userEntity,
+      onlyCreations,
+    )
 
     // get gdt sum
     const resultGDTSum = await apiPost(`${CONFIG.GDT_API_URL}/GdtEntries/sumPerEmailApi`, {
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index d867e14ad..c6d5a36c3 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -47,8 +47,18 @@ export const logout = gql`
 `
 
 export const transactionsQuery = gql`
-  query($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC) {
-    transactionList(currentPage: $currentPage, pageSize: $pageSize, order: $order) {
+  query(
+    $currentPage: Int = 1
+    $pageSize: Int = 25
+    $order: Order = DESC
+    $onlyCreations: Boolean = false
+  ) {
+    transactionList(
+      currentPage: $currentPage
+      pageSize: $pageSize
+      order: $order
+      onlyCreations: $onlyCreations
+    ) {
       gdtSum
       count
       balance

From 0b0af7ae76d47c2e90799e5446507c5ba87f7872 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 21 Dec 2021 02:33:54 +0100
Subject: [PATCH 41/74] added migration 0006-login_users_collation

---
 .../migrations/0006-login_users_collation.ts    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 database/migrations/0006-login_users_collation.ts

diff --git a/database/migrations/0006-login_users_collation.ts b/database/migrations/0006-login_users_collation.ts
new file mode 100644
index 000000000..407c5605c
--- /dev/null
+++ b/database/migrations/0006-login_users_collation.ts
@@ -0,0 +1,17 @@
+/* MIGRATION TO ALIGN COLLATIONS
+ *
+ * in oder to be able to compare `login_users` with `state_users`
+ * when the databases default is not `utf8mb4_unicode_ci`, we need
+ * to also explicitly define it in the table
+ *
+ */
+
+export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  await queryFn(
+    'ALTER TABLE `login_users` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;',
+  )
+}
+
+export async function downgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {
+  await queryFn('ALTER TABLE `login_users` CONVERT TO CHARACTER SET utf8mb4;')
+}

From a467c8d945dd64defab3879110e75fad83c8aa1f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 21 Dec 2021 02:34:52 +0100
Subject: [PATCH 42/74] updated model accordingly

---
 .../0006-login_users_collation/LoginUser.ts   | 60 +++++++++++++++++++
 database/entity/LoginUser.ts                  |  2 +-
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 database/entity/0006-login_users_collation/LoginUser.ts

diff --git a/database/entity/0006-login_users_collation/LoginUser.ts b/database/entity/0006-login_users_collation/LoginUser.ts
new file mode 100644
index 000000000..e404a3937
--- /dev/null
+++ b/database/entity/0006-login_users_collation/LoginUser.ts
@@ -0,0 +1,60 @@
+import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, OneToOne } from 'typeorm'
+import { LoginUserBackup } from '../LoginUserBackup'
+
+// Moriz: I do not like the idea of having two user tables
+@Entity('login_users', { engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci' })
+export class LoginUser extends BaseEntity {
+  @PrimaryGeneratedColumn('increment', { unsigned: true })
+  id: number
+
+  @Column({ length: 191, unique: true, collation: 'utf8mb4_unicode_ci' })
+  email: string
+
+  @Column({ name: 'first_name', length: 150, collation: 'utf8mb4_unicode_ci' })
+  firstName: string
+
+  @Column({ name: 'last_name', length: 255, default: '', collation: 'utf8mb4_unicode_ci' })
+  lastName: string
+
+  @Column({ length: 255, default: '', collation: 'utf8mb4_unicode_ci' })
+  username: string
+
+  @Column({ default: '', collation: 'utf8mb4_unicode_ci' })
+  description: string
+
+  @Column({ type: 'bigint', default: 0, unsigned: true })
+  password: BigInt
+
+  @Column({ name: 'pubkey', type: 'binary', length: 32, default: null, nullable: true })
+  pubKey: Buffer
+
+  @Column({ name: 'privkey', type: 'binary', length: 80, default: null, nullable: true })
+  privKey: Buffer
+
+  @Column({ name: 'email_hash', type: 'binary', length: 32, default: null, nullable: true })
+  emailHash: Buffer
+
+  @Column({ name: 'created', default: () => 'CURRENT_TIMESTAMP' })
+  createdAt: Date
+
+  @Column({ name: 'email_checked', default: 0 })
+  emailChecked: boolean
+
+  @Column({ name: 'passphrase_shown', default: 0 })
+  passphraseShown: boolean
+
+  @Column({ length: 4, default: 'de', collation: 'utf8mb4_unicode_ci' })
+  language: string
+
+  @Column({ default: 0 })
+  disabled: boolean
+
+  @Column({ name: 'group_id', default: 0, unsigned: true })
+  groupId: number
+
+  @Column({ name: 'publisher_id', default: 0 })
+  publisherId: number
+
+  @OneToOne(() => LoginUserBackup, (loginUserBackup) => loginUserBackup.loginUser)
+  loginUserBackup: LoginUserBackup
+}
diff --git a/database/entity/LoginUser.ts b/database/entity/LoginUser.ts
index 034f791cb..b22e1137f 100644
--- a/database/entity/LoginUser.ts
+++ b/database/entity/LoginUser.ts
@@ -1 +1 @@
-export { LoginUser } from './0003-login_server_tables/LoginUser'
+export { LoginUser } from './0006-login_users_collation/LoginUser'

From e90744e1f9e3a4869ec121f49e80621c2764c806 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 21 Dec 2021 02:37:05 +0100
Subject: [PATCH 43/74] description migration: 0005-admin_tables

---
 database/migrations/0005-admin_tables.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/database/migrations/0005-admin_tables.ts b/database/migrations/0005-admin_tables.ts
index bd325678f..832008970 100644
--- a/database/migrations/0005-admin_tables.ts
+++ b/database/migrations/0005-admin_tables.ts
@@ -1,12 +1,6 @@
 /* MIGRATION FOR ADMIN INTERFACE
  *
- * This migration is special since it takes into account that
- * the database can be setup already but also may not be.
- * Therefore you will find all `CREATE TABLE` statements with
- * a `IF NOT EXISTS`, all `INSERT` with an `IGNORE` and in the
- * downgrade function all `DROP TABLE` with a `IF EXISTS`.
- * This ensures compatibility for existing or non-existing
- * databases.
+ * This migration adds the table `login_pending_tasks_admin` to store pending creations
  */
 
 export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {

From c42e6f5e96c00768973f88323a211065b7c8cdc3 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 21 Dec 2021 02:42:15 +0100
Subject: [PATCH 44/74] typo

---
 database/migrations/0006-login_users_collation.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/database/migrations/0006-login_users_collation.ts b/database/migrations/0006-login_users_collation.ts
index 407c5605c..579bb0a7a 100644
--- a/database/migrations/0006-login_users_collation.ts
+++ b/database/migrations/0006-login_users_collation.ts
@@ -3,7 +3,6 @@
  * in oder to be able to compare `login_users` with `state_users`
  * when the databases default is not `utf8mb4_unicode_ci`, we need
  * to also explicitly define it in the table
- *
  */
 
 export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {

From f7459b73eda48510e993e50e697aee161fdebd93 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 21 Dec 2021 02:42:32 +0100
Subject: [PATCH 45/74] description migration: 0004-login_server_data

---
 database/migrations/0004-login_server_data.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/database/migrations/0004-login_server_data.ts b/database/migrations/0004-login_server_data.ts
index 6d67dcdcb..4a38e016e 100644
--- a/database/migrations/0004-login_server_data.ts
+++ b/database/migrations/0004-login_server_data.ts
@@ -1,15 +1,15 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-/* FIRST MIGRATION
+/* MIGRATION TO COPY LOGIN_SERVER DATA
  *
- * This migration is special since it takes into account that
- * the database can be setup already but also may not be.
- * Therefore you will find all `CREATE TABLE` statements with
- * a `IF NOT EXISTS`, all `INSERT` with an `IGNORE` and in the
- * downgrade function all `DROP TABLE` with a `IF EXISTS`.
- * This ensures compatibility for existing or non-existing
- * databases.
+ * This migration copies all existing data from the `login_server` database (`gradido_login`)
+ * to the `community_server` database (`gradido_community`) in case the login_server database
+ * is present.
+ *
+ * NOTE: This will fail if the two databases are located on different servers.
+ *       Manual export and import of the database will be required then.
+ * NOTE: This migration does not delete the data when downgrading!
  */
 
 const LOGIN_SERVER_DB = 'gradido_login'

From e6ae25cd907e7d0750c0695f176d5f03cf253a38 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 21 Dec 2021 02:45:09 +0100
Subject: [PATCH 46/74] description migration: 0003-login_server_tables

---
 database/migrations/0003-login_server_tables.ts | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/database/migrations/0003-login_server_tables.ts b/database/migrations/0003-login_server_tables.ts
index d3d720c97..909e63c0b 100644
--- a/database/migrations/0003-login_server_tables.ts
+++ b/database/migrations/0003-login_server_tables.ts
@@ -1,15 +1,11 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-/* FIRST MIGRATION
+/* MIGRATION TO CREATE THE LOGIN_SERVER TABLES
  *
- * This migration is special since it takes into account that
- * the database can be setup already but also may not be.
- * Therefore you will find all `CREATE TABLE` statements with
- * a `IF NOT EXISTS`, all `INSERT` with an `IGNORE` and in the
- * downgrade function all `DROP TABLE` with a `IF EXISTS`.
- * This ensures compatibility for existing or non-existing
- * databases.
+ * This migration creates the `login_server` tables in the `community_server` database (`gradido_community`).
+ * This is done to keep all data in the same place and is to be understood in conjunction with the next migration
+ * `0004-login_server_data` which will fill the tables with the existing data
  */
 
 export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {

From cdd7d25024dac9091479f3fbe9e1d8a8ccb3f6f4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 21 Dec 2021 02:46:23 +0100
Subject: [PATCH 47/74] description migration: 0002-add_settings

---
 database/migrations/0002-add_settings.ts | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/database/migrations/0002-add_settings.ts b/database/migrations/0002-add_settings.ts
index 5c1b4fbe7..aed4feab4 100644
--- a/database/migrations/0002-add_settings.ts
+++ b/database/migrations/0002-add_settings.ts
@@ -1,15 +1,9 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-/* FIRST MIGRATION
+/* MIGRATION TO ADD USER SETTINGS
  *
- * This migration is special since it takes into account that
- * the database can be setup already but also may not be.
- * Therefore you will find all `CREATE TABLE` statements with
- * a `IF NOT EXISTS`, all `INSERT` with an `IGNORE` and in the
- * downgrade function all `DROP TABLE` with a `IF EXISTS`.
- * This ensures compatibility for existing or non-existing
- * databases.
+ * This migration adds the table `user_setting` in order to store all sorts of user configuration data
  */
 
 export async function upgrade(queryFn: (query: string, values?: any[]) => Promise<Array<any>>) {

From 1f8d7b8230711b97b71f06db3e386cf183ba6001 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 21 Dec 2021 02:58:11 +0100
Subject: [PATCH 48/74] fixed two old User Entity definitions. This is legit
 since this never changed and just was a missing definition. (Normally it
 would be forbidden to change old entity models or migrations)

---
 database/entity/0001-init_db/User.ts      | 22 +++++++++++++++++-----
 database/entity/0002-add_settings/User.ts | 22 +++++++++++++++++-----
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/database/entity/0001-init_db/User.ts b/database/entity/0001-init_db/User.ts
index 545d4f5c5..b349e2584 100644
--- a/database/entity/0001-init_db/User.ts
+++ b/database/entity/0001-init_db/User.ts
@@ -2,7 +2,7 @@ import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, OneToOne } from 'ty
 import { Balance } from '../Balance'
 
 // Moriz: I do not like the idea of having two user tables
-@Entity('state_users')
+@Entity('state_users', { engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci' })
 export class User extends BaseEntity {
   @PrimaryGeneratedColumn('increment', { unsigned: true })
   id: number
@@ -16,16 +16,28 @@ export class User extends BaseEntity {
   @Column({ type: 'binary', length: 32, name: 'public_key' })
   pubkey: Buffer
 
-  @Column({ length: 255, nullable: true, default: null })
+  @Column({ length: 255, nullable: true, default: null, collation: 'utf8mb4_unicode_ci' })
   email: string
 
-  @Column({ name: 'first_name', length: 255, nullable: true, default: null })
+  @Column({
+    name: 'first_name',
+    length: 255,
+    nullable: true,
+    default: null,
+    collation: 'utf8mb4_unicode_ci',
+  })
   firstName: string
 
-  @Column({ name: 'last_name', length: 255, nullable: true, default: null })
+  @Column({
+    name: 'last_name',
+    length: 255,
+    nullable: true,
+    default: null,
+    collation: 'utf8mb4_unicode_ci',
+  })
   lastName: string
 
-  @Column({ length: 255, nullable: true, default: null })
+  @Column({ length: 255, nullable: true, default: null, collation: 'utf8mb4_unicode_ci' })
   username: string
 
   @Column()
diff --git a/database/entity/0002-add_settings/User.ts b/database/entity/0002-add_settings/User.ts
index 6f3067c79..78e774489 100644
--- a/database/entity/0002-add_settings/User.ts
+++ b/database/entity/0002-add_settings/User.ts
@@ -2,7 +2,7 @@ import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, OneToMany } from 't
 import { UserSetting } from './UserSetting'
 
 // Moriz: I do not like the idea of having two user tables
-@Entity('state_users')
+@Entity('state_users', { engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci' })
 export class User extends BaseEntity {
   @PrimaryGeneratedColumn('increment', { unsigned: true })
   id: number
@@ -16,16 +16,28 @@ export class User extends BaseEntity {
   @Column({ type: 'binary', length: 32, name: 'public_key' })
   pubkey: Buffer
 
-  @Column({ length: 255, nullable: true, default: null })
+  @Column({ length: 255, nullable: true, default: null, collation: 'utf8mb4_unicode_ci' })
   email: string
 
-  @Column({ name: 'first_name', length: 255, nullable: true, default: null })
+  @Column({
+    name: 'first_name',
+    length: 255,
+    nullable: true,
+    default: null,
+    collation: 'utf8mb4_unicode_ci',
+  })
   firstName: string
 
-  @Column({ name: 'last_name', length: 255, nullable: true, default: null })
+  @Column({
+    name: 'last_name',
+    length: 255,
+    nullable: true,
+    default: null,
+    collation: 'utf8mb4_unicode_ci',
+  })
   lastName: string
 
-  @Column({ length: 255, nullable: true, default: null })
+  @Column({ length: 255, nullable: true, default: null, collation: 'utf8mb4_unicode_ci' })
   username: string
 
   @Column()

From 6ae330da51bd5f9673a413f4946957902a51f653 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 21 Dec 2021 07:08:17 +0100
Subject: [PATCH 49/74] update required database version

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

diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts
index e5dfd113b..4ed20232d 100644
--- a/backend/src/server/createServer.ts
+++ b/backend/src/server/createServer.ts
@@ -29,7 +29,7 @@ import { elopageWebhook } from '../webhook/elopage'
 // TODO implement
 // import queryComplexity, { simpleEstimator, fieldConfigEstimator } from "graphql-query-complexity";
 
-const DB_VERSION = '0005-admin_tables'
+const DB_VERSION = '0006-login_users_collation'
 
 const createServer = async (context: any = serverContext): Promise<any> => {
   // open mysql connection

From 3c5d7f2ced0fdd495b225b902bd33f1991522160 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 21 Dec 2021 10:56:46 +0100
Subject: [PATCH 50/74] refactor show details

---
 admin/src/components/CreationFormular.vue     |   1 +
 .../CreationTransactionListFormular.vue       |   1 +
 admin/src/components/RowDetails.vue           |  27 +++
 admin/src/components/UserTable.vue            | 228 ++++++------------
 admin/src/pages/UserSearch.vue                |   7 +-
 5 files changed, 108 insertions(+), 156 deletions(-)
 create mode 100644 admin/src/components/RowDetails.vue

diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index 2074da857..efaff3481 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="component-creation-formular">
+    CREATION FORMULAR
     <div class="shadow p-3 mb-5 bg-white rounded">
       <b-form ref="creationForm">
         <b-row class="m-4">
diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue
index fcf984ea9..350af6c48 100644
--- a/admin/src/components/CreationTransactionListFormular.vue
+++ b/admin/src/components/CreationTransactionListFormular.vue
@@ -33,6 +33,7 @@ export default {
           this.items = result.data.transactionList.transactions
         })
         .catch((error) => {
+          // eslint-disable-next-line no-console
           console.log('Something went wrong', error)
         })
     },
diff --git a/admin/src/components/RowDetails.vue b/admin/src/components/RowDetails.vue
new file mode 100644
index 000000000..7153870ee
--- /dev/null
+++ b/admin/src/components/RowDetails.vue
@@ -0,0 +1,27 @@
+<template>
+  <b-card class="shadow-lg pl-3 pr-3 mb-5 bg-white rounded">
+    <b-row class="mb-2">
+      <b-col></b-col>
+    </b-row>
+    <slot :name="slotName" />
+    <b-button size="sm" @click="$emit('row-toogle-details', row, index)">
+      <b-icon
+        :icon="type === 'PageCreationConfirm' ? 'x' : 'eye-slash-fill'"
+        aria-label="Help"
+      ></b-icon>
+      Details verbergen von {{ row.item.firstName }} {{ row.item.lastName }}
+    </b-button>
+  </b-card>
+</template>
+
+<script>
+export default {
+  name: 'RowDetails',
+  props: {
+    row: { required: true, type: Object },
+    slotName: { requried: true, type: String },
+    type: { requried: true, type: String },
+    index: { requried: true, type: Number },
+  },
+}
+</script>
diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 4c8f2bb67..ca539fc9d 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -37,28 +37,14 @@
       stacked="md"
     >
       <template #cell(edit_creation)="row">
-        <b-button
-          variant="info"
-          size="md"
-          :ref="'details_edit_' + row.detailsShowing"
-          @click="editCreationUserTable(row, row.detailsShowing)"
-          class="mr-2"
-        >
-          <b-icon v-if="row.detailsShowing" icon="x" aria-label="Help"></b-icon>
-          <b-icon v-else icon="pencil-square" aria-label="Help"></b-icon>
+        <b-button variant="info" size="md" @click="rowToogleDetails(row, 0)" class="mr-2">
+          <b-icon :icon="row.detailsShowing ? 'x' : 'pencil-square'" aria-label="Help"></b-icon>
         </b-button>
       </template>
 
       <template #cell(show_details)="row">
-        <b-button
-          variant="info"
-          size="md"
-          :ref="'showing_detals_' + row.detailsShowing"
-          @click="rowDetailsToogle(row, row.detailsShowing)"
-          class="mr-2"
-        >
-          <b-icon v-if="row.detailsShowing" icon="eye-slash-fill" aria-label="Help"></b-icon>
-          <b-icon v-else icon="eye-fill" aria-label="Help"></b-icon>
+        <b-button variant="info" size="md" @click="rowToogleDetails(row, 0)" class="mr-2">
+          <b-icon :icon="row.detailsShowing ? 'eye-slash-fill' : 'eye-fill'"></b-icon>
         </b-button>
       </template>
 
@@ -66,10 +52,7 @@
         <b-button
           :variant="row.item.emailChecked ? 'success' : 'danger'"
           size="md"
-          :ref="'showing_registermail_detals_' + row.detailsShowing"
-          @click="
-            !row.item.emailChecked ? rowDetailsToogleRegisterMail(row, row.detailsShowing) : ''
-          "
+          @click="rowToogleDetails(row, 1)"
           class="mr-2"
         >
           <b-icon
@@ -80,66 +63,59 @@
       </template>
 
       <template #cell(transactions_list)="row">
-        <b-button
-          variant="warning"
-          size="md"
-          :ref="'showing_transactions_list_' + row.detailsShowing"
-          @click="rowDetailsToogleTransactionsList(row, row.detailsShowing)"
-          class="mr-2"
-        >
+        <b-button variant="warning" size="md" @click="rowToogleDetails(row, 2)" class="mr-2">
           <b-icon icon="list"></b-icon>
         </b-button>
       </template>
 
       <template #row-details="row">
-        <b-card class="shadow-lg pl-3 pr-3 mb-5 bg-white rounded">
-          <b-row class="mb-2">
-            <b-col></b-col>
-          </b-row>
-          <div v-if="showCreationFormular">
-            <creation-formular
-              v-if="type === 'PageUserSearch'"
-              type="singleCreation"
-              :pagetype="type"
-              :creation="row.item.creation"
-              :item="row.item"
-              :creationUserData="creationUserData"
-              @update-creation-data="updateCreationData"
-              @update-user-data="updateUserData"
+        <row-details
+          :row="row"
+          :type="type"
+          :slotName="slotName"
+          :index="slotIndex"
+          @row-toogle-details="rowToogleDetails"
+        >
+          <template #show-creation>
+            <div>
+              <creation-formular
+                v-if="type === 'PageUserSearch'"
+                type="singleCreation"
+                :pagetype="type"
+                :creation="row.item.creation"
+                :item="row.item"
+                :creationUserData="creationUserData"
+                @update-creation-data="updateCreationData"
+                @update-user-data="updateUserData"
+              />
+              <edit-creation-formular
+                v-else
+                type="singleCreation"
+                :pagetype="type"
+                :creation="row.item.creation"
+                :item="row.item"
+                :row="row"
+                :creationUserData="creationUserData"
+                @update-creation-data="updateCreationData"
+                @update-user-data="updateUserData"
+              />
+            </div>
+          </template>
+          <template #show-register-mail>
+            <confirm-register-mail-formular
+              v-if="showConfirmRegisterMailFormular"
+              :email="row.item.email"
+              :dateLastSend="$moment().subtract(1, 'month').format('dddd, DD.MMMM.YYYY HH:mm'),"
             />
-            <edit-creation-formular
-              v-else
-              type="singleCreation"
-              :pagetype="type"
-              :creation="row.item.creation"
-              :item="row.item"
-              :row="row"
-              :creationUserData="creationUserData"
-              @update-creation-data="updateCreationData"
-              @update-user-data="updateUserData"
+          </template>
+          <template #show-transaction-list>
+            <creation-transaction-list-formular
+              v-if="showCreationTransactionListFormular"
+              :userId="row.item.userId"
             />
-          </div>
-          <confirm-register-mail-formular
-            v-if="showConfirmRegisterMailFormular"
-            :email="row.item.email"
-            :dateLastSend="$moment().subtract(1, 'month').format('dddd, DD.MMMM.YYYY HH:mm'),"
-          />
-
-          <creation-transaction-list-formular
-            v-if="showCreationTransactionListFormular"
-            :userId="row.item.userId"
-          />
-
-          <b-button size="sm" @click="row.toggleDetails">
-            <b-icon
-              :icon="type === 'PageCreationConfirm' ? 'x' : 'eye-slash-fill'"
-              aria-label="Help"
-            ></b-icon>
-            Details verbergen von {{ row.item.firstName }} {{ row.item.lastName }}
-          </b-button>
-        </b-card>
+          </template>
+        </row-details>
       </template>
-
       <template #cell(bookmark)="row">
         <b-button
           variant="warning"
@@ -181,9 +157,12 @@ import CreationFormular from '../components/CreationFormular.vue'
 import EditCreationFormular from '../components/EditCreationFormular.vue'
 import ConfirmRegisterMailFormular from '../components/ConfirmRegisterMailFormular.vue'
 import CreationTransactionListFormular from '../components/CreationTransactionListFormular.vue'
+import RowDetails from '../components/RowDetails.vue'
 
 import { confirmPendingCreation } from '../graphql/confirmPendingCreation'
 
+const slotNames = ['show-creation', 'show-register-mail', 'show-transaction-list']
+
 export default {
   name: 'UserTable',
   props: {
@@ -214,6 +193,7 @@ export default {
     EditCreationFormular,
     ConfirmRegisterMailFormular,
     CreationTransactionListFormular,
+    RowDetails,
   },
   data() {
     return {
@@ -233,65 +213,30 @@ export default {
           button_cancel: 'Cancel',
         },
       ],
+      slotIndex: 0,
+      openRow: null,
     }
   },
   methods: {
-    rowDetailsToogle(row, details) {
-      if (
-        this.showConfirmRegisterMailFormular === true ||
-        this.showCreationTransactionListFormular === true
-      ) {
-        this.showCreationFormular = true
-        this.showConfirmRegisterMailFormular = false
-        this.showCreationTransactionListFormular = false
-        return
-      }
-      if (details) {
-        row.toggleDetails()
-      }
-      if (!details) {
-        row.toggleDetails()
-        this.showCreationFormular = true
-        if (this.$refs.showing_detals_true !== undefined) {
-          this.$refs.showing_detals_true.click()
+    async rowToogleDetails(row, index) {
+      if (this.openRow) {
+        if (this.openRow.index === row.index) {
+          if (index === this.slotIndex) {
+            row.toggleDetails()
+            this.openRow = null
+          } else {
+            this.slotIndex = index
+          }
+        } else {
+          this.openRow.toggleDetails()
+          row.toggleDetails()
+          this.slotIndex = index
+          this.openRow = row
         }
-      }
-    },
-
-    rowDetailsToogleRegisterMail(row, details) {
-      if (this.showCreationFormular === true || this.showCreationTransactionListFormular === true) {
-        this.showCreationFormular = false
-        this.showConfirmRegisterMailFormular = true
-        this.showCreationTransactionListFormular = false
-        return
-      }
-      if (details) {
+      } else {
         row.toggleDetails()
-      }
-      if (!details) {
-        row.toggleDetails()
-        this.showConfirmRegisterMailFormular = true
-        if (this.$refs.showing_registermail_detals_true !== undefined) {
-          this.$refs.showing_registermail_detals_true.click()
-        }
-      }
-    },
-    rowDetailsToogleTransactionsList(row, details) {
-      if (this.showCreationFormular === true || this.showConfirmRegisterMailFormular === true) {
-        this.showCreationFormular = false
-        this.showConfirmRegisterMailFormular = false
-        this.showCreationTransactionListFormular = true
-        return
-      }
-      if (details) {
-        row.toggleDetails()
-      }
-      if (!details) {
-        row.toggleDetails()
-        this.showCreationTransactionListFormular = true
-        if (this.$refs.showing_transactions_list_true !== undefined) {
-          this.$refs.showing_transactions_list_true.click()
-        }
+        this.slotIndex = index
+        this.openRow = row
       }
     },
     overlayShow(bookmarkType, item) {
@@ -356,28 +301,6 @@ export default {
           this.$toasted.error(error.message)
         })
     },
-    editCreationUserTable(row, details) {
-      if (
-        this.showConfirmRegisterMailFormular === true ||
-        this.showCreationTransactionListFormular === true
-      ) {
-        this.showCreationFormular = true
-        this.showConfirmRegisterMailFormular = false
-        this.showCreationTransactionListFormular = false
-        return
-      }
-      if (details) {
-        row.toggleDetails()
-      }
-      if (!details) {
-        row.toggleDetails()
-        this.showCreationFormular = true
-        this.creationUserData = row.item
-        if (this.$refs.details_edit_true !== undefined) {
-          this.$refs.details_edit_true.click()
-        }
-      }
-    },
     updateCreationData(data) {
       this.creationUserData.amount = data.amount
       this.creationUserData.date = data.date
@@ -390,6 +313,11 @@ export default {
       rowItem.creation = newCreation
     },
   },
+  computed: {
+    slotName() {
+      return slotNames[this.slotIndex]
+    },
+  },
 }
 </script>
 <style>
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index e9d2b180f..f6bd4506d 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -71,12 +71,7 @@ export default {
           },
         })
         .then((result) => {
-          this.searchResult = result.data.searchUsers.map((user) => {
-            return {
-              ...user,
-              // showDetails: true,
-            }
-          })
+          this.searchResult = result.data.searchUsers
         })
         .catch((error) => {
           this.$toasted.error(error.message)

From d96e458356ab0c3e38a56901d859ff5e4e34333e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 21 Dec 2021 11:11:13 +0100
Subject: [PATCH 51/74] test email checked filter

---
 admin/src/pages/UserSearch.spec.js | 11 +++++++++++
 admin/src/pages/UserSearch.vue     |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js
index 37ba4f5ec..0591ea01b 100644
--- a/admin/src/pages/UserSearch.spec.js
+++ b/admin/src/pages/UserSearch.spec.js
@@ -11,6 +11,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
         lastName: 'Bloxberg',
         email: 'bibi@bloxberg.de',
         creation: [200, 400, 600],
+        emailChecked: false,
       },
     ],
   },
@@ -43,6 +44,16 @@ describe('UserSearch', () => {
       expect(wrapper.find('div.user-search').exists()).toBeTruthy()
     })
 
+    describe('unconfirmed emails', () => {
+      beforeEach(async () => {
+        await wrapper.find('button.btn-block').trigger('click')
+      })
+
+      it('filters the users by unconfirmed emails', () => {
+        expect(wrapper.vm.searchResult).toHaveLength(0)
+      })
+    })
+
     describe('apollo returns error', () => {
       beforeEach(() => {
         apolloQueryMock.mockRejectedValue({
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index f6bd4506d..3bb194959 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -58,8 +58,8 @@ export default {
 
   methods: {
     unconfirmedRegisterMails() {
-      this.searchResult = this.searchResult.filter((result) => {
-        return !result.emailChecked
+      this.searchResult = this.searchResult.filter((user) => {
+        return user.emailChecked
       })
     },
     getUsers() {

From 1890475d59341bf329c10a1242f721dc3901b8d9 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 21 Dec 2021 11:20:40 +0100
Subject: [PATCH 52/74] test ConfirmRegisterMailFormular API calls

---
 .../ConfirmRegisterMailFormular.spec.js       | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/ConfirmRegisterMailFormular.spec.js b/admin/src/components/ConfirmRegisterMailFormular.spec.js
index a53fcae02..7fd71a37d 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.spec.js
+++ b/admin/src/components/ConfirmRegisterMailFormular.spec.js
@@ -3,6 +3,8 @@ import ConfirmRegisterMailFormular from './ConfirmRegisterMailFormular.vue'
 
 const localVue = global.localVue
 
+const apolloMutateMock = jest.fn().mockResolvedValue()
+
 const mocks = {
   $moment: jest.fn(() => {
     return {
@@ -14,10 +16,13 @@ const mocks = {
       }),
     }
   }),
+  $apollo: {
+    mutate: apolloMutateMock,
+  },
 }
 
 const propsData = {
-  email: '',
+  email: 'bob@baumeister.de',
   dateLastSend: '',
 }
 
@@ -36,5 +41,27 @@ describe('ConfirmRegisterMailFormular', () => {
     it('has a DIV element with the class.component-confirm-register-mail', () => {
       expect(wrapper.find('.component-confirm-register-mail').exists()).toBeTruthy()
     })
+
+    describe('send register mail with success', () => {
+      beforeEach(() => {
+        wrapper.find('button.test-button').trigger('click')
+      })
+
+      it('calls the API', () => {
+        expect(apolloMutateMock).toBeCalled()
+      })
+    })
+
+    describe('send register mail with error', () => {
+      beforeEach(() => {
+        apolloMutateMock.mockRejectedValue({ message: 'OUCH!' })
+        wrapper = Wrapper()
+        wrapper.find('button.test-button').trigger('click')
+      })
+
+      it('calls the API', () => {
+        expect(apolloMutateMock).toBeCalled()
+      })
+    })
   })
 })

From 34ce6fb333039d577fcb278d6b4482b7d8adfbf9 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 21 Dec 2021 11:33:39 +0100
Subject: [PATCH 53/74] better test for server error

---
 admin/src/components/CreationFormular.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/components/CreationFormular.spec.js b/admin/src/components/CreationFormular.spec.js
index f6bd1a924..1c7dd40fc 100644
--- a/admin/src/components/CreationFormular.spec.js
+++ b/admin/src/components/CreationFormular.spec.js
@@ -176,8 +176,8 @@ describe('CreationFormular', () => {
               await wrapper.find('.test-submit').trigger('click')
             })
 
-            it('sends ... to apollo', () => {
-              expect(toastedErrorMock).toBeCalled()
+            it('toasts an error message', () => {
+              expect(toastedErrorMock).toBeCalledWith('Ouch!')
             })
           })
 

From 82fd10d489aa00e7236a9547b7f9b8787fdcf846 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 21 Dec 2021 11:51:47 +0100
Subject: [PATCH 54/74] remove unused if clauses

---
 admin/src/components/UserTable.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index ca539fc9d..b021ef754 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -103,16 +103,12 @@
           </template>
           <template #show-register-mail>
             <confirm-register-mail-formular
-              v-if="showConfirmRegisterMailFormular"
               :email="row.item.email"
               :dateLastSend="$moment().subtract(1, 'month').format('dddd, DD.MMMM.YYYY HH:mm'),"
             />
           </template>
           <template #show-transaction-list>
-            <creation-transaction-list-formular
-              v-if="showCreationTransactionListFormular"
-              :userId="row.item.userId"
-            />
+            <creation-transaction-list-formular :userId="row.item.userId" />
           </template>
         </row-details>
       </template>

From 9138a6e407f9e8cd4aa9d71759c3d5b23eed9a39 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 21 Dec 2021 12:44:39 +0100
Subject: [PATCH 55/74] Remove console.log

---
 backend/src/graphql/resolver/TransactionResolver.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 40e29cfe6..51500ce56 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -381,12 +381,9 @@ async function listTransactions(
   const transactionList = new TransactionList()
   transactionList.count = userTransactionsCount
   if (onlyCreations) {
-    console.log('before filtering', transactions)
     transactions = transactions.filter((transaction) => {
-      console.log('In filter', transaction)
       return transaction.type === 'creation'
     })
-    console.log('after filtering', transactions)
   }
   transactionList.transactions = transactions
   return transactionList
@@ -492,7 +489,6 @@ export class TransactionResolver {
     const userRepository = getCustomRepository(UserRepository)
     let userEntity: dbUser | undefined
     if (userId) {
-      console.log('Find by id, ', userId)
       userEntity = await userRepository.findOneOrFail({ id: userId })
     } else {
       userEntity = await userRepository.findByPubkeyHex(context.pubKey)

From 56802e967fe894f52566c313b86941778b73813e Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Tue, 21 Dec 2021 15:32:13 +0100
Subject: [PATCH 56/74] Change the Test of login.vue so we check the
 redirections.

---
 frontend/src/views/Pages/Login.spec.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/frontend/src/views/Pages/Login.spec.js b/frontend/src/views/Pages/Login.spec.js
index 9e8be9342..f9fde0e1e 100644
--- a/frontend/src/views/Pages/Login.spec.js
+++ b/frontend/src/views/Pages/Login.spec.js
@@ -266,6 +266,25 @@ describe('Login', () => {
               await flushPromises()
             })
 
+            it('redirects to /thx/login', () => {
+              expect(mockRouterPush).toBeCalledWith('/thx/login')
+            })
+          })
+
+          describe('login fails with "User has no password set yet"', () => {
+            beforeEach(async () => {
+              apolloQueryMock.mockRejectedValue({
+                message: 'User has no password set yet',
+              })
+              wrapper = Wrapper()
+              jest.clearAllMocks()
+              await wrapper.find('input[placeholder="Email"]').setValue('user@example.org')
+              await wrapper.find('input[placeholder="form.password"]').setValue('1234')
+              await flushPromises()
+              await wrapper.find('form').trigger('submit')
+              await flushPromises()
+            })
+
             it('redirects to /reset/login', () => {
               expect(mockRouterPush).toBeCalledWith('/reset/login')
             })

From 69ffa165d53863156b4fd90ab61e8664ad34658b Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Tue, 21 Dec 2021 16:38:16 +0100
Subject: [PATCH 57/74] Update backend/src/graphql/resolver/AdminResolver.ts

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 backend/src/graphql/resolver/AdminResolver.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index f1f570b71..3ccb0fa63 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -323,5 +323,5 @@ async function hasActivatedEmail(email: string): Promise<boolean> {
   const user = await repository.findByEmail(email)
   let emailActivate = false
   if (user) emailActivate = user.emailChecked
-  return emailActivate
+  return user ? user.emailChecked : false
 }

From 6f73a7392691238e096ec946f92870457979d171 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 22 Dec 2021 08:13:53 +0100
Subject: [PATCH 58/74] Change console.log to  error.

---
 admin/src/components/ConfirmRegisterMailFormular.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
index 9eaead65c..2f2c3a21f 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.vue
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -42,15 +42,14 @@ export default {
           },
         })
         .then(() => {
-          // eslint-disable-next-line no-console
-          console.log(
-            'Erfolgreich senden der Confirmation Link an die E-Mail des Users!',
-            this.email,
+          this.$toasted.global.success(
+            'Erfolgreich senden der Confirmation Link an die E-Mail des Users!' + this.email,
           )
         })
         .catch((error) => {
-          // eslint-disable-next-line no-console
-          console.log('Fehler beim senden des confirmation link an den Benutzer', error)
+          this.$toasted.global.error(
+            'Fehler beim senden des confirmation link an den Benutzer' + error,
+          )
         })
     },
   },

From 13642133c1c663862df40ef4c827a5cd4cd4106f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 22 Dec 2021 08:25:08 +0100
Subject: [PATCH 59/74] Moved the filter on creation to the query.

---
 backend/src/graphql/resolver/TransactionResolver.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index 51500ce56..d8ef1fb0f 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -359,6 +359,7 @@ async function listTransactions(
     limit,
     offset,
     order,
+    onlyCreations,
   )
   skipFirstTransaction = userTransactionsCount > offset + limit
   const decay = !(currentPage > 1)
@@ -380,11 +381,6 @@ async function listTransactions(
 
   const transactionList = new TransactionList()
   transactionList.count = userTransactionsCount
-  if (onlyCreations) {
-    transactions = transactions.filter((transaction) => {
-      return transaction.type === 'creation'
-    })
-  }
   transactionList.transactions = transactions
   return transactionList
 }

From c53db1e255861a3c7e2d3c28ec66ddc48a5ca06d Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 22 Dec 2021 08:25:40 +0100
Subject: [PATCH 60/74] Console.log replaced by toasted

---
 admin/src/components/CreationTransactionListFormular.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue
index 350af6c48..c9901c49e 100644
--- a/admin/src/components/CreationTransactionListFormular.vue
+++ b/admin/src/components/CreationTransactionListFormular.vue
@@ -33,6 +33,7 @@ export default {
           this.items = result.data.transactionList.transactions
         })
         .catch((error) => {
+          this.$toasted.global.error('Error while searching the creations', error)
           // eslint-disable-next-line no-console
           console.log('Something went wrong', error)
         })

From 07d4a8103a5a5245b4b16391fb5f8ca04bddc2b0 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 22 Dec 2021 08:26:30 +0100
Subject: [PATCH 61/74] Change the query so we get only creation transactions.

---
 backend/src/typeorm/repository/UserTransaction.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/backend/src/typeorm/repository/UserTransaction.ts b/backend/src/typeorm/repository/UserTransaction.ts
index 87166fcfc..57f89d5a5 100644
--- a/backend/src/typeorm/repository/UserTransaction.ts
+++ b/backend/src/typeorm/repository/UserTransaction.ts
@@ -9,7 +9,17 @@ export class UserTransactionRepository extends Repository<UserTransaction> {
     limit: number,
     offset: number,
     order: Order,
+    onlyCreation?: boolean,
   ): Promise<[UserTransaction[], number]> {
+    if (onlyCreation) {
+      return this.createQueryBuilder('userTransaction')
+        .where('userTransaction.userId = :userId', { userId })
+        .andWhere('userTransaction.type = "creation"')
+        .orderBy('userTransaction.balanceDate', order)
+        .limit(limit)
+        .offset(offset)
+        .getManyAndCount()
+    }
     return this.createQueryBuilder('userTransaction')
       .where('userTransaction.userId = :userId', { userId })
       .orderBy('userTransaction.balanceDate', order)

From 5af3d635fd936a2e91011847ad84894084a63207 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 22 Dec 2021 08:28:19 +0100
Subject: [PATCH 62/74] Delete console.log.

---
 admin/src/components/CreationTransactionListFormular.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue
index c9901c49e..bccd6ce7e 100644
--- a/admin/src/components/CreationTransactionListFormular.vue
+++ b/admin/src/components/CreationTransactionListFormular.vue
@@ -34,8 +34,6 @@ export default {
         })
         .catch((error) => {
           this.$toasted.global.error('Error while searching the creations', error)
-          // eslint-disable-next-line no-console
-          console.log('Something went wrong', error)
         })
     },
   },

From 2bec8f3f9058a8266d988a952e502ae276b71e96 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 22 Dec 2021 09:16:15 +0100
Subject: [PATCH 63/74] Test the CreationTransactionListFormular.

---
 .../CreationTransactionListFormular.spec.js   | 115 ++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 admin/src/components/CreationTransactionListFormular.spec.js

diff --git a/admin/src/components/CreationTransactionListFormular.spec.js b/admin/src/components/CreationTransactionListFormular.spec.js
new file mode 100644
index 000000000..80b337268
--- /dev/null
+++ b/admin/src/components/CreationTransactionListFormular.spec.js
@@ -0,0 +1,115 @@
+import { mount } from '@vue/test-utils'
+import CreationTransactionListFormular from './CreationTransactionListFormular.vue'
+
+const localVue = global.localVue
+
+const apolloQueryMock = jest.fn().mockResolvedValue({
+  data: {
+    transactionList: {
+      transactions: [
+        {
+          type: 'created',
+          balance: 100,
+          decayStart: 0,
+          decayEnd: 0,
+          decayDuration: 0,
+          memo: 'Testing',
+          transactionId: 1,
+          name: 'Bibi',
+          email: 'bibi@bloxberg.de',
+          date: new Date(),
+          decay: {
+            balance: 0.01,
+            decayStart: 0,
+            decayEnd: 0,
+            decayDuration: 0,
+            decayStartBlock: 0,
+          },
+        },
+        {
+          type: 'created',
+          balance: 200,
+          decayStart: 0,
+          decayEnd: 0,
+          decayDuration: 0,
+          memo: 'Testing 2',
+          transactionId: 2,
+          name: 'Bibi',
+          email: 'bibi@bloxberg.de',
+          date: new Date(),
+          decay: {
+            balance: 0.01,
+            decayStart: 0,
+            decayEnd: 0,
+            decayDuration: 0,
+            decayStartBlock: 0,
+          },
+        },
+      ],
+    },
+  },
+})
+
+const toastedErrorMock = jest.fn()
+
+const mocks = {
+  $apollo: {
+    query: apolloQueryMock,
+  },
+  $toasted: {
+    global: {
+      error: toastedErrorMock,
+    },
+  },
+}
+
+const propsData = {
+  userId: 1,
+}
+
+describe('CreationTransactionListFormular', () => {
+  let wrapper
+
+  const Wrapper = () => {
+    return mount(CreationTransactionListFormular, { localVue, mocks, propsData })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('sends query to Apollo when created', () => {
+      expect(apolloQueryMock).toBeCalledWith(
+        expect.objectContaining({
+          variables: {
+            currentPage: 1,
+            pageSize: 25,
+            order: 'DESC',
+            onlyCreations: true,
+            userId: 1,
+          },
+        }),
+      )
+    })
+
+    it('has two values for the transaction', () => {
+      expect(wrapper.find('tbody').findAll('tr').length).toBe(2)
+    })
+
+    describe('query transaction with error', () => {
+      beforeEach(() => {
+        apolloQueryMock.mockRejectedValue({ message: 'OUCH!' })
+        wrapper = Wrapper()
+      })
+
+      it('calls the API', () => {
+        expect(apolloQueryMock).toBeCalled()
+      })
+
+      it('toast error', () => {
+        expect(toastedErrorMock).toBeCalledWith('OUCH!')
+      })
+    })
+  })
+})

From 75263989911f4070a254ec66894812207c2ffc4e Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 22 Dec 2021 09:16:31 +0100
Subject: [PATCH 64/74] Toast should only send the error message.

---
 admin/src/components/CreationTransactionListFormular.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue
index bccd6ce7e..04f1c9a13 100644
--- a/admin/src/components/CreationTransactionListFormular.vue
+++ b/admin/src/components/CreationTransactionListFormular.vue
@@ -33,7 +33,7 @@ export default {
           this.items = result.data.transactionList.transactions
         })
         .catch((error) => {
-          this.$toasted.global.error('Error while searching the creations', error)
+          this.$toasted.global.error(error.message)
         })
     },
   },

From d275291d8219cb1a85e7dc12bdd3096776083af1 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Wed, 22 Dec 2021 10:04:56 +0100
Subject: [PATCH 65/74] rowToogleDetails check type === PageCreationConfirm and
 fill creationUserData

---
 admin/src/components/UserTable.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 3ad4b40cf..85de25a49 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -233,6 +233,9 @@ export default {
         row.toggleDetails()
         this.slotIndex = index
         this.openRow = row
+        if (this.type === 'PageCreationConfirm') {
+          this.creationUserData = row.item
+        }
       }
     },
     overlayShow(bookmarkType, item) {

From 8070213036bab87ec0e439df1a2c8be7465ee6a5 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 22 Dec 2021 10:26:48 +0100
Subject: [PATCH 66/74] Remove props that are not used.

---
 admin/src/components/EditCreationFormular.vue | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index 3a1c91a02..13b6ddd34 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -113,7 +113,7 @@
                 @click="submitCreation"
                 :disabled="radioSelected === '' || value <= 0 || text.length < 10"
               >
-                Update Schöpfung ({{ type }},{{ pagetype }})
+                Update Schöpfung
               </b-button>
             </div>
           </b-col>
@@ -127,15 +127,6 @@ import { updatePendingCreation } from '../graphql/updatePendingCreation'
 export default {
   name: 'EditCreationFormular',
   props: {
-    type: {
-      type: String,
-      required: false,
-    },
-    pagetype: {
-      type: String,
-      required: false,
-      default: '',
-    },
     item: {
       type: Object,
       required: false,
@@ -143,13 +134,6 @@ export default {
         return {}
       },
     },
-    items: {
-      type: Array,
-      required: false,
-      default() {
-        return []
-      },
-    },
     row: {
       type: Object,
       required: false,
@@ -199,6 +183,7 @@ export default {
     updateRadioSelected(name, index, openCreation) {
       this.createdIndex = index
       this.rangeMin = 0
+      console.log('this.creation, index', this.creation, index)
       this.rangeMax = this.creation[index]
     },
     submitCreation() {
@@ -247,7 +232,7 @@ export default {
     },
   },
   created() {
-    if (this.pagetype === 'PageCreationConfirm' && this.creationUserData.date) {
+    if (this.creationUserData.date) {
       switch (this.$moment(this.creationUserData.date).format('MMMM')) {
         case this.currentMonth.short:
           this.createdIndex = 2

From cb7d79d01e81a7d9d2bdd0376046e166d945c520 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 22 Dec 2021 10:44:33 +0100
Subject: [PATCH 67/74] Test that the error are toasted.

---
 .../components/EditCreationFormular.spec.js   | 80 +++++++++++++++++--
 1 file changed, 72 insertions(+), 8 deletions(-)

diff --git a/admin/src/components/EditCreationFormular.spec.js b/admin/src/components/EditCreationFormular.spec.js
index 50704ed76..0a8ddad90 100644
--- a/admin/src/components/EditCreationFormular.spec.js
+++ b/admin/src/components/EditCreationFormular.spec.js
@@ -46,9 +46,12 @@ const mocks = {
 }
 
 const propsData = {
-  type: '',
   creation: [],
-  itemsMassCreation: {},
+  creationUserData: {
+    memo: 'Test schöpfung 1',
+    amount: 100,
+    date: '2021-12-01',
+  },
 }
 
 describe('EditCreationFormular', () => {
@@ -67,7 +70,7 @@ describe('EditCreationFormular', () => {
       expect(wrapper.find('.component-edit-creation-formular').exists()).toBeTruthy()
     })
 
-    describe('radio buttons to selcet month', () => {
+    describe('radio buttons to select month', () => {
       it('has three radio buttons', () => {
         expect(wrapper.findAll('input[type="radio"]').length).toBe(3)
       })
@@ -75,7 +78,7 @@ describe('EditCreationFormular', () => {
       describe('with single creation', () => {
         beforeEach(async () => {
           jest.clearAllMocks()
-          await wrapper.setProps({ type: 'singleCreation', creation: [200, 400, 600] })
+          await wrapper.setProps({ creation: [200, 400, 600] })
           await wrapper.setData({ rangeMin: 180 })
           await wrapper.setData({ text: 'Test create coins' })
           await wrapper.setData({ value: 90 })
@@ -113,6 +116,26 @@ describe('EditCreationFormular', () => {
                 }),
               )
             })
+
+            describe('sendForm with error', () => {
+              beforeEach(async () => {
+                jest.clearAllMocks()
+                apolloMutateMock.mockRejectedValue({
+                  message: 'Ouch!',
+                })
+                wrapper = Wrapper()
+                await wrapper.setProps({ type: 'singleCreation', creation: [200, 400, 600] })
+                await wrapper.setData({ text: 'Test create coins' })
+                await wrapper.setData({ value: 90 })
+                await wrapper.findAll('input[type="radio"]').at(0).setChecked()
+                await wrapper.setData({ rangeMin: 100 })
+                await wrapper.find('.test-submit').trigger('click')
+              })
+
+              it('toast error message', () => {
+                expect(toastedErrorMock).toBeCalledWith('Ouch!')
+              })
+            })
           })
         })
 
@@ -148,23 +171,44 @@ describe('EditCreationFormular', () => {
                 }),
               )
             })
+
+            describe('sendForm with error', () => {
+              beforeEach(async () => {
+                jest.clearAllMocks()
+                apolloMutateMock.mockRejectedValue({
+                  message: 'Ouch!',
+                })
+                wrapper = Wrapper()
+                await wrapper.setProps({ creation: [200, 400, 600] })
+                await wrapper.setData({ text: 'Test create coins' })
+                await wrapper.setData({ value: 100 })
+                await wrapper.findAll('input[type="radio"]').at(1).setChecked()
+                await wrapper.setData({ rangeMin: 180 })
+                await wrapper.find('.test-submit').trigger('click')
+              })
+
+              it('toast error message', () => {
+                expect(toastedErrorMock).toBeCalledWith('Ouch!')
+              })
+            })
           })
         })
 
         describe('third radio button', () => {
           beforeEach(async () => {
             await wrapper.findAll('input[type="radio"]').at(2).setChecked()
+            await wrapper.setData({ rangeMin: 180 })
           })
 
-          it('sets rangeMin to 0', () => {
-            expect(wrapper.vm.rangeMin).toBe(0)
+          it('sets rangeMin to 180', () => {
+            expect(wrapper.vm.rangeMin).toBe(180)
           })
 
-          it('sets rangeMax to 400', () => {
+          it('sets rangeMax to 600', () => {
             expect(wrapper.vm.rangeMax).toBe(600)
           })
 
-          describe('sendForm', () => {
+          describe('sendForm with success', () => {
             beforeEach(async () => {
               await wrapper.find('.test-submit').trigger('click')
             })
@@ -184,6 +228,26 @@ describe('EditCreationFormular', () => {
               )
             })
           })
+
+          describe('sendForm with error', () => {
+            beforeEach(async () => {
+              jest.clearAllMocks()
+              apolloMutateMock.mockRejectedValue({
+                message: 'Ouch!',
+              })
+              wrapper = Wrapper()
+              await wrapper.setProps({ creation: [200, 400, 600] })
+              await wrapper.setData({ text: 'Test create coins' })
+              await wrapper.setData({ value: 90 })
+              await wrapper.findAll('input[type="radio"]').at(2).setChecked()
+              await wrapper.setData({ rangeMin: 180 })
+              await wrapper.find('.test-submit').trigger('click')
+            })
+
+            it('toast error message', () => {
+              expect(toastedErrorMock).toBeCalledWith('Ouch!')
+            })
+          })
         })
       })
     })

From 509fb41cfc890dea7d3a386b32459c052931d1b4 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 22 Dec 2021 11:04:48 +0100
Subject: [PATCH 68/74] Change the test but the moment mock don't work.

---
 admin/src/components/EditCreationFormular.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/EditCreationFormular.spec.js b/admin/src/components/EditCreationFormular.spec.js
index 0a8ddad90..e3ab88cd7 100644
--- a/admin/src/components/EditCreationFormular.spec.js
+++ b/admin/src/components/EditCreationFormular.spec.js
@@ -204,7 +204,7 @@ describe('EditCreationFormular', () => {
             expect(wrapper.vm.rangeMin).toBe(180)
           })
 
-          it('sets rangeMax to 600', () => {
+          it.skip('sets rangeMax to 600', () => {
             expect(wrapper.vm.rangeMax).toBe(600)
           })
 

From d2e017f7a912c0288db2432239075143f3b764b8 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 22 Dec 2021 11:48:35 +0100
Subject: [PATCH 69/74] get skipped test working

---
 admin/src/components/EditCreationFormular.spec.js | 8 ++++----
 admin/src/components/EditCreationFormular.vue     | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/EditCreationFormular.spec.js b/admin/src/components/EditCreationFormular.spec.js
index e3ab88cd7..b7b091e32 100644
--- a/admin/src/components/EditCreationFormular.spec.js
+++ b/admin/src/components/EditCreationFormular.spec.js
@@ -46,7 +46,7 @@ const mocks = {
 }
 
 const propsData = {
-  creation: [],
+  creation: [200, 400, 600],
   creationUserData: {
     memo: 'Test schöpfung 1',
     amount: 100,
@@ -196,16 +196,16 @@ describe('EditCreationFormular', () => {
 
         describe('third radio button', () => {
           beforeEach(async () => {
-            await wrapper.findAll('input[type="radio"]').at(2).setChecked()
             await wrapper.setData({ rangeMin: 180 })
+            await wrapper.findAll('input[type="radio"]').at(2).setChecked()
           })
 
           it('sets rangeMin to 180', () => {
             expect(wrapper.vm.rangeMin).toBe(180)
           })
 
-          it.skip('sets rangeMax to 600', () => {
-            expect(wrapper.vm.rangeMax).toBe(600)
+          it('sets rangeMax to 700', () => {
+            expect(wrapper.vm.rangeMax).toBe(700)
           })
 
           describe('sendForm with success', () => {
diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index 13b6ddd34..84a155206 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -183,7 +183,6 @@ export default {
     updateRadioSelected(name, index, openCreation) {
       this.createdIndex = index
       this.rangeMin = 0
-      console.log('this.creation, index', this.creation, index)
       this.rangeMax = this.creation[index]
     },
     submitCreation() {

From 0851a7bc359d2f5a6a57d57e4102ff653b424354 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 22 Dec 2021 11:57:04 +0100
Subject: [PATCH 70/74] Fix Test Confirm Register Email

---
 .../ConfirmRegisterMailFormular.spec.js       | 26 ++++++++++++++++---
 .../ConfirmRegisterMailFormular.vue           |  8 +++---
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/admin/src/components/ConfirmRegisterMailFormular.spec.js b/admin/src/components/ConfirmRegisterMailFormular.spec.js
index 7fd71a37d..834721fba 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.spec.js
+++ b/admin/src/components/ConfirmRegisterMailFormular.spec.js
@@ -4,6 +4,8 @@ import ConfirmRegisterMailFormular from './ConfirmRegisterMailFormular.vue'
 const localVue = global.localVue
 
 const apolloMutateMock = jest.fn().mockResolvedValue()
+const toastSuccessMock = jest.fn()
+const toastErrorMock = jest.fn()
 
 const mocks = {
   $moment: jest.fn(() => {
@@ -19,6 +21,10 @@ const mocks = {
   $apollo: {
     mutate: apolloMutateMock,
   },
+  $toasted: {
+    success: toastSuccessMock,
+    error: toastErrorMock,
+  },
 }
 
 const propsData = {
@@ -47,8 +53,18 @@ describe('ConfirmRegisterMailFormular', () => {
         wrapper.find('button.test-button').trigger('click')
       })
 
-      it('calls the API', () => {
-        expect(apolloMutateMock).toBeCalled()
+      it('calls the API with email', () => {
+        expect(apolloMutateMock).toBeCalledWith(
+          expect.objectContaining({
+            variables: { email: 'bob@baumeister.de' },
+          }),
+        )
+      })
+
+      it('toasts a success message', () => {
+        expect(toastSuccessMock).toBeCalledWith(
+          'Erfolgreich senden der Confirmation Link an die E-Mail des Users! bob@baumeister.de',
+        )
       })
     })
 
@@ -59,8 +75,10 @@ describe('ConfirmRegisterMailFormular', () => {
         wrapper.find('button.test-button').trigger('click')
       })
 
-      it('calls the API', () => {
-        expect(apolloMutateMock).toBeCalled()
+      it('toasts an error message', () => {
+        expect(toastErrorMock).toBeCalledWith(
+          'Fehler beim senden des confirmation link an den Benutzer: OUCH!',
+        )
       })
     })
   })
diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
index 2f2c3a21f..866e8a487 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.vue
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -42,13 +42,13 @@ export default {
           },
         })
         .then(() => {
-          this.$toasted.global.success(
-            'Erfolgreich senden der Confirmation Link an die E-Mail des Users!' + this.email,
+          this.$toasted.success(
+            'Erfolgreich senden der Confirmation Link an die E-Mail des Users! ' + this.email,
           )
         })
         .catch((error) => {
-          this.$toasted.global.error(
-            'Fehler beim senden des confirmation link an den Benutzer' + error,
+          this.$toasted.error(
+            'Fehler beim senden des confirmation link an den Benutzer: ' + error.message,
           )
         })
     },

From 3e2f93b32d2bd9fc9a5a018be3358d8d174161fc Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 22 Dec 2021 11:59:12 +0100
Subject: [PATCH 71/74] remove moment from test

---
 .../src/components/ConfirmRegisterMailFormular.spec.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/admin/src/components/ConfirmRegisterMailFormular.spec.js b/admin/src/components/ConfirmRegisterMailFormular.spec.js
index 834721fba..8872128e9 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.spec.js
+++ b/admin/src/components/ConfirmRegisterMailFormular.spec.js
@@ -8,16 +8,6 @@ const toastSuccessMock = jest.fn()
 const toastErrorMock = jest.fn()
 
 const mocks = {
-  $moment: jest.fn(() => {
-    return {
-      format: jest.fn((m) => m),
-      subtract: jest.fn(() => {
-        return {
-          format: jest.fn((m) => m),
-        }
-      }),
-    }
-  }),
   $apollo: {
     mutate: apolloMutateMock,
   },

From d1b97c4227eb29105a9cb94094e60eb1ee5f43cd Mon Sep 17 00:00:00 2001
From: Hannes Heine <heine.hannes@gmail.com>
Date: Wed, 22 Dec 2021 12:12:44 +0100
Subject: [PATCH 72/74] Update backend/src/config/index.ts

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 backend/src/config/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 4adc21b41..eeca1d80e 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -52,7 +52,7 @@ const email = {
   EMAIL_LINK_VERIFICATION:
     process.env.EMAIL_LINK_VERIFICATION || 'http://localhost/vue/checkEmail/$1',
   EMAIL_LINK_SETPASSWORD: process.env.EMAIL_LINK_SETPASSWORD || 'http://localhost/vue/reset/$1',
-  RESEND_TIME: process.env.RESEND_TIME || 10,
+  RESEND_TIME: isNaN(parseInt(process.env.RESEND_TIME)) ? 10 : parseInt(process.env.RESEND_TIME),
 }
 
 const webhook = {

From 0e24ebdc50afa75df3baa73120f44be0be064a9d Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 22 Dec 2021 12:13:23 +0100
Subject: [PATCH 73/74] remove async.

---
 admin/src/components/UserTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 85de25a49..eae328adf 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -214,7 +214,7 @@ export default {
     }
   },
   methods: {
-    async rowToogleDetails(row, index) {
+    rowToogleDetails(row, index) {
       if (this.openRow) {
         if (this.openRow.index === row.index) {
           if (index === this.slotIndex) {

From 145c1ffd9bcdea27b0047e09c1c05087b603d9a5 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 22 Dec 2021 12:28:36 +0100
Subject: [PATCH 74/74] Assure to have a resendTime in the config.

---
 backend/src/config/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index eeca1d80e..88d07737c 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -42,6 +42,7 @@ const loginServer = {
   LOGIN_SERVER_KEY: process.env.LOGIN_SERVER_KEY || 'a51ef8ac7ef1abf162fb7a65261acd7a',
 }
 
+const resendTime = parseInt(process.env.RESEND_TIME ? process.env.RESEND_TIME : 'null')
 const email = {
   EMAIL: process.env.EMAIL === 'true' || false,
   EMAIL_USERNAME: process.env.EMAIL_USERNAME || 'gradido_email',
@@ -52,7 +53,7 @@ const email = {
   EMAIL_LINK_VERIFICATION:
     process.env.EMAIL_LINK_VERIFICATION || 'http://localhost/vue/checkEmail/$1',
   EMAIL_LINK_SETPASSWORD: process.env.EMAIL_LINK_SETPASSWORD || 'http://localhost/vue/reset/$1',
-  RESEND_TIME: isNaN(parseInt(process.env.RESEND_TIME)) ? 10 : parseInt(process.env.RESEND_TIME),
+  RESEND_TIME: isNaN(resendTime) ? 10 : resendTime,
 }
 
 const webhook = {