From 0bffede0214b9cdbfad843f6221631dbed34dd6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adem=C3=ADlson=20F=2E=20Tonato?= <ademilsonft@outlook.com>
Date: Sat, 24 Oct 2020 11:29:02 +0100
Subject: [PATCH 01/36] feat: add mutation for new functionality
 (mark-all-as-read)

- Add mutation for markAllAsRead (notifications)
- Add method to the schema that returns a list of all notifications
- Add permissions rules to invoke this method (isAuthenticated)

See #2660
---
 .../src/middleware/permissionsMiddleware.js   |  1 +
 backend/src/schema/resolvers/notifications.js | 29 +++++++++++++++
 backend/src/schema/types/type/NOTIFIED.gql    |  1 +
 webapp/graphql/User.js                        | 36 +++++++++++++++++++
 4 files changed, 67 insertions(+)

diff --git a/backend/src/middleware/permissionsMiddleware.js b/backend/src/middleware/permissionsMiddleware.js
index 2c8d7ff63..d3aa7ce9a 100644
--- a/backend/src/middleware/permissionsMiddleware.js
+++ b/backend/src/middleware/permissionsMiddleware.js
@@ -143,6 +143,7 @@ export default shield(
       blockUser: isAuthenticated,
       unblockUser: isAuthenticated,
       markAsRead: isAuthenticated,
+      markAllAsRead: isAuthenticated,
       AddEmailAddress: isAuthenticated,
       VerifyEmailAddress: isAuthenticated,
       pinPost: isAdmin,
diff --git a/backend/src/schema/resolvers/notifications.js b/backend/src/schema/resolvers/notifications.js
index 3c01ddb97..a96181a50 100644
--- a/backend/src/schema/resolvers/notifications.js
+++ b/backend/src/schema/resolvers/notifications.js
@@ -99,6 +99,35 @@ export default {
         session.close()
       }
     },
+    markAllAsRead: async (parent, args, context, resolveInfo) => {
+      const { user: currentUser } = context
+      const session = context.driver.session()
+      const writeTxResultPromise = session.writeTransaction(async (transaction) => {
+        const markAllNotificationAsReadTransactionResponse = await transaction.run(
+          ` 
+            MATCH (resource {deleted: false, disabled: false})-[notification:NOTIFIED {read: FALSE}]->(user:User {id:$id})
+            SET notification.read = TRUE
+            WITH user, notification, resource,
+            [(resource)<-[:WROTE]-(author:User) | author {.*}] AS authors,
+            [(resource)-[:COMMENTS]->(post:Post)<-[:WROTE]-(author:User) | post{.*, author: properties(author)} ] AS posts
+            WITH resource, user, notification, authors, posts,
+            resource {.*, __typename: labels(resource)[0], author: authors[0], post: posts[0]} AS finalResource
+            RETURN notification {.*, from: finalResource, to: properties(user)}
+          `,
+          { id: currentUser.id },
+        )
+        log(markAllNotificationAsReadTransactionResponse)
+        return markAllNotificationAsReadTransactionResponse.records.map((record) =>
+          record.get('notification'),
+        )
+      })
+      try {
+        const notifications = await writeTxResultPromise
+        return notifications
+      } finally {
+        session.close()
+      }
+    },
   },
   NOTIFIED: {
     id: async (parent) => {
diff --git a/backend/src/schema/types/type/NOTIFIED.gql b/backend/src/schema/types/type/NOTIFIED.gql
index 88ecd3882..864cdea4d 100644
--- a/backend/src/schema/types/type/NOTIFIED.gql
+++ b/backend/src/schema/types/type/NOTIFIED.gql
@@ -29,6 +29,7 @@ type Query {
   
 type Mutation {
   markAsRead(id: ID!): NOTIFIED
+  markAllAsRead: [NOTIFIED]
 }
 
 type Subscription {
diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index 3b015dacc..8a0494402 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -136,6 +136,42 @@ export const markAsReadMutation = (i18n) => {
   `
 }
 
+export const markAllAsReadMutation = (i18n) => {
+  return gql`
+    ${userFragment}
+    ${commentFragment}
+    ${postFragment}
+
+    mutation {
+      markAllAsRead {
+        id
+        read
+        reason
+        createdAt
+        updatedAt
+        from {
+          __typename
+          ... on Post {
+            ...post
+            author {
+              ...user
+            }
+          }
+          ... on Comment {
+            ...comment
+            post {
+              ...post
+              author {
+                ...user
+              }
+            }
+          }
+        }
+      }
+    }
+  `
+}
+
 export const notificationAdded = () => {
   return gql`
     ${userFragment}

From e37fb535dce43cd5629ee0a900568be5409608be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adem=C3=ADlson=20F=2E=20Tonato?= <ademilsonft@outlook.com>
Date: Sat, 24 Oct 2020 11:54:52 +0100
Subject: [PATCH 02/36] feat: add translations for notifications label (mark
 all as read)

---
 webapp/locales/de.json |  1 +
 webapp/locales/en.json |  1 +
 webapp/locales/es.json |  1 +
 webapp/locales/fr.json |  1 +
 webapp/locales/it.json |  1 +
 webapp/locales/nl.json | 20 ++++++++++++++++++++
 webapp/locales/pt.json |  1 +
 webapp/locales/ru.json |  1 +
 8 files changed, 27 insertions(+)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index adee8921c..8de89bd5c 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -456,6 +456,7 @@
       "unread": "Ungelesen"
     },
     "pageLink": "Alle Benachrichtigungen",
+    "markAllAsRead": "Markiere alle als gelesen",
     "post": "Beitrag",
     "reason": {
       "commented_on_post": "Hat Deinen Beitrag kommentiert …",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 8959e3830..f9e7a43e6 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -456,6 +456,7 @@
       "unread": "Unread"
     },
     "pageLink": "All notifications",
+    "markAllAsRead": "Mark all as read",
     "post": "Post",
     "reason": {
       "commented_on_post": "Commented on your post …",
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index 0925687fc..8dc91ac52 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -449,6 +449,7 @@
       "unread": "No leído"
     },
     "pageLink": "Todas las notificaciones",
+    "markAllAsRead": "Marcar todas como leido",
     "post": "Contribución",
     "reason": {
       "commented_on_post": "Comentó su contribución ...",
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index e0bcf14e1..0bab5e73d 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -438,6 +438,7 @@
       "unread": "Non lu"
     },
     "pageLink": "Toutes les notifications",
+    "markAllAsRead": "Tout marquer comme lu",
     "post": "Post",
     "reason": {
       "commented_on_post": "Commenté sur votre post…",
diff --git a/webapp/locales/it.json b/webapp/locales/it.json
index b53b863cc..898a80d63 100644
--- a/webapp/locales/it.json
+++ b/webapp/locales/it.json
@@ -388,6 +388,7 @@
       "unread": ""
     },
     "pageLink": "",
+    "markAllAsRead": "Segna tutti come letti",
     "post": "",
     "reason": {
       "commented_on_post": "",
diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json
index 64643133c..35e31591f 100644
--- a/webapp/locales/nl.json
+++ b/webapp/locales/nl.json
@@ -172,5 +172,25 @@
     "taxident": "Identificatienummer voor de belasting over de toegevoegde waarde overeenkomstig § 27 a Wet op de belasting over de toegevoegde waarde (Duitsland).",
     "termsAc": "Gebruiksvoorwaarden",
     "tribunal": "registerrechtbank"
+  },
+  "notifications": {
+    "comment": "",
+    "content": "",
+    "empty": "",
+    "filterLabel": {
+      "all": "",
+      "read": "",
+      "unread": ""
+    },
+    "pageLink": "",
+    "markAllAsRead": "Markeer alles als gelezen",
+    "post": "",
+    "reason": {
+      "commented_on_post": "",
+      "mentioned_in_comment": "",
+      "mentioned_in_post": ""
+    },
+    "title": "",
+    "user": ""
   }
 }
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index 1a3efeb44..96be89f8e 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -377,6 +377,7 @@
       "unread": "Não lido"
     },
     "pageLink": "Todas as notificações",
+    "markAllAsRead": "Marcar todas como lidas",
     "post": "Post",
     "reason": {
       "commented_on_post": "Comentou no seu post …",
diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json
index 59928a2c5..bb66aa862 100644
--- a/webapp/locales/ru.json
+++ b/webapp/locales/ru.json
@@ -449,6 +449,7 @@
       "unread": "Непрочитанные"
     },
     "pageLink": "Все уведомления",
+    "markAllAsRead": "Отметить все как прочитанное",
     "post": "Пост",
     "reason": {
       "commented_on_post": "Комментарий к посту...",

From 1df69c90fdd5233d4ab1059a3afb0b95f85db134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adem=C3=ADlson=20F=2E=20Tonato?= <ademilsonft@outlook.com>
Date: Sat, 24 Oct 2020 19:38:45 +0100
Subject: [PATCH 03/36] feat: add tests for mark all as read (backend)

---
 .../schema/resolvers/notifications.spec.js    | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/backend/src/schema/resolvers/notifications.spec.js b/backend/src/schema/resolvers/notifications.spec.js
index 9d7795dd4..d4805bfc9 100644
--- a/backend/src/schema/resolvers/notifications.spec.js
+++ b/backend/src/schema/resolvers/notifications.spec.js
@@ -393,4 +393,51 @@ describe('given some notifications', () => {
       })
     })
   })
+  describe('markAllAsRead', () => {
+    const markAllAsReadMutation = gql`
+      mutation {
+        markAllAsRead {
+          from {
+            __typename
+            ... on Post {
+              content
+            }
+            ... on Comment {
+              content
+            }
+          }
+          read
+          createdAt
+        }
+      }
+    `
+    describe('unauthenticated', () => {
+      it('throws authorization error', async () => {
+        const result = await mutate({
+          mutation: markAllAsReadMutation,
+        })
+        expect(result.errors[0]).toHaveProperty('message', 'Not Authorised!')
+      })
+    })
+
+    describe('authenticated', () => {
+      beforeEach(async () => {
+        authenticatedUser = await user.toJson()
+      })
+
+      describe('not being notified at all', () => {
+        beforeEach(async () => {
+          variables = {
+            ...variables,
+          }
+        })
+
+        it('returns undefined', async () => {
+          const response = await mutate({ mutation: markAllAsReadMutation, variables })
+          expect(response.data.markAsRead).toEqual(undefined)
+          expect(response.errors).toBeUndefined()
+        })
+      })
+    })
+  })
 })

