From 6d48b6f4e39f97ddf05e4fe5241156db8c43d5f4 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 26 Apr 2022 09:27:55 +0200
Subject: [PATCH 01/21] fix: Confirm Creation with Decimal

---
 backend/src/graphql/resolver/AdminResolver.ts | 5 ++---
 backend/src/seeds/graphql/mutations.ts        | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 379412cdc..2009af3b0 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -333,8 +333,7 @@ export class AdminResolver {
       decay = calculateDecay(lastTransaction.balance, lastTransaction.balanceDate, receivedCallDate)
       newBalance = decay.balance
     }
-    // TODO pending creations decimal
-    newBalance = newBalance.add(new Decimal(Number(pendingCreation.amount)).toString())
+    newBalance = newBalance.add(pendingCreation.amount.toString())
 
     const transaction = new DbTransaction()
     transaction.typeId = TransactionTypeId.CREATION
@@ -516,7 +515,7 @@ function isCreationValid(creations: Decimal[], amount: Decimal, creationDate: Da
     throw new Error(`No Creation found!`)
   }
 
-  if (amount.greaterThan(creations[index])) {
+  if (amount.greaterThan(creations[index].toString())) {
     throw new Error(
       `The amount (${amount} GDD) to be created exceeds the available amount (${creations[index]} GDD) for this month.`,
     )
diff --git a/backend/src/seeds/graphql/mutations.ts b/backend/src/seeds/graphql/mutations.ts
index fc662cf19..601b1fbbf 100644
--- a/backend/src/seeds/graphql/mutations.ts
+++ b/backend/src/seeds/graphql/mutations.ts
@@ -86,7 +86,7 @@ export const createTransactionLink = gql`
 export const createPendingCreation = gql`
   mutation (
     $email: String!
-    $amount: Float!
+    $amount: Decimal!
     $memo: String!
     $creationDate: String!
     $moderator: Int!

From 3c9a12d29311182140cb399e447b70bfd93e5c35 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 26 Apr 2022 11:05:30 +0200
Subject: [PATCH 02/21] open modal only for id

---
 frontend/src/components/ClipboardCopy.vue          | 12 +++++++++++-
 .../TransactionLinks/TransactionLink.vue           | 14 ++++++++++++++
 frontend/src/locales/de.json                       |  2 +-
 frontend/src/locales/en.json                       |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index 936f6db1a..e8fb6e084 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="clipboard-copy">
-    <b-input-group size="lg" class="mb-3" prepend="Link">
+    <b-input-group v-if="!noCopy" size="lg" class="mb-3" prepend="Link">
       <b-form-input :value="link" type="text" readonly></b-form-input>
       <b-input-group-append>
         <b-button size="sm" text="Button" variant="primary" @click="CopyLink">
@@ -11,6 +11,10 @@
         </b-button>
       </b-input-group-append>
     </b-input-group>
+    <div v-if="noCopy">
+      <div class="alert-danger p-3">{{ $t('gdd_per_link.not-copied') }}</div>
+      <div class="alert-muted h3 p-3">{{ link }}</div>
+    </div>
   </div>
 </template>
 <script>
@@ -19,6 +23,11 @@ export default {
   props: {
     link: { type: String, required: true },
   },
+  data() {
+    return {
+      noCopy: false,
+    }
+  },
   methods: {
     CopyLink() {
       navigator.clipboard
@@ -27,6 +36,7 @@ export default {
           this.toastSuccess(this.$t('gdd_per_link.link-copied'))
         })
         .catch(() => {
+          this.noCopy = true
           this.toastError(this.$t('gdd_per_link.not-copied'))
         })
     },
diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index 5b8e15d5c..2437e0e1d 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -50,6 +50,14 @@
         </template>
       </b-card>
     </b-modal>
+    <b-modal :id="'modalPopoverCopyError' + id" ok-only hide-header-close>
+      <b-card header-tag="header" footer-tag="footer">
+        <b-card-text>
+          <div class="alert-danger p-3">{{ $t('gdd_per_link.not-copied') }}</div>
+          <div class="alert-muted h3 p-3">{{ link }}</div>
+        </b-card-text>
+      </b-card>
+    </b-modal>
   </div>
 </template>
 <script>
@@ -79,6 +87,11 @@ export default {
     memo: { type: String, required: true },
     validUntil: { type: String, required: true },
   },
+  data() {
+    return {
+      noCopy: true,
+    }
+  },
   methods: {
     copy() {
       navigator.clipboard
@@ -87,6 +100,7 @@ export default {
           this.toastSuccess(this.$t('gdd_per_link.link-copied'))
         })
         .catch(() => {
+          this.$bvModal.show('modalPopoverCopyError' + this.id)
           this.toastError(this.$t('gdd_per_link.not-copied'))
         })
     },
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 16111ef4a..8e42bf885 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -114,7 +114,7 @@
     "links_sum": "Offene Links und QR-Codes",
     "no-account": "Du besitzt noch kein Gradido Konto?",
     "no-redeem": "Du darfst deinen eigenen Link nicht einlösen!",
-    "not-copied": "Konnte den Link nicht kopieren: {err}",
+    "not-copied": "Dein Gerät lässt das kopieren leider nicht zu! Bitte kopiere den Link per hand!",
     "redeem": "Einlösen",
     "redeem-text": "Willst du den Betrag jetzt einlösen?",
     "redeemed": "Erfolgreich eingelöst! Deinem Konto wurden {n} GDD gutgeschrieben.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 70a2fabca..2c53837d0 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -114,7 +114,7 @@
     "links_sum": "Open links and QR codes",
     "no-account": "You don't have a Gradido account yet?",
     "no-redeem": "You not allowed to redeem your own link!",
-    "not-copied": "Could not copy link: {err}",
+    "not-copied": "Unfortunately, your device does not allow copying! Please copy the link by hand!",
     "redeem": "Redeem",
     "redeem-text": "Do you want to redeem the amount now?",
     "redeemed": "Successfully redeemed! Your account has been credited with {n} GDD.",

From f9589fad840369d9ec84502d6bc83ac845392655 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 26 Apr 2022 12:22:40 +0200
Subject: [PATCH 03/21] force NODE_ENV=development for seed target

---
 backend/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/package.json b/backend/package.json
index c5318d674..641a24601 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -14,7 +14,7 @@
     "dev": "cross-env TZ=UTC nodemon -w src --ext ts --exec ts-node -r tsconfig-paths/register src/index.ts",
     "lint": "eslint --max-warnings=0 --ext .js,.ts .",
     "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles",
-    "seed": "cross-env TZ=UTC ts-node -r tsconfig-paths/register src/seeds/index.ts"
+    "seed": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/index.ts"
   },
   "dependencies": {
     "@types/jest": "^27.0.2",

From ad68c881ed1312bc91afc41258fe0b517a093646 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 26 Apr 2022 12:36:24 +0200
Subject: [PATCH 04/21] debug server

---
 backend/src/seeds/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/seeds/index.ts b/backend/src/seeds/index.ts
index 37c9992a7..dc71291cb 100644
--- a/backend/src/seeds/index.ts
+++ b/backend/src/seeds/index.ts
@@ -43,6 +43,7 @@ const resetEntity = async (entity: any) => {
 const run = async () => {
   const server = await createServer(context)
   const seedClient = createTestClient(server.apollo)
+  console.log(seedClient)
   const { con } = server
   await cleanDB()
 

From 82f6bf4d9cf5717cad620307d48c52d50a672b98 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Tue, 26 Apr 2022 12:38:01 +0200
Subject: [PATCH 05/21] Update frontend/src/components/ClipboardCopy.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/ClipboardCopy.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index e8fb6e084..a58a642e3 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="clipboard-copy">
-    <b-input-group v-if="!noCopy" size="lg" class="mb-3" prepend="Link">
+    <b-input-group v-if="canCopyLink" size="lg" class="mb-3" prepend="Link">
       <b-form-input :value="link" type="text" readonly></b-form-input>
       <b-input-group-append>
         <b-button size="sm" text="Button" variant="primary" @click="CopyLink">

From 205a1d6fd4682b74c5b45a5c7c1a2707752c2221 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 26 Apr 2022 12:38:12 +0200
Subject: [PATCH 06/21] debug server

---
 backend/src/seeds/factory/user.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/src/seeds/factory/user.ts b/backend/src/seeds/factory/user.ts
index 4b5913d48..18f66d109 100644
--- a/backend/src/seeds/factory/user.ts
+++ b/backend/src/seeds/factory/user.ts
@@ -10,6 +10,8 @@ export const userFactory = async (
 ): Promise<void> => {
   const { mutate } = client
 
+  console.log(client)
+  
   const {
     data: {
       createUser: { id },

From 73b7b5b1a19fddbecbd19f9d09e37ca97dc72a1d Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Tue, 26 Apr 2022 12:38:29 +0200
Subject: [PATCH 07/21] Update frontend/src/components/ClipboardCopy.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/ClipboardCopy.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index a58a642e3..25b25e2cd 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -25,7 +25,7 @@ export default {
   },
   data() {
     return {
-      noCopy: false,
+      canCopyLink: true,
     }
   },
   methods: {

From 526b2bbd5c99c830a59799c76df65e353f9c1380 Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Tue, 26 Apr 2022 12:38:52 +0200
Subject: [PATCH 08/21] Update frontend/src/locales/de.json

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

diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 8e42bf885..e9ad958cf 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -114,7 +114,7 @@
     "links_sum": "Offene Links und QR-Codes",
     "no-account": "Du besitzt noch kein Gradido Konto?",
     "no-redeem": "Du darfst deinen eigenen Link nicht einlösen!",
-    "not-copied": "Dein Gerät lässt das kopieren leider nicht zu! Bitte kopiere den Link per hand!",
+    "not-copied": "Dein Gerät lässt das Kopieren leider nicht zu! Bitte kopiere den Link von Hand!",
     "redeem": "Einlösen",
     "redeem-text": "Willst du den Betrag jetzt einlösen?",
     "redeemed": "Erfolgreich eingelöst! Deinem Konto wurden {n} GDD gutgeschrieben.",

From 38fe002f4bd353285cd540310e3772c87f5183fc Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Tue, 26 Apr 2022 12:39:09 +0200
Subject: [PATCH 09/21] Update frontend/src/components/ClipboardCopy.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/ClipboardCopy.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index 25b25e2cd..654c04e10 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -36,7 +36,7 @@ export default {
           this.toastSuccess(this.$t('gdd_per_link.link-copied'))
         })
         .catch(() => {
-          this.noCopy = true
+          this.canCopyLink = false
           this.toastError(this.$t('gdd_per_link.not-copied'))
         })
     },

From ae679bcb4c267dfc8153ce0864240f7f9b614248 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 26 Apr 2022 12:41:56 +0200
Subject: [PATCH 10/21] debug server

---
 backend/src/seeds/factory/user.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/seeds/factory/user.ts b/backend/src/seeds/factory/user.ts
index 18f66d109..bee82e444 100644
--- a/backend/src/seeds/factory/user.ts
+++ b/backend/src/seeds/factory/user.ts
@@ -2,7 +2,7 @@ import { createUser, setPassword } from '@/seeds/graphql/mutations'
 import { User } from '@entity/User'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { UserInterface } from '@/seeds/users/UserInterface'
-import { ApolloServerTestClient } from 'apollo-server-testing'
+import { ApolloServerTestClient } from 'apollo-server-testing/dist/createTestClient'
 
 export const userFactory = async (
   client: ApolloServerTestClient,

From d212ccb4b7901a4b0f2d3eb9bfab59c397a17212 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 26 Apr 2022 12:45:23 +0200
Subject: [PATCH 11/21] debug server

---
 backend/package.json              | 2 +-
 backend/src/seeds/factory/user.ts | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 641a24601..c3c916d50 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -14,7 +14,7 @@
     "dev": "cross-env TZ=UTC nodemon -w src --ext ts --exec ts-node -r tsconfig-paths/register src/index.ts",
     "lint": "eslint --max-warnings=0 --ext .js,.ts .",
     "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles",
-    "seed": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/index.ts"
+    "seed": "TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/index.ts"
   },
   "dependencies": {
     "@types/jest": "^27.0.2",
diff --git a/backend/src/seeds/factory/user.ts b/backend/src/seeds/factory/user.ts
index bee82e444..4b5913d48 100644
--- a/backend/src/seeds/factory/user.ts
+++ b/backend/src/seeds/factory/user.ts
@@ -2,7 +2,7 @@ import { createUser, setPassword } from '@/seeds/graphql/mutations'
 import { User } from '@entity/User'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { UserInterface } from '@/seeds/users/UserInterface'
-import { ApolloServerTestClient } from 'apollo-server-testing/dist/createTestClient'
+import { ApolloServerTestClient } from 'apollo-server-testing'
 
 export const userFactory = async (
   client: ApolloServerTestClient,
@@ -10,8 +10,6 @@ export const userFactory = async (
 ): Promise<void> => {
   const { mutate } = client
 
-  console.log(client)
-  
   const {
     data: {
       createUser: { id },

From 3ff2ee659e77aa4128229387cf48b44c2bfc2e74 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 26 Apr 2022 12:47:40 +0200
Subject: [PATCH 12/21] debug server

---
 backend/package.json              | 2 +-
 backend/src/seeds/factory/user.ts | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/package.json b/backend/package.json
index c3c916d50..641a24601 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -14,7 +14,7 @@
     "dev": "cross-env TZ=UTC nodemon -w src --ext ts --exec ts-node -r tsconfig-paths/register src/index.ts",
     "lint": "eslint --max-warnings=0 --ext .js,.ts .",
     "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles",
-    "seed": "TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/index.ts"
+    "seed": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/index.ts"
   },
   "dependencies": {
     "@types/jest": "^27.0.2",
diff --git a/backend/src/seeds/factory/user.ts b/backend/src/seeds/factory/user.ts
index 4b5913d48..b09211052 100644
--- a/backend/src/seeds/factory/user.ts
+++ b/backend/src/seeds/factory/user.ts
@@ -10,6 +10,8 @@ export const userFactory = async (
 ): Promise<void> => {
   const { mutate } = client
 
+  console.log(user)
+  
   const {
     data: {
       createUser: { id },

From e639b732833ae391990411df93c4220303a6ca49 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 26 Apr 2022 12:49:28 +0200
Subject: [PATCH 13/21] debug server

---
 backend/src/seeds/factory/user.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/backend/src/seeds/factory/user.ts b/backend/src/seeds/factory/user.ts
index b09211052..81e4785dd 100644
--- a/backend/src/seeds/factory/user.ts
+++ b/backend/src/seeds/factory/user.ts
@@ -5,13 +5,11 @@ import { UserInterface } from '@/seeds/users/UserInterface'
 import { ApolloServerTestClient } from 'apollo-server-testing'
 
 export const userFactory = async (
-  client: ApolloServerTestClient,
+  client: any,
   user: UserInterface,
 ): Promise<void> => {
   const { mutate } = client
 
-  console.log(user)
-  
   const {
     data: {
       createUser: { id },

From bef2badd89f5af7ccc31ed0e0504c9e2de4368e8 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 26 Apr 2022 12:58:31 +0200
Subject: [PATCH 14/21] debug seeed on stage1

---
 .../graphql/resolver/AdminResolver.test.ts    | 25 +++++++++++++++++++
 backend/src/graphql/resolver/UserResolver.ts  |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 backend/src/graphql/resolver/AdminResolver.test.ts

diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts
new file mode 100644
index 000000000..0855f8f27
--- /dev/null
+++ b/backend/src/graphql/resolver/AdminResolver.test.ts
@@ -0,0 +1,25 @@
+import { testEnvironment, headerPushMock, resetToken, cleanDB } from '@test/helpers'
+import { seedAll } from '@/seeds/index'
+
+let mutate: any, query: any, con: any
+let testEnv: any
+
+beforeAll(async () => {
+  testEnv = await testEnvironment()
+  mutate = testEnv.mutate
+  query = testEnv.query
+  con = testEnv.con
+  await cleanDB()
+  seedAll(testEnv.testClient)
+})
+
+afterAll(async () => {
+  await cleanDB()
+  await con.close()
+})
+
+describe('AdminResolver', () => {
+  it('runs', () => {
+    expect(true).toBe(true)
+  })
+})
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 4ab5a901b..4f4de63fe 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -283,6 +283,7 @@ export class UserResolver {
     @Args()
     { email, firstName, lastName, language, publisherId, redeemCode = null }: CreateUserArgs,
   ): Promise<User> {
+    console.log('------', email)
     // TODO: wrong default value (should be null), how does graphql work here? Is it an required field?
     // default int publisher_id = 0;
 

From 8d1ead22eb82ae27ac2392b44f83c2790275c4dc Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 26 Apr 2022 13:08:19 +0200
Subject: [PATCH 15/21] disable email on stage1

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

diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist
index a1751a859..a7e266bdf 100644
--- a/deployment/bare_metal/.env.dist
+++ b/deployment/bare_metal/.env.dist
@@ -38,7 +38,7 @@ KLICKTIPP_PASSWORD=
 KLICKTIPP_APIKEY_DE=
 KLICKTIPP_APIKEY_EN=
 
-EMAIL=true
+EMAIL=false
 EMAIL_USERNAME=peter@lustig.de
 EMAIL_SENDER=peter@lustig.de
 EMAIL_PASSWORD=1234

From b6f855ea75fc163702d143d1ff0bb302ff66a8dd Mon Sep 17 00:00:00 2001
From: Alexander Friedland <ogerly@users.noreply.github.com>
Date: Tue, 26 Apr 2022 13:12:28 +0200
Subject: [PATCH 16/21] Update frontend/src/components/ClipboardCopy.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 frontend/src/components/ClipboardCopy.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/ClipboardCopy.vue b/frontend/src/components/ClipboardCopy.vue
index 654c04e10..7a6cf0ec1 100644
--- a/frontend/src/components/ClipboardCopy.vue
+++ b/frontend/src/components/ClipboardCopy.vue
@@ -11,7 +11,7 @@
         </b-button>
       </b-input-group-append>
     </b-input-group>
-    <div v-if="noCopy">
+    <div v-else>
       <div class="alert-danger p-3">{{ $t('gdd_per_link.not-copied') }}</div>
       <div class="alert-muted h3 p-3">{{ link }}</div>
     </div>

From f1e87ff271bc259852e9ae79ebf5fb425d917496 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 26 Apr 2022 13:15:52 +0200
Subject: [PATCH 17/21] remove unused data

---
 frontend/src/components/TransactionLinks/TransactionLink.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frontend/src/components/TransactionLinks/TransactionLink.vue b/frontend/src/components/TransactionLinks/TransactionLink.vue
index 2437e0e1d..c7b7682ec 100644
--- a/frontend/src/components/TransactionLinks/TransactionLink.vue
+++ b/frontend/src/components/TransactionLinks/TransactionLink.vue
@@ -87,11 +87,6 @@ export default {
     memo: { type: String, required: true },
     validUntil: { type: String, required: true },
   },
-  data() {
-    return {
-      noCopy: true,
-    }
-  },
   methods: {
     copy() {
       navigator.clipboard

From 6810c7b50dfd097933965c1accf00dcef56ffa33 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 26 Apr 2022 13:24:25 +0200
Subject: [PATCH 18/21] remove comment

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

diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 4f4de63fe..4ab5a901b 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -283,7 +283,6 @@ export class UserResolver {
     @Args()
     { email, firstName, lastName, language, publisherId, redeemCode = null }: CreateUserArgs,
   ): Promise<User> {
-    console.log('------', email)
     // TODO: wrong default value (should be null), how does graphql work here? Is it an required field?
     // default int publisher_id = 0;
 

From 2ca291684c4051bf7c96f08b4e2e5cd6cdd1ac58 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 26 Apr 2022 13:26:59 +0200
Subject: [PATCH 19/21] Delete AdminResolver.test.ts

---
 .../graphql/resolver/AdminResolver.test.ts    | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 backend/src/graphql/resolver/AdminResolver.test.ts

diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts
deleted file mode 100644
index 0855f8f27..000000000
--- a/backend/src/graphql/resolver/AdminResolver.test.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { testEnvironment, headerPushMock, resetToken, cleanDB } from '@test/helpers'
-import { seedAll } from '@/seeds/index'
-
-let mutate: any, query: any, con: any
-let testEnv: any
-
-beforeAll(async () => {
-  testEnv = await testEnvironment()
-  mutate = testEnv.mutate
-  query = testEnv.query
-  con = testEnv.con
-  await cleanDB()
-  seedAll(testEnv.testClient)
-})
-
-afterAll(async () => {
-  await cleanDB()
-  await con.close()
-})
-
-describe('AdminResolver', () => {
-  it('runs', () => {
-    expect(true).toBe(true)
-  })
-})

From b06e3c3c044e426860f72363127eba2e68dbdd58 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 26 Apr 2022 13:28:36 +0200
Subject: [PATCH 20/21] proper TS definition

---
 backend/src/seeds/factory/user.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/seeds/factory/user.ts b/backend/src/seeds/factory/user.ts
index 81e4785dd..4b5913d48 100644
--- a/backend/src/seeds/factory/user.ts
+++ b/backend/src/seeds/factory/user.ts
@@ -5,7 +5,7 @@ import { UserInterface } from '@/seeds/users/UserInterface'
 import { ApolloServerTestClient } from 'apollo-server-testing'
 
 export const userFactory = async (
-  client: any,
+  client: ApolloServerTestClient,
   user: UserInterface,
 ): Promise<void> => {
   const { mutate } = client

From e5dd373f526fceff646927905c797027b685b922 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 26 Apr 2022 13:30:21 +0200
Subject: [PATCH 21/21] no console

---
 backend/src/seeds/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/seeds/index.ts b/backend/src/seeds/index.ts
index dc71291cb..37c9992a7 100644
--- a/backend/src/seeds/index.ts
+++ b/backend/src/seeds/index.ts
@@ -43,7 +43,6 @@ const resetEntity = async (entity: any) => {
 const run = async () => {
   const server = await createServer(context)
   const seedClient = createTestClient(server.apollo)
-  console.log(seedClient)
   const { con } = server
   await cleanDB()