From a3c3b0272913eaf54f6ff845ed6866a6e4c6ef2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 26 May 2023 19:21:17 +0200
Subject: [PATCH 01/59] Fix filter button and post type filter menu labels

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

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 82b7c7bd4..80942f7b5 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -272,7 +272,7 @@
       "myFriends": "Nutzer denen ich folge",
       "myGroups": "Aus meinen Gruppen",
       "myTopics": "Meine Themen",
-      "noFilter": "Beiträge filtern"
+      "noFilter": "Inhalt filtern"
     },
     "filterMyGroups": "Beiträge in meinen Gruppen",
     "inappropriatePicture": "Dieses Bild kann für einige Menschen unangemessen sein.",
@@ -378,11 +378,11 @@
   },
   "filter-menu": {
     "all": "Alle",
-    "article": "Artikel",
+    "article": "Beitrag",
     "categories": "Themen",
     "deleteFilter": "Filter löschen",
     "emotions": "Emotionen",
-    "events": "Veranstaltungen",
+    "event": "Veranstaltung",
     "filter-by": "Filtern nach ...",
     "following": "Nutzer denen ich folge",
     "languages": "Sprachen",
@@ -398,7 +398,7 @@
       }
     },
     "order-by": "Sortieren nach ...",
-    "post-type": "Beitrags-Typ",
+    "post-type": "Inhaltstyp",
     "save": {
       "error": "Themen konnten nicht gespeichert werden!",
       "success": "Themen gespeichert!"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 45a241957..338c34be1 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -272,7 +272,7 @@
       "myFriends": "Users I follow",
       "myGroups": "By my groups",
       "myTopics": "My topics",
-      "noFilter": "Filter posts"
+      "noFilter": "Filter content"
     },
     "filterMyGroups": "Contributions in my groups",
     "inappropriatePicture": "This image may be inappropriate for some people.",
@@ -382,7 +382,7 @@
     "categories": "Topics",
     "deleteFilter": "Delete filter",
     "emotions": "Emotions",
-    "events": "Events",
+    "event": "Event",
     "filter-by": "Filter by ...",
     "following": "Users I follow",
     "languages": "Languages",
@@ -398,7 +398,7 @@
       }
     },
     "order-by": "Order by ...",