From bfe66adaacc9a6bc19976ea7e616f62ac061bb01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adem=C3=ADlson=20F=2E=20Tonato?= <ademilsonft@outlook.com>
Date: Sat, 24 Oct 2020 19:40:05 +0100
Subject: [PATCH 04/36] feat: add button to mark all notifications as read on
 notification menu

---
 .../NotificationMenu/NotificationMenu.vue     | 46 ++++++++++++++++---
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index ec991f0ef..c53545b91 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -16,11 +16,24 @@
       <div class="notifications-menu-popover">
         <notification-list :notifications="notifications" @markAsRead="markAsRead" />
       </div>
-      <div class="notifications-link-container">
-        <nuxt-link :to="{ name: 'notifications' }">
-          {{ $t('notifications.pageLink') }}
-        </nuxt-link>
-      </div>
+      <ds-flex class="notifications-link-container">
+        <ds-flex-item :width="{ base: '50%' }" centered>
+          <nuxt-link :to="{ name: 'notifications' }">
+            {{ $t('notifications.pageLink') }}
+          </nuxt-link>
+        </ds-flex-item>
+        <ds-flex-item :width="{ base: '50%' }" centered>
+          <ds-button
+            ghost
+            primary
+            :disabled="unreadNotificationsCount === 0"
+            @click="markAllAsRead"
+            data-test="markAllAsRead-button"
+          >
+            {{ $t('notifications.markAllAsRead') }}
+          </ds-button>
+        </ds-flex-item>
+      </ds-flex>
     </template>
   </dropdown>
 </template>
@@ -28,7 +41,12 @@
 <script>
 import { mapGetters } from 'vuex'
 import unionBy from 'lodash/unionBy'
-import { notificationQuery, markAsReadMutation, notificationAdded } from '~/graphql/User'
+import {
+  notificationQuery,
+  markAsReadMutation,
+  notificationAdded,
+  markAllAsReadMutation,
+} from '~/graphql/User'
 import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
 import Dropdown from '~/components/Dropdown'
 import NotificationList from '../NotificationList/NotificationList'
@@ -60,6 +78,19 @@ export default {
         this.$toast.error(err.message)
       }
     },
