Follow @alina-beck and @Tirokk suggestions

- following PR reviews

webapp/components/NotificationMenu/NotificationMenu.vue

@@ -9,14 +9,14 @@
       </ds-button>
     </template>
     <template slot="popover">
+      <ds-space centered>
+        <ds-button primary fullwidth :path="{ name: 'notifications' }">
+          {{ $t('notifications.pageLink') }}
+        </ds-button>
+      </ds-space>
       <div class="notifications-menu-popover">
         <notification-list :notifications="displayedNotifications" @markAsRead="markAsRead" />
       </div>
-      <ds-space centered>
-        <nuxt-link to="/notifications">
-          {{ $t('notifications.pageLink') }}
-        </nuxt-link>
-      </ds-space>
     </template>
   </dropdown>
 </template>
@@ -113,7 +113,7 @@ export default {
 }
 </script>
 
-<style>
+<style lang="scss" scoped>
 .notifications-menu {
   display: flex;
   align-items: center;
@@ -122,4 +122,13 @@ export default {
 .notifications-menu-popover {
   max-width: 500px;
 }
+.link-bg {
+  position: sticky;
+  width: 100%;
+  background-color: $background-color-primary-active;
+  text-align: center;
+}
+.notifications-link {
+  color: $text-color-softer;
+}
 </style>

webapp/locales/de.json

@@ -185,7 +185,8 @@
       "all": "Alle",
       "read": "Lesen  ",
       "unread": "Ungelesen"
-    }
+    },
+    "empty": "Sorry, du hast im Moment keine Benachrichtigungen."
   },
   "search": {
     "placeholder": "Suchen",

webapp/locales/en.json

@@ -186,7 +186,8 @@
       "all": "All",
       "read": "Read",
       "unread": "Unread"
-    }
+    },
+    "empty": "Sorry, you don't have any notifications at the moment."
   },
   "search": {
     "placeholder": "Search",

webapp/pages/notifications/index.vue

@@ -44,19 +44,35 @@
       :fields="fields"
       class="notifications-table"
     >
+      <template slot="icon" slot-scope="scope">
+        <ds-icon
+          v-if="scope.row.from.post"
+          name="comment"
+          v-tooltip="{ content: $t('notifications.comment'), placement: 'right' }"
+        />
+        <ds-icon
+          v-else
+          name="bookmark"
+          v-tooltip="{ content: $t('notifications.post'), placement: 'right' }"
+        />
+      </template>
       <template slot="user" slot-scope="scope">
         <ds-space margin-bottom="base">
           <hc-user
             :user="scope.row.from.author"
             :date-time="scope.row.from.createdAt"
             :trunc="35"
+            :class="{ 'notification-status': scope.row.read }"
           />
         </ds-space>
-        {{ $t(`notifications.reason.${scope.row.reason}`) }}
+        <ds-text :class="{ 'notification-status': scope.row.read }">
+          {{ $t(`notifications.reason.${scope.row.reason}`) }}
+        </ds-text>
       </template>
       <template slot="post" slot-scope="scope">
         <nuxt-link
           class="notification-mention-post"
+          :class="{ 'notification-status': scope.row.read }"
           :to="{
             name: 'post-id-slug',
             params: {
@@ -71,16 +87,18 @@
             },
             hash: scope.row.from.__typename === 'Comment' ? `#commentId-${scope.row.from.id}` : {},
           }"
-          @click.native="$emit('read')"
+          @click.native="markNotificationAsRead(scope.row.from.id)"
         >
           <b>{{ scope.row.from.title || scope.row.from.post.title | truncate(50) }}</b>
         </nuxt-link>
       </template>
       <template slot="content" slot-scope="scope">
-        <b>{{ scope.row.from.contentExcerpt || scope.row.from.contentExcerpt | removeHtml }}</b>
+        <b :class="{ 'notification-status': scope.row.read }">
+          {{ scope.row.from.contentExcerpt || scope.row.from.contentExcerpt | removeHtml }}
+        </b>
       </template>
     </ds-table>
-    <hc-empty v-else icon="alert" :message="$t('moderation.reports.empty')" />
+    <hc-empty v-else icon="alert" :message="$t('notifications.empty')" />
   </ds-card>
 </template>
 
@@ -88,7 +106,7 @@
 import HcUser from '~/components/User/User'
 import HcEmpty from '~/components/Empty.vue'
 import Dropdown from '~/components/Dropdown'
-import { notificationQuery } from '~/graphql/User'
+import { notificationQuery, markAsReadMutation } from '~/graphql/User'
 
 export default {
   components: {
@@ -111,7 +129,14 @@ export default {
   computed: {
     fields() {
       return {
-        user: this.$t('notifications.user'),
+        icon: {
+          label: ' ',
+          width: '60px',
+        },
+        user: {
+          label: this.$t('notifications.user'),
+          width: '350px',
+        },
         post: this.$t('notifications.post'),
         content: this.$t('notifications.content'),
       }
@@ -133,6 +158,16 @@ export default {
       this.$apollo.queries.notifications.refresh()
       toggleMenu()
     },
+    async markNotificationAsRead(notificationSourceId) {
+      try {
+        await this.$apollo.mutate({
+          mutation: markAsReadMutation(this.$i18n),
+          variables: { id: notificationSourceId },
+        })
+      } catch (error) {
+        this.$toast.error(error.message)
+      }
+    },
   },
   apollo: {
     notifications: {
@@ -160,7 +195,8 @@ export default {
 .sorting-dropdown {
   float: right;
 }
-.notifications-table td {
+.notification-status {
-  width: 500px;
+  opacity: 0.6; /* Real browsers */
+  filter: alpha(opacity = 60); /* MSIE */
 }
 </style>