From 57922daea9e9b0cd2c2b0254b1a3fd00094bf5a0 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 6 Jan 2022 16:05:50 +0100
Subject: [PATCH 1/5] change creationdatas if change pending creation

---
 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 3f5393412..fecd39e67 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -232,6 +232,9 @@ export default {
           row.toggleDetails()
           this.slotIndex = index
           this.openRow = row
+          if (this.type === 'PageCreationConfirm') {
+            this.creationUserData = row.item
+          }
         }
       } else {
         row.toggleDetails()

From a9d92d1c038b34f479ece40c5c38c4adfd2a045a Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 7 Jan 2022 10:22:11 +0100
Subject: [PATCH 2/5] e-mail verification during registration, form only
 appears if register email is not confirmed

---
 .../src/components/ConfirmRegisterMailFormular.vue  | 13 ++++++++++---
 admin/src/components/UserTable.vue                  |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
index 5052a8a3e..f69f887e0 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.vue
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -1,10 +1,13 @@
 <template>
   <div class="component-confirm-register-mail">
     <div class="shadow p-3 mb-5 bg-white rounded">
-      <div class="h5">
-        {{ $t('unregister_mail.text', { date: dateLastSend, mail: email }) }}
+     
+      <div v-if="checked">
+        Die E-Mail wurde am  {{ dateLastSend  }} bestätigt.
       </div>
-
+       <div v-else  >
+        {{ $t('unregister_mail.text', { date: dateLastSend, mail: email }) }}
+     
       <!-- Using components -->
       <b-input-group :prepend="$t('unregister_mail.info')" class="mt-3">
         <b-form-input readonly :value="email"></b-form-input>
@@ -14,6 +17,7 @@
           </b-button>
         </b-input-group-append>
       </b-input-group>
+       </div>
     </div>
   </div>
 </template>
@@ -23,6 +27,9 @@ import { sendActivationEmail } from '../graphql/sendActivationEmail'
 export default {
   name: 'ConfirmRegisterMail',
   props: {
+    checked: {
+      type: String,
+    },
     email: {
       type: String,
     },
diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 3f5393412..35803337d 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -107,6 +107,7 @@
           </template>
           <template #show-register-mail>
             <confirm-register-mail-formular
+              :checked="row.item.emailChecked"
               :email="row.item.email"
               :dateLastSend="$moment().subtract(1, 'month').format('dddd, DD.MMMM.YYYY HH:mm'),"
             />

From e5be54e2767e338ace12f0a01b8ed53ee69e1155 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 7 Jan 2022 10:23:16 +0100
Subject: [PATCH 3/5] yarn lint --fix

---
 .../ConfirmRegisterMailFormular.vue           | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
index f69f887e0..3199b375b 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.vue
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -1,23 +1,20 @@
 <template>
   <div class="component-confirm-register-mail">
     <div class="shadow p-3 mb-5 bg-white rounded">
-     
-      <div v-if="checked">
-        Die E-Mail wurde am  {{ dateLastSend  }} bestätigt.
-      </div>
-       <div v-else  >
+      <div v-if="checked">Die E-Mail wurde am {{ dateLastSend }} bestätigt.</div>
+      <div v-else>
         {{ $t('unregister_mail.text', { date: dateLastSend, mail: email }) }}
-     
-      <!-- Using components -->
-      <b-input-group :prepend="$t('unregister_mail.info')" 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">
-            {{ $t('unregister_mail.button') }}
-          </b-button>
-        </b-input-group-append>
-      </b-input-group>
-       </div>
+
+        <!-- Using components -->
+        <b-input-group :prepend="$t('unregister_mail.info')" 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">
+              {{ $t('unregister_mail.button') }}
+            </b-button>
+          </b-input-group-append>
+        </b-input-group>
+      </div>
     </div>
   </div>
 </template>

From d5c32d97a652c61c9f924c43cdbda8e8755afe33 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 7 Jan 2022 10:27:10 +0100
Subject: [PATCH 4/5] the props variable 'checked' added in the vue and specs
 as a boolean

---
 admin/src/components/ConfirmRegisterMailFormular.spec.js | 1 +
 admin/src/components/ConfirmRegisterMailFormular.vue     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/ConfirmRegisterMailFormular.spec.js b/admin/src/components/ConfirmRegisterMailFormular.spec.js
index 705a185a3..78f5791dc 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.spec.js
+++ b/admin/src/components/ConfirmRegisterMailFormular.spec.js
@@ -19,6 +19,7 @@ const mocks = {
 }
 
 const propsData = {
+  checked: false,
   email: 'bob@baumeister.de',
   dateLastSend: '',
 }
diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
index 3199b375b..18f83eb81 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.vue
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -25,7 +25,7 @@ export default {
   name: 'ConfirmRegisterMail',
   props: {
     checked: {
-      type: String,
+      type: Boolean,
     },
     email: {
       type: String,

From 11616305665a8b9d980cddb93edd7e88187dcd9b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 7 Jan 2022 10:33:25 +0100
Subject: [PATCH 5/5] Translation for English and German added

---
 admin/src/components/ConfirmRegisterMailFormular.vue | 4 ++--
 admin/src/locales/de.json                            | 3 ++-
 admin/src/locales/en.json                            | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
index 18f83eb81..635b80939 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.vue
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="component-confirm-register-mail">
     <div class="shadow p-3 mb-5 bg-white rounded">
-      <div v-if="checked">Die E-Mail wurde am {{ dateLastSend }} bestätigt.</div>
+      <div v-if="checked">{{ $t('unregister_mail.text_true', { date: dateLastSend }) }}</div>
       <div v-else>
-        {{ $t('unregister_mail.text', { date: dateLastSend, mail: email }) }}
+        {{ $t('unregister_mail.text_false', { date: dateLastSend, mail: email }) }}
 
         <!-- Using components -->
         <b-input-group :prepend="$t('unregister_mail.info')" class="mt-3">
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index b2f0e427d..471f9626d 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -59,7 +59,8 @@
     "error": "Fehler beim Senden des Bestätigungs-Links an den Benutzer: {message}",
     "info": "Email bestätigen, wiederholt senden an:",
     "success": "Erfolgreiches Senden des Bestätigungs-Links an die E-Mail des Nutzers! ({email})",
-    "text": " Die letzte Email wurde am <b>{date} Uhr</b> an das Mitglied ({mail}) gesendet."
+    "text_false": " Die letzte Email wurde am {date} Uhr an das Mitglied ({mail}) gesendet.",
+    "text_true": " Die Email wurde am {date} Uhr bestätigt."
   },
   "user_search": "Nutzer-Suche"
 }
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 398f4b5f6..6bbc6bd57 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -59,7 +59,8 @@
     "error": "Error sending the confirmation link to the user: {message}",
     "info": "Confirm email, send repeatedly to:",
     "success": "Successfully send the confirmation link to the user's email! ({email})",
-    "text": " The last email was sent to the member ({mail}) on <b>{date} clock</b>."
+    "text_false": "The last email was sent to the member ({mail}) on {date} clock.",
+    "text_true": "The email was confirmed on {date} clock."
   },
   "user_search": "User search"
 }