+    async markAllAsRead() {
+      if (!this.hasNotifications) {
+        return
+      }
+
+      try {
+        await this.$apollo.mutate({
+          mutation: markAllAsReadMutation(this.$i18n),
+        })
+      } catch (error) {
+        this.$toast.error(error.message)
+      }
+    },
   },
   computed: {
     ...mapGetters({
@@ -71,6 +102,9 @@ export default {
       }, 0)
       return result
     },
+    hasNotifications() {
+      return this.notifications.length
+    },
   },
   apollo: {
     notifications: {

From d831e141095c76c2e0a713875e8d008964b4ac8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adem=C3=ADlson=20F=2E=20Tonato?= <ademilsonft@outlook.com>
Date: Sat, 24 Oct 2020 19:41:03 +0100
Subject: [PATCH 05/36] feat: add button to mark all notifications as read on
 notification page

---
 webapp/pages/notifications/index.vue | 51 ++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/webapp/pages/notifications/index.vue b/webapp/pages/notifications/index.vue
index f59eef2f1..0c404dc04 100644
--- a/webapp/pages/notifications/index.vue
+++ b/webapp/pages/notifications/index.vue
@@ -15,7 +15,28 @@
       @markNotificationAsRead="markNotificationAsRead"
       :notifications="notifications"
     />
-    <pagination-buttons :hasNext="hasNext" :hasPrevious="hasPrevious" @back="back" @next="next" />
+
+    <ds-flex>
+      <ds-flex-item class="notifications-footer" :width="{ base: '90%' }" centered>
+        <ds-button
+          ghost
+          primary
+          :disabled="unreadNotificationsCount === 0"
+          @click="markAllAsRead"
+          data-test="markAllAsRead-button"
+        >
+          {{ $t('notifications.markAllAsRead') }}
+        </ds-button>
+      </ds-flex-item>
+      <ds-flex-item :width="{ base: '10%' }">
+        <pagination-buttons
+          :hasNext="hasNext"
+          :hasPrevious="hasPrevious"
+          @back="back"
+          @next="next"
+        />
+      </ds-flex-item>
+    </ds-flex>
   </base-card>
 </template>
 
@@ -23,7 +44,7 @@
 import NotificationsTable from '~/components/NotificationsTable/NotificationsTable'
 import DropdownFilter from '~/components/DropdownFilter/DropdownFilter'
 import PaginationButtons from '~/components/_new/generic/PaginationButtons/PaginationButtons'
-import { notificationQuery, markAsReadMutation } from '~/graphql/User'
+import { notificationQuery, markAsReadMutation, markAllAsReadMutation } from '~/graphql/User'
 
 export default {
   components: {
@@ -54,6 +75,15 @@ export default {
         { label: this.$t('notifications.filterLabel.unread'), value: false },
       ]
     },
+    hasNotifications() {
+      return this.notifications.length
+    },
+    unreadNotificationsCount() {
+      const result = this.notifications.reduce((count, notification) => {
+        return notification.read ? count : count + 1
+      }, 0)
+      return result
+    },
   },
   methods: {
     filter(option) {
@@ -77,6 +107,19 @@ export default {
     next() {
       this.offset += this.pageSize
     },
+    async markAllAsRead() {
+      if (!this.hasNotifications) {
+        return
+      }
+
+      try {
+        await this.$apollo.mutate({
+          mutation: markAllAsReadMutation(this.$i18n),
+        })
+      } catch (error) {
+        this.$toast.error(error.message)
+      }
+    },
   },
   apollo: {
     notifications: {
@@ -112,4 +155,8 @@ export default {
 .notifications-page-flex {
   justify-content: space-between;
 }
+
+.notifications-footer {
+  text-align: center;
+}
 </style>

From 4a23087c11fb9222cea4de6194a15bbb2b4a0c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adem=C3=ADlson=20F=2E=20Tonato?= <ademilsonft@outlook.com>
Date: Sat, 24 Oct 2020 19:41:29 +0100
Subject: [PATCH 06/36] feat: add tests for mark all as read (webapp)

---
 webapp/pages/notifications/index.spec.js | 54 ++++++++++++++++++++++--
 1 file changed, 50 insertions(+), 4 deletions(-)

diff --git a/webapp/pages/notifications/index.spec.js b/webapp/pages/notifications/index.spec.js
index 14bcf790b..e9cea64a7 100644
--- a/webapp/pages/notifications/index.spec.js
+++ b/webapp/pages/notifications/index.spec.js
@@ -5,12 +5,13 @@ import DropdownFilter from '~/components/DropdownFilter/DropdownFilter'
 import NotificationsTable from '~/components/NotificationsTable/NotificationsTable'
 import PaginationButtons from '~/components/_new/generic/PaginationButtons/PaginationButtons'
 
+import { markAsReadMutation, markAllAsReadMutation } from '~/graphql/User'
 const localVue = global.localVue
 
 config.stubs['client-only'] = '<span><slot /></span>'
 
 describe('PostIndex', () => {
-  let wrapper, Wrapper, mocks, propsData
+  let wrapper, Wrapper, mocks, propsData, markAllAsReadButton
 
   beforeEach(() => {
     propsData = {}
@@ -80,6 +81,9 @@ describe('PostIndex', () => {
         ]
         wrapper = Wrapper()
         wrapper.find(DropdownFilter).vm.$emit('filter', propsData.filterOptions[1])
+
+        markAllAsReadButton = wrapper.find('[data-test="markAllAsRead-button"]')
+        expect(markAllAsReadButton).toBeTruthy()
       })
 
       it('sets `notificationRead` to value of received option', () => {
@@ -93,18 +97,25 @@ describe('PostIndex', () => {
       it('refreshes the notificaitons', () => {
         expect(mocks.$apollo.queries.notifications.refresh).toHaveBeenCalledTimes(1)
       })
+      it('click on `mark all as read` button', async () => {
+        await markAllAsReadButton.trigger('click')
+        expect(mocks.$apollo.mutate).not.toHaveBeenCalled()
+      })
     })
 
     describe('markNotificationAsRead', () => {
+      let expectedParams
       beforeEach(() => {
         wrapper = Wrapper()
         wrapper.find(NotificationsTable).vm.$emit('markNotificationAsRead', 'notificationSourceId')
       })
 
       it('calls markNotificationAsRead mutation', () => {
-        expect(mocks.$apollo.mutate).toHaveBeenCalledWith(
-          expect.objectContaining({ variables: { id: 'notificationSourceId' } }),
-        )
+        expectedParams = {
+          mutation: markAsReadMutation(),
+          variables: { id: 'notificationSourceId' },
+        }
+        expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
       })
 
       describe('error handling', () => {
@@ -122,6 +133,41 @@ describe('PostIndex', () => {
       })
     })
 
+    describe('markAllNotificationAsRead', () => {
+      let expectedParams
+      beforeEach(() => {
+        wrapper = Wrapper()
+        // FIXME Should I remove next line?
+        wrapper.find(NotificationsTable).vm.$emit('markNotificationAsRead', 'notificationSourceId')
+      })
+
+      // FIXME: I need to discover why this test isn't working =(
+      it.skip('calls markAllNotificationAsRead mutation', async () => {
+        expectedParams = {
+          mutation: markAllAsReadMutation(),
+        }
+        // expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
+        // await wrapper.find('[data-test="markAllAsRead-button"]').trigger('click')
+
+        expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
+      })
+
+      describe('error handling', () => {
+        beforeEach(() => {
+          mocks.$apollo.mutate = jest.fn().mockRejectedValueOnce({ message: 'Some error message' })
+          wrapper = Wrapper()
+          // FIXME Should I remove next line?
+          wrapper
+            .find(NotificationsTable)
+            .vm.$emit('markNotificationAsRead', 'notificationSourceId')
+        })
+
+        it('shows an error message if there is an error', () => {
+          expect(mocks.$toast.error).toHaveBeenCalledWith('Some error message')
+        })
+      })
+    })
+
     describe('PaginationButtons', () => {
       beforeEach(() => {
         wrapper = Wrapper()

From cc99e27fd4a713f98fefae06828bc2ae113d40db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adem=C3=ADlson=20F=2E=20Tonato?= <ademilsonft@outlook.com>
Date: Tue, 27 Oct 2020 19:44:28 +0000
Subject: [PATCH 07/36] refactor: updating locales in alphabetical order

---
 webapp/locales/de.json |  2 +-
 webapp/locales/en.json |  2 +-
 webapp/locales/es.json |  2 +-
 webapp/locales/fr.json |  2 +-
 webapp/locales/it.json |  2 +-
 webapp/locales/nl.json | 40 ++++++++++++++++++++--------------------
 webapp/locales/pt.json |  2 +-
 webapp/locales/ru.json |  2 +-
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 8de89bd5c..f7612afe2 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -455,8 +455,8 @@
       "read": "Gelesen",
       "unread": "Ungelesen"
     },
-    "pageLink": "Alle Benachrichtigungen",
     "markAllAsRead": "Markiere alle als gelesen",
+    "pageLink": "Alle Benachrichtigungen",
     "post": "Beitrag",
     "reason": {
       "commented_on_post": "Hat Deinen Beitrag kommentiert …",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index f9e7a43e6..dd37f8114 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -455,8 +455,8 @@
       "read": "Read",
       "unread": "Unread"
     },
-    "pageLink": "All notifications",
     "markAllAsRead": "Mark all as read",
+    "pageLink": "All notifications",
     "post": "Post",
     "reason": {
       "commented_on_post": "Commented on your post …",
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index 8dc91ac52..710042ab4 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -448,8 +448,8 @@
       "read": "Leído",
       "unread": "No leído"
     },
-    "pageLink": "Todas las notificaciones",
     "markAllAsRead": "Marcar todas como leido",
+    "pageLink": "Todas las notificaciones",
     "post": "Contribución",
     "reason": {
       "commented_on_post": "Comentó su contribución ...",
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index 0bab5e73d..566fbc54f 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -437,8 +437,8 @@
       "read": "Lire",
       "unread": "Non lu"
     },
-    "pageLink": "Toutes les notifications",
     "markAllAsRead": "Tout marquer comme lu",
+    "pageLink": "Toutes les notifications",
     "post": "Post",
     "reason": {
       "commented_on_post": "Commenté sur votre post…",
diff --git a/webapp/locales/it.json b/webapp/locales/it.json
index 898a80d63..76dc87915 100644
--- a/webapp/locales/it.json
+++ b/webapp/locales/it.json
@@ -387,8 +387,8 @@
       "read": "",
       "unread": ""
     },
-    "pageLink": "",
     "markAllAsRead": "Segna tutti come letti",
+    "pageLink": "",
     "post": "",
     "reason": {
       "commented_on_post": "",
diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json
index 35e31591f..e955fdcc5 100644
--- a/webapp/locales/nl.json
+++ b/webapp/locales/nl.json
@@ -91,6 +91,26 @@
     "moreInfo": "Wat is Human Connection?",
     "password": "Uw Wachtwoord"
   },
+  "notifications": {
+    "comment": "",
+    "content": "",
+    "empty": "",
+    "filterLabel": {
+      "all": "",
+      "read": "",
+      "unread": ""
+    },
+    "markAllAsRead": "Markeer alles als gelezen",
+    "pageLink": "",
+    "post": "",
+    "reason": {
+      "commented_on_post": "",
+      "mentioned_in_comment": "",
+      "mentioned_in_post": ""
+    },
+    "title": "",
+    "user": ""
+  },
   "post": {
     "moreInfo": {
       "name": "Meer info"
@@ -172,25 +192,5 @@
     "taxident": "Identificatienummer voor de belasting over de toegevoegde waarde overeenkomstig § 27 a Wet op de belasting over de toegevoegde waarde (Duitsland).",
     "termsAc": "Gebruiksvoorwaarden",
     "tribunal": "registerrechtbank"
-  },
-  "notifications": {
-    "comment": "",
-    "content": "",
-    "empty": "",
-    "filterLabel": {
-      "all": "",
-      "read": "",
-      "unread": ""
-    },
-    "pageLink": "",
-    "markAllAsRead": "Markeer alles als gelezen",
-    "post": "",
-    "reason": {
-      "commented_on_post": "",
-      "mentioned_in_comment": "",
-      "mentioned_in_post": ""
-    },
-    "title": "",
-    "user": ""
   }
 }
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index 96be89f8e..b41fefa3d 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -376,8 +376,8 @@
       "read": "Lido",
       "unread": "Não lido"
     },
-    "pageLink": "Todas as notificações",
     "markAllAsRead": "Marcar todas como lidas",
+    "pageLink": "Todas as notificações",
     "post": "Post",
     "reason": {
       "commented_on_post": "Comentou no seu post …",
diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json
index bb66aa862..396ddc69f 100644
--- a/webapp/locales/ru.json
+++ b/webapp/locales/ru.json
@@ -448,8 +448,8 @@
       "read": "Прочитанные",
       "unread": "Непрочитанные"
     },
-    "pageLink": "Все уведомления",
     "markAllAsRead": "Отметить все как прочитанное",
+    "pageLink": "Все уведомления",
     "post": "Пост",
     "reason": {
       "commented_on_post": "Комментарий к посту...",

From ae4f53e09c7efec42bbe1af305d36ede1b4cb9dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 2 Nov 2020 15:50:21 +0100
Subject: [PATCH 08/36] Correct backend test

- And added some empty lines for nice formating.
---
 .../src/schema/resolvers/notifications.spec.js | 18 ++++++++++++++++--
 webapp/pages/notifications/index.spec.js       |  1 +
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/notifications.spec.js b/backend/src/schema/resolvers/notifications.spec.js
index d4805bfc9..5caccd110 100644
--- a/backend/src/schema/resolvers/notifications.spec.js
+++ b/backend/src/schema/resolvers/notifications.spec.js
@@ -300,6 +300,7 @@ describe('given some notifications', () => {
         }
       }
     `
+
     describe('unauthenticated', () => {
       it('throws authorization error', async () => {
         const result = await mutate({
@@ -393,6 +394,7 @@ describe('given some notifications', () => {
       })
     })
   })
+
   describe('markAllAsRead', () => {
     const markAllAsReadMutation = gql`
       mutation {
@@ -411,6 +413,7 @@ describe('given some notifications', () => {
         }
       }
     `
+
     describe('unauthenticated', () => {
       it('throws authorization error', async () => {
         const result = await mutate({
@@ -432,9 +435,20 @@ describe('given some notifications', () => {
           }
         })
 
-        it('returns undefined', async () => {
+        it('returns all as read', async () => {
           const response = await mutate({ mutation: markAllAsReadMutation, variables })
-          expect(response.data.markAsRead).toEqual(undefined)
+          expect(response.data.markAllAsRead).toEqual([
+            {
+              createdAt: '2019-08-30T19:33:48.651Z',
+              from: { __typename: 'Comment', content: 'You have been mentioned in a comment' },
+              read: true,
+            },
+            {
+              createdAt: '2019-08-31T17:33:48.651Z',
+              from: { __typename: 'Post', content: 'You have been mentioned in a post' },
+              read: true,
+            },
+          ])
           expect(response.errors).toBeUndefined()
         })
       })
diff --git a/webapp/pages/notifications/index.spec.js b/webapp/pages/notifications/index.spec.js
index e9cea64a7..8b0f33693 100644
--- a/webapp/pages/notifications/index.spec.js
+++ b/webapp/pages/notifications/index.spec.js
@@ -97,6 +97,7 @@ describe('PostIndex', () => {
       it('refreshes the notificaitons', () => {
         expect(mocks.$apollo.queries.notifications.refresh).toHaveBeenCalledTimes(1)
       })
+
       it('click on `mark all as read` button', async () => {
         await markAllAsReadButton.trigger('click')
         expect(mocks.$apollo.mutate).not.toHaveBeenCalled()

From 89e034057dfe0188e1a1970aff149f0fd239b855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adem=C3=ADlson=20F=2E=20Tonato?= <ademilsonft@outlook.com>
Date: Thu, 5 Nov 2020 20:21:05 +0000
Subject: [PATCH 09/36] fix: update based on code-review suggestions

---
 webapp/components/NotificationMenu/NotificationMenu.vue | 5 ++---
 webapp/pages/notifications/index.vue                    | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index c53545b91..9b666be4b 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -26,7 +26,6 @@
           <ds-button
             ghost
             primary
-            :disabled="unreadNotificationsCount === 0"
             @click="markAllAsRead"
             data-test="markAllAsRead-button"
           >
@@ -74,8 +73,8 @@ export default {
           mutation: markAsReadMutation(this.$i18n),
           variables,
         })
-      } catch (err) {
-        this.$toast.error(err.message)
+      } catch (error) {
+        this.$toast.error(error.message)
       }
     },
     async markAllAsRead() {
diff --git a/webapp/pages/notifications/index.vue b/webapp/pages/notifications/index.vue
index 0c404dc04..803deb1e2 100644
--- a/webapp/pages/notifications/index.vue
+++ b/webapp/pages/notifications/index.vue
@@ -21,7 +21,6 @@
         <ds-button
           ghost
           primary
-          :disabled="unreadNotificationsCount === 0"
           @click="markAllAsRead"
           data-test="markAllAsRead-button"
         >

From 7f345c3140cde347f56459368297e9f97672e8a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adem=C3=ADlson=20F=2E=20Tonato?= <ademilsonft@outlook.com>
Date: Thu, 5 Nov 2020 20:21:25 +0000
Subject: [PATCH 10/36] fix: update based on code-review suggestions

---
 backend/src/schema/resolvers/notifications.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/schema/resolvers/notifications.js b/backend/src/schema/resolvers/notifications.js
index a96181a50..a2b850336 100644
--- a/backend/src/schema/resolvers/notifications.js
+++ b/backend/src/schema/resolvers/notifications.js
@@ -105,7 +105,7 @@ export default {
       const writeTxResultPromise = session.writeTransaction(async (transaction) => {
         const markAllNotificationAsReadTransactionResponse = await transaction.run(
           ` 
-            MATCH (resource {deleted: false, disabled: false})-[notification:NOTIFIED {read: FALSE}]->(user:User {id:$id})
+            MATCH (resource)-[notification:NOTIFIED {read: FALSE}]->(user:User {id:$id})
             SET notification.read = TRUE
             WITH user, notification, resource,
             [(resource)<-[:WROTE]-(author:User) | author {.*}] AS authors,

From e1ef6f807ff309afed68d92d471f2e0961758f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adem=C3=ADlson=20F=2E=20Tonato?= <ademilsonft@outlook.com>
Date: Thu, 5 Nov 2020 20:23:27 +0000
Subject: [PATCH 11/36] fix: update tests for markAllAsRead

---
 webapp/pages/notifications/index.spec.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/webapp/pages/notifications/index.spec.js b/webapp/pages/notifications/index.spec.js
index 8b0f33693..1d397ee2e 100644
--- a/webapp/pages/notifications/index.spec.js
+++ b/webapp/pages/notifications/index.spec.js
@@ -104,14 +104,14 @@ describe('PostIndex', () => {
       })
     })
 
-    describe('markNotificationAsRead', () => {
+    describe('markAllAsRead', () => {
       let expectedParams
       beforeEach(() => {
         wrapper = Wrapper()
-        wrapper.find(NotificationsTable).vm.$emit('markNotificationAsRead', 'notificationSourceId')
+        wrapper.find(NotificationsTable).vm.$emit('markAllAsRead', 'notificationSourceId')
       })
 
-      it('calls markNotificationAsRead mutation', () => {
+      it('calls markAllAsRead mutation', () => {
         expectedParams = {
           mutation: markAsReadMutation(),
           variables: { id: 'notificationSourceId' },
@@ -125,7 +125,7 @@ describe('PostIndex', () => {
           wrapper = Wrapper()
           wrapper
             .find(NotificationsTable)
-            .vm.$emit('markNotificationAsRead', 'notificationSourceId')
+            .vm.$emit('markAllAsRead', 'notificationSourceId')
         })
 
         it('shows an error message if there is an error', () => {
@@ -139,7 +139,7 @@ describe('PostIndex', () => {
       beforeEach(() => {
         wrapper = Wrapper()
         // FIXME Should I remove next line?
-        wrapper.find(NotificationsTable).vm.$emit('markNotificationAsRead', 'notificationSourceId')
+        wrapper.find(NotificationsTable).vm.$emit('markAllAsRead', 'notificationSourceId')
       })
 
       // FIXME: I need to discover why this test isn't working =(
@@ -160,7 +160,7 @@ describe('PostIndex', () => {
           // FIXME Should I remove next line?
           wrapper
             .find(NotificationsTable)
-            .vm.$emit('markNotificationAsRead', 'notificationSourceId')
+            .vm.$emit('markAllAsRead', 'notificationSourceId')
         })
 
         it('shows an error message if there is an error', () => {

From b404355cd9e0c0b3a26e7c6755f19198d408e5a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 16 Nov 2020 15:55:33 +0100
Subject: [PATCH 12/36] Fix linting

---
 webapp/components/NotificationMenu/NotificationMenu.vue | 7 +------
 webapp/pages/notifications/index.spec.js                | 8 ++------
 webapp/pages/notifications/index.vue                    | 7 +------
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index 9b666be4b..e18b84159 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -23,12 +23,7 @@
           </nuxt-link>
         </ds-flex-item>
         <ds-flex-item :width="{ base: '50%' }" centered>
-          <ds-button
-            ghost
-            primary
-            @click="markAllAsRead"
-            data-test="markAllAsRead-button"
-          >
+          <ds-button ghost primary @click="markAllAsRead" data-test="markAllAsRead-button">
             {{ $t('notifications.markAllAsRead') }}
           </ds-button>
         </ds-flex-item>
diff --git a/webapp/pages/notifications/index.spec.js b/webapp/pages/notifications/index.spec.js
index 1d397ee2e..2ed362517 100644
--- a/webapp/pages/notifications/index.spec.js
+++ b/webapp/pages/notifications/index.spec.js
@@ -123,9 +123,7 @@ describe('PostIndex', () => {
         beforeEach(() => {
           mocks.$apollo.mutate = jest.fn().mockRejectedValueOnce({ message: 'Some error message' })
           wrapper = Wrapper()
-          wrapper
-            .find(NotificationsTable)
-            .vm.$emit('markAllAsRead', 'notificationSourceId')
+          wrapper.find(NotificationsTable).vm.$emit('markAllAsRead', 'notificationSourceId')
         })
 
         it('shows an error message if there is an error', () => {
@@ -158,9 +156,7 @@ describe('PostIndex', () => {
           mocks.$apollo.mutate = jest.fn().mockRejectedValueOnce({ message: 'Some error message' })
           wrapper = Wrapper()
           // FIXME Should I remove next line?
-          wrapper
-            .find(NotificationsTable)
-            .vm.$emit('markAllAsRead', 'notificationSourceId')
+          wrapper.find(NotificationsTable).vm.$emit('markAllAsRead', 'notificationSourceId')
         })
 
         it('shows an error message if there is an error', () => {
diff --git a/webapp/pages/notifications/index.vue b/webapp/pages/notifications/index.vue
index 803deb1e2..4f0be5f34 100644
--- a/webapp/pages/notifications/index.vue
+++ b/webapp/pages/notifications/index.vue
@@ -18,12 +18,7 @@
 
     <ds-flex>
       <ds-flex-item class="notifications-footer" :width="{ base: '90%' }" centered>
-        <ds-button
-          ghost
-          primary
-          @click="markAllAsRead"
-          data-test="markAllAsRead-button"
-        >
+        <ds-button ghost primary @click="markAllAsRead" data-test="markAllAsRead-button">
           {{ $t('notifications.markAllAsRead') }}
         </ds-button>
       </ds-flex-item>

From e1060b4abdd540a90126c46497ff653468b49e33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 16 Nov 2022 11:47:12 +0100
Subject: [PATCH 13/36] Fix Neo4j README

---
 neo4j/README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/neo4j/README.md b/neo4j/README.md
index f2b26d551..df3b5fde6 100644
--- a/neo4j/README.md
+++ b/neo4j/README.md
@@ -55,7 +55,7 @@ Start Neo4J and confirm the database is running at [http://localhost:7474](http:
 
 Here we describe some rarely used Cypher commands for Neo4j that are needed from time to time:
 
-### Index And Contraint Commands
+### Index And Constraint Commands
 
 If indexes or constraints are missing or not set correctly, the browser search will not work or the database seed for development will not work.
 
@@ -98,22 +98,22 @@ On a server with Kubernetes cluster:
 $ kubectl -n default exec -it $(kubectl -n default get pods | grep ocelot-backend | awk '{ print $1 }') -- /bin/sh -c "yarn prod:migrate init"
 ```
 
-***Cypher commands to show indexes and contraints***
+***Cypher commands to show indexes and constraints***
 
 ```bash
 # in browser command line or cypher shell
 
-# show all indexes and contraints
+# show all indexes and constraints
 $ :schema
 
 # show all indexes
 $ CALL db.indexes();
 
-# show all contraints
+# show all constraints
 $ CALL db.constraints();
 ```
 
-***Cypher commands to create and drop indexes and contraints***
+***Cypher commands to create and drop indexes and constraints***
 
 ```bash
 # in browser command line or cypher shell
@@ -126,6 +126,6 @@ $ CALL db.index.fulltext.createNodeIndex("tag_fulltext_search",["Tag"],["id"]);
 # drop an index
 $ DROP CONSTRAINT ON ( image:Image ) ASSERT image.url IS UNIQUE
 
-# drop all indexes and contraints
+# drop all indexes and constraints
 $ CALL apoc.schema.assert({},{},true) YIELD label, key RETURN * ;
 ```

From dd80dc764cbf7749bef0bf2cd5ae4a568e421f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 16 Nov 2022 14:13:32 +0100
Subject: [PATCH 14/36] Fix unused parameters naming

---
 webapp/graphql/User.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index b3aaa0940..6d29f55b4 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -62,7 +62,7 @@ export const minimisedUserQuery = () => {
   `
 }
 
-export const notificationQuery = (i18n) => {
+export const notificationQuery = (_i18n) => {
   return gql`
     ${userFragment}
     ${commentFragment}
@@ -101,7 +101,7 @@ export const notificationQuery = (i18n) => {
   `
 }
 
-export const markAsReadMutation = (i18n) => {
+export const markAsReadMutation = (_i18n) => {
   return gql`
     ${userFragment}
     ${commentFragment}
@@ -137,7 +137,7 @@ export const markAsReadMutation = (i18n) => {
   `
 }
 
-export const markAllAsReadMutation = (i18n) => {
+export const markAllAsReadMutation = (_i18n) => {
   return gql`
     ${userFragment}
     ${commentFragment}

From 3a968361dbc48074392e87adce51d9e847b5d580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 16 Nov 2022 14:14:09 +0100
Subject: [PATCH 15/36] Fix locales to be 'null' instead of '""'

---
 webapp/locales/nl.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json
index 55f09f36c..66f296eb0 100644
--- a/webapp/locales/nl.json
+++ b/webapp/locales/nl.json
@@ -101,24 +101,24 @@
     "password": "Uw Wachtwoord"
   },
   "notifications": {
-    "comment": "",
-    "content": "",
-    "empty": "",
+    "comment": null,
+    "content": null,
+    "empty": null,
     "filterLabel": {
-      "all": "",
-      "read": "",
-      "unread": ""
+      "all": null,
+      "read": null,
+      "unread": null
     },
     "markAllAsRead": "Markeer alles als gelezen",
-    "pageLink": "",
-    "post": "",
+    "pageLink": null,
+    "post": null,
     "reason": {
-      "commented_on_post": "",
-      "mentioned_in_comment": "",
-      "mentioned_in_post": ""
+      "commented_on_post": null,
+      "mentioned_in_comment": null,
+      "mentioned_in_post": null
     },
-    "title": "",
-    "user": ""
+    "title": null,
+    "user": null
   },
   "post": {
     "moreInfo": {

From 8234615505c8e1190bdfceaeb3968f58635dea4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 16 Nov 2022 14:14:47 +0100
Subject: [PATCH 16/36] Fix template slot notation

---
 webapp/components/FilterMenu/CategoriesMenu.vue | 2 +-
 webapp/components/FilterMenu/FilterMenu.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/FilterMenu/CategoriesMenu.vue b/webapp/components/FilterMenu/CategoriesMenu.vue
index 0b5505503..091aed24f 100644
--- a/webapp/components/FilterMenu/CategoriesMenu.vue
+++ b/webapp/components/FilterMenu/CategoriesMenu.vue
@@ -3,7 +3,7 @@
     <a href="#" slot="default" slot-scope="{ toggleMenu }" @click.prevent="toggleMenu()">
       <ds-text bold size="large">{{ $t('admin.categories.name') }}</ds-text>
     </a>
-    <template slot="popover">
+    <template #popover>
       <div class="category-menu-options">
         <h2 class="title">{{ $t('filter-menu.filter-by') }}</h2>
         <categories-filter v-if="categoriesActive" />
diff --git a/webapp/components/FilterMenu/FilterMenu.vue b/webapp/components/FilterMenu/FilterMenu.vue
index 28cda6669..6a060f81b 100644
--- a/webapp/components/FilterMenu/FilterMenu.vue
+++ b/webapp/components/FilterMenu/FilterMenu.vue
@@ -10,7 +10,7 @@
     >
       <base-icon class="dropdown-arrow" name="angle-down" />
     </base-button>
-    <template slot="popover">
+    <template #popover>
       <div class="filter-menu-options">
         <h2 class="title">{{ $t('filter-menu.filter-by') }}</h2>
         <following-filter />

From 4ebae574f25927e385db0075693574080cb79c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 16 Nov 2022 14:15:59 +0100
Subject: [PATCH 17/36] Add 'pl' translation

---
 webapp/locales/pl.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json
index 840698487..41120dd26 100644
--- a/webapp/locales/pl.json
+++ b/webapp/locales/pl.json
@@ -199,6 +199,7 @@
     }
   },
   "notifications": {
+    "markAllAsRead": "Oznacz wszystkie jako przeczytane",
     "menu": {
       "mentioned": "wspomiał o Tobie we wpisie"
     }

From 61effbe4037dcc1359c80b02b67e89586684cf68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 16 Nov 2022 14:16:22 +0100
Subject: [PATCH 18/36] Refine 'NotificationMenu.vue'

---
 .../components/NotificationMenu/NotificationMenu.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index f8c3a74af..7fcfabe82 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -12,17 +12,19 @@
         <counter-icon icon="bell" :count="unreadNotificationsCount" danger />
       </base-button>
     </template>
-    <template slot="popover">
+    <template #popover>
       <div class="notifications-menu-popover">
         <notification-list :notifications="notifications" @markAsRead="markAsRead" />
       </div>
       <ds-flex class="notifications-link-container">
-        <ds-flex-item :width="{ base: '50%' }" centered>
+        <ds-flex-item :width="{ base: 'auto' }" centered>
           <nuxt-link :to="{ name: 'notifications' }">
-            {{ $t('notifications.pageLink') }}
+            <ds-button ghost primary>
+              {{ $t('notifications.pageLink') }}
+            </ds-button>
           </nuxt-link>
         </ds-flex-item>
-        <ds-flex-item :width="{ base: '50%' }" centered>
+        <ds-flex-item :width="{ base: 'auto' }" centered>
           <ds-button ghost primary @click="markAllAsRead" data-test="markAllAsRead-button">
             {{ $t('notifications.markAllAsRead') }}
           </ds-button>
@@ -146,7 +148,7 @@ export default {
 }
 .notifications-link-container {
   background-color: $background-color-softer-active;
-  text-align: center;
+  justify-content: center;
   position: fixed;
   bottom: 0;
   left: 0;

From d26c37a545f6b33735e3183d167697c6d85c1bfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 16 Nov 2022 14:16:51 +0100
Subject: [PATCH 19/36] Refine notifications page

---
 webapp/pages/notifications/index.vue | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/webapp/pages/notifications/index.vue b/webapp/pages/notifications/index.vue
index 4f0be5f34..92bd38359 100644
--- a/webapp/pages/notifications/index.vue
+++ b/webapp/pages/notifications/index.vue
@@ -16,13 +16,8 @@
       :notifications="notifications"
     />
 
-    <ds-flex>
-      <ds-flex-item class="notifications-footer" :width="{ base: '90%' }" centered>
-        <ds-button ghost primary @click="markAllAsRead" data-test="markAllAsRead-button">
-          {{ $t('notifications.markAllAsRead') }}
-        </ds-button>
-      </ds-flex-item>
-      <ds-flex-item :width="{ base: '10%' }">
+    <ds-flex class="notifications-footer">
+      <ds-flex-item :width="{ base: 'auto' }" centered>
         <pagination-buttons
           :hasNext="hasNext"
           :hasPrevious="hasPrevious"
@@ -30,6 +25,16 @@
           @next="next"
         />
       </ds-flex-item>
+      <ds-flex-item class="notifications-footer-button" :width="{ base: 'auto' }" centered>
+        <ds-button
+          primary
+          :disabled="unreadNotificationsCount === 0"
+          @click="markAllAsRead"
+          data-test="markAllAsRead-button"
+        >
+          {{ $t('notifications.markAllAsRead') }}
+        </ds-button>
+      </ds-flex-item>
     </ds-flex>
   </base-card>
 </template>
@@ -151,6 +156,6 @@ export default {
 }
 
 .notifications-footer {
-  text-align: center;
+  justify-content: space-evenly;
 }
 </style>

From f63a12d8d7e027353a984f686c3ad68767b665ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 16 Nov 2022 15:01:22 +0100
Subject: [PATCH 20/36] Move GQL in notification tests in separate file

---
 backend/src/graphql/notifications.js          | 65 ++++++++++++++
 .../schema/resolvers/notifications.spec.js    | 84 ++++---------------
 2 files changed, 83 insertions(+), 66 deletions(-)
 create mode 100644 backend/src/graphql/notifications.js

diff --git a/backend/src/graphql/notifications.js b/backend/src/graphql/notifications.js
new file mode 100644
index 000000000..233077372
--- /dev/null
+++ b/backend/src/graphql/notifications.js
@@ -0,0 +1,65 @@
+import gql from 'graphql-tag'
+
+// ------ mutations
+
+export const markAsReadMutation = () => {
+  return gql`
+    mutation ($id: ID!) {
+      markAsRead(id: $id) {
+        from {
+          __typename
+          ... on Post {
+            content
+          }
+          ... on Comment {
+            content
+          }
+        }
+        read
+        createdAt
+      }
+    }
+  `
+}
+
+export const markAllAsReadMutation = () => {
+  return gql`
+    mutation {
+      markAllAsRead {
+        from {
+          __typename
+          ... on Post {
+            content
+          }
+          ... on Comment {
+            content
+          }
+        }
+        read
+        createdAt
+      }
+    }
+  `
+}
+
+// ------ queries
+
+export const notificationQuery = () => {
+  return gql`
+    query ($read: Boolean, $orderBy: NotificationOrdering) {
+      notifications(read: $read, orderBy: $orderBy) {
+        from {
+          __typename
+          ... on Post {
+            content
+          }
+          ... on Comment {
+            content
+          }
+        }
+        read
+        createdAt
+      }
+    }
+  `
+}
diff --git a/backend/src/schema/resolvers/notifications.spec.js b/backend/src/schema/resolvers/notifications.spec.js
index a3fc23018..b4e3f3a37 100644
--- a/backend/src/schema/resolvers/notifications.spec.js
+++ b/backend/src/schema/resolvers/notifications.spec.js
@@ -3,6 +3,11 @@ import { gql } from '../../helpers/jest'
 import { getDriver } from '../../db/neo4j'
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '../.././server'
+import {
+  markAsReadMutation,
+  markAllAsReadMutation,
+  notificationQuery,
+} from '../../graphql/notifications'
 
 const driver = getDriver()
 let authenticatedUser
@@ -145,26 +150,9 @@ describe('given some notifications', () => {
   })
 
   describe('notifications', () => {
-    const notificationQuery = gql`
-      query ($read: Boolean, $orderBy: NotificationOrdering) {
-        notifications(read: $read, orderBy: $orderBy) {
-          from {
-            __typename
-            ... on Post {
-              content
-            }
-            ... on Comment {
-              content
-            }
-          }
-          read
-          createdAt
-        }
-      }
-    `
     describe('unauthenticated', () => {
       it('throws authorization error', async () => {
-        const { errors } = await query({ query: notificationQuery })
+        const { errors } = await query({ query: notificationQuery() })
         expect(errors[0]).toHaveProperty('message', 'Not Authorized!')
       })
     })
@@ -211,7 +199,7 @@ describe('given some notifications', () => {
             },
           ]
 
-          await expect(query({ query: notificationQuery, variables })).resolves.toMatchObject({
+          await expect(query({ query: notificationQuery(), variables })).resolves.toMatchObject({
             data: {
               notifications: expect.arrayContaining(expected),
             },
@@ -245,7 +233,7 @@ describe('given some notifications', () => {
             },
           })
           const response = await query({
-            query: notificationQuery,
+            query: notificationQuery(),
             variables: { ...variables, read: false },
           })
           await expect(response).toMatchObject(expected)
@@ -274,14 +262,14 @@ describe('given some notifications', () => {
 
           it('reduces notifications list', async () => {
             await expect(
-              query({ query: notificationQuery, variables: { ...variables, read: false } }),
+              query({ query: notificationQuery(), variables: { ...variables, read: false } }),
             ).resolves.toMatchObject({
               data: { notifications: [expect.any(Object), expect.any(Object)] },
               errors: undefined,
             })
             await deletePostAction()
             await expect(
-              query({ query: notificationQuery, variables: { ...variables, read: false } }),
+              query({ query: notificationQuery(), variables: { ...variables, read: false } }),
             ).resolves.toMatchObject({ data: { notifications: [] }, errors: undefined })
           })
         })
@@ -290,28 +278,10 @@ describe('given some notifications', () => {
   })
 
   describe('markAsRead', () => {
-    const markAsReadMutation = gql`
-      mutation ($id: ID!) {
-        markAsRead(id: $id) {
-          from {
-            __typename
-            ... on Post {
-              content
-            }
-            ... on Comment {
-              content
-            }
-          }
-          read
-          createdAt
-        }
-      }
-    `
-
     describe('unauthenticated', () => {
       it('throws authorization error', async () => {
         const result = await mutate({
-          mutation: markAsReadMutation,
+          mutation: markAsReadMutation(),
           variables: { ...variables, id: 'p1' },
         })
         expect(result.errors[0]).toHaveProperty('message', 'Not Authorized!')
@@ -332,7 +302,7 @@ describe('given some notifications', () => {
         })
 
         it('returns null', async () => {
-          const response = await mutate({ mutation: markAsReadMutation, variables })
+          const response = await mutate({ mutation: markAsReadMutation(), variables })
           expect(response.data.markAsRead).toEqual(null)
           expect(response.errors).toBeUndefined()
         })
@@ -348,7 +318,7 @@ describe('given some notifications', () => {
           })
 
           it('updates `read` attribute and returns NOTIFIED relationship', async () => {
-            const { data } = await mutate({ mutation: markAsReadMutation, variables })
+            const { data } = await mutate({ mutation: markAsReadMutation(), variables })
             expect(data).toEqual({
               markAsRead: {
                 from: {
@@ -369,7 +339,7 @@ describe('given some notifications', () => {
               }
             })
             it('returns null', async () => {
-              const response = await mutate({ mutation: markAsReadMutation, variables })
+              const response = await mutate({ mutation: markAsReadMutation(), variables })
               expect(response.data.markAsRead).toEqual(null)
               expect(response.errors).toBeUndefined()
             })
@@ -385,7 +355,7 @@ describe('given some notifications', () => {
           })
 
           it('updates `read` attribute and returns NOTIFIED relationship', async () => {
-            const { data } = await mutate({ mutation: markAsReadMutation, variables })
+            const { data } = await mutate({ mutation: markAsReadMutation(), variables })
             expect(data).toEqual({
               markAsRead: {
                 from: {
@@ -403,30 +373,12 @@ describe('given some notifications', () => {
   })
 
   describe('markAllAsRead', () => {
-    const markAllAsReadMutation = gql`
-      mutation {
-        markAllAsRead {
-          from {
-            __typename
-            ... on Post {
-              content
-            }
-            ... on Comment {
-              content
-            }
-          }
-          read
-          createdAt
-        }
-      }
-    `
-
     describe('unauthenticated', () => {
       it('throws authorization error', async () => {
         const result = await mutate({
-          mutation: markAllAsReadMutation,
+          mutation: markAllAsReadMutation(),
         })
-        expect(result.errors[0]).toHaveProperty('message', 'Not Authorised!')
+        expect(result.errors[0]).toHaveProperty('message', 'Not Authorized!')
       })
     })
 
@@ -443,7 +395,7 @@ describe('given some notifications', () => {
         })
 
         it('returns all as read', async () => {
-          const response = await mutate({ mutation: markAllAsReadMutation, variables })
+          const response = await mutate({ mutation: markAllAsReadMutation(), variables })
           expect(response.data.markAllAsRead).toEqual([
             {
               createdAt: '2019-08-30T19:33:48.651Z',

From cecd506581ea769bab36e5166eb32e566aa6df0e Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Mon, 27 Feb 2023 10:45:46 +0100
Subject: [PATCH 21/36] removed gap above news feed in desktop view

---
 webapp/pages/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index d5f1ac3d0..88bb20ebb 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -75,15 +75,16 @@
         </div>
       </ds-grid-item>
       <ds-space :margin-bottom="{ base: 'small', md: 'base', lg: 'large' }" />
+      <ds-space :margin-bottom="{ base: 'small', md: 'base', lg: 'large' }" />
+      <ds-space :margin-bottom="{ base: 'small', md: 'base', lg: 'large' }" />
+      <!-- hashtag filter -->
       <ds-grid-item v-if="hashtag" :row-span="2" column-span="fullWidth">
         <hashtags-filter :hashtag="hashtag" @clearSearch="clearSearch" />
       </ds-grid-item>
-      <ds-space :margin-bottom="{ base: 'small', md: 'base', lg: 'large' }" />
       <!-- donation info -->
       <ds-grid-item v-if="showDonations" class="top-info-bar" :row-span="1" column-span="fullWidth">
         <donation-info :goal="goal" :progress="progress" />
       </ds-grid-item>
-      <ds-space :margin-bottom="{ base: 'small', md: 'base', lg: 'large' }" />
       <!-- news feed -->
       <template v-if="hasResults">
         <masonry-grid-item

From ee6f72c09a27cd6e61c936586798eb849fd6d54b Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Thu, 2 Mar 2023 11:56:16 +0100
Subject: [PATCH 22/36] Fix gap above news feed by adding a multi column space
 element

---
 webapp/pages/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 88bb20ebb..d336383c8 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -74,9 +74,9 @@
           </div>
         </div>
       </ds-grid-item>
-      <ds-space :margin-bottom="{ base: 'small', md: 'base', lg: 'large' }" />
-      <ds-space :margin-bottom="{ base: 'small', md: 'base', lg: 'large' }" />
-      <ds-space :margin-bottom="{ base: 'small', md: 'base', lg: 'large' }" />
+      <!-- Placeholder/Space Row -->
+      <ds-grid-item :row-span="1" column-span="fullWidth">
+      </ds-grid-item>
       <!-- hashtag filter -->
       <ds-grid-item v-if="hashtag" :row-span="2" column-span="fullWidth">
         <hashtags-filter :hashtag="hashtag" @clearSearch="clearSearch" />

From aea21b0989773d8d3650c5d02c03bb8704ce819e Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Fri, 3 Mar 2023 17:43:02 +0100
Subject: [PATCH 23/36] Fix missing padding above newsfeed for mobile view

---
 webapp/pages/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index d336383c8..04e748d52 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -400,5 +400,8 @@ export default {
     font-size: 23px;
     z-index: 10;
   }
+  .ds-grid{                                         
+    padding-top: 1em;                               
+  } 
 }
 </style>

From 70354fa3e283c079f3f1bbf2bbd3557b733c5116 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 8 Mar 2023 09:21:44 +0100
Subject: [PATCH 24/36] fix deploy branded

---
 .github/workflows/publish-branded.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/publish-branded.yml b/.github/workflows/publish-branded.yml
index a404453e6..869eb6302 100644
--- a/.github/workflows/publish-branded.yml
+++ b/.github/workflows/publish-branded.yml
@@ -46,6 +46,11 @@ jobs:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.client_payload.ref }}
+
       - name: Download Docker Image (Backend)
         uses: actions/download-artifact@v2
         with:

From b28a595ae409c99b181cd228523558a222b096d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 8 Mar 2023 16:22:53 +0100
Subject: [PATCH 25/36] Change group filter button text

---
 webapp/locales/de.json | 2 +-
 webapp/locales/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 1db5a3dcd..5b95cd632 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -270,7 +270,7 @@
     "filterFollow": "Beiträge von Nutzern filtern, denen ich folge",
     "filterMasonryGrid": {
       "myFriends": "Nutzer denen ich folge",
-      "myGroups": "Meine Gruppen",
+      "myGroups": "Aus meinen Gruppen",
       "myTopics": "Meine Themen",
       "noFilter": "Beiträge filtern"
     },
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index f7a7a54ad..b13757893 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -270,7 +270,7 @@
     "filterFollow": "Filter contributions from users I follow",
     "filterMasonryGrid": {
       "myFriends": "Users I follow",
-      "myGroups": "My groups",
+      "myGroups": "By my groups",
       "myTopics": "My topics",
       "noFilter": "Filter posts"
     },

From b64e35c69bae7bc1ffa26705f3147911e6701e4d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 8 Mar 2023 17:11:57 +0100
Subject: [PATCH 26/36] fix typo

---
 webapp/components/FilterMenu/FilterMenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/FilterMenu/FilterMenu.vue b/webapp/components/FilterMenu/FilterMenu.vue
index a1aed3950..fcd386c38 100644
--- a/webapp/components/FilterMenu/FilterMenu.vue
+++ b/webapp/components/FilterMenu/FilterMenu.vue
@@ -10,7 +10,7 @@
     >
       <base-icon class="dropdown-arrow" name="angle-down" />
     </base-button>
-    <template #popover">
+    <template #popover>
       <filter-menu-component />
     </template>
   </dropdown>

From c865b72fa345a79615ebc7006f36c33ba514fa29 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 8 Mar 2023 18:11:18 +0100
Subject: [PATCH 27/36] refresh notifications after mark all as read, fix tests

---
 webapp/pages/notifications/index.spec.js | 160 ++++++++++-------------
 webapp/pages/notifications/index.vue     |   1 +
 2 files changed, 73 insertions(+), 88 deletions(-)

diff --git a/webapp/pages/notifications/index.spec.js b/webapp/pages/notifications/index.spec.js
index 75ec01be1..d933da2c2 100644
--- a/webapp/pages/notifications/index.spec.js
+++ b/webapp/pages/notifications/index.spec.js
@@ -1,4 +1,4 @@
-import { shallowMount, mount } from '@vue/test-utils'
+import { mount } from '@vue/test-utils'
 import NotificationsPage from './index.vue'
 
 import DropdownFilter from '~/components/DropdownFilter/DropdownFilter'
@@ -10,13 +10,13 @@ const localVue = global.localVue
 
 const stubs = {
   'client-only': true,
+  'notifications-table': true,
 }
 
 describe('PostIndex', () => {
-  let wrapper, Wrapper, mocks, propsData, markAllAsReadButton
+  let wrapper, Wrapper, mocks
 
   beforeEach(() => {
-    propsData = {}
     mocks = {
       $t: (string) => string,
       $toast: {
@@ -38,97 +38,97 @@ describe('PostIndex', () => {
     }
   })
 
-  describe('shallowMount', () => {
-    beforeEach(() => {
-      Wrapper = () => {
-        return shallowMount(NotificationsPage, {
-          mocks,
-          localVue,
-          propsData,
-          stubs,
-        })
-      }
-      wrapper = Wrapper()
-    })
-
-    it('renders a Notications header', () => {
-      expect(wrapper.find('ds-heading-stub').exists()).toBe(true)
-    })
-
-    it('renders a `dropdown-filter` component', () => {
-      expect(wrapper.find('dropdown-filter-stub').exists()).toBe(true)
-    })
-
-    it('renders a `notifications-table` component', () => {
-      expect(wrapper.find('notifications-table-stub').exists()).toBe(true)
-    })
-  })
-
   describe('mount', () => {
+    jest.clearAllMocks()
     beforeEach(() => {
       Wrapper = () => {
         return mount(NotificationsPage, {
           mocks,
           localVue,
-          propsData,
           stubs,
         })
       }
+      wrapper = Wrapper()
+      wrapper.setData({
+        notifications: [
+          {
+            id: 'mentioned_in_comment/c4-1/u1',
+            read: false,
+            reason: 'mentioned_in_comment',
+            createdAt: '2023-03-06T14:32:47.924Z',
+            updatedAt: '2023-03-06T14:32:47.924Z',
+          },
+          {
+            id: 'mentioned_in_post/p8/u1',
+            read: false,
+            reason: 'mentioned_in_post',
+            createdAt: '2023-03-06T14:32:47.667Z',
+            updatedAt: '2023-03-06T14:32:47.667Z',
+          },
+        ],
+      })
+    })
+
+    it('renders a Notications header', () => {
+      expect(wrapper.find('.ds-heading').exists()).toBe(true)
+    })
+
+    it('renders a `dropdown-filter` component', () => {
+      expect(wrapper.find('.dropdown-filter').exists()).toBe(true)
+    })
+
+    it('renders a `notifications-table` component', () => {
+      expect(wrapper.findComponent(NotificationsTable).exists()).toBe(true)
+    })
+
+    it('renders a `mark-all-as-read` button', () => {
+      expect(wrapper.find('[data-test="markAllAsRead-button"]').exists()).toBe(true)
     })
 
     describe('filter', () => {
-      beforeEach(() => {
-        propsData.filterOptions = [
-          { label: 'All', value: null },
-          { label: 'Read', value: true },
-          { label: 'Unread', value: false },
-        ]
-        wrapper = Wrapper()
-        markAllAsReadButton = wrapper.find('[data-test="markAllAsRead-button"]')
-        expect(markAllAsReadButton).toBeTruthy()
-        wrapper.findComponent(DropdownFilter).vm.$emit('filter', propsData.filterOptions[1])
+      it('has "All" as default', () => {
+        expect(wrapper.find('a.dropdown-filter').text()).toBe('notifications.filterLabel.all')
       })
 
-      it('sets `notificationRead` to value of received option', () => {
-        expect(wrapper.vm.notificationRead).toEqual(propsData.filterOptions[1].value)
-      })
+      describe('select Read', () => {
+        beforeEach(() => {
+          wrapper.findComponent(DropdownFilter).vm.$emit('filter', wrapper.vm.filterOptions[1])
+        })
 
-      it('set label to the label of the received option', () => {
-        expect(wrapper.vm.selected).toEqual(propsData.filterOptions[1].label)
-      })
+        it('sets `notificationRead` to value of received option', () => {
+          expect(wrapper.vm.notificationRead).toEqual(wrapper.vm.filterOptions[1].value)
+        })
 
-      it('refreshes the notifications', () => {
-        expect(mocks.$apollo.queries.notifications.refresh).toHaveBeenCalledTimes(1)
-      })
+        it('sets label to the label of the received option', () => {
+          expect(wrapper.vm.selected).toEqual(wrapper.vm.filterOptions[1].label)
+        })
 
-      it('click on `mark all as read` button', async () => {
-        await markAllAsReadButton.trigger('click')
-        expect(mocks.$apollo.mutate).not.toHaveBeenCalled()
+        it('refreshes the notifications', () => {
+          expect(mocks.$apollo.queries.notifications.refresh).toHaveBeenCalledTimes(1)
+        })
       })
     })
 
-    describe('markAllAsRead', () => {
-      let expectedParams
+    describe('markNotificationAsRead', () => {
       beforeEach(() => {
-        wrapper = Wrapper()
         wrapper
-          .findComponentComponent(NotificationsTable)
+          .findComponent(NotificationsTable)
           .vm.$emit('markNotificationAsRead', 'notificationSourceId')
       })
 
       it('calls markAllAsRead mutation', () => {
-        expectedParams = {
+        expect(mocks.$apollo.mutate).toHaveBeenCalledWith({
           mutation: markAsReadMutation(),
           variables: { id: 'notificationSourceId' },
-        }
-        expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
+        })
       })
 
       describe('error handling', () => {
         beforeEach(() => {
           mocks.$apollo.mutate = jest.fn().mockRejectedValueOnce({ message: 'Some error message' })
-          wrapper = Wrapper()
-          wrapper.findComponent(NotificationsTable).vm.$emit('markAllAsRead', 'notificationSourceId')
+          wrapper
+            .findComponent(NotificationsTable)
+            .vm.$emit('markNotificationAsRead', 'notificationSourceId')
         })
 
         it('shows an error message if there is an error', () => {
@@ -138,37 +138,21 @@ describe('PostIndex', () => {
     })
 
     describe('markAllNotificationAsRead', () => {
-      let expectedParams
-      beforeEach(() => {
-        wrapper = Wrapper()
-        // FIXME Should I remove next line?
-        wrapper.find(NotificationsTable).vm.$emit('markAllAsRead', 'notificationSourceId')
-      })
-
-      // FIXME: I need to discover why this test isn't working =(
-      it.skip('calls markAllNotificationAsRead mutation', async () => {
-        expectedParams = {
+      it('calls markAllNotificationAsRead mutation and refreshes notification', async () => {
+        wrapper.find('button[data-test="markAllAsRead-button"]').trigger('click')
+        await expect(mocks.$apollo.mutate).toHaveBeenCalledWith({
           mutation: markAllAsReadMutation(),
-        }
-        // expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
-        // await wrapper.find('[data-test="markAllAsRead-button"]').trigger('click')
-
-        expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expect.objectContaining(expectedParams))
+        })
+        expect(mocks.$apollo.queries.notifications.refresh).toHaveBeenCalledTimes(1)
       })
 
       describe('error handling', () => {
-        beforeEach(() => {
-          mocks.$apollo.mutate = jest.fn().mockRejectedValueOnce({ message: 'Some error message' })
-          wrapper = Wrapper()
-          // FIXME Should I remove next line?
-          wrapper.findComponent(NotificationsTable).vm.$emit('markAllAsRead', 'notificationSourceId')
-          wrapper
-            .findComponent(NotificationsTable)
-            .vm.$emit('markNotificationAsRead', 'notificationSourceId')
-        })
-
-        it('shows an error message if there is an error', () => {
-          expect(mocks.$toast.error).toHaveBeenCalledWith('Some error message')
+        it('shows an error message if there is an error', async () => {
+          mocks.$apollo.mutate = jest
+            .fn()
+            .mockRejectedValueOnce({ message: 'Another error message' })
+          await wrapper.find('button[data-test="markAllAsRead-button"]').trigger('click')
+          expect(mocks.$toast.error).toHaveBeenCalledWith('Another error message')
         })
       })
     })
diff --git a/webapp/pages/notifications/index.vue b/webapp/pages/notifications/index.vue
index 92bd38359..b3a63281a 100644
--- a/webapp/pages/notifications/index.vue
+++ b/webapp/pages/notifications/index.vue
@@ -115,6 +115,7 @@ export default {
         await this.$apollo.mutate({
           mutation: markAllAsReadMutation(this.$i18n),
         })
+        this.$apollo.queries.notifications.refresh()
       } catch (error) {
         this.$toast.error(error.message)
       }

From cf6116b5d9ef07b0002d7c6eff048fc3075cbf8e Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 9 Mar 2023 13:02:28 +0100
Subject: [PATCH 28/36] change locales for invitation link short description

---
 webapp/locales/de.json | 2 +-
 webapp/locales/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index c0cae5b08..fbb9a1ce5 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -518,7 +518,7 @@
     "copy-code": "Code:",
     "copy-success": "Einladungscode erfolgreich in die Zwischenablage kopiert",
     "not-available": "Du hast keinen Einladungscode zur Verfügung!",
-    "your-code": "Kopiere deinen Einladungscode in die Ablage:"
+    "your-code": "Sende diesen Link per E-Mail oder in sozialen Medien, um deine Freunde einzuladen:"
   },
   "login": {
     "email": "Deine E-Mail",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 3a741a02b..d31f3f90c 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -518,7 +518,7 @@
     "copy-code": "Code:",
     "copy-success": "Invite code copied to clipboard",
     "not-available": "You have no valid invite code available!",
-    "your-code": "Copy your invite code to the clipboard:"
+    "your-code": "Send this link per e-mail or in social media to invite your friends:"
   },
   "login": {
     "email": "Your E-mail",

From 9a59799b2bd62102e876797a7628b791e44b79a9 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 9 Mar 2023 13:10:57 +0100
Subject: [PATCH 29/36] change copy text in invite button menu

---
 webapp/components/InviteButton/InviteButton.vue | 5 +----
 webapp/locales/de.json                          | 2 +-
 webapp/locales/en.json                          | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/webapp/components/InviteButton/InviteButton.vue b/webapp/components/InviteButton/InviteButton.vue
index 9eec37bc2..d3d926533 100644
--- a/webapp/components/InviteButton/InviteButton.vue
+++ b/webapp/components/InviteButton/InviteButton.vue
@@ -15,10 +15,7 @@
               ghost
               @click="copyInviteLink"
             >
-              <ds-text bold>
-                {{ $t('invite-codes.copy-code') }}
-                {{ inviteCode.code }}
-              </ds-text>
+              <ds-text bold>{{ $t('invite-codes.copy-code') }}</ds-text>
             </base-button>
           </base-card>
         </div>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index fbb9a1ce5..d21e63547 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -515,7 +515,7 @@
     "no-results": "Keine Beiträge gefunden."
   },
   "invite-codes": {
-    "copy-code": "Code:",
+    "copy-code": "Einladungslink kopieren",
     "copy-success": "Einladungscode erfolgreich in die Zwischenablage kopiert",
     "not-available": "Du hast keinen Einladungscode zur Verfügung!",
     "your-code": "Sende diesen Link per E-Mail oder in sozialen Medien, um deine Freunde einzuladen:"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index d31f3f90c..c3022b7ad 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -515,7 +515,7 @@
     "no-results": "No contributions found."
   },
   "invite-codes": {
-    "copy-code": "Code:",
+    "copy-code": "Copy Invite Link",
     "copy-success": "Invite code copied to clipboard",
     "not-available": "You have no valid invite code available!",
     "your-code": "Send this link per e-mail or in social media to invite your friends:"

From c9d6e1a9eaae960cf1f5185ab86cd7c5506728de Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 9 Mar 2023 15:43:58 +0100
Subject: [PATCH 30/36] add tooltip to invite button

---
 webapp/components/InviteButton/InviteButton.vue | 10 +++++++++-
 webapp/locales/de.json                          |  3 +++
 webapp/locales/en.json                          |  3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/webapp/components/InviteButton/InviteButton.vue b/webapp/components/InviteButton/InviteButton.vue
index d3d926533..f1774fddf 100644
--- a/webapp/components/InviteButton/InviteButton.vue
+++ b/webapp/components/InviteButton/InviteButton.vue
@@ -1,7 +1,15 @@
 <template>
   <dropdown class="invite-button" offset="8" :placement="placement">
     <template #default="{ toggleMenu }">
-      <base-button icon="user-plus" circle ghost @click.prevent="toggleMenu" />
+      <base-button
+        icon="user-plus"
+        circle ghost
+        v-tooltip="{
+          content: $t('invite-codes.button.tooltip'),
+          placement: 'bottom-start',
+        }"
+        @click.prevent="toggleMenu"
+      />
     </template>
     <template #popover>
       <div class="invite-button-menu-popover">
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index d21e63547..55c521883 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -515,6 +515,9 @@
     "no-results": "Keine Beiträge gefunden."
   },
   "invite-codes": {
+    "button": {
+      "tooltip": "Lade deine Freunde ein"
+    },
     "copy-code": "Einladungslink kopieren",
     "copy-success": "Einladungscode erfolgreich in die Zwischenablage kopiert",
     "not-available": "Du hast keinen Einladungscode zur Verfügung!",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index c3022b7ad..acc8528aa 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -515,6 +515,9 @@
     "no-results": "No contributions found."
   },
   "invite-codes": {
+    "button": {
+      "tooltip": "Invite your friends"
+    },
     "copy-code": "Copy Invite Link",
     "copy-success": "Invite code copied to clipboard",
     "not-available": "You have no valid invite code available!",

From f5b3adc842ac6aca2563ab56e402b12cb1ae4340 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 9 Mar 2023 15:48:33 +0100
Subject: [PATCH 31/36] center button in invite link popover

---
 webapp/components/InviteButton/InviteButton.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/InviteButton/InviteButton.vue b/webapp/components/InviteButton/InviteButton.vue
index f1774fddf..2c4bd8cb3 100644
--- a/webapp/components/InviteButton/InviteButton.vue
+++ b/webapp/components/InviteButton/InviteButton.vue
@@ -113,6 +113,6 @@ export default {
 }
 
 .invite-code {
-  left: 50%;
+  margin-left: 25%;
 }
 </style>

From 66e7edc2f80d1cbc422275b053db6494cbdb29d4 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 9 Mar 2023 16:03:48 +0100
Subject: [PATCH 32/36] linting

---
 webapp/components/InviteButton/InviteButton.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webapp/components/InviteButton/InviteButton.vue b/webapp/components/InviteButton/InviteButton.vue
index 2c4bd8cb3..3042a706a 100644
--- a/webapp/components/InviteButton/InviteButton.vue
+++ b/webapp/components/InviteButton/InviteButton.vue
@@ -3,7 +3,8 @@
     <template #default="{ toggleMenu }">
       <base-button
         icon="user-plus"
-        circle ghost
+        circle
+        ghost
         v-tooltip="{
           content: $t('invite-codes.button.tooltip'),
           placement: 'bottom-start',

From 3f875525f2466e423082706217c8b0f101081225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 9 Mar 2023 18:41:34 +0100
Subject: [PATCH 33/36] Change shout icon 'bullhorn' to 'heart-o'

---
 webapp/components/PostTeaser/PostTeaser.vue                   | 2 +-
 webapp/components/ShoutButton.vue                             | 2 +-
 webapp/components/_new/generic/BaseButton/BaseButton.story.js | 2 +-
 webapp/components/generic/SearchPost/SearchPost.vue           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/components/PostTeaser/PostTeaser.vue b/webapp/components/PostTeaser/PostTeaser.vue
index 6dc770d99..73b721202 100644
--- a/webapp/components/PostTeaser/PostTeaser.vue
+++ b/webapp/components/PostTeaser/PostTeaser.vue
@@ -42,7 +42,7 @@
         </div>
         <div v-else class="categories-placeholder"></div>
         <counter-icon
-          icon="bullhorn"
+          icon="heart-o"
           :count="post.shoutedCount"
           :title="$t('contribution.amount-shouts', { amount: post.shoutedCount })"
         />
diff --git a/webapp/components/ShoutButton.vue b/webapp/components/ShoutButton.vue
index d9946c1c2..4b644bc25 100644
--- a/webapp/components/ShoutButton.vue
+++ b/webapp/components/ShoutButton.vue
@@ -4,7 +4,7 @@
       :loading="loading"
       :disabled="disabled"
       :filled="shouted"
-      icon="bullhorn"
+      icon="heart-o"
       circle
       @click="toggle"
     />
diff --git a/webapp/components/_new/generic/BaseButton/BaseButton.story.js b/webapp/components/_new/generic/BaseButton/BaseButton.story.js
index 14674d99e..1b7ffec91 100644
--- a/webapp/components/_new/generic/BaseButton/BaseButton.story.js
+++ b/webapp/components/_new/generic/BaseButton/BaseButton.story.js
@@ -21,7 +21,7 @@ storiesOf('Generic/BaseButton', module)
     template: `
       <div>
         <base-button icon="edit">With Text</base-button>
-        <base-button icon="bullhorn" />
+        <base-button icon="heart-o" />
         <base-button icon="trash" disabled />
         <base-button icon="trash" loading />
       </div>
diff --git a/webapp/components/generic/SearchPost/SearchPost.vue b/webapp/components/generic/SearchPost/SearchPost.vue
index 6ab419d6d..82bf44d61 100644
--- a/webapp/components/generic/SearchPost/SearchPost.vue
+++ b/webapp/components/generic/SearchPost/SearchPost.vue
@@ -4,7 +4,7 @@
     <div class="metadata">
       <span class="counts">
         <counter-icon icon="comments" :count="option.commentsCount" soft />
-        <counter-icon icon="bullhorn" :count="option.shoutedCount" soft />
+        <counter-icon icon="heart-o" :count="option.shoutedCount" soft />
         <counter-icon icon="hand-pointer" :count="option.clickedCount" soft />
         <counter-icon icon="eye" :count="option.viewedTeaserCount" soft />
       </span>

From 69ab2ec626e3689d8b8b7be3441946922972b63b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 10 Mar 2023 11:10:29 +0100
Subject: [PATCH 34/36] Fix linting

---
 webapp/pages/index.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 04e748d52..c5c4bfedc 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -75,8 +75,7 @@
         </div>
       </ds-grid-item>
       <!-- Placeholder/Space Row -->
-      <ds-grid-item :row-span="1" column-span="fullWidth">
-      </ds-grid-item>
+      <ds-grid-item :row-span="1" column-span="fullWidth" />
       <!-- hashtag filter -->
       <ds-grid-item v-if="hashtag" :row-span="2" column-span="fullWidth">
         <hashtags-filter :hashtag="hashtag" @clearSearch="clearSearch" />
@@ -400,8 +399,8 @@ export default {
     font-size: 23px;
     z-index: 10;
   }
-  .ds-grid{                                         
-    padding-top: 1em;                               
-  } 
+  .ds-grid {
+    padding-top: 1em;
+  }
 }
 </style>

From 42cfbe2d052a0a44d4364633ab234a5c511541e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Mar 2023 02:57:44 +0000
Subject: [PATCH 35/36] Bump peter-evans/repository-dispatch from 1 to 2

Bumps [peter-evans/repository-dispatch](https://github.com/peter-evans/repository-dispatch) from 1 to 2.
- [Release notes](https://github.com/peter-evans/repository-dispatch/releases)
- [Commits](https://github.com/peter-evans/repository-dispatch/compare/v1...v2)

---
updated-dependencies:
- dependency-name: peter-evans/repository-dispatch
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 01256d719..4452f2286 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -293,7 +293,7 @@ jobs:
           echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
       - run: echo "BUILD_VERSION=${VERSION}-${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
       - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v1
+        uses: peter-evans/repository-dispatch@v2
         with:
           token: ${{ github.token }}
           event-type: trigger-build-success

From 851679fe33d6700593351105116cdad6ddb1cb87 Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Mon, 13 Mar 2023 15:01:08 +0100
Subject: [PATCH 36/36] increased the y-Gap in the masonry-grid component for a
 better overview

---
 webapp/components/MasonryGrid/MasonryGrid.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/MasonryGrid/MasonryGrid.vue b/webapp/components/MasonryGrid/MasonryGrid.vue
index 00afa31af..f95c0e16e 100644
--- a/webapp/components/MasonryGrid/MasonryGrid.vue
+++ b/webapp/components/MasonryGrid/MasonryGrid.vue
@@ -30,7 +30,7 @@ export default {
 /* dirty fix to override broken styleguide inline-styles */
 .ds-grid {
   grid-template-columns: repeat(auto-fit, minmax(min(300px, 100%), 1fr)) !important;
-  gap: 16px !important;
+  gap: 32px 16px !important;
   grid-auto-rows: 20px;
 }