From c3f7b30e323ca96cf6c59610aa39233af56e843e Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 26 Jun 2023 10:11:13 +0200
Subject: [PATCH] messages only visible for moderators

---
 .../ContributionMessagesFormular.vue          |  2 +-
 .../slots/ContributionMessagesListItem.vue    | 60 +++++++++++--------
 admin/src/locales/de.json                     |  6 +-
 admin/src/locales/en.json                     |  7 ++-
 admin/src/pages/CreationConfirm.vue           | 10 ++--
 5 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index a13df5ef9..68a58ec08 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -21,7 +21,7 @@
               @click="onSubmit('MODERATOR')"
               data-test="submit-moderator"
             >
-              Moderator Notiz
+              {{ $t('moderator.notice') }}
             </b-button>
           </b-col>
 
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
index 37e05334a..4a212ef23 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue
@@ -1,29 +1,27 @@
 <template>
   <div class="contribution-messages-list-item">
     <div
-      v-if="message.isModerator"
-      class="text-right is-moderator"
-      :class="message.type === 'MODERATOR' ? 'is-hidden-moderator-message p-2' : ''"
+      v-if="isModerator"
+      class="text-right is-moderator p-2 rounded-sm mb-3"
+      :class="isModeratorMessage ? 'is-hidden-moderator-message ' : 'is-moderator-message'"
     >
-      <b-avatar square variant="warning"></b-avatar>
-      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
-      <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
-      <small
-        class="ml-4 text-success"
-        :class="message.type === 'MODERATOR' ? 'text-success' : 'text-warning'"
-      >
-        {{ $t('moderator') }}
+      <small class="ml-4">
+        {{ $t('moderator.moderator') }}
       </small>
+      <small class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</small>
+      <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
+      <b-avatar square variant="warning"></b-avatar>
+
       <parse-message v-bind="message"></parse-message>
-      <small v-if="message.type === 'MODERATOR'">
+      <small v-if="isModeratorMessage">
         <hr />
-        Diese Nachricht ist nur für die Moderatoren sichtbar!
+        {{ $t('moderator.request') }}
       </small>
     </div>
-    <div v-else class="text-left is-not-moderator">
+    <div v-else class="text-left is-user p-2 rounded-sm is-user-message mb-3">
       <b-avatar variant="info"></b-avatar>
       <span class="ml-2 mr-2">{{ message.userFirstName }} {{ message.userLastName }}</span>
-      <span class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</span>
+      <small class="ml-2">{{ $d(new Date(message.createdAt), 'short') }}</small>
       <parse-message v-bind="message"></parse-message>
     </div>
   </div>
@@ -42,24 +40,36 @@ export default {
       required: true,
     },
   },
+  computed: {
+    isModerator() {
+      return (
+        this.message.userFirstName === this.$store.state.moderator.firstName &&
+        this.message.userLastName === this.$store.state.moderator.lastName
+      )
+    },
+    isModeratorMessage() {
+      return this.message.type === 'MODERATOR'
+    },
+  },
 }
 </script>
 <style>
-.is-not-moderator {
-  clear: both;
-  width: 75%;
-  margin-top: 20px;
-  /* background-color: rgb(261, 204, 221); */
-}
 .is-moderator {
   clear: both;
   float: right;
   width: 75%;
-  margin-top: 20px;
-  margin-bottom: 20px;
-  /* background-color: rgb(255, 255, 128); */
+}
+.is-moderator-message {
+  background-color: rgb(228, 237, 245);
 }
 .is-hidden-moderator-message {
-  background-color: rgb(161, 194, 228);
+  background-color: rgb(217, 161, 228);
+}
+.is-user {
+  clear: both;
+  width: 75%;
+}
+.is-user-message {
+  background-color: rgb(236, 235, 213);
 }
 </style>
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index e7fb80062..cc6b4d5ec 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -108,7 +108,11 @@
   "message": {
     "request": "Die Anfrage wurde gesendet."
   },
-  "moderator": "Moderator",
+  "moderator": {
+    "moderator": "Moderator",
+    "notice": "Moderator Notiz",
+    "modalNote":"Diese Nachricht ist nur für die Moderatoren sichtbar!"
+  },
   "name": "Name",
   "navbar": {
     "automaticContributions": "Automatische Beiträge",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 8ed53cd4b..0a74b0fed 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -108,8 +108,11 @@
   "message": {
     "request": "Request has been sent."
   },
-  "moderator": "Moderator",
-  "name": "Name",
+  "moderator": {
+    "moderator": "Moderator",
+    "notice": "Moderator note",
+    "request":"This message is only visible to the moderators!"
+  },
   "navbar": {
     "automaticContributions": "Automatic Contributions",
     "instances": "Instances",
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 53ffbd66e..415f2edf7 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -217,7 +217,7 @@ export default {
               return this.formatDateOrDash(value)
             },
           },
-          { key: 'moderatorId', label: this.$t('moderator') },
+          { key: 'moderatorId', label: this.$t('moderator.moderator') },
           { key: 'editCreation', label: this.$t('chat') },
           { key: 'confirm', label: this.$t('save') },
         ],
@@ -254,7 +254,7 @@ export default {
               return this.formatDateOrDash(value)
             },
           },
-          { key: 'confirmedBy', label: this.$t('moderator') },
+          { key: 'confirmedBy', label: this.$t('moderator.moderator') },
           { key: 'chatCreation', label: this.$t('chat') },
         ],
         [
@@ -290,7 +290,7 @@ export default {
               return this.formatDateOrDash(value)
             },
           },
-          { key: 'deniedBy', label: this.$t('moderator') },
+          { key: 'deniedBy', label: this.$t('moderator.moderator') },
           { key: 'chatCreation', label: this.$t('chat') },
         ],
         [
@@ -326,7 +326,7 @@ export default {
               return this.formatDateOrDash(value)
             },
           },
-          { key: 'deletedBy', label: this.$t('moderator') },
+          { key: 'deletedBy', label: this.$t('moderator.moderator') },
           { key: 'chatCreation', label: this.$t('chat') },
         ],
         [
@@ -363,7 +363,7 @@ export default {
               return this.formatDateOrDash(value)
             },
           },
-          { key: 'confirmedBy', label: this.$t('moderator') },
+          { key: 'confirmedBy', label: this.$t('moderator.moderator') },
           { key: 'chatCreation', label: this.$t('chat') },
         ],
       ][this.tabIndex]