-    "post-type": "Post type",
+    "post-type": "Content type",
     "save": {
       "error": "Failed saving topic settings!",
       "success": "Topics saved!"

From 3fa8c3d2e3ff5a9a1cb456a1b51d96ba3fe6945a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 26 May 2023 19:22:55 +0200
Subject: [PATCH 02/59] Change behavior of filter menu post type buttons to
 switch between them by click

---
 .../components/FilterMenu/PostTypeFilter.vue  | 37 +++++++++++++++++--
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/webapp/components/FilterMenu/PostTypeFilter.vue b/webapp/components/FilterMenu/PostTypeFilter.vue
index 005bfd9d2..4fc1205ec 100644
--- a/webapp/components/FilterMenu/PostTypeFilter.vue
+++ b/webapp/components/FilterMenu/PostTypeFilter.vue
@@ -11,16 +11,16 @@
           :label="$t('filter-menu.article')"
           :filled="articleSet"
           :title="$t('filter-menu.article')"
-          @click="toggleFilterPostType('Article')"
+          @click="setPostTypeFilter('Article')"
         />
       </li>
       <li class="item event-item">
         <labeled-button
           icon="calendar"
-          :label="$t('filter-menu.events')"
+          :label="$t('filter-menu.event')"
           :filled="eventSet"
-          :title="$t('filter-menu.events')"
-          @click="toggleFilterPostType('Event')"
+          :title="$t('filter-menu.event')"
+          @click="setPostTypeFilter('Event')"
         />
       </li>
     </template>
@@ -38,11 +38,19 @@ export default {
     FilterMenuSection,
     LabeledButton,
   },
+  data() {
+    return {
+      postTypes: ['Article', 'Event'],
+    }
+  },
   computed: {
     ...mapGetters({
       filteredPostTypes: 'posts/filteredPostTypes',
       currentUser: 'auth/user',
     }),
+    noneSet() {
+      return !this.articleSet && !this.eventSet
+    },
     articleSet() {
       return this.filteredPostTypes.includes('Article')
     },
@@ -54,6 +62,27 @@ export default {
     ...mapMutations({
       toggleFilterPostType: 'posts/TOGGLE_POST_TYPE',
     }),
+    setPostTypeFilter(setPostType) {
+      if (this.noneSet) {
+        if (setPostType !== 'All') this.toggleFilterPostType(setPostType)
+      } else {
+        if (setPostType !== 'All') {
+          // if not set then set and unset all others
+          if (!this.filteredPostTypes.includes(setPostType)) {
+            this.toggleFilterPostType(setPostType)
+            this.postTypes.forEach((postType) => {
+              if (postType !== setPostType)
+                if (this.filteredPostTypes.includes(postType)) this.toggleFilterPostType(postType)
+            })
+          }
+        } else {
+          // unset all
+          this.postTypes.forEach((postType) => {
+            if (this.filteredPostTypes.includes(postType)) this.toggleFilterPostType(postType)
+          })
+        }
+      }
+    },
   },
 }
 </script>

From 133e584dec30711371d8fd3668ff0999497eefdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 26 May 2023 19:40:14 +0200
Subject: [PATCH 03/59] Add 'All' button to filter menu post type buttons

- Unset post type filter menu button by clicking a set button.
---
 .../components/FilterMenu/PostTypeFilter.vue  | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/webapp/components/FilterMenu/PostTypeFilter.vue b/webapp/components/FilterMenu/PostTypeFilter.vue
index 4fc1205ec..bc6669238 100644
--- a/webapp/components/FilterMenu/PostTypeFilter.vue
+++ b/webapp/components/FilterMenu/PostTypeFilter.vue
@@ -5,13 +5,22 @@
     class="following-filter"
   >
     <template #filter-follower>
+      <li class="item article-item">
+        <labeled-button
+          icon="check"
+          :label="$t('filter-menu.all')"
+          :filled="noneSet"
+          :title="$t('filter-menu.all')"
+          @click="setUnsetPostTypeFilter('All')"
+        />
+      </li>
       <li class="item article-item">
         <labeled-button
           icon="book"
           :label="$t('filter-menu.article')"
           :filled="articleSet"
           :title="$t('filter-menu.article')"
-          @click="setPostTypeFilter('Article')"
+          @click="setUnsetPostTypeFilter('Article')"
         />
       </li>
       <li class="item event-item">
@@ -20,7 +29,7 @@
           :label="$t('filter-menu.event')"
           :filled="eventSet"
           :title="$t('filter-menu.event')"
-          @click="setPostTypeFilter('Event')"
+          @click="setUnsetPostTypeFilter('Event')"
         />
       </li>
     </template>
@@ -62,13 +71,20 @@ export default {
     ...mapMutations({
       toggleFilterPostType: 'posts/TOGGLE_POST_TYPE',
     }),
-    setPostTypeFilter(setPostType) {
+    unsetAll() {
+      this.postTypes.forEach((postType) => {
+        if (this.filteredPostTypes.includes(postType)) this.toggleFilterPostType(postType)
+      })
+    },
+    setUnsetPostTypeFilter(setPostType) {
       if (this.noneSet) {
         if (setPostType !== 'All') this.toggleFilterPostType(setPostType)
       } else {
         if (setPostType !== 'All') {
-          // if not set then set and unset all others
-          if (!this.filteredPostTypes.includes(setPostType)) {
+          if (this.filteredPostTypes.includes(setPostType)) {
+            this.unsetAll()
+          } else {
+            // if not set then set and unset all others
             this.toggleFilterPostType(setPostType)
             this.postTypes.forEach((postType) => {
               if (postType !== setPostType)
@@ -76,10 +92,7 @@ export default {
             })
           }
         } else {
-          // unset all
-          this.postTypes.forEach((postType) => {
-            if (this.filteredPostTypes.includes(postType)) this.toggleFilterPostType(postType)
-          })
+          this.unsetAll()
         }
       }
     },

From 0acc41dc73a553aa3411f18d3474409244d01a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 30 May 2023 11:44:23 +0200
Subject: [PATCH 04/59] Implement dev switch for stop automatic closing of
 filter menu

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

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 591da3300..b43ac7de4 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -62,7 +62,7 @@
               :clickRemove="resetByGroups"
             />
             <div id="my-filter" v-if="showFilter">
-              <div @mouseleave="showFilter = false">
+              <div @mouseleave="mouseLeaveFilterMenu">
                 <filter-menu-component @showFilterMenu="showFilterMenu" />
               </div>
             </div>
@@ -154,6 +154,7 @@ export default {
       hideByScroll: false,
       revScrollpos: 0,
       showFilter: false,
+      developerNoAutoClosingFilterMenu: false, // stops automatic closing of filter menu for developer purposes: default is 'false'
       showDonations: false,
       goal: 15000,
       progress: 7000,
@@ -215,6 +216,10 @@ export default {
     openFilterMenu() {
       this.showFilter = !this.showFilter
     },
+    mouseLeaveFilterMenu() {
+      if (this.developerNoAutoClosingFilterMenu) return
+      this.showFilter = false
+    },
     showFilterMenu(e) {
       if (!e || (!e.target.closest('#my-filter') && !e.target.closest('.my-filter-button'))) {
         if (!this.showFilter) return

From afbcb1244d1aff185745f940786eb6c1d5c8aab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 30 May 2023 11:44:52 +0200
Subject: [PATCH 05/59] Fix comment typing

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

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index b43ac7de4..f8a6b7c4b 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -160,7 +160,7 @@ export default {
       progress: 7000,
       posts: [],
       hasMore: true,
-      // Initialize your apollo data
+      // initialize your apollo data
       offset: 0,
       pageSize: 12,
       hashtag,

From 4050d8d01d0e6bbe9c72c3d5311d8c0692f34686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 30 May 2023 11:46:00 +0200
Subject: [PATCH 06/59] Stop auto closing by mouse leave of filter menu

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

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index f8a6b7c4b..9f186994a 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -154,7 +154,8 @@ export default {
       hideByScroll: false,
       revScrollpos: 0,
       showFilter: false,
-      developerNoAutoClosingFilterMenu: false, // stops automatic closing of filter menu for developer purposes: default is 'false'
+      // Wolle
+      developerNoAutoClosingFilterMenu: true, // stops automatic closing of filter menu for developer purposes: default is 'false'
       showDonations: false,
       goal: 15000,
       progress: 7000,

From 3e800751ed121e9de21b8f3520c0cf230dce7d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 30 May 2023 11:47:34 +0200
Subject: [PATCH 07/59] Beautify horizontal line above category buttons in
 filter menu

---
 webapp/components/FilterMenu/CategoriesFilter.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/FilterMenu/CategoriesFilter.vue b/webapp/components/FilterMenu/CategoriesFilter.vue
index 8b96245fd..347994c9a 100644
--- a/webapp/components/FilterMenu/CategoriesFilter.vue
+++ b/webapp/components/FilterMenu/CategoriesFilter.vue
@@ -12,12 +12,12 @@
       <li class="item item-save-topics">
         <labeled-button filled :label="$t('actions.save')" icon="save" @click="saveCategories" />
       </li>
-      <hr />
-      <ds-space margin="base" />
     </template>
 
     <template #filter-list>
       <div class="category-filter-list">
+        <hr />
+        <ds-space margin="small" />
         <base-button
           v-for="category in categories"
           :key="category.id"

From dba07a258e14ea553bc44deeda7aa48fc0c78ae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 30 May 2023 11:53:28 +0200
Subject: [PATCH 08/59] Revert "Stop auto closing by mouse leave of filter
 menu"

This reverts commit 4050d8d01d0e6bbe9c72c3d5311d8c0692f34686.
---
 webapp/pages/index.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 9f186994a..f8a6b7c4b 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -154,8 +154,7 @@ export default {
       hideByScroll: false,
       revScrollpos: 0,
       showFilter: false,
-      // Wolle
-      developerNoAutoClosingFilterMenu: true, // stops automatic closing of filter menu for developer purposes: default is 'false'
+      developerNoAutoClosingFilterMenu: false, // stops automatic closing of filter menu for developer purposes: default is 'false'
       showDonations: false,
       goal: 15000,
       progress: 7000,

From 7d381a5fdb806b8f75c985af77b7186f19523f26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 30 May 2023 12:11:16 +0200
Subject: [PATCH 09/59] Fix typo in backend 'filter-posts.spec.js'

---
 backend/src/schema/resolvers/filter-posts.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/schema/resolvers/filter-posts.spec.js b/backend/src/schema/resolvers/filter-posts.spec.js
index 0b96e001f..41fbd0ea7 100644
--- a/backend/src/schema/resolvers/filter-posts.spec.js
+++ b/backend/src/schema/resolvers/filter-posts.spec.js
@@ -158,7 +158,7 @@ describe('Filter Posts', () => {
   })
 
   describe('order events by event start descending', () => {
-    it('finds the events orderd accordingly', async () => {
+    it('finds the events ordered accordingly', async () => {
       const {
         data: { Post: result },
       } = await query({
@@ -180,7 +180,7 @@ describe('Filter Posts', () => {
   })
 
   describe('order events by event start ascending', () => {
-    it('finds the events orderd accordingly', async () => {
+    it('finds the events ordered accordingly', async () => {
       const {
         data: { Post: result },
       } = await query({

From b08bacb7e06ea1bb0f30ba6c13cc4ec7a7d68607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 30 May 2023 12:36:49 +0200
Subject: [PATCH 10/59] Add title 'Creation date' to 'OrderByFilter.vue'

---
 webapp/components/FilterMenu/OrderByFilter.vue | 7 ++++++-
 webapp/locales/de.json                         | 1 +
 webapp/locales/en.json                         | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/webapp/components/FilterMenu/OrderByFilter.vue b/webapp/components/FilterMenu/OrderByFilter.vue
index b6b0673e1..31b3e741c 100644
--- a/webapp/components/FilterMenu/OrderByFilter.vue
+++ b/webapp/components/FilterMenu/OrderByFilter.vue
@@ -1,5 +1,9 @@
 <template>
-  <filter-menu-section :divider="false" class="order-by-filter">
+  <filter-menu-section
+    class="order-by-filter"
+    :title="$t('filter-menu.creationDate')"
+    :divider="false"
+  >
     <template #filter-list>
       <li class="item">
         <labeled-button
@@ -38,6 +42,7 @@ export default {
   },
   computed: {
     ...mapGetters({
+      filteredPostTypes: 'posts/filteredPostTypes',
       orderBy: 'posts/orderBy',
     }),
   },
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 80942f7b5..00595a79c 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -380,6 +380,7 @@
     "all": "Alle",
     "article": "Beitrag",
     "categories": "Themen",
+    "creationDate": "Erstellungsdatum",
     "deleteFilter": "Filter löschen",
     "emotions": "Emotionen",
     "event": "Veranstaltung",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 338c34be1..8a2012a73 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -380,6 +380,7 @@
     "all": "All",
     "article": "Article",
     "categories": "Topics",
+    "creationDate": "Creation date",
     "deleteFilter": "Delete filter",
     "emotions": "Emotions",
     "event": "Event",

From badc388da9f51f80d694bd122ce6990cfcc547cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 30 May 2023 12:37:38 +0200
Subject: [PATCH 11/59] Implement mixin for filter menu

---
 .../components/FilterMenu/PostTypeFilter.vue  | 35 +++++--------------
 webapp/mixins/filterMenuMixin.js              | 24 +++++++++++++
 2 files changed, 33 insertions(+), 26 deletions(-)
 create mode 100644 webapp/mixins/filterMenuMixin.js

diff --git a/webapp/components/FilterMenu/PostTypeFilter.vue b/webapp/components/FilterMenu/PostTypeFilter.vue
index bc6669238..fcd4f161a 100644
--- a/webapp/components/FilterMenu/PostTypeFilter.vue
+++ b/webapp/components/FilterMenu/PostTypeFilter.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-import { mapGetters, mapMutations } from 'vuex'
+import FilterMenuMixin from '~/mixins/filterMenuMixin.js'
 import FilterMenuSection from '~/components/FilterMenu/FilterMenuSection'
 import LabeledButton from '~/components/_new/generic/LabeledButton/LabeledButton'
 
@@ -47,32 +47,15 @@ export default {
     FilterMenuSection,
     LabeledButton,
   },
+  mixins: [FilterMenuMixin],
   data() {
     return {
-      postTypes: ['Article', 'Event'],
+      filterPostTypes: ['Article', 'Event'],
     }
   },
-  computed: {
-    ...mapGetters({
-      filteredPostTypes: 'posts/filteredPostTypes',
-      currentUser: 'auth/user',
-    }),
-    noneSet() {
-      return !this.articleSet && !this.eventSet
-    },
-    articleSet() {
-      return this.filteredPostTypes.includes('Article')
-    },
-    eventSet() {
-      return this.filteredPostTypes.includes('Event')
-    },
-  },
   methods: {
-    ...mapMutations({
-      toggleFilterPostType: 'posts/TOGGLE_POST_TYPE',
-    }),
-    unsetAll() {
-      this.postTypes.forEach((postType) => {
+    unsetAllPostTypeFilters() {
+      this.filterPostTypes.forEach((postType) => {
         if (this.filteredPostTypes.includes(postType)) this.toggleFilterPostType(postType)
       })
     },
@@ -82,17 +65,17 @@ export default {
       } else {
         if (setPostType !== 'All') {
           if (this.filteredPostTypes.includes(setPostType)) {
-            this.unsetAll()
+            this.unsetAllPostTypeFilters()
           } else {
-            // if not set then set and unset all others
+            // if 'setPostType' is not set then set it and unset all others
             this.toggleFilterPostType(setPostType)
-            this.postTypes.forEach((postType) => {
+            this.filterPostTypes.forEach((postType) => {
               if (postType !== setPostType)
                 if (this.filteredPostTypes.includes(postType)) this.toggleFilterPostType(postType)
             })
           }
         } else {
-          this.unsetAll()
+          this.unsetAllPostTypeFilters()
         }
       }
     },
diff --git a/webapp/mixins/filterMenuMixin.js b/webapp/mixins/filterMenuMixin.js
new file mode 100644
index 000000000..47ac5c5c6
--- /dev/null
+++ b/webapp/mixins/filterMenuMixin.js
@@ -0,0 +1,24 @@
+import { mapGetters, mapMutations } from 'vuex'
+
+export default {
+  computed: {
+    ...mapGetters({
+      filteredPostTypes: 'posts/filteredPostTypes',
+      currentUser: 'auth/user',
+    }),
+    noneSet() {
+      return !this.articleSet && !this.eventSet
+    },
+    articleSet() {
+      return this.filteredPostTypes.includes('Article')
+    },
+    eventSet() {
+      return this.filteredPostTypes.includes('Event')
+    },
+  },
+  methods: {
+    ...mapMutations({
+      toggleFilterPostType: 'posts/TOGGLE_POST_TYPE',
+    }),
+  },
+}

From 747cfb8c1d891bba70571aee2996bb36003feaaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 30 May 2023 13:03:38 +0200
Subject: [PATCH 12/59] Rename post type filters computed in mixin

---
 webapp/components/FilterMenu/OrderByFilter.vue  | 4 +++-
 webapp/components/FilterMenu/PostTypeFilter.vue | 8 ++++----
 webapp/mixins/filterMenuMixin.js                | 8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/webapp/components/FilterMenu/OrderByFilter.vue b/webapp/components/FilterMenu/OrderByFilter.vue
index 31b3e741c..5ed60c48e 100644
--- a/webapp/components/FilterMenu/OrderByFilter.vue
+++ b/webapp/components/FilterMenu/OrderByFilter.vue
@@ -1,5 +1,6 @@
 <template>
   <filter-menu-section
+    v-if="noneSetInPostTypeFilter || articleSetInPostTypeFilter"
     class="order-by-filter"
     :title="$t('filter-menu.creationDate')"
     :divider="false"
@@ -31,6 +32,7 @@
 
 <script>
 import { mapGetters, mapMutations } from 'vuex'
+import FilterMenuMixin from '~/mixins/filterMenuMixin.js'
 import FilterMenuSection from '~/components/FilterMenu/FilterMenuSection'
 import LabeledButton from '~/components/_new/generic/LabeledButton/LabeledButton'
 
@@ -40,9 +42,9 @@ export default {
     FilterMenuSection,
     LabeledButton,
   },
+  mixins: [FilterMenuMixin],
   computed: {
     ...mapGetters({
-      filteredPostTypes: 'posts/filteredPostTypes',
       orderBy: 'posts/orderBy',
     }),
   },
diff --git a/webapp/components/FilterMenu/PostTypeFilter.vue b/webapp/components/FilterMenu/PostTypeFilter.vue
index fcd4f161a..ea69cda18 100644
--- a/webapp/components/FilterMenu/PostTypeFilter.vue
+++ b/webapp/components/FilterMenu/PostTypeFilter.vue
@@ -9,7 +9,7 @@
         <labeled-button
           icon="check"
           :label="$t('filter-menu.all')"
-          :filled="noneSet"
+          :filled="noneSetInPostTypeFilter"
           :title="$t('filter-menu.all')"
           @click="setUnsetPostTypeFilter('All')"
         />
@@ -18,7 +18,7 @@
         <labeled-button
           icon="book"
           :label="$t('filter-menu.article')"
-          :filled="articleSet"
+          :filled="articleSetInPostTypeFilter"
           :title="$t('filter-menu.article')"
           @click="setUnsetPostTypeFilter('Article')"
         />
@@ -27,7 +27,7 @@
         <labeled-button
           icon="calendar"
           :label="$t('filter-menu.event')"
-          :filled="eventSet"
+          :filled="eventSetInPostTypeFilter"
           :title="$t('filter-menu.event')"
           @click="setUnsetPostTypeFilter('Event')"
         />
@@ -60,7 +60,7 @@ export default {
       })
     },
     setUnsetPostTypeFilter(setPostType) {
-      if (this.noneSet) {
+      if (this.noneSetInPostTypeFilter) {
         if (setPostType !== 'All') this.toggleFilterPostType(setPostType)
       } else {
         if (setPostType !== 'All') {
diff --git a/webapp/mixins/filterMenuMixin.js b/webapp/mixins/filterMenuMixin.js
index 47ac5c5c6..c6f57d43d 100644
--- a/webapp/mixins/filterMenuMixin.js
+++ b/webapp/mixins/filterMenuMixin.js
@@ -6,13 +6,13 @@ export default {
       filteredPostTypes: 'posts/filteredPostTypes',
       currentUser: 'auth/user',
     }),
-    noneSet() {
-      return !this.articleSet && !this.eventSet
+    noneSetInPostTypeFilter() {
+      return !this.articleSetInPostTypeFilter && !this.eventSetInPostTypeFilter
     },
-    articleSet() {
+    articleSetInPostTypeFilter() {
       return this.filteredPostTypes.includes('Article')
     },
-    eventSet() {
+    eventSetInPostTypeFilter() {
       return this.filteredPostTypes.includes('Event')
     },
   },

From 4b4c3c91ff72968171d03659fcb7e7980ad10309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 30 May 2023 17:08:23 +0200
Subject: [PATCH 13/59] Implement order by start date for events

---
 .../components/FilterMenu/OrderByFilter.vue   | 89 ++++++++++++++-----
 .../components/FilterMenu/PostTypeFilter.vue  | 32 -------
 webapp/locales/de.json                        | 13 ++-
 webapp/locales/en.json                        | 11 ++-
 webapp/mixins/filterMenuMixin.js              | 57 +++++++++++-
 5 files changed, 145 insertions(+), 57 deletions(-)

diff --git a/webapp/components/FilterMenu/OrderByFilter.vue b/webapp/components/FilterMenu/OrderByFilter.vue
index 5ed60c48e..edc12f5a3 100644
--- a/webapp/components/FilterMenu/OrderByFilter.vue
+++ b/webapp/components/FilterMenu/OrderByFilter.vue
@@ -1,28 +1,23 @@
 <template>
-  <filter-menu-section
-    v-if="noneSetInPostTypeFilter || articleSetInPostTypeFilter"
-    class="order-by-filter"
-    :title="$t('filter-menu.creationDate')"
-    :divider="false"
-  >
+  <filter-menu-section class="order-by-filter" :title="sectionTitle" :divider="false">
     <template #filter-list>
       <li class="item">
         <labeled-button
           icon="sort-amount-asc"
-          :label="$t('filter-menu.order.newest.label')"
-          :filled="orderBy === 'createdAt_desc'"
-          :title="$t('filter-menu.order.newest.hint')"
-          @click="toggleOrder('createdAt_desc')"
+          :label="buttonLable('desc')"
+          :filled="orderBy === orderedDesc"
+          :title="buttonTitle('desc')"
+          @click="setOrder(orderedDesc)"
           data-test="newest-button"
         />
       </li>
       <li class="item">
         <labeled-button
           icon="sort-amount-desc"
-          :label="$t('filter-menu.order.oldest.label')"
-          :filled="orderBy === 'createdAt_asc'"
-          :title="$t('filter-menu.order.oldest.hint')"
-          @click="toggleOrder('createdAt_asc')"
+          :label="buttonLable('asc')"
+          :filled="orderBy === orderedAsc"
+          :title="buttonTitle('asc')"
+          @click="setOrder(orderedAsc)"
           data-test="oldest-button"
         />
       </li>
@@ -31,7 +26,6 @@
 </template>
 
 <script>
-import { mapGetters, mapMutations } from 'vuex'
 import FilterMenuMixin from '~/mixins/filterMenuMixin.js'
 import FilterMenuSection from '~/components/FilterMenu/FilterMenuSection'
 import LabeledButton from '~/components/_new/generic/LabeledButton/LabeledButton'
@@ -44,14 +38,67 @@ export default {
   },
   mixins: [FilterMenuMixin],
   computed: {
-    ...mapGetters({
-      orderBy: 'posts/orderBy',
-    }),
+    orderedAsc() {
+      return this.orderedByCreationDate ? 'createdAt_asc' : 'eventStart_desc'
+    },
+    orderedDesc() {
+      return this.orderedByCreationDate ? 'createdAt_desc' : 'eventStart_asc'
+    },
+    sectionTitle() {
+      return this.orderedByCreationDate
+        ? this.$t('filter-menu.creationDate')
+        : this.$t('filter-menu.startDate')
+    },
   },
   methods: {
-    ...mapMutations({
-      toggleOrder: 'posts/TOGGLE_ORDER',
-    }),
+    buttonLable(buttonType) {
+      let title
+      switch (buttonType) {
+        case 'asc':
+          if (this.orderedByCreationDate) {
+            title = this.$t('filter-menu.order.oldest.label')
+          } else {
+            title = this.$t('filter-menu.order.last.label')
+          }
+          break
+        case 'desc':
+          if (this.orderedByCreationDate) {
+            title = this.$t('filter-menu.order.newest.label')
+          } else {
+            title = this.$t('filter-menu.order.next.label')
+          }
+          break
+
+        default:
+          title = ''
+          break
+      }
+      return title
+    },
+    buttonTitle(buttonType) {
+      let title
+      switch (buttonType) {
+        case 'asc':
+          if (this.orderedByCreationDate) {
+            title = this.$t('filter-menu.order.oldest.hint')
+          } else {
+            title = this.$t('filter-menu.order.last.hint')
+          }
+          break
+        case 'desc':
+          if (this.orderedByCreationDate) {
+            title = this.$t('filter-menu.order.newest.hint')
+          } else {
+            title = this.$t('filter-menu.order.next.hint')
+          }
+          break
+
+        default:
+          title = ''
+          break
+      }
+      return title
+    },
   },
 }
 </script>
diff --git a/webapp/components/FilterMenu/PostTypeFilter.vue b/webapp/components/FilterMenu/PostTypeFilter.vue
index ea69cda18..95bc6f5b6 100644
--- a/webapp/components/FilterMenu/PostTypeFilter.vue
+++ b/webapp/components/FilterMenu/PostTypeFilter.vue
@@ -48,37 +48,5 @@ export default {
     LabeledButton,
   },
   mixins: [FilterMenuMixin],
-  data() {
-    return {
-      filterPostTypes: ['Article', 'Event'],
-    }
-  },
-  methods: {
-    unsetAllPostTypeFilters() {
-      this.filterPostTypes.forEach((postType) => {
-        if (this.filteredPostTypes.includes(postType)) this.toggleFilterPostType(postType)
-      })
-    },
-    setUnsetPostTypeFilter(setPostType) {
-      if (this.noneSetInPostTypeFilter) {
-        if (setPostType !== 'All') this.toggleFilterPostType(setPostType)
-      } else {
-        if (setPostType !== 'All') {
-          if (this.filteredPostTypes.includes(setPostType)) {
-            this.unsetAllPostTypeFilters()
-          } else {
-            // if 'setPostType' is not set then set it and unset all others
-            this.toggleFilterPostType(setPostType)
-            this.filterPostTypes.forEach((postType) => {
-              if (postType !== setPostType)
-                if (this.filteredPostTypes.includes(postType)) this.toggleFilterPostType(postType)
-            })
-          }
-        } else {
-          this.unsetAllPostTypeFilters()
-        }
-      }
-    },
-  },
 }
 </script>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 00595a79c..5586dc08c 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -380,7 +380,7 @@
     "all": "Alle",
     "article": "Beitrag",
     "categories": "Themen",
-    "creationDate": "Erstellungsdatum",
+    "creationDate": "Erstellungszeitpunkt",
     "deleteFilter": "Filter löschen",
     "emotions": "Emotionen",
     "event": "Veranstaltung",
@@ -389,10 +389,18 @@
     "languages": "Sprachen",
     "my-groups": "Meinen Gruppen",
     "order": {
+      "last": {
+        "hint": "Sortiere die Letzten nach vorn",
+        "label": "Letzte zuerst"
+      },
       "newest": {
         "hint": "Sortiere die Neuesten nach vorn",
         "label": "Neueste zuerst"
       },
+      "next": {
+        "hint": "Sortiere die Nächsten nach vorn",
+        "label": "Nächste zuerst"
+      },
       "oldest": {
         "hint": "Sortiere die Ältesten nach vorn",
         "label": "Älteste zuerst"
@@ -403,7 +411,8 @@
     "save": {
       "error": "Themen konnten nicht gespeichert werden!",
       "success": "Themen gespeichert!"
-    }
+    },
+    "startDate": "Anfangszeitpunkt"
   },
   "followButton": {
     "follow": "Folgen",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 8a2012a73..5d396e75f 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -389,10 +389,18 @@
     "languages": "Languages",
     "my-groups": "My groups",
     "order": {
+      "last": {
+        "hint": "Sort posts by the last first",
+        "label": "Last first"
+      },
       "newest": {
         "hint": "Sort posts by the newest first",
         "label": "Newest first"
       },
+      "next": {
+        "hint": "Sort posts by the next first",
+        "label": "Next first"
+      },
       "oldest": {
         "hint": "Sort posts by the oldest first",
         "label": "Oldest first"
@@ -403,7 +411,8 @@
     "save": {
       "error": "Failed saving topic settings!",
       "success": "Topics saved!"
-    }
+    },
+    "startDate": "Start date"
   },
   "followButton": {
     "follow": "Follow",
diff --git a/webapp/mixins/filterMenuMixin.js b/webapp/mixins/filterMenuMixin.js
index c6f57d43d..d7747fa78 100644
--- a/webapp/mixins/filterMenuMixin.js
+++ b/webapp/mixins/filterMenuMixin.js
@@ -1,10 +1,20 @@
 import { mapGetters, mapMutations } from 'vuex'
 
 export default {
+  data() {
+    return {
+      filterPostTypes: ['Article', 'Event'],
+      orderByTypes: {
+        creationDate: ['createdAt_asc', 'createdAt_desc'],
+        startDate: ['eventStart_asc', 'eventStart_desc'],
+      },
+    }
+  },
   computed: {
     ...mapGetters({
-      filteredPostTypes: 'posts/filteredPostTypes',
       currentUser: 'auth/user',
+      filteredPostTypes: 'posts/filteredPostTypes',
+      orderBy: 'posts/orderBy',
     }),
     noneSetInPostTypeFilter() {
       return !this.articleSetInPostTypeFilter && !this.eventSetInPostTypeFilter
@@ -15,10 +25,55 @@ export default {
     eventSetInPostTypeFilter() {
       return this.filteredPostTypes.includes('Event')
     },
+    orderedByCreationDate() {
+      return this.noneSetInPostTypeFilter || this.articleSetInPostTypeFilter
+    },
   },
   methods: {
     ...mapMutations({
       toggleFilterPostType: 'posts/TOGGLE_POST_TYPE',
+      toggleOrder: 'posts/TOGGLE_ORDER',
     }),
+    unsetAllPostTypeFilters() {
+      this.filterPostTypes.forEach((postType) => {
+        if (this.filteredPostTypes.includes(postType)) this.toggleFilterPostType(postType)
+      })
+      this.adjustOrder()
+    },
+    setUnsetPostTypeFilter(setPostType) {
+      if (this.noneSetInPostTypeFilter) {
+        if (setPostType !== 'All') this.toggleFilterPostType(setPostType)
+      } else {
+        if (setPostType !== 'All') {
+          if (this.filteredPostTypes.includes(setPostType)) {
+            this.unsetAllPostTypeFilters()
+          } else {
+            // if 'setPostType' is not set then set it and unset all others
+            this.toggleFilterPostType(setPostType)
+            this.filterPostTypes.forEach((postType) => {
+              if (postType !== setPostType)
+                if (this.filteredPostTypes.includes(postType)) this.toggleFilterPostType(postType)
+            })
+          }
+        } else {
+          this.unsetAllPostTypeFilters()
+        }
+      }
+      this.adjustOrder()
+    },
+    setOrder(newOrder) {
+      this.toggleOrder(newOrder)
+    },
+    adjustOrder() {
+      if (this.orderedByCreationDate) {
+        if (!this.orderByTypes.creationDate.includes(this.orderBy)) {
+          this.setOrder('createdAt_desc')
+        }
+      } else {
+        if (!this.orderByTypes.startDate.includes(this.orderBy)) {
+          this.setOrder('eventStart_asc')
+        }
+      }
+    },
   },
 }

From a454ce51de449caea000fd99446eb4a16782404d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 31 May 2023 12:10:00 +0200
Subject: [PATCH 14/59] Fix webapp tests

---
 webapp/components/FilterMenu/FilterMenu.spec.js    | 1 +
 webapp/components/FilterMenu/OrderByFilter.spec.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/webapp/components/FilterMenu/FilterMenu.spec.js b/webapp/components/FilterMenu/FilterMenu.spec.js
index c3a3ca113..30f970b62 100644
--- a/webapp/components/FilterMenu/FilterMenu.spec.js
+++ b/webapp/components/FilterMenu/FilterMenu.spec.js
@@ -15,6 +15,7 @@ describe('FilterMenu.vue', () => {
 
   const getters = {
     'posts/isActive': () => false,
+    'posts/filteredPostTypes': () => [],
     'posts/orderBy': () => 'createdAt_desc',
   }
 
diff --git a/webapp/components/FilterMenu/OrderByFilter.spec.js b/webapp/components/FilterMenu/OrderByFilter.spec.js
index ebd5eedaa..11979c359 100644
--- a/webapp/components/FilterMenu/OrderByFilter.spec.js
+++ b/webapp/components/FilterMenu/OrderByFilter.spec.js
@@ -11,6 +11,7 @@ describe('OrderByFilter', () => {
     'posts/TOGGLE_ORDER': jest.fn(),
   }
   const getters = {
+    'posts/filteredPostTypes': () => [],
     'posts/orderBy': () => 'createdAt_desc',
   }
 

From 238c0ef6055b77c1b2585fc006d8d932334efd54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 31 May 2023 15:05:02 +0200
Subject: [PATCH 15/59] Adjustment for filter button remove 'X'

---
 webapp/components/FilterMenu/HeaderButton.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/webapp/components/FilterMenu/HeaderButton.vue b/webapp/components/FilterMenu/HeaderButton.vue
index 780e29ade..dfacff43f 100644
--- a/webapp/components/FilterMenu/HeaderButton.vue
+++ b/webapp/components/FilterMenu/HeaderButton.vue
@@ -44,13 +44,12 @@ export default {
 </script>
 <style lang="scss">
 .my-filter-button-selected {
-  padding-right: 30px;
-  margin-top: 4px;
+  padding-right: 36px;
 }
 
 .base-button.filter-remove {
   position: relative;
-  margin-left: -31px;
+  margin-left: -37px;
   top: -5px;
   margin-right: 8px;
 }

From 152e18e6509176ab42e642005ebc905f0bfe0790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 31 May 2023 15:06:52 +0200
Subject: [PATCH 16/59] Add separate filter buttons for articles and events

---
 webapp/locales/de.json |  4 +++-
 webapp/locales/en.json |  4 +++-
 webapp/pages/index.vue | 29 ++++++++++++++++++++++-------
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 5586dc08c..2d138f65b 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -272,7 +272,9 @@
       "myFriends": "Nutzer denen ich folge",
       "myGroups": "Aus meinen Gruppen",
       "myTopics": "Meine Themen",
-      "noFilter": "Inhalt filtern"
+      "noFilter": "Inhalt filtern",
+      "onlyArticles": "Nur Beiträge",
+      "onlyEvents": "Nur Veranstaltungen"
     },
     "filterMyGroups": "Beiträge in meinen Gruppen",
     "inappropriatePicture": "Dieses Bild kann für einige Menschen unangemessen sein.",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 5d396e75f..b4cdd3cb6 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -272,7 +272,9 @@
       "myFriends": "Users I follow",
       "myGroups": "By my groups",
       "myTopics": "My topics",
-      "noFilter": "Filter content"
+      "noFilter": "Filter content",
+      "onlyArticles": "Only articles",
+      "onlyEvents": "Only events"
     },
     "filterMyGroups": "Contributions in my groups",
     "inappropriatePicture": "This image may be inappropriate for some people.",
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index f8a6b7c4b..63620c01a 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -25,6 +25,8 @@
             <base-button
               class="my-filter-button"
               v-if="
+                !articleSetInPostTypeFilter &&
+                !eventSetInPostTypeFilter &&
                 !postsFilter['categories_some'] &&
                 !postsFilter['author'] &&
                 !postsFilter['postsInMyGroups']
@@ -38,6 +40,22 @@
               <base-icon class="my-filter-button" :name="filterButtonIcon"></base-icon>
             </base-button>
 
+            <header-button
+              v-if="articleSetInPostTypeFilter"
+              :title="$t('contribution.filterMasonryGrid.onlyArticles')"
+              :clickButton="openFilterMenu"
+              :titleRemove="$t('filter-menu.deleteFilter')"
+              :clickRemove="unsetAllPostTypeFilters"
+            />
+
+            <header-button
+              v-if="eventSetInPostTypeFilter"
+              :title="$t('contribution.filterMasonryGrid.onlyEvents')"
+              :clickButton="openFilterMenu"
+              :titleRemove="$t('filter-menu.deleteFilter')"
+              :clickRemove="unsetAllPostTypeFilters"
+            />
+
             <header-button
               v-if="postsFilter['categories_some']"
               :title="$t('contribution.filterMasonryGrid.myTopics')"
@@ -120,6 +138,8 @@
 
 <script>
 import postListActions from '~/mixins/postListActions'
+import FilterMenuMixin from '~/mixins/filterMenuMixin.js'
+import mobile from '~/mixins/mobile'
 import DonationInfo from '~/components/DonationInfo/DonationInfo.vue'
 import HashtagsFilter from '~/components/HashtagsFilter/HashtagsFilter.vue'
 import HcEmpty from '~/components/Empty/Empty'
@@ -134,7 +154,6 @@ import UpdateQuery from '~/components/utils/UpdateQuery'
 import FilterMenuComponent from '~/components/FilterMenu/FilterMenuComponent'
 import { SHOW_CONTENT_FILTER_MASONRY_GRID } from '~/constants/filter.js'
 import { POST_ADD_BUTTON_POSITION_TOP } from '~/constants/posts.js'
-import mobile from '~/mixins/mobile'
 
 export default {
   components: {
@@ -147,7 +166,7 @@ export default {
     FilterMenuComponent,
     HeaderButton,
   },
-  mixins: [postListActions, mobile()],
+  mixins: [postListActions, FilterMenuMixin, mobile()],
   data() {
     const { hashtag = null } = this.$route.query
     return {
@@ -172,13 +191,9 @@ export default {
   computed: {
     ...mapGetters({
       postsFilter: 'posts/filter',
-      orderBy: 'posts/orderBy',
     }),
     filterButtonIcon() {
-      if (Object.keys(this.postsFilter).length === 0) {
-        return this.showFilter ? 'angle-up' : 'angle-down'
-      }
-      return 'close'
+      return this.showFilter ? 'angle-up' : 'angle-down'
     },
     finalFilters() {
       let filter = this.postsFilter

From 39288b4cb5f9167ba30932e36bd70197a5f1268f Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 31 May 2023 18:05:29 +0200
Subject: [PATCH 17/59] fix(webapp): warnings in unit tests

---
 webapp/components/InviteButton/InviteButton.spec.js | 4 +++-
 webapp/pages/post/create.spec.js                    | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/webapp/components/InviteButton/InviteButton.spec.js b/webapp/components/InviteButton/InviteButton.spec.js
index cb73ecfd1..1282c2bad 100644
--- a/webapp/components/InviteButton/InviteButton.spec.js
+++ b/webapp/components/InviteButton/InviteButton.spec.js
@@ -1,6 +1,8 @@
 import { mount } from '@vue/test-utils'
 import InviteButton from './InviteButton.vue'
 
+const localVue = global.localVue
+
 const stubs = {
   'v-popover': {
     template: '<span><slot /></span>',
@@ -26,7 +28,7 @@ describe('InviteButton.vue', () => {
 
   describe('mount', () => {
     const Wrapper = () => {
-      return mount(InviteButton, { mocks, propsData, stubs })
+      return mount(InviteButton, { mocks, localVue, propsData, stubs })
     }
 
     beforeEach(() => {
diff --git a/webapp/pages/post/create.spec.js b/webapp/pages/post/create.spec.js
index 4f786aaa9..45ac5f3f3 100644
--- a/webapp/pages/post/create.spec.js
+++ b/webapp/pages/post/create.spec.js
@@ -18,9 +18,13 @@ describe('create.vue', () => {
     },
   }
 
+  const stubs = {
+    ContributionForm: true,
+  }
+
   describe('mount', () => {
     const Wrapper = () => {
-      return mount(create, { mocks, localVue })
+      return mount(create, { mocks, localVue, stubs })
     }
 
     beforeEach(() => {
@@ -28,7 +32,7 @@ describe('create.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.findAll('.contribution-form')).toHaveLength(1)
+      expect(wrapper.findComponent({ name: 'ContributionForm' }).exists()).toBe(true)
     })
   })
 })

From fab85aea7856eadc2e41988518e3ac6add374cbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 31 May 2023 18:31:27 +0200
Subject: [PATCH 18/59] Implement showing of only ended events on newsfeed

---
 .../components/FilterMenu/EventsByFilter.vue  | 47 +++++++++++++++++++
 .../FilterMenu/FilterMenuComponent.vue        |  8 ++++
 webapp/locales/de.json                        | 12 +++++
 webapp/locales/en.json                        | 12 +++++
 webapp/mixins/filterMenuMixin.js              | 18 +++++++
 webapp/pages/index.vue                        |  9 ++--
 webapp/store/posts.js                         |  7 +++
 7 files changed, 108 insertions(+), 5 deletions(-)
 create mode 100644 webapp/components/FilterMenu/EventsByFilter.vue

diff --git a/webapp/components/FilterMenu/EventsByFilter.vue b/webapp/components/FilterMenu/EventsByFilter.vue
new file mode 100644
index 000000000..553b19815
--- /dev/null
+++ b/webapp/components/FilterMenu/EventsByFilter.vue
@@ -0,0 +1,47 @@
+<template>
+  <filter-menu-section class="order-by-filter" :title="sectionTitle" :divider="false">
+    <template #filter-list>
+      <li class="item">
+        <labeled-button
+          icon="check"
+          :label="$t('filter-menu.ended.all.label')"
+          :filled="eventsEnded === ''"
+          :title="$t('filter-menu.ended.all.hint')"
+          @click="setEventsEnded('')"
+          data-test="all-button"
+        />
+      </li>
+      <li class="item">
+        <labeled-button
+          icon="calendar"
+          :label="$t('filter-menu.ended.onlyEnded.label')"
+          :filled="eventsEnded === 'eventStart_gte'"
+          :title="$t('filter-menu.ended.onlyEnded.hint')"
+          @click="setEventsEnded('eventStart_gte')"
+          data-test="not-ended-button"
+        />
+      </li>
+    </template>
+  </filter-menu-section>
+</template>
+
+<script>
+import FilterMenuMixin from '~/mixins/filterMenuMixin.js'
+import FilterMenuSection from '~/components/FilterMenu/FilterMenuSection'
+import LabeledButton from '~/components/_new/generic/LabeledButton/LabeledButton'
+
+export default {
+  name: 'EventsByFilter',
+  components: {
+    FilterMenuSection,
+    LabeledButton,
+  },
+  mixins: [FilterMenuMixin],
+  computed: {
+    sectionTitle() {
+      // return $t('filter-menu.eventsEnded')
+      return null
+    },
+  },
+}
+</script>
diff --git a/webapp/components/FilterMenu/FilterMenuComponent.vue b/webapp/components/FilterMenu/FilterMenuComponent.vue
index 708c3bc7c..b8a8d4043 100644
--- a/webapp/components/FilterMenu/FilterMenuComponent.vue
+++ b/webapp/components/FilterMenu/FilterMenuComponent.vue
@@ -6,6 +6,10 @@
       <post-type-filter />
       <categories-filter v-if="categoriesActive" @showFilterMenu="$emit('showFilterMenu')" />
     </div>
+    <div v-if="eventSetInPostTypeFilter" class="filter-menu-options">
+      <h2 class="title">{{ $t('filter-menu.eventsBy') }}</h2>
+      <events-by-filter />
+    </div>
     <div class="filter-menu-options">
       <h2 class="title">{{ $t('filter-menu.order-by') }}</h2>
       <order-by-filter />
@@ -14,6 +18,8 @@
 </template>
 
 <script>
+import EventsByFilter from './EventsByFilter'
+import FilterMenuMixin from '~/mixins/filterMenuMixin.js'
 import PostTypeFilter from './PostTypeFilter'
 import FollowingFilter from './FollowingFilter'
 import OrderByFilter from './OrderByFilter'
@@ -21,11 +27,13 @@ import CategoriesFilter from './CategoriesFilter'
 
 export default {
   components: {
+    EventsByFilter,
     FollowingFilter,
     OrderByFilter,
     CategoriesFilter,
     PostTypeFilter,
   },
+  mixins: [FilterMenuMixin],
   data() {
     return {
       categoriesActive: this.$env.CATEGORIES_ACTIVE,
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 2d138f65b..5f36d293b 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -385,7 +385,19 @@
     "creationDate": "Erstellungszeitpunkt",
     "deleteFilter": "Filter löschen",
     "emotions": "Emotionen",
+    "ended": {
+      "all": {
+        "hint": "Zeige alle, auch beendete",
+        "label": "Alle"
+      },
+      "onlyEnded": {
+        "hint": "Zeige nur noch nicht beendete",
+        "label": "Nicht beendete"
+      }
+    },
     "event": "Veranstaltung",
+    "eventsBy": "Veranstaltungen – zeige ...",
+    "eventsEnded": "Beendet",
     "filter-by": "Filtern nach ...",
     "following": "Nutzer denen ich folge",
     "languages": "Sprachen",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index b4cdd3cb6..d4d52e071 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -385,7 +385,19 @@
     "creationDate": "Creation date",
     "deleteFilter": "Delete filter",
     "emotions": "Emotions",
+    "ended": {
+      "all": {
+        "hint": "Show all, also ended",
+        "label": "All"
+      },
+      "onlyEnded": {
+        "hint": "Show only not ended",
+        "label": "Not ended"
+      }
+    },
     "event": "Event",
+    "eventsBy": "Events – show ...",
+    "eventsEnded": "Ended",
     "filter-by": "Filter by ...",
     "following": "Users I follow",
     "languages": "Languages",
diff --git a/webapp/mixins/filterMenuMixin.js b/webapp/mixins/filterMenuMixin.js
index d7747fa78..ed94ea1ac 100644
--- a/webapp/mixins/filterMenuMixin.js
+++ b/webapp/mixins/filterMenuMixin.js
@@ -14,6 +14,7 @@ export default {
     ...mapGetters({
       currentUser: 'auth/user',
       filteredPostTypes: 'posts/filteredPostTypes',
+      eventsEnded: 'posts/eventsEnded',
       orderBy: 'posts/orderBy',
     }),
     noneSetInPostTypeFilter() {
@@ -32,15 +33,19 @@ export default {
   methods: {
     ...mapMutations({
       toggleFilterPostType: 'posts/TOGGLE_POST_TYPE',
+      toggleEventsEnded: 'posts/TOGGLE_EVENTS_ENDED',
       toggleOrder: 'posts/TOGGLE_ORDER',
     }),
     unsetAllPostTypeFilters() {
+      const beforeEventSetInPostTypeFilter = this.eventSetInPostTypeFilter
       this.filterPostTypes.forEach((postType) => {
         if (this.filteredPostTypes.includes(postType)) this.toggleFilterPostType(postType)
       })
+      this.adjustEventsEnded(beforeEventSetInPostTypeFilter)
       this.adjustOrder()
     },
     setUnsetPostTypeFilter(setPostType) {
+      const beforeEventSetInPostTypeFilter = this.eventSetInPostTypeFilter
       if (this.noneSetInPostTypeFilter) {
         if (setPostType !== 'All') this.toggleFilterPostType(setPostType)
       } else {
@@ -59,11 +64,24 @@ export default {
           this.unsetAllPostTypeFilters()
         }
       }
+      this.adjustEventsEnded(beforeEventSetInPostTypeFilter)
       this.adjustOrder()
     },
+    setEventsEnded(newEventsEnded) {
+      this.toggleEventsEnded(newEventsEnded)
+    },
     setOrder(newOrder) {
       this.toggleOrder(newOrder)
     },
+    adjustEventsEnded(beforeEventSetInPostTypeFilter) {
+      if (this.eventSetInPostTypeFilter !== beforeEventSetInPostTypeFilter) {
+        if (this.eventSetInPostTypeFilter) {
+          this.setEventsEnded('eventStart_gte')
+        } else {
+          this.setEventsEnded('')
+        }
+      }
+    },
     adjustOrder() {
       if (this.orderedByCreationDate) {
         if (!this.orderByTypes.creationDate.includes(this.orderBy)) {
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 63620c01a..ce84755b9 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -197,11 +197,10 @@ export default {
     },
     finalFilters() {
       let filter = this.postsFilter
-      if (this.hashtag) {
-        filter = {
-          ...filter,
-          tags_some: { id: this.hashtag },
-        }
+      filter = {
+        ...filter,
+        tags_some: this.hashtag ? { id: this.hashtag } : undefined,
+        eventStart_gte: this.eventsEnded === 'eventStart_gte' ? new Date() : undefined,
       }
       return filter
     },
diff --git a/webapp/store/posts.js b/webapp/store/posts.js
index 6deb2ed15..00aa1fadc 100644
--- a/webapp/store/posts.js
+++ b/webapp/store/posts.js
@@ -13,6 +13,7 @@ export const state = () => {
       ...defaultFilter,
     },
     order: 'createdAt_desc',
+    eventsEnded: '',
   }
 }
 
@@ -84,6 +85,9 @@ export const mutations = {
   TOGGLE_ORDER(state, value) {
     state.order = value
   },
+  TOGGLE_EVENTS_ENDED(state, value) {
+    state.eventsEnded = value
+  },
 }
 
 export const getters = {
@@ -111,6 +115,9 @@ export const getters = {
   filteredByEmotions(state) {
     return get(state.filter, 'emotions_some.emotion_in') || []
   },
+  eventsEnded(state) {
+    return state.eventsEnded
+  },
   orderBy(state) {
     return state.order
   },

From 1a9c35cb11ab5229c34ca39487965188a00ba40d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 1 Jun 2023 16:26:38 +0200
Subject: [PATCH 19/59] Fix webapp tests

---
 webapp/pages/index.spec.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/pages/index.spec.js b/webapp/pages/index.spec.js
index 8e55fada1..d36c657e9 100644
--- a/webapp/pages/index.spec.js
+++ b/webapp/pages/index.spec.js
@@ -28,6 +28,7 @@ describe('PostIndex', () => {
     store = new Vuex.Store({
       getters: {
         'posts/filter': () => ({}),
+        'posts/filteredPostTypes': () => [],
         'posts/orderBy': () => 'createdAt_desc',
         'auth/user': () => {
           return { id: 'u23' }

From 8b0248057b5c87e04f2cacbf03d369a81aa3303b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 1 Jun 2023 17:05:18 +0200
Subject: [PATCH 20/59] Fix post type filter class name

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

diff --git a/webapp/components/FilterMenu/PostTypeFilter.vue b/webapp/components/FilterMenu/PostTypeFilter.vue
index 95bc6f5b6..85916051c 100644
--- a/webapp/components/FilterMenu/PostTypeFilter.vue
+++ b/webapp/components/FilterMenu/PostTypeFilter.vue
@@ -5,7 +5,7 @@
     class="following-filter"
   >
     <template #filter-follower>
-      <li class="item article-item">
+      <li class="item all-item">
         <labeled-button
           icon="check"
           :label="$t('filter-menu.all')"

From 4fbdf70880b0ef78796ab3efa33fca4777afd338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 1 Jun 2023 17:08:05 +0200
Subject: [PATCH 21/59] Change order of imports in 'FilterMenuComponent.vue'

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

diff --git a/webapp/components/FilterMenu/FilterMenuComponent.vue b/webapp/components/FilterMenu/FilterMenuComponent.vue
index b8a8d4043..20beaedfd 100644
--- a/webapp/components/FilterMenu/FilterMenuComponent.vue
+++ b/webapp/components/FilterMenu/FilterMenuComponent.vue
@@ -18,8 +18,8 @@
 </template>
 
 <script>
-import EventsByFilter from './EventsByFilter'
 import FilterMenuMixin from '~/mixins/filterMenuMixin.js'
+import EventsByFilter from './EventsByFilter'
 import PostTypeFilter from './PostTypeFilter'
 import FollowingFilter from './FollowingFilter'
 import OrderByFilter from './OrderByFilter'

From 28e94b381fca80c5c6ed856f6ee81baea5f564c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 1 Jun 2023 17:10:24 +0200
Subject: [PATCH 22/59] Update webapp/components/FilterMenu/OrderByFilter.vue

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 .../components/FilterMenu/OrderByFilter.vue   | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/webapp/components/FilterMenu/OrderByFilter.vue b/webapp/components/FilterMenu/OrderByFilter.vue
index edc12f5a3..799b5e199 100644
--- a/webapp/components/FilterMenu/OrderByFilter.vue
+++ b/webapp/components/FilterMenu/OrderByFilter.vue
@@ -55,25 +55,12 @@ export default {
       let title
       switch (buttonType) {
         case 'asc':
-          if (this.orderedByCreationDate) {
-            title = this.$t('filter-menu.order.oldest.label')
-          } else {
-            title = this.$t('filter-menu.order.last.label')
-          }
-          break
+          return this.orderedByCreationDate ? this.$t('filter-menu.order.oldest.label') : this.$t('filter-menu.order.last.label')
         case 'desc':
-          if (this.orderedByCreationDate) {
-            title = this.$t('filter-menu.order.newest.label')
-          } else {
-            title = this.$t('filter-menu.order.next.label')
-          }
-          break
-
+          return this.orderedByCreationDate ? this.$t('filter-menu.order.newest.label') : this.$t('filter-menu.order.next.label')
         default:
-          title = ''
-          break
+          return ''
       }
-      return title
     },
     buttonTitle(buttonType) {
       let title

From d0fe3006bc9aabbb13c2ef7510b3f08b0b6a69d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 1 Jun 2023 17:11:05 +0200
Subject: [PATCH 23/59] Update webapp/components/FilterMenu/OrderByFilter.vue

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 .../components/FilterMenu/OrderByFilter.vue   | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/webapp/components/FilterMenu/OrderByFilter.vue b/webapp/components/FilterMenu/OrderByFilter.vue
index 799b5e199..5670669a9 100644
--- a/webapp/components/FilterMenu/OrderByFilter.vue
+++ b/webapp/components/FilterMenu/OrderByFilter.vue
@@ -63,28 +63,14 @@ export default {
       }
     },
     buttonTitle(buttonType) {
-      let title
       switch (buttonType) {
         case 'asc':
-          if (this.orderedByCreationDate) {
-            title = this.$t('filter-menu.order.oldest.hint')
-          } else {
-            title = this.$t('filter-menu.order.last.hint')
-          }
-          break
+          return this.orderedByCreationDate ? this.$t('filter-menu.order.oldest.hint') : this.$t('filter-menu.order.last.hint')
         case 'desc':
-          if (this.orderedByCreationDate) {
-            title = this.$t('filter-menu.order.newest.hint')
-          } else {
-            title = this.$t('filter-menu.order.next.hint')
-          }
-          break
-
+          return this.orderedByCreationDate ? this.$t('filter-menu.order.newest.hint') : this.$t('filter-menu.order.next.hint')
         default:
-          title = ''
-          break
+          return ''
       }
-      return title
     },
   },
 }

From d24200eabdc9ed7429a31d66d9f66b61c6369cf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 1 Jun 2023 17:11:55 +0200
Subject: [PATCH 24/59] Update webapp/mixins/filterMenuMixin.js

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 webapp/mixins/filterMenuMixin.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/mixins/filterMenuMixin.js b/webapp/mixins/filterMenuMixin.js
index ed94ea1ac..b293977d9 100644
--- a/webapp/mixins/filterMenuMixin.js
+++ b/webapp/mixins/filterMenuMixin.js
@@ -56,8 +56,8 @@ export default {
             // if 'setPostType' is not set then set it and unset all others
             this.toggleFilterPostType(setPostType)
             this.filterPostTypes.forEach((postType) => {
-              if (postType !== setPostType)
-                if (this.filteredPostTypes.includes(postType)) this.toggleFilterPostType(postType)
+              if (postType !== setPostType && this.filteredPostTypes.includes(postType))
+                this.toggleFilterPostType(postType)
             })
           }
         } else {

From 4eeaf7a793d9edde17e6da6a54e5692158ab5100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 1 Jun 2023 17:12:31 +0200
Subject: [PATCH 25/59] Update webapp/components/FilterMenu/OrderByFilter.vue

Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
---
 webapp/components/FilterMenu/OrderByFilter.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/webapp/components/FilterMenu/OrderByFilter.vue b/webapp/components/FilterMenu/OrderByFilter.vue
index 5670669a9..ac1b6c194 100644
--- a/webapp/components/FilterMenu/OrderByFilter.vue
+++ b/webapp/components/FilterMenu/OrderByFilter.vue
@@ -52,7 +52,6 @@ export default {
   },
   methods: {
     buttonLable(buttonType) {
-      let title
       switch (buttonType) {
         case 'asc':
           return this.orderedByCreationDate ? this.$t('filter-menu.order.oldest.label') : this.$t('filter-menu.order.last.label')

From 9fee1b43c8c68503e4d88ca4110e60f327df2ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 1 Jun 2023 17:18:24 +0200
Subject: [PATCH 26/59] Fix typo of 'buttonLabel'

---
 .../components/FilterMenu/OrderByFilter.vue   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/webapp/components/FilterMenu/OrderByFilter.vue b/webapp/components/FilterMenu/OrderByFilter.vue
index ac1b6c194..d431de50c 100644
--- a/webapp/components/FilterMenu/OrderByFilter.vue
+++ b/webapp/components/FilterMenu/OrderByFilter.vue
@@ -4,7 +4,7 @@
       <li class="item">
         <labeled-button
           icon="sort-amount-asc"
-          :label="buttonLable('desc')"
+          :label="buttonLabel('desc')"
           :filled="orderBy === orderedDesc"
           :title="buttonTitle('desc')"
           @click="setOrder(orderedDesc)"
@@ -14,7 +14,7 @@
       <li class="item">
         <labeled-button
           icon="sort-amount-desc"
-          :label="buttonLable('asc')"
+          :label="buttonLabel('asc')"
           :filled="orderBy === orderedAsc"
           :title="buttonTitle('asc')"
           @click="setOrder(orderedAsc)"
@@ -51,12 +51,16 @@ export default {
     },
   },
   methods: {
-    buttonLable(buttonType) {
+    buttonLabel(buttonType) {
       switch (buttonType) {
         case 'asc':
-          return this.orderedByCreationDate ? this.$t('filter-menu.order.oldest.label') : this.$t('filter-menu.order.last.label')
+          return this.orderedByCreationDate
+            ? this.$t('filter-menu.order.oldest.label')
+            : this.$t('filter-menu.order.last.label')
         case 'desc':
-          return this.orderedByCreationDate ? this.$t('filter-menu.order.newest.label') : this.$t('filter-menu.order.next.label')
+          return this.orderedByCreationDate
+            ? this.$t('filter-menu.order.newest.label')
+            : this.$t('filter-menu.order.next.label')
         default:
           return ''
       }
@@ -64,9 +68,13 @@ export default {
     buttonTitle(buttonType) {
       switch (buttonType) {
         case 'asc':
-          return this.orderedByCreationDate ? this.$t('filter-menu.order.oldest.hint') : this.$t('filter-menu.order.last.hint')
+          return this.orderedByCreationDate
+            ? this.$t('filter-menu.order.oldest.hint')
+            : this.$t('filter-menu.order.last.hint')
         case 'desc':
-          return this.orderedByCreationDate ? this.$t('filter-menu.order.newest.hint') : this.$t('filter-menu.order.next.hint')
+          return this.orderedByCreationDate
+            ? this.$t('filter-menu.order.newest.hint')
+            : this.$t('filter-menu.order.next.hint')
         default:
           return ''
       }

From 52c474536fa1f8f231ba8679aec65742091a2d72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 1 Jun 2023 18:00:41 +0200
Subject: [PATCH 27/59] Move all computed in file 'filterMenuMixin.js' to the
 store

---
 webapp/mixins/filterMenuMixin.js | 16 ++++------------
 webapp/store/posts.js            | 24 +++++++++++++++++++++---
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/webapp/mixins/filterMenuMixin.js b/webapp/mixins/filterMenuMixin.js
index b293977d9..2e1b487e5 100644
--- a/webapp/mixins/filterMenuMixin.js
+++ b/webapp/mixins/filterMenuMixin.js
@@ -14,21 +14,13 @@ export default {
     ...mapGetters({
       currentUser: 'auth/user',
       filteredPostTypes: 'posts/filteredPostTypes',
+      noneSetInPostTypeFilter: 'posts/noneSetInPostTypeFilter',
+      articleSetInPostTypeFilter: 'posts/articleSetInPostTypeFilter',
+      eventSetInPostTypeFilter: 'posts/eventSetInPostTypeFilter',
+      orderedByCreationDate: 'posts/orderedByCreationDate',
       eventsEnded: 'posts/eventsEnded',
       orderBy: 'posts/orderBy',
     }),
-    noneSetInPostTypeFilter() {
-      return !this.articleSetInPostTypeFilter && !this.eventSetInPostTypeFilter
-    },
-    articleSetInPostTypeFilter() {
-      return this.filteredPostTypes.includes('Article')
-    },
-    eventSetInPostTypeFilter() {
-      return this.filteredPostTypes.includes('Event')
-    },
-    orderedByCreationDate() {
-      return this.noneSetInPostTypeFilter || this.articleSetInPostTypeFilter
-    },
   },
   methods: {
     ...mapMutations({
diff --git a/webapp/store/posts.js b/webapp/store/posts.js
index 00aa1fadc..e7d039274 100644
--- a/webapp/store/posts.js
+++ b/webapp/store/posts.js
@@ -7,6 +7,22 @@ import clone from 'lodash/clone'
 
 const defaultFilter = {}
 
+const filteredPostTypes = (state) => {
+  return get(state.filter, 'postType_in') || []
+}
+const noneSetInPostTypeFilter = (state) => {
+  return !articleSetInPostTypeFilter(state) && !eventSetInPostTypeFilter(state)
+}
+const articleSetInPostTypeFilter = (state) => {
+  return filteredPostTypes(state).includes('Article')
+}
+const eventSetInPostTypeFilter = (state) => {
+  return filteredPostTypes(state).includes('Event')
+}
+const orderedByCreationDate = (state) => {
+  return noneSetInPostTypeFilter(state) || articleSetInPostTypeFilter(state)
+}
+
 export const state = () => {
   return {
     filter: {
@@ -100,9 +116,7 @@ export const getters = {
   filteredCategoryIds(state) {
     return get(state.filter, 'categories_some.id_in') || []
   },
-  filteredPostTypes(state) {
-    return get(state.filter, 'postType_in') || []
-  },
+  filteredPostTypes,
   filteredLanguageCodes(state) {
     return get(state.filter, 'language_in') || []
   },
@@ -115,6 +129,10 @@ export const getters = {
   filteredByEmotions(state) {
     return get(state.filter, 'emotions_some.emotion_in') || []
   },
+  noneSetInPostTypeFilter,
+  articleSetInPostTypeFilter,
+  eventSetInPostTypeFilter,
+  orderedByCreationDate,
   eventsEnded(state) {
     return state.eventsEnded
   },

From 52839f4b222382521abfaeda84f76843bde9f5a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 1 Jun 2023 19:07:07 +0200
Subject: [PATCH 28/59] Move 'unsetAllPostTypeFilters' to the store

---
 webapp/mixins/filterMenuMixin.js |  23 ++++---
 webapp/pages/index.vue           |   4 +-
 webapp/store/posts.js            | 112 ++++++++++++++++++++++++-------
 3 files changed, 103 insertions(+), 36 deletions(-)

diff --git a/webapp/mixins/filterMenuMixin.js b/webapp/mixins/filterMenuMixin.js
index 2e1b487e5..d481d374c 100644
--- a/webapp/mixins/filterMenuMixin.js
+++ b/webapp/mixins/filterMenuMixin.js
@@ -25,17 +25,19 @@ export default {
   methods: {
     ...mapMutations({
       toggleFilterPostType: 'posts/TOGGLE_POST_TYPE',
+      toggleUnsetAllPostTypeFilters: 'posts/TOGGLE_UNSET_ALL_POST_TYPES_FILTERS',
       toggleEventsEnded: 'posts/TOGGLE_EVENTS_ENDED',
       toggleOrder: 'posts/TOGGLE_ORDER',
     }),
-    unsetAllPostTypeFilters() {
-      const beforeEventSetInPostTypeFilter = this.eventSetInPostTypeFilter
-      this.filterPostTypes.forEach((postType) => {
-        if (this.filteredPostTypes.includes(postType)) this.toggleFilterPostType(postType)
-      })
-      this.adjustEventsEnded(beforeEventSetInPostTypeFilter)
-      this.adjustOrder()
-    },
+    // Wolle
+    // unsetAllPostTypeFilters() {
+    //   const beforeEventSetInPostTypeFilter = this.eventSetInPostTypeFilter
+    //   this.filterPostTypes.forEach((postType) => {
+    //     if (this.filteredPostTypes.includes(postType)) this.toggleFilterPostType(postType)
+    //   })
+    //   this.adjustEventsEnded(beforeEventSetInPostTypeFilter)
+    //   this.adjustOrder()
+    // },
     setUnsetPostTypeFilter(setPostType) {
       const beforeEventSetInPostTypeFilter = this.eventSetInPostTypeFilter
       if (this.noneSetInPostTypeFilter) {
@@ -43,7 +45,7 @@ export default {
       } else {
         if (setPostType !== 'All') {
           if (this.filteredPostTypes.includes(setPostType)) {
-            this.unsetAllPostTypeFilters()
+            this.toggleUnsetAllPostTypeFilters()
           } else {
             // if 'setPostType' is not set then set it and unset all others
             this.toggleFilterPostType(setPostType)
@@ -53,7 +55,7 @@ export default {
             })
           }
         } else {
-          this.unsetAllPostTypeFilters()
+          this.toggleUnsetAllPostTypeFilters()
         }
       }
       this.adjustEventsEnded(beforeEventSetInPostTypeFilter)
@@ -65,6 +67,7 @@ export default {
     setOrder(newOrder) {
       this.toggleOrder(newOrder)
     },
+    // Wolle
     adjustEventsEnded(beforeEventSetInPostTypeFilter) {
       if (this.eventSetInPostTypeFilter !== beforeEventSetInPostTypeFilter) {
         if (this.eventSetInPostTypeFilter) {
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index ce84755b9..5ca6247b8 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -45,7 +45,7 @@
               :title="$t('contribution.filterMasonryGrid.onlyArticles')"
               :clickButton="openFilterMenu"
               :titleRemove="$t('filter-menu.deleteFilter')"
-              :clickRemove="unsetAllPostTypeFilters"
+              :clickRemove="toggleUnsetAllPostTypeFilters"
             />
 
             <header-button
@@ -53,7 +53,7 @@
               :title="$t('contribution.filterMasonryGrid.onlyEvents')"
               :clickButton="openFilterMenu"
               :titleRemove="$t('filter-menu.deleteFilter')"
-              :clickRemove="unsetAllPostTypeFilters"
+              :clickRemove="toggleUnsetAllPostTypeFilters"
             />
 
             <header-button
diff --git a/webapp/store/posts.js b/webapp/store/posts.js
index e7d039274..5100120d9 100644
--- a/webapp/store/posts.js
+++ b/webapp/store/posts.js
@@ -6,6 +6,87 @@ import isEqual from 'lodash/isEqual'
 import clone from 'lodash/clone'
 
 const defaultFilter = {}
+const filterPostTypes = ['Article', 'Event']
+const orderByTypes = {
+  creationDate: ['createdAt_asc', 'createdAt_desc'],
+  startDate: ['eventStart_asc', 'eventStart_desc'],
+}
+
+export const state = () => {
+  return {
+    filter: {
+      ...defaultFilter,
+    },
+    order: 'createdAt_desc',
+    eventsEnded: '',
+  }
+}
+
+const TOGGLE_POST_TYPE = (state, postType) => {
+  const filter = clone(state.filter)
+  update(filter, 'postType_in', (postTypes) => xor(postTypes, [postType]))
+  if (isEmpty(get(filter, 'postType_in'))) delete filter.postType_in
+  state.filter = filter
+}
+
+// Wolle
+const TOGGLE_UNSET_ALL_POST_TYPES_FILTERS = (state) => {
+  const beforeEventSetInPostTypeFilter = eventSetInPostTypeFilter(state)
+  filterPostTypes.forEach((postType) => {
+    if (filteredPostTypes(state).includes(postType)) TOGGLE_POST_TYPE(state, postType)
+  })
+  adjustEventsEnded(state, beforeEventSetInPostTypeFilter)
+  adjustOrder(state)
+}
+// const setUnsetPostTypeFilter = (state, setPostType) => {
+//   const beforeEventSetInPostTypeFilter = this.eventSetInPostTypeFilter
+//   if (this.noneSetInPostTypeFilter) {
+//     if (setPostType !== 'All') this.toggleFilterPostType(setPostType)
+//   } else {
+//     if (setPostType !== 'All') {
+//       if (this.filteredPostTypes.includes(setPostType)) {
+//         TOGGLE_UNSET_ALL_POST_TYPES_FILTERS(state)
+//       } else {
+//         // if 'setPostType' is not set then set it and unset all others
+//         this.toggleFilterPostType(setPostType)
+//         this.filterPostTypes.forEach((postType) => {
+//           if (postType !== setPostType && this.filteredPostTypes.includes(postType))
+//             this.toggleFilterPostType(postType)
+//         })
+//       }
+//     } else {
+//       TOGGLE_UNSET_ALL_POST_TYPES_FILTERS(state)
+//     }
+//   }
+//   this.adjustEventsEnded(beforeEventSetInPostTypeFilter)
+//   this.adjustOrder()
+// }
+const TOGGLE_EVENTS_ENDED = (state, value) => {
+  state.eventsEnded = value
+}
+const TOGGLE_ORDER = (state, value) => {
+  state.order = value
+}
+const adjustEventsEnded = (state, beforeEventSetInPostTypeFilter) => {
+  if (eventSetInPostTypeFilter(state) !== beforeEventSetInPostTypeFilter) {
+    if (eventSetInPostTypeFilter(state)) {
+      TOGGLE_EVENTS_ENDED(state, 'eventStart_gte')
+    } else {
+      TOGGLE_EVENTS_ENDED(state, '')
+    }
+  }
+}
+const adjustOrder = (state) => {
+  if (orderedByCreationDate(state)) {
+    if (!orderByTypes.creationDate.includes(orderBy(state))) {
+      TOGGLE_ORDER(state, 'createdAt_desc')
+    }
+  } else {
+    if (!orderByTypes.startDate.includes(orderBy(state))) {
+      TOGGLE_ORDER(state, 'eventStart_asc')
+    }
+  }
+}
 
 const filteredPostTypes = (state) => {
   return get(state.filter, 'postType_in') || []
@@ -22,15 +103,8 @@ const eventSetInPostTypeFilter = (state) => {
 const orderedByCreationDate = (state) => {
   return noneSetInPostTypeFilter(state) || articleSetInPostTypeFilter(state)
 }
-
-export const state = () => {
-  return {
-    filter: {
-      ...defaultFilter,
-    },
-    order: 'createdAt_desc',
-    eventsEnded: '',
-  }
+const orderBy = (state) => {
+  return state.order
 }
 
 export const mutations = {
@@ -80,12 +154,6 @@ export const mutations = {
     if (isEmpty(get(filter, 'categories_some.id_in'))) delete filter.categories_some
     state.filter = filter
   },
-  TOGGLE_POST_TYPE(state, postType) {
-    const filter = clone(state.filter)
-    update(filter, 'postType_in', (postTypes) => xor(postTypes, [postType]))
-    if (isEmpty(get(filter, 'postType_in'))) delete filter.postType_in
-    state.filter = filter
-  },
   TOGGLE_LANGUAGE(state, languageCode) {
     const filter = clone(state.filter)
     update(filter, 'language_in', (languageCodes) => xor(languageCodes, [languageCode]))
@@ -98,12 +166,10 @@ export const mutations = {
     if (isEmpty(get(filter, 'emotions_some.emotion_in'))) delete filter.emotions_some
     state.filter = filter
   },
-  TOGGLE_ORDER(state, value) {
-    state.order = value
-  },
-  TOGGLE_EVENTS_ENDED(state, value) {
-    state.eventsEnded = value
-  },
+  TOGGLE_POST_TYPE,
+  TOGGLE_UNSET_ALL_POST_TYPES_FILTERS,
+  TOGGLE_EVENTS_ENDED,
+  TOGGLE_ORDER,
 }
 
 export const getters = {
@@ -136,7 +202,5 @@ export const getters = {
   eventsEnded(state) {
     return state.eventsEnded
   },
-  orderBy(state) {
-    return state.order
-  },
+  orderBy,
 }

From 7687d6f28c0bdedac322d0ad5eddd996139313b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 1 Jun 2023 19:27:13 +0200
Subject: [PATCH 29/59] Move 'setUnsetPostTypeFilter' to the store

---
 .../components/FilterMenu/PostTypeFilter.vue  |  6 +-
 webapp/mixins/filterMenuMixin.js              | 63 +------------------
 webapp/store/posts.js                         | 49 +++++++--------
 3 files changed, 28 insertions(+), 90 deletions(-)

diff --git a/webapp/components/FilterMenu/PostTypeFilter.vue b/webapp/components/FilterMenu/PostTypeFilter.vue
index 85916051c..db391a77a 100644
--- a/webapp/components/FilterMenu/PostTypeFilter.vue
+++ b/webapp/components/FilterMenu/PostTypeFilter.vue
@@ -11,7 +11,7 @@
           :label="$t('filter-menu.all')"
           :filled="noneSetInPostTypeFilter"
           :title="$t('filter-menu.all')"
-          @click="setUnsetPostTypeFilter('All')"
+          @click="toggleSetUnsetPostTypeFilter('All')"
         />
       </li>
       <li class="item article-item">
@@ -20,7 +20,7 @@
           :label="$t('filter-menu.article')"
           :filled="articleSetInPostTypeFilter"
           :title="$t('filter-menu.article')"
-          @click="setUnsetPostTypeFilter('Article')"
+          @click="toggleSetUnsetPostTypeFilter('Article')"
         />
       </li>
       <li class="item event-item">
@@ -29,7 +29,7 @@
           :label="$t('filter-menu.event')"
           :filled="eventSetInPostTypeFilter"
           :title="$t('filter-menu.event')"
-          @click="setUnsetPostTypeFilter('Event')"
+          @click="toggleSetUnsetPostTypeFilter('Event')"
         />
       </li>
     </template>
diff --git a/webapp/mixins/filterMenuMixin.js b/webapp/mixins/filterMenuMixin.js
index d481d374c..40429515d 100644
--- a/webapp/mixins/filterMenuMixin.js
+++ b/webapp/mixins/filterMenuMixin.js
@@ -1,15 +1,6 @@
 import { mapGetters, mapMutations } from 'vuex'
 
 export default {
-  data() {
-    return {
-      filterPostTypes: ['Article', 'Event'],
-      orderByTypes: {
-        creationDate: ['createdAt_asc', 'createdAt_desc'],
-        startDate: ['eventStart_asc', 'eventStart_desc'],
-      },
-    }
-  },
   computed: {
     ...mapGetters({
       currentUser: 'auth/user',
@@ -26,67 +17,15 @@ export default {
     ...mapMutations({
       toggleFilterPostType: 'posts/TOGGLE_POST_TYPE',
       toggleUnsetAllPostTypeFilters: 'posts/TOGGLE_UNSET_ALL_POST_TYPES_FILTERS',
+      toggleSetUnsetPostTypeFilter: 'posts/TOGGLE_SET_UNSET_POST_TYPE_FILTER',
       toggleEventsEnded: 'posts/TOGGLE_EVENTS_ENDED',
       toggleOrder: 'posts/TOGGLE_ORDER',
     }),
-    // Wolle
-    // unsetAllPostTypeFilters() {
-    //   const beforeEventSetInPostTypeFilter = this.eventSetInPostTypeFilter
-    //   this.filterPostTypes.forEach((postType) => {
-    //     if (this.filteredPostTypes.includes(postType)) this.toggleFilterPostType(postType)
-    //   })
-    //   this.adjustEventsEnded(beforeEventSetInPostTypeFilter)
-    //   this.adjustOrder()
-    // },
-    setUnsetPostTypeFilter(setPostType) {
-      const beforeEventSetInPostTypeFilter = this.eventSetInPostTypeFilter
-      if (this.noneSetInPostTypeFilter) {
-        if (setPostType !== 'All') this.toggleFilterPostType(setPostType)
-      } else {
-        if (setPostType !== 'All') {
-          if (this.filteredPostTypes.includes(setPostType)) {
-            this.toggleUnsetAllPostTypeFilters()
-          } else {
-            // if 'setPostType' is not set then set it and unset all others
-            this.toggleFilterPostType(setPostType)
-            this.filterPostTypes.forEach((postType) => {
-              if (postType !== setPostType && this.filteredPostTypes.includes(postType))
-                this.toggleFilterPostType(postType)
-            })
-          }
-        } else {
-          this.toggleUnsetAllPostTypeFilters()
-        }
-      }
-      this.adjustEventsEnded(beforeEventSetInPostTypeFilter)
-      this.adjustOrder()
-    },
     setEventsEnded(newEventsEnded) {
       this.toggleEventsEnded(newEventsEnded)
     },
     setOrder(newOrder) {
       this.toggleOrder(newOrder)
     },
-    // Wolle
-    adjustEventsEnded(beforeEventSetInPostTypeFilter) {
-      if (this.eventSetInPostTypeFilter !== beforeEventSetInPostTypeFilter) {
-        if (this.eventSetInPostTypeFilter) {
-          this.setEventsEnded('eventStart_gte')
-        } else {
-          this.setEventsEnded('')
-        }
-      }
-    },
-    adjustOrder() {
-      if (this.orderedByCreationDate) {
-        if (!this.orderByTypes.creationDate.includes(this.orderBy)) {
-          this.setOrder('createdAt_desc')
-        }
-      } else {
-        if (!this.orderByTypes.startDate.includes(this.orderBy)) {
-          this.setOrder('eventStart_asc')
-        }
-      }
-    },
   },
 }
diff --git a/webapp/store/posts.js b/webapp/store/posts.js
index 5100120d9..4c213af92 100644
--- a/webapp/store/posts.js
+++ b/webapp/store/posts.js
@@ -28,8 +28,6 @@ const TOGGLE_POST_TYPE = (state, postType) => {
   if (isEmpty(get(filter, 'postType_in'))) delete filter.postType_in
   state.filter = filter
 }
-
-// Wolle
 const TOGGLE_UNSET_ALL_POST_TYPES_FILTERS = (state) => {
   const beforeEventSetInPostTypeFilter = eventSetInPostTypeFilter(state)
   filterPostTypes.forEach((postType) => {
@@ -38,29 +36,29 @@ const TOGGLE_UNSET_ALL_POST_TYPES_FILTERS = (state) => {
   adjustEventsEnded(state, beforeEventSetInPostTypeFilter)
   adjustOrder(state)
 }
-// const setUnsetPostTypeFilter = (state, setPostType) => {
-//   const beforeEventSetInPostTypeFilter = this.eventSetInPostTypeFilter
-//   if (this.noneSetInPostTypeFilter) {
-//     if (setPostType !== 'All') this.toggleFilterPostType(setPostType)
-//   } else {
-//     if (setPostType !== 'All') {
-//       if (this.filteredPostTypes.includes(setPostType)) {
-//         TOGGLE_UNSET_ALL_POST_TYPES_FILTERS(state)
-//       } else {
-//         // if 'setPostType' is not set then set it and unset all others
-//         this.toggleFilterPostType(setPostType)
-//         this.filterPostTypes.forEach((postType) => {
-//           if (postType !== setPostType && this.filteredPostTypes.includes(postType))
-//             this.toggleFilterPostType(postType)
-//         })
-//       }
-//     } else {
-//       TOGGLE_UNSET_ALL_POST_TYPES_FILTERS(state)
-//     }
-//   }
-//   this.adjustEventsEnded(beforeEventSetInPostTypeFilter)
-//   this.adjustOrder()
-// }
+const TOGGLE_SET_UNSET_POST_TYPE_FILTER = (state, setPostType) => {
+  const beforeEventSetInPostTypeFilter = eventSetInPostTypeFilter(state)
+  if (noneSetInPostTypeFilter(state)) {
+    if (setPostType !== 'All') TOGGLE_POST_TYPE(state, setPostType)
+  } else {
+    if (setPostType !== 'All') {
+      if (filteredPostTypes(state).includes(setPostType)) {
+        TOGGLE_UNSET_ALL_POST_TYPES_FILTERS(state)
+      } else {
+        // if 'setPostType' is not set then set it and unset all others
+        TOGGLE_POST_TYPE(state, setPostType)
+        filterPostTypes.forEach((postType) => {
+          if (postType !== setPostType && filteredPostTypes(state).includes(postType))
+            TOGGLE_POST_TYPE(state, postType)
+        })
+      }
+    } else {
+      TOGGLE_UNSET_ALL_POST_TYPES_FILTERS(state)
+    }
+  }
+  adjustEventsEnded(state, beforeEventSetInPostTypeFilter)
+  adjustOrder(state)
+}
 const TOGGLE_EVENTS_ENDED = (state, value) => {
   state.eventsEnded = value
 }
@@ -168,6 +166,7 @@ export const mutations = {
   },
   TOGGLE_POST_TYPE,
   TOGGLE_UNSET_ALL_POST_TYPES_FILTERS,
+  TOGGLE_SET_UNSET_POST_TYPE_FILTER,
   TOGGLE_EVENTS_ENDED,
   TOGGLE_ORDER,
 }

From edfb667bcfcdd9808eaa80cc900e5601aedbe6b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 1 Jun 2023 19:29:58 +0200
Subject: [PATCH 30/59] Replace 'setEventsEnded' by 'toggleEventsEnded'

---
 webapp/mixins/filterMenuMixin.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/webapp/mixins/filterMenuMixin.js b/webapp/mixins/filterMenuMixin.js
index 40429515d..eeb69f349 100644
--- a/webapp/mixins/filterMenuMixin.js
+++ b/webapp/mixins/filterMenuMixin.js
@@ -21,9 +21,6 @@ export default {
       toggleEventsEnded: 'posts/TOGGLE_EVENTS_ENDED',
       toggleOrder: 'posts/TOGGLE_ORDER',
     }),
-    setEventsEnded(newEventsEnded) {
-      this.toggleEventsEnded(newEventsEnded)
-    },
     setOrder(newOrder) {
       this.toggleOrder(newOrder)
     },

From c1d9766f391587a5995e1daf4e52c6241c8dec12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 1 Jun 2023 19:31:21 +0200
Subject: [PATCH 31/59] Replace 'setOrder' by 'toggleOrder'

---
 webapp/components/FilterMenu/EventsByFilter.vue | 4 ++--
 webapp/components/FilterMenu/OrderByFilter.vue  | 4 ++--
 webapp/mixins/filterMenuMixin.js                | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/webapp/components/FilterMenu/EventsByFilter.vue b/webapp/components/FilterMenu/EventsByFilter.vue
index 553b19815..3d0531e51 100644
--- a/webapp/components/FilterMenu/EventsByFilter.vue
+++ b/webapp/components/FilterMenu/EventsByFilter.vue
@@ -7,7 +7,7 @@
           :label="$t('filter-menu.ended.all.label')"
           :filled="eventsEnded === ''"
           :title="$t('filter-menu.ended.all.hint')"
-          @click="setEventsEnded('')"
+          @click="toggleEventsEnded('')"
           data-test="all-button"
         />
       </li>
@@ -17,7 +17,7 @@
           :label="$t('filter-menu.ended.onlyEnded.label')"
           :filled="eventsEnded === 'eventStart_gte'"
           :title="$t('filter-menu.ended.onlyEnded.hint')"
-          @click="setEventsEnded('eventStart_gte')"
+          @click="toggleEventsEnded('eventStart_gte')"
           data-test="not-ended-button"
         />
       </li>
diff --git a/webapp/components/FilterMenu/OrderByFilter.vue b/webapp/components/FilterMenu/OrderByFilter.vue
index d431de50c..279c2600a 100644
--- a/webapp/components/FilterMenu/OrderByFilter.vue
+++ b/webapp/components/FilterMenu/OrderByFilter.vue
@@ -7,7 +7,7 @@
           :label="buttonLabel('desc')"
           :filled="orderBy === orderedDesc"
           :title="buttonTitle('desc')"
-          @click="setOrder(orderedDesc)"
+          @click="toggleOrder(orderedDesc)"
           data-test="newest-button"
         />
       </li>
@@ -17,7 +17,7 @@
           :label="buttonLabel('asc')"
           :filled="orderBy === orderedAsc"
           :title="buttonTitle('asc')"
-          @click="setOrder(orderedAsc)"
+          @click="toggleOrder(orderedAsc)"
           data-test="oldest-button"
         />
       </li>
diff --git a/webapp/mixins/filterMenuMixin.js b/webapp/mixins/filterMenuMixin.js
index eeb69f349..9c59770ae 100644
--- a/webapp/mixins/filterMenuMixin.js
+++ b/webapp/mixins/filterMenuMixin.js
@@ -21,8 +21,5 @@ export default {
       toggleEventsEnded: 'posts/TOGGLE_EVENTS_ENDED',
       toggleOrder: 'posts/TOGGLE_ORDER',
     }),
-    setOrder(newOrder) {
-      this.toggleOrder(newOrder)
-    },
   },
 }

From 419ec5384fba5f854607e87419d8000db946379c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 1 Jun 2023 19:44:13 +0200
Subject: [PATCH 32/59] Move 'eventsEnded' and 'toggleEventsEnded' from file
 'filterMenuMixin.js' to the files where it's used

---
 webapp/components/FilterMenu/EventsByFilter.vue | 11 +++++++++--
 webapp/mixins/filterMenuMixin.js                |  2 --
 webapp/pages/index.vue                          |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/webapp/components/FilterMenu/EventsByFilter.vue b/webapp/components/FilterMenu/EventsByFilter.vue
index 3d0531e51..f29c5eb81 100644
--- a/webapp/components/FilterMenu/EventsByFilter.vue
+++ b/webapp/components/FilterMenu/EventsByFilter.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import FilterMenuMixin from '~/mixins/filterMenuMixin.js'
+import { mapGetters, mapMutations } from 'vuex'
 import FilterMenuSection from '~/components/FilterMenu/FilterMenuSection'
 import LabeledButton from '~/components/_new/generic/LabeledButton/LabeledButton'
 
@@ -36,12 +36,19 @@ export default {
     FilterMenuSection,
     LabeledButton,
   },
-  mixins: [FilterMenuMixin],
   computed: {
+    ...mapGetters({
+      eventsEnded: 'posts/eventsEnded',
+    }),
     sectionTitle() {
       // return $t('filter-menu.eventsEnded')
       return null
     },
   },
+  methods: {
+    ...mapMutations({
+      toggleEventsEnded: 'posts/TOGGLE_EVENTS_ENDED',
+    }),
+  },
 }
 </script>
diff --git a/webapp/mixins/filterMenuMixin.js b/webapp/mixins/filterMenuMixin.js
index 9c59770ae..2d7aefc48 100644
--- a/webapp/mixins/filterMenuMixin.js
+++ b/webapp/mixins/filterMenuMixin.js
@@ -9,7 +9,6 @@ export default {
       articleSetInPostTypeFilter: 'posts/articleSetInPostTypeFilter',
       eventSetInPostTypeFilter: 'posts/eventSetInPostTypeFilter',
       orderedByCreationDate: 'posts/orderedByCreationDate',
-      eventsEnded: 'posts/eventsEnded',
       orderBy: 'posts/orderBy',
     }),
   },
@@ -18,7 +17,6 @@ export default {
       toggleFilterPostType: 'posts/TOGGLE_POST_TYPE',
       toggleUnsetAllPostTypeFilters: 'posts/TOGGLE_UNSET_ALL_POST_TYPES_FILTERS',
       toggleSetUnsetPostTypeFilter: 'posts/TOGGLE_SET_UNSET_POST_TYPE_FILTER',
-      toggleEventsEnded: 'posts/TOGGLE_EVENTS_ENDED',
       toggleOrder: 'posts/TOGGLE_ORDER',
     }),
   },
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 5ca6247b8..09d4cf919 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -191,6 +191,7 @@ export default {
   computed: {
     ...mapGetters({
       postsFilter: 'posts/filter',
+      eventsEnded: 'posts/eventsEnded',
     }),
     filterButtonIcon() {
       return this.showFilter ? 'angle-up' : 'angle-down'

From 5863eed59a2412347c3c27e2eed68d3d10c511c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 1 Jun 2023 20:42:51 +0200
Subject: [PATCH 33/59] Delete file 'filterMenuMixin.js' and move all from
 there to the files where it's used

---
 .../FilterMenu/FilterMenuComponent.vue        |  8 +++++--
 .../components/FilterMenu/OrderByFilter.vue   | 10 ++++++--
 .../components/FilterMenu/PostTypeFilter.vue  | 15 ++++++++++--
 webapp/mixins/filterMenuMixin.js              | 23 -------------------
 webapp/pages/index.vue                        |  8 +++++--
 5 files changed, 33 insertions(+), 31 deletions(-)
 delete mode 100644 webapp/mixins/filterMenuMixin.js

diff --git a/webapp/components/FilterMenu/FilterMenuComponent.vue b/webapp/components/FilterMenu/FilterMenuComponent.vue
index 20beaedfd..c1179ccbe 100644
--- a/webapp/components/FilterMenu/FilterMenuComponent.vue
+++ b/webapp/components/FilterMenu/FilterMenuComponent.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import FilterMenuMixin from '~/mixins/filterMenuMixin.js'
+import { mapGetters } from 'vuex'
 import EventsByFilter from './EventsByFilter'
 import PostTypeFilter from './PostTypeFilter'
 import FollowingFilter from './FollowingFilter'
@@ -33,12 +33,16 @@ export default {
     CategoriesFilter,
     PostTypeFilter,
   },
-  mixins: [FilterMenuMixin],
   data() {
     return {
       categoriesActive: this.$env.CATEGORIES_ACTIVE,
     }
   },
+  computed: {
+    ...mapGetters({
+      eventSetInPostTypeFilter: 'posts/eventSetInPostTypeFilter',
+    }),
+  },
 }
 </script>
 
diff --git a/webapp/components/FilterMenu/OrderByFilter.vue b/webapp/components/FilterMenu/OrderByFilter.vue
index 279c2600a..1edd908b4 100644
--- a/webapp/components/FilterMenu/OrderByFilter.vue
+++ b/webapp/components/FilterMenu/OrderByFilter.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import FilterMenuMixin from '~/mixins/filterMenuMixin.js'
+import { mapGetters, mapMutations } from 'vuex'
 import FilterMenuSection from '~/components/FilterMenu/FilterMenuSection'
 import LabeledButton from '~/components/_new/generic/LabeledButton/LabeledButton'
 
@@ -36,8 +36,11 @@ export default {
     FilterMenuSection,
     LabeledButton,
   },
-  mixins: [FilterMenuMixin],
   computed: {
+    ...mapGetters({
+      orderedByCreationDate: 'posts/orderedByCreationDate',
+      orderBy: 'posts/orderBy',
+    }),
     orderedAsc() {
       return this.orderedByCreationDate ? 'createdAt_asc' : 'eventStart_desc'
     },
@@ -51,6 +54,9 @@ export default {
     },
   },
   methods: {
+    ...mapMutations({
+      toggleOrder: 'posts/TOGGLE_ORDER',
+    }),
     buttonLabel(buttonType) {
       switch (buttonType) {
         case 'asc':
diff --git a/webapp/components/FilterMenu/PostTypeFilter.vue b/webapp/components/FilterMenu/PostTypeFilter.vue
index db391a77a..cf2f518cd 100644
--- a/webapp/components/FilterMenu/PostTypeFilter.vue
+++ b/webapp/components/FilterMenu/PostTypeFilter.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-import FilterMenuMixin from '~/mixins/filterMenuMixin.js'
+import { mapGetters, mapMutations } from 'vuex'
 import FilterMenuSection from '~/components/FilterMenu/FilterMenuSection'
 import LabeledButton from '~/components/_new/generic/LabeledButton/LabeledButton'
 
@@ -47,6 +47,17 @@ export default {
     FilterMenuSection,
     LabeledButton,
   },
-  mixins: [FilterMenuMixin],
+  computed: {
+    ...mapGetters({
+      noneSetInPostTypeFilter: 'posts/noneSetInPostTypeFilter',
+      articleSetInPostTypeFilter: 'posts/articleSetInPostTypeFilter',
+      eventSetInPostTypeFilter: 'posts/eventSetInPostTypeFilter',
+    }),
+  },
+  methods: {
+    ...mapMutations({
+      toggleSetUnsetPostTypeFilter: 'posts/TOGGLE_SET_UNSET_POST_TYPE_FILTER',
+    }),
+  },
 }
 </script>
diff --git a/webapp/mixins/filterMenuMixin.js b/webapp/mixins/filterMenuMixin.js
deleted file mode 100644
index 2d7aefc48..000000000
--- a/webapp/mixins/filterMenuMixin.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { mapGetters, mapMutations } from 'vuex'
-
-export default {
-  computed: {
-    ...mapGetters({
-      currentUser: 'auth/user',
-      filteredPostTypes: 'posts/filteredPostTypes',
-      noneSetInPostTypeFilter: 'posts/noneSetInPostTypeFilter',
-      articleSetInPostTypeFilter: 'posts/articleSetInPostTypeFilter',
-      eventSetInPostTypeFilter: 'posts/eventSetInPostTypeFilter',
-      orderedByCreationDate: 'posts/orderedByCreationDate',
-      orderBy: 'posts/orderBy',
-    }),
-  },
-  methods: {
-    ...mapMutations({
-      toggleFilterPostType: 'posts/TOGGLE_POST_TYPE',
-      toggleUnsetAllPostTypeFilters: 'posts/TOGGLE_UNSET_ALL_POST_TYPES_FILTERS',
-      toggleSetUnsetPostTypeFilter: 'posts/TOGGLE_SET_UNSET_POST_TYPE_FILTER',
-      toggleOrder: 'posts/TOGGLE_ORDER',
-    }),
-  },
-}
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 09d4cf919..16a41a831 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -138,7 +138,6 @@
 
 <script>
 import postListActions from '~/mixins/postListActions'
-import FilterMenuMixin from '~/mixins/filterMenuMixin.js'
 import mobile from '~/mixins/mobile'
 import DonationInfo from '~/components/DonationInfo/DonationInfo.vue'
 import HashtagsFilter from '~/components/HashtagsFilter/HashtagsFilter.vue'
@@ -166,7 +165,7 @@ export default {
     FilterMenuComponent,
     HeaderButton,
   },
-  mixins: [postListActions, FilterMenuMixin, mobile()],
+  mixins: [postListActions, mobile()],
   data() {
     const { hashtag = null } = this.$route.query
     return {
@@ -191,7 +190,10 @@ export default {
   computed: {
     ...mapGetters({
       postsFilter: 'posts/filter',
+      articleSetInPostTypeFilter: 'posts/articleSetInPostTypeFilter',
+      eventSetInPostTypeFilter: 'posts/eventSetInPostTypeFilter',
       eventsEnded: 'posts/eventsEnded',
+      orderBy: 'posts/orderBy',
     }),
     filterButtonIcon() {
       return this.showFilter ? 'angle-up' : 'angle-down'
@@ -223,6 +225,8 @@ export default {
   },
   methods: {
     ...mapMutations({
+      toggleUnsetAllPostTypeFilters: 'posts/TOGGLE_UNSET_ALL_POST_TYPES_FILTERS',
+      toggleSetUnsetPostTypeFilter: 'posts/TOGGLE_SET_UNSET_POST_TYPE_FILTER',
       resetByFollowed: 'posts/TOGGLE_FILTER_BY_FOLLOWED',
       resetByGroups: 'posts/TOGGLE_FILTER_BY_MY_GROUPS',
       resetCategories: 'posts/RESET_CATEGORIES',

From a08d4f48aeb4d54d381022a2b1e26f369373782e Mon Sep 17 00:00:00 2001
From: entermex <max@infinity.labs.ooo>
Date: Thu, 1 Jun 2023 23:42:09 +0200
Subject: [PATCH 34/59] refactor(webapp): changed color for event-ribbon.

Co-authored-by: Elweyn <heine.hannes@gmail.com>
---
 webapp/assets/_new/styles/tokens.scss | 1 +
 webapp/components/Ribbon/index.vue    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss
index 863e0e0b7..f3e308573 100644
--- a/webapp/assets/_new/styles/tokens.scss
+++ b/webapp/assets/_new/styles/tokens.scss
@@ -11,6 +11,7 @@ $color-primary-inverse: rgb(241, 253, 244);
 $color-secondary: rgb(0, 142, 230);
 $color-secondary-active: rgb(10, 161, 255);
 $color-secondary-inverse: rgb(240, 249, 255);
+$color-third: rgb(149,74,255);
 $color-success: rgb(23, 181, 63);
 $color-success-active: rgb(26, 203, 71);
 $color-success-inverse: rgb(241, 253, 244);
diff --git a/webapp/components/Ribbon/index.vue b/webapp/components/Ribbon/index.vue
index ea7fd273a..89b84e817 100644
--- a/webapp/components/Ribbon/index.vue
+++ b/webapp/components/Ribbon/index.vue
@@ -48,10 +48,10 @@ export default {
   }
 }
 .eventBg {
-  background-color: $color-success-active;
+  background-color: $color-third;
 
   &::before {
-    border-color: $color-success-active transparent transparent $color-success-active;
+    border-color: $color-third transparent transparent $color-third;
   }
 }
 </style>

From 75f18e60d3d358b1586cac1ed021344d7c490ba5 Mon Sep 17 00:00:00 2001
From: entermex <max@infinity.labs.ooo>
Date: Fri, 2 Jun 2023 00:17:29 +0200
Subject: [PATCH 35/59] refactor(webapp): changed locaalized text for article
 ribbon.

---
 webapp/locales/en.json | 80 +++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 45a241957..ea2947c70 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -12,7 +12,7 @@
     "categories": {
       "categoryName": "Name",
       "name": "Topics",
-      "postCount": "Posts"
+      "postCount": "Articles"
     },
     "dashboard": {
       "comments": "Comments",
@@ -21,7 +21,7 @@
       "name": "Dashboard",
       "notifications": "Notifications",
       "organizations": "Organizations",
-      "posts": "Posts",
+      "posts": "Articles",
       "projects": "Projects",
       "shouts": "Shouts",
       "users": "Users"
@@ -37,7 +37,7 @@
       "name": "Hashtags",
       "nameOfHashtag": "Name",
       "number": "No.",
-      "tagCount": "Posts",
+      "tagCount": "Articles",
       "tagCountUnique": "Users"
     },
     "invites": {
@@ -105,7 +105,7 @@
     "loadMore": "load more",
     "name": "Name",
     "organization": "Organization ::: Organizations",
-    "post": "Post ::: Posts",
+    "post": "Contribution ::: Contributions",
     "project": "Project ::: Projects",
     "reportContent": "Report",
     "shout": "Shout ::: Shouts",
@@ -272,14 +272,14 @@
       "myFriends": "Users I follow",
       "myGroups": "By my groups",
       "myTopics": "My topics",
-      "noFilter": "Filter posts"
+      "noFilter": "Filter articles"
     },
     "filterMyGroups": "Contributions in my groups",
     "inappropriatePicture": "This image may be inappropriate for some people.",
     "languageSelectLabel": "Language of your contribution",
     "languageSelectText": "Select Language",
     "newEvent": "Create a new Event",
-    "newPost": "Create a new Post",
+    "newPost": "Create a new Article",
     "success": "Saved!",
     "teaserImage": {
       "cropImage": "Crop image",
@@ -291,7 +291,7 @@
       "supportedFormats": "Insert a picture of file format JPG, PNG or GIF"
     },
     "title": "Title",
-    "visibleOnlyForMembersOfGroup": "This post will only be visible to members of the “<b>{name}</b>” group."
+    "visibleOnlyForMembersOfGroup": "This contribution will only be visible to members of the “<b>{name}</b>” group."
   },
   "delete": {
     "cancel": "Cancel",
@@ -370,10 +370,10 @@
     "500-default": "Internal Server Error!",
     "503-default": "Service Unavailable!",
     "back-to-index": "Back to index page!",
-    "cannot-edit-post": "This post cannot be edited!",
+    "cannot-edit-post": "This contribution cannot be edited!",
     "default": "An error occurred!",
     "group-not-found": "This group profile could not be found!",
-    "post-not-found": "This post could not be found!",
+    "post-not-found": "This contribution could not be found!",
     "profile-not-found": "This profile could not be found!"
   },
   "filter-menu": {
@@ -398,7 +398,7 @@
       }
     },
     "order-by": "Order by ...",
-    "post-type": "Post type",
+    "post-type": "Article type",
     "save": {
       "error": "Failed saving topic settings!",
       "success": "Topics saved!"
@@ -500,9 +500,9 @@
       "public": "Public"
     },
     "typesOptions": {
-      "closed": "Closed — All posts only visible to the group's members",
+      "closed": "Closed — All contributions only visible to the group's members",
       "hidden": "Secret — Group (including the name) is completely invisible",
-      "public": "Public — Group and all posts are visible for all registered users"
+      "public": "Public — Group and all contributions are visible for all registered users"
     },
     "update": "Save change",
     "updatedGroup": "The group data has been changed."
@@ -601,12 +601,12 @@
         },
         "Post": {
           "disable": {
-            "message": "Do you really want to let the post \"<b>{name}</b>\" stay <b>disabled</b>?",
-            "title": "Finally Disable Post"
+            "message": "Do you really want to let the article \"<b>{name}</b>\" stay <b>disabled</b>?",
+            "title": "Finally Disable Article"
           },
           "enable": {
-            "message": "Do you really want to let the post \"<b>{name}</b>\" stay <b>enabled</b>?",
-            "title": "Finally Enable Post"
+            "message": "Do you really want to let the article \"<b>{name}</b>\" stay <b>enabled</b>?",
+            "title": "Finally Enable Article"
           }
         },
         "submit": "Confirm decision",
@@ -663,12 +663,12 @@
     },
     "markAllAsRead": "Mark all as read",
     "pageLink": "All notifications",
-    "post": "Post or Group",
+    "post": "Contribution or Group",
     "reason": {
       "changed_group_member_role": "Changed your role in group …",
-      "commented_on_post": "Commented on your post …",
+      "commented_on_post": "Commented on your contribution …",
       "mentioned_in_comment": "Mentioned you in a comment …",
-      "mentioned_in_post": "Mentioned you in a post …",
+      "mentioned_in_post": "Mentioned you in a contribution …",
       "removed_user_from_group": "Removed you from group …",
       "user_joined_group": "Joined your group …",
       "user_left_group": "Left your group …"
@@ -698,25 +698,25 @@
       "forGroup": {
         "title": "For The Group “{name}”"
       },
-      "title": "Create A New Post"
+      "title": "Create A New Article"
     },
     "edited": "edited",
     "editPost": {
       "forGroup": {
         "title": "For The Group “{name}”"
       },
-      "title": "Edit Your Post"
+      "title": "Edit Your Contribution"
     },
     "event": "Event",
     "menu": {
-      "delete": "Delete post",
-      "edit": "Edit post",
-      "pin": "Pin post",
-      "pinnedSuccessfully": "Post pinned successfully!",
-      "unpin": "Unpin post",
-      "unpinnedSuccessfully": "Post unpinned successfully!"
+      "delete": "Delete contribution",
+      "edit": "Edit contribution",
+      "pin": "Pin contribution",
+      "pinnedSuccessfully": "Contribution pinned successfully!",
+      "unpin": "Unpin contribution",
+      "unpinnedSuccessfully": "Contribution unpinned successfully!"
     },
-    "name": "Post",
+    "name": "Article",
     "pinned": "Announcement",
     "takeAction": {
       "name": "Take action"
@@ -733,7 +733,7 @@
       "forGroup": {
         "title": "In The Group “{name}”"
       },
-      "title": "Post"
+      "title": "Article"
     }
   },
   "profile": {
@@ -802,7 +802,7 @@
     "contribution": {
       "error": "You have already reported the contribution!",
       "message": "Do you really want to report the contribution \"<b>{name}</b>\"?",
-      "title": "Report Post",
+      "title": "Report Contribution",
       "type": "Contribution"
     },
     "reason": {
@@ -812,7 +812,7 @@
         "options": {
           "advert_products_services_commercial": "Advertising products and services with commercial intent.",
           "criminal_behavior_violation_german_law": "Criminal behavior or violation of German law.",
-          "discrimination_etc": "Discriminatory posts, comments, utterances or insults.",
+          "discrimination_etc": "Discriminatory contributions, comments, utterances or insults.",
           "doxing": "The disclosure of others' personal information without their consent or threat there of (\"doxing\").",
           "glorific_trivia_of_cruel_inhuman_acts": "Glorification or trivialization of cruel or inhuman acts of violence.",
           "intentional_intimidation_stalking_persecution": "Intentional intimidation, stalking or persecution.",
@@ -840,11 +840,11 @@
     "for": "Searching for ",
     "heading": {
       "Group": "Group ::: Groups",
-      "Post": "Post ::: Posts",
+      "Post": "Contribution ::: Contributions",
       "Tag": "Hashtag ::: Hashtags",
       "User": "User ::: Users"
     },
-    "hint": "What are you searching for? Use !… for posts, @… for users, &… for groups, #… for hashtags.",
+    "hint": "What are you searching for? Use !… for contributions, @… for users, &… for groups, #… for hashtags.",
     "no-results": "No results found for \"{search}\". Try a different search term!",
     "page": "Page",
     "placeholder": "Search",
@@ -862,7 +862,7 @@
       "empty": "So far, you have not blocked anybody.",
       "explanation": {
         "closing": "This should be sufficient for now so that blocked users can no longer bother you.",
-        "commenting-disabled": "Commenting is not possible at this time on this post.",
+        "commenting-disabled": "Commenting is not possible at this time on this contribution.",
         "commenting-explanation": "This can happen for several reasons, please see our ",
         "intro": "If another user has been blocked by you, this is what happens:",
         "notifications": "Blocked users will no longer receive notifications if they mention each other.",
@@ -885,20 +885,20 @@
       "success": "Your data was successfully updated!"
     },
     "deleteUserAccount": {
-      "accountDescription": "Be aware that your Posts and Comments are important to our community. If you still choose to delete them, you have to mark them below.",
-      "accountWarning": "You CAN'T MANAGE and CAN'T RECOVER your Account, Posts, or Comments after deleting your account!",
+      "accountDescription": "Be aware that your Contributions and Comments are important to our community. If you still choose to delete them, you have to mark them below.",
+      "accountWarning": "You CAN'T MANAGE and CAN'T RECOVER your Account, Contributions, or Comments after deleting your account!",
       "accountWarningAdmin": "The account, contributions or comments can NOT BE ADMINISTERED OR RESTORED after deletion!",
       "accountWarningIsAdmin": "Attention! You are about to delete a user account!",
       "commentedCount": "Delete my {count} comment ::: Delete my {count} comments",
       "confirmDeleting": "Delete user account now",
-      "contributionsCount": "Delete my {count} post ::: Delete my {count} posts",
+      "contributionsCount": "Delete my {count} contribution ::: Delete my {count} contributions",
       "infoAdmin": "All contributions and comments of the user will be deleted additionally!",
       "name": "Delete user account",
       "pleaseConfirm": "Destructive action! Type “{confirm}” to confirm.",
       "success": "Account successfully deleted!"
     },
     "download": {
-      "description": "Click on the button above to download the content of your posts and comments. To download the images of your posts, you have to click on the corresponding link below.",
+      "description": "Click on the button above to download the content of your contributions and comments. To download the images of your contributions, you have to click on the corresponding link below.",
       "json": "as JSON",
       "name": "Download Data"
     },
@@ -954,8 +954,8 @@
       "empty": "So far, you have not muted anybody.",
       "explanation": {
         "intro": "If another user has been muted by you, this is what happens:",
-        "search": "Posts of muted people disappear from your search results.",
-        "your-perspective": "The muted person's posts will no longer appear in your news feed."
+        "search": "Contributions of muted people disappear from your search results.",
+        "your-perspective": "The muted person's contributions will no longer appear in your news feed."
       },
       "how-to": "You can mute other users on their profile page via the content menu.",
       "mute": "Mute user",

From 9c98f87e69a3bfafd994d5a973b3abb040b53af4 Mon Sep 17 00:00:00 2001
From: entermex <max@infinity.labs.ooo>
Date: Fri, 2 Jun 2023 09:49:45 +0200
Subject: [PATCH 36/59] refactor(webapp): changed color a bit litter for
 event-ribbons

---
 webapp/assets/_new/styles/tokens.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss
index f3e308573..c01b7d2cc 100644
--- a/webapp/assets/_new/styles/tokens.scss
+++ b/webapp/assets/_new/styles/tokens.scss
@@ -11,7 +11,7 @@ $color-primary-inverse: rgb(241, 253, 244);
 $color-secondary: rgb(0, 142, 230);
 $color-secondary-active: rgb(10, 161, 255);
 $color-secondary-inverse: rgb(240, 249, 255);
-$color-third: rgb(149,74,255);
+$color-third: rgb(160,103,255);
 $color-success: rgb(23, 181, 63);
 $color-success-active: rgb(26, 203, 71);
 $color-success-inverse: rgb(241, 253, 244);

From 4f078e4b24b5364985dbc6d6aefa767852c8e1ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 2 Jun 2023 10:08:55 +0200
Subject: [PATCH 37/59] Fix webapp tests

---
 webapp/components/FilterMenu/OrderByFilter.spec.js | 1 +
 webapp/pages/index.spec.js                         | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/webapp/components/FilterMenu/OrderByFilter.spec.js b/webapp/components/FilterMenu/OrderByFilter.spec.js
index 11979c359..10b52449a 100644
--- a/webapp/components/FilterMenu/OrderByFilter.spec.js
+++ b/webapp/components/FilterMenu/OrderByFilter.spec.js
@@ -12,6 +12,7 @@ describe('OrderByFilter', () => {
   }
   const getters = {
     'posts/filteredPostTypes': () => [],
+    'posts/orderedByCreationDate': () => true,
     'posts/orderBy': () => 'createdAt_desc',
   }
 
diff --git a/webapp/pages/index.spec.js b/webapp/pages/index.spec.js
index d36c657e9..c16560a84 100644
--- a/webapp/pages/index.spec.js
+++ b/webapp/pages/index.spec.js
@@ -29,6 +29,9 @@ describe('PostIndex', () => {
       getters: {
         'posts/filter': () => ({}),
         'posts/filteredPostTypes': () => [],
+        'posts/articleSetInPostTypeFilter': () => false,
+        'posts/eventSetInPostTypeFilter': () => false,
+        'posts/eventsEnded': () => '',
         'posts/orderBy': () => 'createdAt_desc',
         'auth/user': () => {
           return { id: 'u23' }

From 52798c11746de9196cc659fb689377f95a9a3564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 2 Jun 2023 11:04:28 +0200
Subject: [PATCH 38/59] Refactor 'TOGGLE_EVENTS_ENDED' and 'eventsEnded' in
 store to contain the event start date

---
 webapp/components/FilterMenu/EventsByFilter.vue | 8 ++++----
 webapp/pages/index.vue                          | 2 +-
 webapp/store/posts.js                           | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/webapp/components/FilterMenu/EventsByFilter.vue b/webapp/components/FilterMenu/EventsByFilter.vue
index f29c5eb81..79285bc47 100644
--- a/webapp/components/FilterMenu/EventsByFilter.vue
+++ b/webapp/components/FilterMenu/EventsByFilter.vue
@@ -5,9 +5,9 @@
         <labeled-button
           icon="check"
           :label="$t('filter-menu.ended.all.label')"
-          :filled="eventsEnded === ''"
+          :filled="!eventsEnded"
           :title="$t('filter-menu.ended.all.hint')"
-          @click="toggleEventsEnded('')"
+          @click="toggleEventsEnded(false)"
           data-test="all-button"
         />
       </li>
@@ -15,9 +15,9 @@
         <labeled-button
           icon="calendar"
           :label="$t('filter-menu.ended.onlyEnded.label')"
-          :filled="eventsEnded === 'eventStart_gte'"
+          :filled="!!eventsEnded"
           :title="$t('filter-menu.ended.onlyEnded.hint')"
-          @click="toggleEventsEnded('eventStart_gte')"
+          @click="toggleEventsEnded(true)"
           data-test="not-ended-button"
         />
       </li>
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 16a41a831..ccb49cf74 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -203,7 +203,7 @@ export default {
       filter = {
         ...filter,
         tags_some: this.hashtag ? { id: this.hashtag } : undefined,
-        eventStart_gte: this.eventsEnded === 'eventStart_gte' ? new Date() : undefined,
+        eventStart_gte: this.eventsEnded,
       }
       return filter
     },
diff --git a/webapp/store/posts.js b/webapp/store/posts.js
index 4c213af92..e20391a9c 100644
--- a/webapp/store/posts.js
+++ b/webapp/store/posts.js
@@ -18,7 +18,7 @@ export const state = () => {
       ...defaultFilter,
     },
     order: 'createdAt_desc',
-    eventsEnded: '',
+    eventsEnded: null,
   }
 }
 
@@ -60,7 +60,7 @@ const TOGGLE_SET_UNSET_POST_TYPE_FILTER = (state, setPostType) => {
   adjustOrder(state)
 }
 const TOGGLE_EVENTS_ENDED = (state, value) => {
-  state.eventsEnded = value
+  state.eventsEnded = value ? new Date() : null
 }
 const TOGGLE_ORDER = (state, value) => {
   state.order = value
@@ -68,9 +68,9 @@ const TOGGLE_ORDER = (state, value) => {
 const adjustEventsEnded = (state, beforeEventSetInPostTypeFilter) => {
   if (eventSetInPostTypeFilter(state) !== beforeEventSetInPostTypeFilter) {
     if (eventSetInPostTypeFilter(state)) {
-      TOGGLE_EVENTS_ENDED(state, 'eventStart_gte')
+      TOGGLE_EVENTS_ENDED(state, true)
     } else {
-      TOGGLE_EVENTS_ENDED(state, '')
+      TOGGLE_EVENTS_ENDED(state, false)
     }
   }
 }

From 031c9c370b801974fd235547ae73a794ed0843b8 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 2 Jun 2023 11:08:08 +0200
Subject: [PATCH 39/59] copy files in external script

---
 backend/package.json                |  2 +-
 backend/scripts/build.copy.files.sh | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100755 backend/scripts/build.copy.files.sh

diff --git a/backend/package.json b/backend/package.json
index 9e0e3b72e..549f2d1ca 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -11,7 +11,7 @@
     "__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations",
     "prod:migrate": "migrate --migrations-dir ./build/db/migrations --store ./build/db/migrate/store.js",
     "start": "node build/",
-    "build": "tsc && mkdir -p build/middleware/helpers/email/templates/ && cp -r src/middleware/helpers/email/templates/*.html build/middleware/helpers/email/templates/ && mkdir -p build/middleware/helpers/email/templates/en/ && cp -r src/middleware/helpers/email/templates/en/*.html build/middleware/helpers/email/templates/en/ && mkdir -p build/middleware/helpers/email/templates/de/ && cp -r src/middleware/helpers/email/templates/de/*.html build/middleware/helpers/email/templates/de/ && mkdir -p build/schema/types/ && cp -r src/schema/types/*.gql build/schema/types/ && mkdir -p build/schema/types/enum/ && cp -r src/schema/types/enum/*.gql build/schema/types/enum/ && mkdir -p build/schema/types/scalar/ && cp -r src/schema/types/scalar/*.gql build/schema/types/scalar/ && mkdir -p build/schema/types/type/ && cp -r src/schema/types/type/*.gql build/schema/types/type/",
+    "build": "tsc && ./scripts/build.copy.files.sh",
     "dev": "nodemon --exec ts-node src/ -e js,ts,gql",
     "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/ -e js,gql",
     "lint": "eslint src --config .eslintrc.js",
diff --git a/backend/scripts/build.copy.files.sh b/backend/scripts/build.copy.files.sh
new file mode 100755
index 000000000..773177ec4
--- /dev/null
+++ b/backend/scripts/build.copy.files.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# html files
+mkdir -p build/middleware/helpers/email/templates/
+cp -r src/middleware/helpers/email/templates/*.html build/middleware/helpers/email/templates/
+
+mkdir -p build/middleware/helpers/email/templates/en/
+cp -r src/middleware/helpers/email/templates/en/*.html build/middleware/helpers/email/templates/en/
+
+mkdir -p build/middleware/helpers/email/templates/de/
+cp -r src/middleware/helpers/email/templates/de/*.html build/middleware/helpers/email/templates/de/
+
+# gql files
+mkdir -p build/schema/types/
+cp -r src/schema/types/*.gql build/schema/types/
+
+mkdir -p build/schema/types/enum/
+cp -r src/schema/types/enum/*.gql build/schema/types/enum/
+
+mkdir -p build/schema/types/scalar/
+cp -r src/schema/types/scalar/*.gql build/schema/types/scalar/
+
+mkdir -p build/schema/types/type/
+cp -r src/schema/types/type/*.gql build/schema/types/type/
\ No newline at end of file

From 0954951e2661392cfd572f8af869b541d023d2e3 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 2 Jun 2023 12:11:42 +0200
Subject: [PATCH 40/59] removed ./

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

diff --git a/backend/package.json b/backend/package.json
index 549f2d1ca..c3a45cbe7 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -11,7 +11,7 @@
     "__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations",
     "prod:migrate": "migrate --migrations-dir ./build/db/migrations --store ./build/db/migrate/store.js",
     "start": "node build/",
-    "build": "tsc && ./scripts/build.copy.files.sh",
+    "build": "tsc && scripts/build.copy.files.sh",
     "dev": "nodemon --exec ts-node src/ -e js,ts,gql",
     "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/ -e js,gql",
     "lint": "eslint src --config .eslintrc.js",

From f4f016265a736efc7aadac458989b8eb7b723e6d Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 2 Jun 2023 12:18:08 +0200
Subject: [PATCH 41/59] capsulate in /bin/sh

---
 backend/Dockerfile   | 2 +-
 backend/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index fc15aca63..fc6c1f4b3 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -74,7 +74,7 @@ FROM code as build
 # yarn install
 RUN yarn install --production=false --frozen-lockfile --non-interactive
 # yarn build
-RUN yarn run build
+RUN /bin/sh -c "yarn run build"
 
 ##################################################################################
 # TEST ###########################################################################
diff --git a/backend/package.json b/backend/package.json
index c3a45cbe7..549f2d1ca 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -11,7 +11,7 @@
     "__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations",
     "prod:migrate": "migrate --migrations-dir ./build/db/migrations --store ./build/db/migrate/store.js",
     "start": "node build/",
-    "build": "tsc && scripts/build.copy.files.sh",
+    "build": "tsc && ./scripts/build.copy.files.sh",
     "dev": "nodemon --exec ts-node src/ -e js,ts,gql",
     "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/ -e js,gql",
     "lint": "eslint src --config .eslintrc.js",

From 987e204ff9e819a1494002c74e8537a6d365f527 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 2 Jun 2023 12:24:18 +0200
Subject: [PATCH 42/59] remove all script functionality

---
 backend/scripts/build.copy.files.sh | 30 ++++++++++++++---------------
 yarn.lock                           | 13 +++++++++----
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/backend/scripts/build.copy.files.sh b/backend/scripts/build.copy.files.sh
index 773177ec4..2cb286238 100755
--- a/backend/scripts/build.copy.files.sh
+++ b/backend/scripts/build.copy.files.sh
@@ -1,24 +1,24 @@
-#!/bin/bash
+##!/bin/bash
 
 # html files
-mkdir -p build/middleware/helpers/email/templates/
-cp -r src/middleware/helpers/email/templates/*.html build/middleware/helpers/email/templates/
+#mkdir -p build/middleware/helpers/email/templates/
+#cp -r src/middleware/helpers/email/templates/*.html build/middleware/helpers/email/templates/
 
-mkdir -p build/middleware/helpers/email/templates/en/
-cp -r src/middleware/helpers/email/templates/en/*.html build/middleware/helpers/email/templates/en/
+#mkdir -p build/middleware/helpers/email/templates/en/
+#cp -r src/middleware/helpers/email/templates/en/*.html build/middleware/helpers/email/templates/en/
 
-mkdir -p build/middleware/helpers/email/templates/de/
-cp -r src/middleware/helpers/email/templates/de/*.html build/middleware/helpers/email/templates/de/
+#mkdir -p build/middleware/helpers/email/templates/de/
+#cp -r src/middleware/helpers/email/templates/de/*.html build/middleware/helpers/email/templates/de/
 
 # gql files
-mkdir -p build/schema/types/
-cp -r src/schema/types/*.gql build/schema/types/
+#mkdir -p build/schema/types/
+#cp -r src/schema/types/*.gql build/schema/types/
 
-mkdir -p build/schema/types/enum/
-cp -r src/schema/types/enum/*.gql build/schema/types/enum/
+#mkdir -p build/schema/types/enum/
+#cp -r src/schema/types/enum/*.gql build/schema/types/enum/
 
-mkdir -p build/schema/types/scalar/
-cp -r src/schema/types/scalar/*.gql build/schema/types/scalar/
+#mkdir -p build/schema/types/scalar/
+#cp -r src/schema/types/scalar/*.gql build/schema/types/scalar/
 
-mkdir -p build/schema/types/type/
-cp -r src/schema/types/type/*.gql build/schema/types/type/
\ No newline at end of file
+#mkdir -p build/schema/types/type/
+#cp -r src/schema/types/type/*.gql build/schema/types/type/
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index a2edb2677..4e69a0aaa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1233,10 +1233,10 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
-"@faker-js/faker@5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-5.1.0.tgz#cee1d77ada0d0dbbe77201d18b1ebabf432d9c0f"
-  integrity sha512-0VonSKh7fBCqvY+V2FLN2ZW4pR4ZtWJalWmwSaiaB7yK7y4qp8vDfuaq9QdLjf/cdZGx3M7Wc4Q+x4fZHxI21Q==
+"@faker-js/faker@7.6.0":
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-7.6.0.tgz#9ea331766084288634a9247fcd8b84f16ff4ba07"
+  integrity sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==
 
 "@hapi/address@2.x.x":
   version "2.0.0"
@@ -2624,6 +2624,11 @@ cypress-file-upload@^3.5.3:
   resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-3.5.3.tgz#cd706485de3fb2cbd4a8c2dd90fe96d537bb4311"
   integrity sha512-S/czzqAj1BYz6Xxnfpx2aSc6hXsj76fd8/iuycJ2RxoxCcQMliw8eQV0ugzVlkzr1GD5dKGviNFGYqv3nRJ+Tg==
 
+cypress-network-idle@^1.14.2:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/cypress-network-idle/-/cypress-network-idle-1.14.2.tgz#0837100861feeb5a18f4c2d9815be079f8590f4d"
+  integrity sha512-xAdR8dH58KFPv8eCDWjviScITrJOcUpuMXYfYTc175nk2/NvnJ+I6ylSn1CM7yZmoV/gLbFa36QLiH5NfNEaLQ==
+
 cypress@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/cypress/-/cypress-7.0.1.tgz#8603f84d828fd4c5462a856f55cef5642e4ce573"

From 6aaa51e388e5bd041453067a3864bc6585fc9c08 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Fri, 2 Jun 2023 12:32:20 +0200
Subject: [PATCH 43/59] use sh instead of bash

---
 backend/scripts/build.copy.files.sh | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/backend/scripts/build.copy.files.sh b/backend/scripts/build.copy.files.sh
index 2cb286238..85022ba9b 100755
--- a/backend/scripts/build.copy.files.sh
+++ b/backend/scripts/build.copy.files.sh
@@ -1,24 +1,24 @@
-##!/bin/bash
+#!/bin/sh
 
 # html files
-#mkdir -p build/middleware/helpers/email/templates/
-#cp -r src/middleware/helpers/email/templates/*.html build/middleware/helpers/email/templates/
+mkdir -p build/middleware/helpers/email/templates/
+cp -r src/middleware/helpers/email/templates/*.html build/middleware/helpers/email/templates/
 
-#mkdir -p build/middleware/helpers/email/templates/en/
-#cp -r src/middleware/helpers/email/templates/en/*.html build/middleware/helpers/email/templates/en/
+mkdir -p build/middleware/helpers/email/templates/en/
+cp -r src/middleware/helpers/email/templates/en/*.html build/middleware/helpers/email/templates/en/
 
-#mkdir -p build/middleware/helpers/email/templates/de/
-#cp -r src/middleware/helpers/email/templates/de/*.html build/middleware/helpers/email/templates/de/
+mkdir -p build/middleware/helpers/email/templates/de/
+cp -r src/middleware/helpers/email/templates/de/*.html build/middleware/helpers/email/templates/de/
 
 # gql files
-#mkdir -p build/schema/types/
-#cp -r src/schema/types/*.gql build/schema/types/
+mkdir -p build/schema/types/
+cp -r src/schema/types/*.gql build/schema/types/
 
-#mkdir -p build/schema/types/enum/
-#cp -r src/schema/types/enum/*.gql build/schema/types/enum/
+mkdir -p build/schema/types/enum/
+cp -r src/schema/types/enum/*.gql build/schema/types/enum/
 
-#mkdir -p build/schema/types/scalar/
-#cp -r src/schema/types/scalar/*.gql build/schema/types/scalar/
+mkdir -p build/schema/types/scalar/
+cp -r src/schema/types/scalar/*.gql build/schema/types/scalar/
 
-#mkdir -p build/schema/types/type/
-#cp -r src/schema/types/type/*.gql build/schema/types/type/
\ No newline at end of file
+mkdir -p build/schema/types/type/
+cp -r src/schema/types/type/*.gql build/schema/types/type/
\ No newline at end of file

From ba80f14d8cd6f1405768e1550aa8257528e6f448 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 2 Jun 2023 16:55:01 +0200
Subject: [PATCH 44/59] refactor store and store tests

---
 webapp/store/posts.js      | 28 ++++++++++--
 webapp/store/posts.spec.js | 90 ++++++++++++++++++++++++++++++++------
 2 files changed, 101 insertions(+), 17 deletions(-)

diff --git a/webapp/store/posts.js b/webapp/store/posts.js
index e20391a9c..58d786ba2 100644
--- a/webapp/store/posts.js
+++ b/webapp/store/posts.js
@@ -24,10 +24,23 @@ export const state = () => {
 
 const TOGGLE_POST_TYPE = (state, postType) => {
   const filter = clone(state.filter)
-  update(filter, 'postType_in', (postTypes) => xor(postTypes, [postType]))
-  if (isEmpty(get(filter, 'postType_in'))) delete filter.postType_in
+  if (postType && !(filter.postType_in && filter.postType_in.includes(postType))) {
+    filter.postType_in = [postType]
+    if (postType === 'Event') {
+      filter.eventStart_gte = new Date()
+      state.order = 'eventStart_asc'
+    } else {
+      delete filter.eventStart_gte
+      state.order = 'createdAt_desc'
+    }
+  } else {
+    delete filter.eventStart_gte
+    delete filter.postType_in
+    state.order = 'createdAt_desc'
+  }
   state.filter = filter
 }
+
 const TOGGLE_UNSET_ALL_POST_TYPES_FILTERS = (state) => {
   const beforeEventSetInPostTypeFilter = eventSetInPostTypeFilter(state)
   filterPostTypes.forEach((postType) => {
@@ -59,9 +72,16 @@ const TOGGLE_SET_UNSET_POST_TYPE_FILTER = (state, setPostType) => {
   adjustEventsEnded(state, beforeEventSetInPostTypeFilter)
   adjustOrder(state)
 }
-const TOGGLE_EVENTS_ENDED = (state, value) => {
-  state.eventsEnded = value ? new Date() : null
+const TOGGLE_EVENTS_ENDED = (state) => {
+  if (state.filter.eventStart_gte) {
+    delete state.filter.eventStart_gte
+  } else {
+    if (state.filter.postType_in && state.filter.postType_in.includes('Event')) {
+      state.filter.eventStart_gte = new Date()
+    }
+  }
 }
+
 const TOGGLE_ORDER = (state, value) => {
   state.order = value
 }
diff --git a/webapp/store/posts.spec.js b/webapp/store/posts.spec.js
index 72e35ef95..123d7815b 100644
--- a/webapp/store/posts.spec.js
+++ b/webapp/store/posts.spec.js
@@ -233,25 +233,49 @@ describe('mutations', () => {
       }
     })
 
-    it('creates post type filter if empty', () => {
+    it('creates post type filter if empty, sets event start filter and event start order', () => {
       state = { filter: {} }
-      expect(testMutation('Event')).toEqual({ postType_in: ['Event'] })
+      expect(testMutation('Event')).toEqual({
+        postType_in: ['Event'],
+        eventStart_gte: expect.any(Date),
+      })
+      expect(getters.orderBy(state)).toEqual('eventStart_asc')
     })
 
-    it('adds post type not present', () => {
-      state = { filter: { postType_in: ['Event'] } }
-      expect(testMutation('Article')).toEqual({ postType_in: ['Event', 'Article'] })
+    it('changes post type if present, resets filter event start and order', () => {
+      state = {
+        filter: {
+          postType_in: ['Event'],
+          eventStart_gte: new Date(),
+        },
+        order: 'eventStart_asc',
+      }
+      expect(testMutation('Article')).toEqual({ postType_in: ['Article'] })
+      expect(getters.orderBy(state)).toEqual('createdAt_desc')
     })
 
-    it('removes category id if present', () => {
-      state = { filter: { postType_in: ['Event', 'Article'] } }
-      const result = testMutation('Event')
-      expect(result).toEqual({ postType_in: ['Article'] })
-    })
-
-    it('removes category filter if empty', () => {
-      state = { filter: { postType_in: ['Event'] } }
+    it('removes post type filter if same post type is present and sets order', () => {
+      state = {
+        filter: {
+          postType_in: ['Event'],
+          eventStart_gte: new Date(),
+        },
+        order: 'eventStart_asc',
+      }
       expect(testMutation('Event')).toEqual({})
+      expect(getters.orderBy(state)).toEqual('createdAt_desc')
+    })
+
+    it('removes post type filter if called with null', () => {
+      state = {
+        filter: {
+          postType_in: ['Event'],
+          eventStart_gte: new Date(),
+        },
+        order: 'eventStart_asc',
+      }
+      expect(testMutation(null)).toEqual({})
+      expect(getters.orderBy(state)).toEqual('createdAt_desc')
     })
 
     it('does not get in the way of other filters', () => {
@@ -265,6 +289,46 @@ describe('mutations', () => {
     })
   })
 
+  describe('TOGGLE_EVENTS_ENDED', () => {
+    beforeEach(() => {
+      testMutation = (postType) => {
+        mutations.TOGGLE_EVENTS_ENDED(state, postType)
+        return getters.filter(state)
+      }
+    })
+
+    it('does not set events ended when post type is not Event', () => {
+      state = {
+        filter: {},
+      }
+      expect(testMutation()).toEqual({})
+    })
+
+    it('sets events ended when post type is Event', () => {
+      state = {
+        filter: {
+          postType_in: ['Event'],
+        },
+      }
+      expect(testMutation()).toEqual({
+        postType_in: ['Event'],
+        eventStart_gte: expect.any(Date),
+      })
+    })
+
+    it('unsets events ended when set', () => {
+      state = {
+        filter: {
+          postType_in: ['Event'],
+          eventStart_gte: new Date(),
+        },
+      }
+      expect(testMutation()).toEqual({
+        postType_in: ['Event'],
+      })
+    })
+  })
+
   describe('TOGGLE_FILTER_BY_FOLLOWED', () => {
     beforeEach(() => {
       testMutation = (userId) => {

From 73f62212f8532242a99c519a85afafddd85eeed7 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 2 Jun 2023 16:55:52 +0200
Subject: [PATCH 45/59] refactor components for store changes

---
 .../components/FilterMenu/EventsByFilter.vue  |  4 ++--
 .../FilterMenu/FilterMenuComponent.vue        |  5 ++++-
 .../components/FilterMenu/OrderByFilter.vue   |  5 ++++-
 .../components/FilterMenu/PostTypeFilter.vue  | 18 ++++++++----------
 webapp/pages/index.vue                        | 19 +++++++------------
 5 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/webapp/components/FilterMenu/EventsByFilter.vue b/webapp/components/FilterMenu/EventsByFilter.vue
index 79285bc47..42de5aad8 100644
--- a/webapp/components/FilterMenu/EventsByFilter.vue
+++ b/webapp/components/FilterMenu/EventsByFilter.vue
@@ -7,7 +7,7 @@
           :label="$t('filter-menu.ended.all.label')"
           :filled="!eventsEnded"
           :title="$t('filter-menu.ended.all.hint')"
-          @click="toggleEventsEnded(false)"
+          @click="toggleEventsEnded"
           data-test="all-button"
         />
       </li>
@@ -17,7 +17,7 @@
           :label="$t('filter-menu.ended.onlyEnded.label')"
           :filled="!!eventsEnded"
           :title="$t('filter-menu.ended.onlyEnded.hint')"
-          @click="toggleEventsEnded(true)"
+          @click="toggleEventsEnded"
           data-test="not-ended-button"
         />
       </li>
diff --git a/webapp/components/FilterMenu/FilterMenuComponent.vue b/webapp/components/FilterMenu/FilterMenuComponent.vue
index c1179ccbe..9a52a9b98 100644
--- a/webapp/components/FilterMenu/FilterMenuComponent.vue
+++ b/webapp/components/FilterMenu/FilterMenuComponent.vue
@@ -40,8 +40,11 @@ export default {
   },
   computed: {
     ...mapGetters({
-      eventSetInPostTypeFilter: 'posts/eventSetInPostTypeFilter',
+      filteredPostTypes: 'posts/filteredPostTypes',
     }),
+    eventSetInPostTypeFilter() {
+      return this.filteredPostTypes.includes('Event')
+    },
   },
 }
 </script>
diff --git a/webapp/components/FilterMenu/OrderByFilter.vue b/webapp/components/FilterMenu/OrderByFilter.vue
index 1edd908b4..8ef248f6d 100644
--- a/webapp/components/FilterMenu/OrderByFilter.vue
+++ b/webapp/components/FilterMenu/OrderByFilter.vue
@@ -38,9 +38,12 @@ export default {
   },
   computed: {
     ...mapGetters({
-      orderedByCreationDate: 'posts/orderedByCreationDate',
+      filteredPostTypes: 'posts/filteredPostTypes',
       orderBy: 'posts/orderBy',
     }),
+    orderedByCreationDate() {
+      return !this.filteredPostTypes.includes('Event')
+    },
     orderedAsc() {
       return this.orderedByCreationDate ? 'createdAt_asc' : 'eventStart_desc'
     },
diff --git a/webapp/components/FilterMenu/PostTypeFilter.vue b/webapp/components/FilterMenu/PostTypeFilter.vue
index cf2f518cd..67eaa4abe 100644
--- a/webapp/components/FilterMenu/PostTypeFilter.vue
+++ b/webapp/components/FilterMenu/PostTypeFilter.vue
@@ -9,27 +9,27 @@
         <labeled-button
           icon="check"
           :label="$t('filter-menu.all')"
-          :filled="noneSetInPostTypeFilter"
+          :filled="filteredPostTypes === []"
           :title="$t('filter-menu.all')"
-          @click="toggleSetUnsetPostTypeFilter('All')"
+          @click="togglePostType(null)"
         />
       </li>
       <li class="item article-item">
         <labeled-button
           icon="book"
           :label="$t('filter-menu.article')"
-          :filled="articleSetInPostTypeFilter"
+          :filled="filteredPostTypes.includes('Article')"
           :title="$t('filter-menu.article')"
-          @click="toggleSetUnsetPostTypeFilter('Article')"
+          @click="togglePostType('Article')"
         />
       </li>
       <li class="item event-item">
         <labeled-button
           icon="calendar"
           :label="$t('filter-menu.event')"
-          :filled="eventSetInPostTypeFilter"
+          :filled="filteredPostTypes.includes('Event')"
           :title="$t('filter-menu.event')"
-          @click="toggleSetUnsetPostTypeFilter('Event')"
+          @click="togglePostType('Event')"
         />
       </li>
     </template>
@@ -49,14 +49,12 @@ export default {
   },
   computed: {
     ...mapGetters({
-      noneSetInPostTypeFilter: 'posts/noneSetInPostTypeFilter',
-      articleSetInPostTypeFilter: 'posts/articleSetInPostTypeFilter',
-      eventSetInPostTypeFilter: 'posts/eventSetInPostTypeFilter',
+      filteredPostTypes: 'posts/filteredPostTypes',
     }),
   },
   methods: {
     ...mapMutations({
-      toggleSetUnsetPostTypeFilter: 'posts/TOGGLE_SET_UNSET_POST_TYPE_FILTER',
+      togglePostType: 'posts/TOGGLE_POST_TYPE',
     }),
   },
 }
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index ccb49cf74..07efd23fd 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -25,8 +25,7 @@
             <base-button
               class="my-filter-button"
               v-if="
-                !articleSetInPostTypeFilter &&
-                !eventSetInPostTypeFilter &&
+                !postsFilter['postType_in'] &&
                 !postsFilter['categories_some'] &&
                 !postsFilter['author'] &&
                 !postsFilter['postsInMyGroups']
@@ -41,19 +40,19 @@
             </base-button>
 
             <header-button
-              v-if="articleSetInPostTypeFilter"
+              v-if="filteredPostTypes.includes('Article')"
               :title="$t('contribution.filterMasonryGrid.onlyArticles')"
               :clickButton="openFilterMenu"
               :titleRemove="$t('filter-menu.deleteFilter')"
-              :clickRemove="toggleUnsetAllPostTypeFilters"
+              :clickRemove="togglePostType(null)"
             />
 
             <header-button
-              v-if="eventSetInPostTypeFilter"
+              v-if="filteredPostTypes.includes('Event')"
               :title="$t('contribution.filterMasonryGrid.onlyEvents')"
               :clickButton="openFilterMenu"
               :titleRemove="$t('filter-menu.deleteFilter')"
-              :clickRemove="toggleUnsetAllPostTypeFilters"
+              :clickRemove="togglePostType(null)"
             />
 
             <header-button
@@ -190,9 +189,7 @@ export default {
   computed: {
     ...mapGetters({
       postsFilter: 'posts/filter',
-      articleSetInPostTypeFilter: 'posts/articleSetInPostTypeFilter',
-      eventSetInPostTypeFilter: 'posts/eventSetInPostTypeFilter',
-      eventsEnded: 'posts/eventsEnded',
+      filteredPostTypes: 'posts/filteredPostTypes',
       orderBy: 'posts/orderBy',
     }),
     filterButtonIcon() {
@@ -203,7 +200,6 @@ export default {
       filter = {
         ...filter,
         tags_some: this.hashtag ? { id: this.hashtag } : undefined,
-        eventStart_gte: this.eventsEnded,
       }
       return filter
     },
@@ -225,8 +221,7 @@ export default {
   },
   methods: {
     ...mapMutations({
-      toggleUnsetAllPostTypeFilters: 'posts/TOGGLE_UNSET_ALL_POST_TYPES_FILTERS',
-      toggleSetUnsetPostTypeFilter: 'posts/TOGGLE_SET_UNSET_POST_TYPE_FILTER',
+      togglePostType: 'posts/TOGGLE_TYPE',
       resetByFollowed: 'posts/TOGGLE_FILTER_BY_FOLLOWED',
       resetByGroups: 'posts/TOGGLE_FILTER_BY_MY_GROUPS',
       resetCategories: 'posts/RESET_CATEGORIES',

From 2ae6c350e1b09520855a6f7c306850836e333dbb Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 2 Jun 2023 17:46:00 +0200
Subject: [PATCH 46/59] get things working

---
 webapp/components/FilterMenu/EventsByFilter.vue | 7 +++++--
 webapp/pages/index.vue                          | 6 +++---
 webapp/store/posts.js                           | 8 +++++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/webapp/components/FilterMenu/EventsByFilter.vue b/webapp/components/FilterMenu/EventsByFilter.vue
index 42de5aad8..6e03a2c65 100644
--- a/webapp/components/FilterMenu/EventsByFilter.vue
+++ b/webapp/components/FilterMenu/EventsByFilter.vue
@@ -15,7 +15,7 @@
         <labeled-button
           icon="calendar"
           :label="$t('filter-menu.ended.onlyEnded.label')"
-          :filled="!!eventsEnded"
+          :filled="eventsEnded"
           :title="$t('filter-menu.ended.onlyEnded.hint')"
           @click="toggleEventsEnded"
           data-test="not-ended-button"
@@ -38,12 +38,15 @@ export default {
   },
   computed: {
     ...mapGetters({
-      eventsEnded: 'posts/eventsEnded',
+      postFilter: 'posts/filter',
     }),
     sectionTitle() {
       // return $t('filter-menu.eventsEnded')
       return null
     },
+    eventsEnded() {
+      return !!this.postFilter.eventStart_gte
+    },
   },
   methods: {
     ...mapMutations({
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 07efd23fd..a7d6864a7 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -44,7 +44,7 @@
               :title="$t('contribution.filterMasonryGrid.onlyArticles')"
               :clickButton="openFilterMenu"
               :titleRemove="$t('filter-menu.deleteFilter')"
-              :clickRemove="togglePostType(null)"
+              :clickRemove="resetPostType"
             />
 
             <header-button
@@ -52,7 +52,7 @@
               :title="$t('contribution.filterMasonryGrid.onlyEvents')"
               :clickButton="openFilterMenu"
               :titleRemove="$t('filter-menu.deleteFilter')"
-              :clickRemove="togglePostType(null)"
+              :clickRemove="resetPostType"
             />
 
             <header-button
@@ -221,7 +221,7 @@ export default {
   },
   methods: {
     ...mapMutations({
-      togglePostType: 'posts/TOGGLE_TYPE',
+      resetPostType: 'posts/RESET_POST_TYPE',
       resetByFollowed: 'posts/TOGGLE_FILTER_BY_FOLLOWED',
       resetByGroups: 'posts/TOGGLE_FILTER_BY_MY_GROUPS',
       resetCategories: 'posts/RESET_CATEGORIES',
diff --git a/webapp/store/posts.js b/webapp/store/posts.js
index 58d786ba2..1e4d21fe3 100644
--- a/webapp/store/posts.js
+++ b/webapp/store/posts.js
@@ -18,7 +18,6 @@ export const state = () => {
       ...defaultFilter,
     },
     order: 'createdAt_desc',
-    eventsEnded: null,
   }
 }
 
@@ -166,6 +165,13 @@ export const mutations = {
     delete filter.language_in
     state.filter = filter
   },
+  RESET_POST_TYPE(state) {
+    const filter = clone(state.filter)
+    delete filter.eventStart_gte
+    delete filter.postType_in
+    state.order = 'createdAt_desc'
+    state.filter = filter
+  },
   TOGGLE_CATEGORY(state, categoryId) {
     const filter = clone(state.filter)
     update(filter, 'categories_some.id_in', (categoryIds) => xor(categoryIds, [categoryId]))

From f252c766705eabf5dffe3114a902d8cc5635a6d2 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 2 Jun 2023 18:05:37 +0200
Subject: [PATCH 47/59] recover filteredPostTypes getter

---
 .../FilterMenu/FilterMenuComponent.vue        |   4 +-
 .../components/FilterMenu/PostTypeFilter.vue  |   2 +-
 webapp/pages/index.vue                        |   2 +-
 webapp/store/posts.js                         | 156 ++++--------------
 4 files changed, 39 insertions(+), 125 deletions(-)

diff --git a/webapp/components/FilterMenu/FilterMenuComponent.vue b/webapp/components/FilterMenu/FilterMenuComponent.vue
index 9a52a9b98..4ca067220 100644
--- a/webapp/components/FilterMenu/FilterMenuComponent.vue
+++ b/webapp/components/FilterMenu/FilterMenuComponent.vue
@@ -40,10 +40,10 @@ export default {
   },
   computed: {
     ...mapGetters({
-      filteredPostTypes: 'posts/filteredPostTypes',
+      postFilters: 'posts/filter',
     }),
     eventSetInPostTypeFilter() {
-      return this.filteredPostTypes.includes('Event')
+      return this.postTypes.postType_in && this.postTypes.postType_in.includes('Event')
     },
   },
 }
diff --git a/webapp/components/FilterMenu/PostTypeFilter.vue b/webapp/components/FilterMenu/PostTypeFilter.vue
index 67eaa4abe..515282782 100644
--- a/webapp/components/FilterMenu/PostTypeFilter.vue
+++ b/webapp/components/FilterMenu/PostTypeFilter.vue
@@ -9,7 +9,7 @@
         <labeled-button
           icon="check"
           :label="$t('filter-menu.all')"
-          :filled="filteredPostTypes === []"
+          :filled="filteredPostTypes.length === 0"
           :title="$t('filter-menu.all')"
           @click="togglePostType(null)"
         />
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index a7d6864a7..e2c92e868 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -188,8 +188,8 @@ export default {
   },
   computed: {
     ...mapGetters({
-      postsFilter: 'posts/filter',
       filteredPostTypes: 'posts/filteredPostTypes',
+      postsFilter: 'posts/filter',
       orderBy: 'posts/orderBy',
     }),
     filterButtonIcon() {
diff --git a/webapp/store/posts.js b/webapp/store/posts.js
index 1e4d21fe3..41b9d99ba 100644
--- a/webapp/store/posts.js
+++ b/webapp/store/posts.js
@@ -6,11 +6,6 @@ import isEqual from 'lodash/isEqual'
 import clone from 'lodash/clone'
 
 const defaultFilter = {}
-const filterPostTypes = ['Article', 'Event']
-const orderByTypes = {
-  creationDate: ['createdAt_asc', 'createdAt_desc'],
-  startDate: ['eventStart_asc', 'eventStart_desc'],
-}
 
 export const state = () => {
   return {
@@ -21,109 +16,6 @@ export const state = () => {
   }
 }
 
-const TOGGLE_POST_TYPE = (state, postType) => {
-  const filter = clone(state.filter)
-  if (postType && !(filter.postType_in && filter.postType_in.includes(postType))) {
-    filter.postType_in = [postType]
-    if (postType === 'Event') {
-      filter.eventStart_gte = new Date()
-      state.order = 'eventStart_asc'
-    } else {
-      delete filter.eventStart_gte
-      state.order = 'createdAt_desc'
-    }
-  } else {
-    delete filter.eventStart_gte
-    delete filter.postType_in
-    state.order = 'createdAt_desc'
-  }
-  state.filter = filter
-}
-
-const TOGGLE_UNSET_ALL_POST_TYPES_FILTERS = (state) => {
-  const beforeEventSetInPostTypeFilter = eventSetInPostTypeFilter(state)
-  filterPostTypes.forEach((postType) => {
-    if (filteredPostTypes(state).includes(postType)) TOGGLE_POST_TYPE(state, postType)
-  })
-  adjustEventsEnded(state, beforeEventSetInPostTypeFilter)
-  adjustOrder(state)
-}
-const TOGGLE_SET_UNSET_POST_TYPE_FILTER = (state, setPostType) => {
-  const beforeEventSetInPostTypeFilter = eventSetInPostTypeFilter(state)
-  if (noneSetInPostTypeFilter(state)) {
-    if (setPostType !== 'All') TOGGLE_POST_TYPE(state, setPostType)
-  } else {
-    if (setPostType !== 'All') {
-      if (filteredPostTypes(state).includes(setPostType)) {
-        TOGGLE_UNSET_ALL_POST_TYPES_FILTERS(state)
-      } else {
-        // if 'setPostType' is not set then set it and unset all others
-        TOGGLE_POST_TYPE(state, setPostType)
-        filterPostTypes.forEach((postType) => {
-          if (postType !== setPostType && filteredPostTypes(state).includes(postType))
-            TOGGLE_POST_TYPE(state, postType)
-        })
-      }
-    } else {
-      TOGGLE_UNSET_ALL_POST_TYPES_FILTERS(state)
-    }
-  }
-  adjustEventsEnded(state, beforeEventSetInPostTypeFilter)
-  adjustOrder(state)
-}
-const TOGGLE_EVENTS_ENDED = (state) => {
-  if (state.filter.eventStart_gte) {
-    delete state.filter.eventStart_gte
-  } else {
-    if (state.filter.postType_in && state.filter.postType_in.includes('Event')) {
-      state.filter.eventStart_gte = new Date()
-    }
-  }
-}
-
-const TOGGLE_ORDER = (state, value) => {
-  state.order = value
-}
-const adjustEventsEnded = (state, beforeEventSetInPostTypeFilter) => {
-  if (eventSetInPostTypeFilter(state) !== beforeEventSetInPostTypeFilter) {
-    if (eventSetInPostTypeFilter(state)) {
-      TOGGLE_EVENTS_ENDED(state, true)
-    } else {
-      TOGGLE_EVENTS_ENDED(state, false)
-    }
-  }
-}
-const adjustOrder = (state) => {
-  if (orderedByCreationDate(state)) {
-    if (!orderByTypes.creationDate.includes(orderBy(state))) {
-      TOGGLE_ORDER(state, 'createdAt_desc')
-    }
-  } else {
-    if (!orderByTypes.startDate.includes(orderBy(state))) {
-      TOGGLE_ORDER(state, 'eventStart_asc')
-    }
-  }
-}
-
-const filteredPostTypes = (state) => {
-  return get(state.filter, 'postType_in') || []
-}
-const noneSetInPostTypeFilter = (state) => {
-  return !articleSetInPostTypeFilter(state) && !eventSetInPostTypeFilter(state)
-}
-const articleSetInPostTypeFilter = (state) => {
-  return filteredPostTypes(state).includes('Article')
-}
-const eventSetInPostTypeFilter = (state) => {
-  return filteredPostTypes(state).includes('Event')
-}
-const orderedByCreationDate = (state) => {
-  return noneSetInPostTypeFilter(state) || articleSetInPostTypeFilter(state)
-}
-const orderBy = (state) => {
-  return state.order
-}
-
 export const mutations = {
   TOGGLE_FILTER_BY_FOLLOWED(state, currentUserId) {
     const filter = clone(state.filter)
@@ -190,11 +82,36 @@ export const mutations = {
     if (isEmpty(get(filter, 'emotions_some.emotion_in'))) delete filter.emotions_some
     state.filter = filter
   },
-  TOGGLE_POST_TYPE,
-  TOGGLE_UNSET_ALL_POST_TYPES_FILTERS,
-  TOGGLE_SET_UNSET_POST_TYPE_FILTER,
-  TOGGLE_EVENTS_ENDED,
-  TOGGLE_ORDER,
+  TOGGLE_POST_TYPE(state, postType) {
+    const filter = clone(state.filter)
+    if (postType && !(filter.postType_in && filter.postType_in.includes(postType))) {
+      filter.postType_in = [postType]
+      if (postType === 'Event') {
+        filter.eventStart_gte = new Date()
+        state.order = 'eventStart_asc'
+      } else {
+        delete filter.eventStart_gte
+        state.order = 'createdAt_desc'
+      }
+    } else {
+      delete filter.eventStart_gte
+      delete filter.postType_in
+      state.order = 'createdAt_desc'
+    }
+    state.filter = filter
+  },
+  TOGGLE_EVENTS_ENDED(state) {
+    if (state.filter.eventStart_gte) {
+      delete state.filter.eventStart_gte
+    } else {
+      if (state.filter.postType_in && state.filter.postType_in.includes('Event')) {
+        state.filter.eventStart_gte = new Date()
+      }
+    }
+  },
+  TOGGLE_ORDER(state, value) {
+    state.order = value
+  },
 }
 
 export const getters = {
@@ -207,25 +124,22 @@ export const getters = {
   filteredCategoryIds(state) {
     return get(state.filter, 'categories_some.id_in') || []
   },
-  filteredPostTypes,
   filteredLanguageCodes(state) {
     return get(state.filter, 'language_in') || []
   },
   filteredByUsersFollowed(state) {
     return !!get(state.filter, 'author.followedBy_some.id')
   },
+  filteredPostTypes(state) {
+    return get(state.filter, 'postType_in') || []
+  },
   filteredByPostsInMyGroups(state) {
     return !!get(state.filter, 'postsInMyGroups')
   },
   filteredByEmotions(state) {
     return get(state.filter, 'emotions_some.emotion_in') || []
   },
-  noneSetInPostTypeFilter,
-  articleSetInPostTypeFilter,
-  eventSetInPostTypeFilter,
-  orderedByCreationDate,
-  eventsEnded(state) {
-    return state.eventsEnded
+  orderBy(state) {
+    return state.order
   },
-  orderBy,
 }

From 5ad7dac1fe4988d0ee0045a320934beed7b5a471 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 2 Jun 2023 18:11:18 +0200
Subject: [PATCH 48/59] use filterdPostTypes getter

---
 webapp/components/FilterMenu/FilterMenuComponent.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/FilterMenu/FilterMenuComponent.vue b/webapp/components/FilterMenu/FilterMenuComponent.vue
index 4ca067220..9a52a9b98 100644
--- a/webapp/components/FilterMenu/FilterMenuComponent.vue
+++ b/webapp/components/FilterMenu/FilterMenuComponent.vue
@@ -40,10 +40,10 @@ export default {
   },
   computed: {
     ...mapGetters({
-      postFilters: 'posts/filter',
+      filteredPostTypes: 'posts/filteredPostTypes',
     }),
     eventSetInPostTypeFilter() {
-      return this.postTypes.postType_in && this.postTypes.postType_in.includes('Event')
+      return this.filteredPostTypes.includes('Event')
     },
   },
 }

From fdf4eb6bdcf5cde5ee116dc93fc8a9f15938ef58 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 2 Jun 2023 18:25:13 +0200
Subject: [PATCH 49/59] get closer to master

---
 webapp/pages/index.vue |  8 +++++---
 webapp/store/posts.js  | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index e2c92e868..db05fc0c5 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -197,9 +197,11 @@ export default {
     },
     finalFilters() {
       let filter = this.postsFilter
-      filter = {
-        ...filter,
-        tags_some: this.hashtag ? { id: this.hashtag } : undefined,
+      if (this.hashtag) {
+        filter = {
+          ...filter,
+          tags_some: this.hashtag ? { id: this.hashtag } : undefined,
+        }
       }
       return filter
     },
diff --git a/webapp/store/posts.js b/webapp/store/posts.js
index 41b9d99ba..c0a5d8ae3 100644
--- a/webapp/store/posts.js
+++ b/webapp/store/posts.js
@@ -57,13 +57,6 @@ export const mutations = {
     delete filter.language_in
     state.filter = filter
   },
-  RESET_POST_TYPE(state) {
-    const filter = clone(state.filter)
-    delete filter.eventStart_gte
-    delete filter.postType_in
-    state.order = 'createdAt_desc'
-    state.filter = filter
-  },
   TOGGLE_CATEGORY(state, categoryId) {
     const filter = clone(state.filter)
     update(filter, 'categories_some.id_in', (categoryIds) => xor(categoryIds, [categoryId]))
@@ -82,6 +75,13 @@ export const mutations = {
     if (isEmpty(get(filter, 'emotions_some.emotion_in'))) delete filter.emotions_some
     state.filter = filter
   },
+  RESET_POST_TYPE(state) {
+    const filter = clone(state.filter)
+    delete filter.eventStart_gte
+    delete filter.postType_in
+    state.order = 'createdAt_desc'
+    state.filter = filter
+  },
   TOGGLE_POST_TYPE(state, postType) {
     const filter = clone(state.filter)
     if (postType && !(filter.postType_in && filter.postType_in.includes(postType))) {
@@ -124,15 +124,15 @@ export const getters = {
   filteredCategoryIds(state) {
     return get(state.filter, 'categories_some.id_in') || []
   },
+  filteredPostTypes(state) {
+    return get(state.filter, 'postType_in') || []
+  },
   filteredLanguageCodes(state) {
     return get(state.filter, 'language_in') || []
   },
   filteredByUsersFollowed(state) {
     return !!get(state.filter, 'author.followedBy_some.id')
   },
-  filteredPostTypes(state) {
-    return get(state.filter, 'postType_in') || []
-  },
   filteredByPostsInMyGroups(state) {
     return !!get(state.filter, 'postsInMyGroups')
   },

From 5389b607db364ac714d12be9a7b8b3d62437bc17 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 2 Jun 2023 18:27:23 +0200
Subject: [PATCH 50/59] even closer to master

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

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index db05fc0c5..267ff618b 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -200,7 +200,7 @@ export default {
       if (this.hashtag) {
         filter = {
           ...filter,
-          tags_some: this.hashtag ? { id: this.hashtag } : undefined,
+          tags_some: { id: this.hashtag },
         }
       }
       return filter

From d3a694e6e7e02fb9ea2663d73f92f3bff0dec541 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 2 Jun 2023 18:45:02 +0200
Subject: [PATCH 51/59] watch posts filters, to ensure that hasMore is reset to
 true

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

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 267ff618b..7b5c4a903 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -213,6 +213,11 @@ export default {
     },
   },
   watchQuery: ['hashtag'],
+  watch: {
+    postsFilter() {
+      this.resetPostList()
+    },
+  },
   mounted() {
     if (this.categoryId) {
       this.resetCategories()

From 72ef3fe6f281c4114aa9ce762346b98a770b0da9 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 2 Jun 2023 18:52:49 +0200
Subject: [PATCH 52/59] clone filter for toggle events ended

---
 webapp/store/posts.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/webapp/store/posts.js b/webapp/store/posts.js
index c0a5d8ae3..95113ab6b 100644
--- a/webapp/store/posts.js
+++ b/webapp/store/posts.js
@@ -101,13 +101,15 @@ export const mutations = {
     state.filter = filter
   },
   TOGGLE_EVENTS_ENDED(state) {
-    if (state.filter.eventStart_gte) {
-      delete state.filter.eventStart_gte
+    const filter = clone(state.filter)
+    if (filter.eventStart_gte) {
+      delete filter.eventStart_gte
     } else {
-      if (state.filter.postType_in && state.filter.postType_in.includes('Event')) {
-        state.filter.eventStart_gte = new Date()
+      if (filter.postType_in && filter.postType_in.includes('Event')) {
+        filter.eventStart_gte = new Date()
       }
     }
+    state.filter = filter
   },
   TOGGLE_ORDER(state, value) {
     state.order = value

From ff41c04cf93d99efc6e0a7cb891304cf7f58adaf Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 2 Jun 2023 19:08:45 +0200
Subject: [PATCH 53/59] test RESET_POST_TYPE

---
 webapp/store/posts.spec.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/webapp/store/posts.spec.js b/webapp/store/posts.spec.js
index 123d7815b..4efb55491 100644
--- a/webapp/store/posts.spec.js
+++ b/webapp/store/posts.spec.js
@@ -289,6 +289,27 @@ describe('mutations', () => {
     })
   })
 
+  describe('RESET_POST_TYPE', () => {
+    beforeEach(() => {
+      testMutation = () => {
+        mutations.RESET_POST_TYPE(state)
+        return getters.filter(state)
+      }
+    })
+
+    it('resets the post type filter, event start and order', () => {
+      state = {
+        filter: {
+          postType_in: ['Event'],
+          eventStart_gte: new Date(),
+        },
+        order: 'eventStart_asc',
+      }
+      expect(testMutation()).toEqual({})
+      expect(getters.orderBy(state)).toEqual('createdAt_desc')
+    })
+  })
+
   describe('TOGGLE_EVENTS_ENDED', () => {
     beforeEach(() => {
       testMutation = (postType) => {

From b3f6d58471096556f7b3822f2d7c7161bd8e4a6a Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 3 Jun 2023 03:29:47 +0200
Subject: [PATCH 54/59] remove scripts folder from docker ignore list, convert
 script back to bash

---
 backend/.dockerignore               | 1 -
 backend/scripts/build.copy.files.sh | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/backend/.dockerignore b/backend/.dockerignore
index d694f0d21..a0883bf4d 100644
--- a/backend/.dockerignore
+++ b/backend/.dockerignore
@@ -12,7 +12,6 @@ docker-compose*.yml
 ./*.log
 
 node_modules/
-scripts/
 build/
 
 maintenance-worker/
diff --git a/backend/scripts/build.copy.files.sh b/backend/scripts/build.copy.files.sh
index 85022ba9b..773177ec4 100755
--- a/backend/scripts/build.copy.files.sh
+++ b/backend/scripts/build.copy.files.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # html files
 mkdir -p build/middleware/helpers/email/templates/

From 8dbdcb4d195398f63f9ad3a1a05b6b45fa0a8082 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 3 Jun 2023 03:44:50 +0200
Subject: [PATCH 55/59] we need to use sh instead of bash

---
 backend/scripts/build.copy.files.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/scripts/build.copy.files.sh b/backend/scripts/build.copy.files.sh
index 773177ec4..85022ba9b 100755
--- a/backend/scripts/build.copy.files.sh
+++ b/backend/scripts/build.copy.files.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # html files
 mkdir -p build/middleware/helpers/email/templates/

From 01343a65443e640821e6207f26468e0b13b72076 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 3 Jun 2023 03:50:02 +0200
Subject: [PATCH 56/59] fixed yarn lock

---
 yarn.lock | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4e69a0aaa..3dfc61609 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2624,11 +2624,6 @@ cypress-file-upload@^3.5.3:
   resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-3.5.3.tgz#cd706485de3fb2cbd4a8c2dd90fe96d537bb4311"
   integrity sha512-S/czzqAj1BYz6Xxnfpx2aSc6hXsj76fd8/iuycJ2RxoxCcQMliw8eQV0ugzVlkzr1GD5dKGviNFGYqv3nRJ+Tg==
 
-cypress-network-idle@^1.14.2:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/cypress-network-idle/-/cypress-network-idle-1.14.2.tgz#0837100861feeb5a18f4c2d9815be079f8590f4d"
-  integrity sha512-xAdR8dH58KFPv8eCDWjviScITrJOcUpuMXYfYTc175nk2/NvnJ+I6ylSn1CM7yZmoV/gLbFa36QLiH5NfNEaLQ==
-
 cypress@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/cypress/-/cypress-7.0.1.tgz#8603f84d828fd4c5462a856f55cef5642e4ce573"

From 1626b06948168bc991e7606aff4b23f7ac315311 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 5 Jun 2023 12:33:48 +0200
Subject: [PATCH 57/59] Revert "refactor(webapp): changed locaalized text for
 article ribbon."

This reverts commit 75f18e60d3d358b1586cac1ed021344d7c490ba5.
---
 webapp/locales/en.json | 80 +++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index ea2947c70..45a241957 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -12,7 +12,7 @@
     "categories": {
       "categoryName": "Name",
       "name": "Topics",
-      "postCount": "Articles"
+      "postCount": "Posts"
     },
     "dashboard": {
       "comments": "Comments",
@@ -21,7 +21,7 @@
       "name": "Dashboard",
       "notifications": "Notifications",
       "organizations": "Organizations",
-      "posts": "Articles",
+      "posts": "Posts",
       "projects": "Projects",
       "shouts": "Shouts",
       "users": "Users"
@@ -37,7 +37,7 @@
       "name": "Hashtags",
       "nameOfHashtag": "Name",
       "number": "No.",
-      "tagCount": "Articles",
+      "tagCount": "Posts",
       "tagCountUnique": "Users"
     },
     "invites": {
@@ -105,7 +105,7 @@
     "loadMore": "load more",
     "name": "Name",
     "organization": "Organization ::: Organizations",
-    "post": "Contribution ::: Contributions",
+    "post": "Post ::: Posts",
     "project": "Project ::: Projects",
     "reportContent": "Report",
     "shout": "Shout ::: Shouts",
@@ -272,14 +272,14 @@
       "myFriends": "Users I follow",
       "myGroups": "By my groups",
       "myTopics": "My topics",
-      "noFilter": "Filter articles"
+      "noFilter": "Filter posts"
     },
     "filterMyGroups": "Contributions in my groups",
     "inappropriatePicture": "This image may be inappropriate for some people.",
     "languageSelectLabel": "Language of your contribution",
     "languageSelectText": "Select Language",
     "newEvent": "Create a new Event",
-    "newPost": "Create a new Article",
+    "newPost": "Create a new Post",
     "success": "Saved!",
     "teaserImage": {
       "cropImage": "Crop image",
@@ -291,7 +291,7 @@
       "supportedFormats": "Insert a picture of file format JPG, PNG or GIF"
     },
     "title": "Title",
-    "visibleOnlyForMembersOfGroup": "This contribution will only be visible to members of the “<b>{name}</b>” group."
+    "visibleOnlyForMembersOfGroup": "This post will only be visible to members of the “<b>{name}</b>” group."
   },
   "delete": {
     "cancel": "Cancel",
@@ -370,10 +370,10 @@
     "500-default": "Internal Server Error!",
     "503-default": "Service Unavailable!",
     "back-to-index": "Back to index page!",
-    "cannot-edit-post": "This contribution cannot be edited!",
+    "cannot-edit-post": "This post cannot be edited!",
     "default": "An error occurred!",
     "group-not-found": "This group profile could not be found!",
-    "post-not-found": "This contribution could not be found!",
+    "post-not-found": "This post could not be found!",
     "profile-not-found": "This profile could not be found!"
   },
   "filter-menu": {
@@ -398,7 +398,7 @@
       }
     },
     "order-by": "Order by ...",
-    "post-type": "Article type",
+    "post-type": "Post type",
     "save": {
       "error": "Failed saving topic settings!",
       "success": "Topics saved!"
@@ -500,9 +500,9 @@
       "public": "Public"
     },
     "typesOptions": {
-      "closed": "Closed — All contributions only visible to the group's members",
+      "closed": "Closed — All posts only visible to the group's members",
       "hidden": "Secret — Group (including the name) is completely invisible",
-      "public": "Public — Group and all contributions are visible for all registered users"
+      "public": "Public — Group and all posts are visible for all registered users"
     },
     "update": "Save change",
     "updatedGroup": "The group data has been changed."
@@ -601,12 +601,12 @@
         },
         "Post": {
           "disable": {
-            "message": "Do you really want to let the article \"<b>{name}</b>\" stay <b>disabled</b>?",
-            "title": "Finally Disable Article"
+            "message": "Do you really want to let the post \"<b>{name}</b>\" stay <b>disabled</b>?",
+            "title": "Finally Disable Post"
           },
           "enable": {
-            "message": "Do you really want to let the article \"<b>{name}</b>\" stay <b>enabled</b>?",
-            "title": "Finally Enable Article"
+            "message": "Do you really want to let the post \"<b>{name}</b>\" stay <b>enabled</b>?",
+            "title": "Finally Enable Post"
           }
         },
         "submit": "Confirm decision",
@@ -663,12 +663,12 @@
     },
     "markAllAsRead": "Mark all as read",
     "pageLink": "All notifications",
-    "post": "Contribution or Group",
+    "post": "Post or Group",
     "reason": {
       "changed_group_member_role": "Changed your role in group …",
-      "commented_on_post": "Commented on your contribution …",
+      "commented_on_post": "Commented on your post …",
       "mentioned_in_comment": "Mentioned you in a comment …",
-      "mentioned_in_post": "Mentioned you in a contribution …",
+      "mentioned_in_post": "Mentioned you in a post …",
       "removed_user_from_group": "Removed you from group …",
       "user_joined_group": "Joined your group …",
       "user_left_group": "Left your group …"
@@ -698,25 +698,25 @@
       "forGroup": {
         "title": "For The Group “{name}”"
       },
-      "title": "Create A New Article"
+      "title": "Create A New Post"
     },
     "edited": "edited",
     "editPost": {
       "forGroup": {
         "title": "For The Group “{name}”"
       },
-      "title": "Edit Your Contribution"
+      "title": "Edit Your Post"
     },
     "event": "Event",
     "menu": {
-      "delete": "Delete contribution",
-      "edit": "Edit contribution",
-      "pin": "Pin contribution",
-      "pinnedSuccessfully": "Contribution pinned successfully!",
-      "unpin": "Unpin contribution",
-      "unpinnedSuccessfully": "Contribution unpinned successfully!"
+      "delete": "Delete post",
+      "edit": "Edit post",
+      "pin": "Pin post",
+      "pinnedSuccessfully": "Post pinned successfully!",
+      "unpin": "Unpin post",
+      "unpinnedSuccessfully": "Post unpinned successfully!"
     },
-    "name": "Article",
+    "name": "Post",
     "pinned": "Announcement",
     "takeAction": {
       "name": "Take action"
@@ -733,7 +733,7 @@
       "forGroup": {
         "title": "In The Group “{name}”"
       },
-      "title": "Article"
+      "title": "Post"
     }
   },
   "profile": {
@@ -802,7 +802,7 @@
     "contribution": {
       "error": "You have already reported the contribution!",
       "message": "Do you really want to report the contribution \"<b>{name}</b>\"?",
-      "title": "Report Contribution",
+      "title": "Report Post",
       "type": "Contribution"
     },
     "reason": {
@@ -812,7 +812,7 @@
         "options": {
           "advert_products_services_commercial": "Advertising products and services with commercial intent.",
           "criminal_behavior_violation_german_law": "Criminal behavior or violation of German law.",
-          "discrimination_etc": "Discriminatory contributions, comments, utterances or insults.",
+          "discrimination_etc": "Discriminatory posts, comments, utterances or insults.",
           "doxing": "The disclosure of others' personal information without their consent or threat there of (\"doxing\").",
           "glorific_trivia_of_cruel_inhuman_acts": "Glorification or trivialization of cruel or inhuman acts of violence.",
           "intentional_intimidation_stalking_persecution": "Intentional intimidation, stalking or persecution.",
@@ -840,11 +840,11 @@
     "for": "Searching for ",
     "heading": {
       "Group": "Group ::: Groups",
-      "Post": "Contribution ::: Contributions",
+      "Post": "Post ::: Posts",
       "Tag": "Hashtag ::: Hashtags",
       "User": "User ::: Users"
     },
-    "hint": "What are you searching for? Use !… for contributions, @… for users, &… for groups, #… for hashtags.",
+    "hint": "What are you searching for? Use !… for posts, @… for users, &… for groups, #… for hashtags.",
     "no-results": "No results found for \"{search}\". Try a different search term!",
     "page": "Page",
     "placeholder": "Search",
@@ -862,7 +862,7 @@
       "empty": "So far, you have not blocked anybody.",
       "explanation": {
         "closing": "This should be sufficient for now so that blocked users can no longer bother you.",
-        "commenting-disabled": "Commenting is not possible at this time on this contribution.",
+        "commenting-disabled": "Commenting is not possible at this time on this post.",
         "commenting-explanation": "This can happen for several reasons, please see our ",
         "intro": "If another user has been blocked by you, this is what happens:",
         "notifications": "Blocked users will no longer receive notifications if they mention each other.",
@@ -885,20 +885,20 @@
       "success": "Your data was successfully updated!"
     },
     "deleteUserAccount": {
-      "accountDescription": "Be aware that your Contributions and Comments are important to our community. If you still choose to delete them, you have to mark them below.",
-      "accountWarning": "You CAN'T MANAGE and CAN'T RECOVER your Account, Contributions, or Comments after deleting your account!",
+      "accountDescription": "Be aware that your Posts and Comments are important to our community. If you still choose to delete them, you have to mark them below.",
+      "accountWarning": "You CAN'T MANAGE and CAN'T RECOVER your Account, Posts, or Comments after deleting your account!",
       "accountWarningAdmin": "The account, contributions or comments can NOT BE ADMINISTERED OR RESTORED after deletion!",
       "accountWarningIsAdmin": "Attention! You are about to delete a user account!",
       "commentedCount": "Delete my {count} comment ::: Delete my {count} comments",
       "confirmDeleting": "Delete user account now",
-      "contributionsCount": "Delete my {count} contribution ::: Delete my {count} contributions",
+      "contributionsCount": "Delete my {count} post ::: Delete my {count} posts",
       "infoAdmin": "All contributions and comments of the user will be deleted additionally!",
       "name": "Delete user account",
       "pleaseConfirm": "Destructive action! Type “{confirm}” to confirm.",
       "success": "Account successfully deleted!"
     },
     "download": {
-      "description": "Click on the button above to download the content of your contributions and comments. To download the images of your contributions, you have to click on the corresponding link below.",
+      "description": "Click on the button above to download the content of your posts and comments. To download the images of your posts, you have to click on the corresponding link below.",
       "json": "as JSON",
       "name": "Download Data"
     },
@@ -954,8 +954,8 @@
       "empty": "So far, you have not muted anybody.",
       "explanation": {
         "intro": "If another user has been muted by you, this is what happens:",
-        "search": "Contributions of muted people disappear from your search results.",
-        "your-perspective": "The muted person's contributions will no longer appear in your news feed."
+        "search": "Posts of muted people disappear from your search results.",
+        "your-perspective": "The muted person's posts will no longer appear in your news feed."
       },
       "how-to": "You can mute other users on their profile page via the content menu.",
       "mute": "Mute user",

From 93a679c17a92e38ee2a00b2723d131b2b2a29c7b Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 5 Jun 2023 12:57:15 +0200
Subject: [PATCH 58/59] Add background color definitions Add background ribbon
 colors

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: entermex <max@infinity.labs.ooo>
---
 webapp/assets/_new/styles/tokens.scss | 13 ++++++++++++-
 webapp/components/Ribbon/index.vue    |  8 ++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss
index c01b7d2cc..22e0214ff 100644
--- a/webapp/assets/_new/styles/tokens.scss
+++ b/webapp/assets/_new/styles/tokens.scss
@@ -11,7 +11,6 @@ $color-primary-inverse: rgb(241, 253, 244);
 $color-secondary: rgb(0, 142, 230);
 $color-secondary-active: rgb(10, 161, 255);
 $color-secondary-inverse: rgb(240, 249, 255);
-$color-third: rgb(160,103,255);
 $color-success: rgb(23, 181, 63);
 $color-success-active: rgb(26, 203, 71);
 $color-success-inverse: rgb(241, 253, 244);
@@ -91,6 +90,9 @@ $background-color-primary-inverse: rgb(241, 253, 244);
 $background-color-secondary: rgb(0, 142, 230);
 $background-color-secondary-active: rgb(10, 161, 255);
 $background-color-secondary-inverse: rgb(240, 249, 255);
+$background-color-third: rgb(126, 82, 204);
+$background-color-third-active: rgb(160, 103, 255);
+$background-color-third-inverse: rgb(239, 230, 255);
 $background-color-success: rgb(23, 181, 63);
 $background-color-success-active: rgb(26, 203, 71);
 $background-color-success-inverse: rgb(241, 253, 244);
@@ -396,3 +398,12 @@ $color-toast-orange: $color-warning;
 $color-toast-yellow: $color-yellow;
 $color-toast-blue: $color-secondary;
 $color-toast-green: $color-success;
+
+/**
+ * @tokens Ribbon Color
+ */
+
+$color-ribbon-event: $background-color-third;
+$color-ribbon-event-active: $background-color-third-active;
+$color-ribbon-article: $background-color-secondary;
+$color-ribbon-article-active: $background-color-secondary-active;
\ No newline at end of file
diff --git a/webapp/components/Ribbon/index.vue b/webapp/components/Ribbon/index.vue
index 89b84e817..8595c0f5d 100644
--- a/webapp/components/Ribbon/index.vue
+++ b/webapp/components/Ribbon/index.vue
@@ -25,7 +25,7 @@ export default {
   padding: $size-ribbon $size-ribbon;
   border-radius: $border-radius-small 0 0 $border-radius-small;
   color: $color-neutral-100;
-  background-color: $background-color-secondary-active;
+  background-color: $color-ribbon-article-active;
   font-size: $font-size-x-small;
   font-weight: $font-weight-bold;
 
@@ -36,7 +36,7 @@ export default {
     bottom: -$size-ribbon;
     border-width: $border-size-large 4px $border-size-large $border-size-large;
     border-style: solid;
-    border-color: $background-color-secondary transparent transparent $background-color-secondary;
+    border-color: $color-ribbon-article transparent transparent $color-ribbon-article;
   }
 
   &.--pinned {
@@ -48,10 +48,10 @@ export default {
   }
 }
 .eventBg {
-  background-color: $color-third;
+  background-color: $color-ribbon-event-active;
 
   &::before {
-    border-color: $color-third transparent transparent $color-third;
+    border-color: $color-ribbon-event transparent transparent $color-ribbon-event;
   }
 }
 </style>

From 277e53ded58f3851721bcabceb05fa8c6f21b1b8 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 5 Jun 2023 13:03:46 +0200
Subject: [PATCH 59/59] Change ribbon text from 'post' to 'article'

Co-authored-by: Tirokk <wolle.huss@pjannto.com>
Co-authored-by: entermex <max@infinity.labs.ooo>
---
 webapp/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 45a241957..70969ac8c 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -716,7 +716,7 @@
       "unpin": "Unpin post",
       "unpinnedSuccessfully": "Post unpinned successfully!"
     },
-    "name": "Post",
+    "name": "Article",
     "pinned": "Announcement",
     "takeAction": {
       "name": "Take action"