From b63ade8da1e5392fe84117b9375b61f7c9c2c121 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Mon, 6 Mar 2023 16:05:15 +0100
Subject: [PATCH] add filter posts by my groups

---
 webapp/components/FilterMenu/FilterMenuSection.vue |  5 +++--
 webapp/components/FilterMenu/FollowingFilter.vue   | 11 +++++++++++
 webapp/locales/de.json                             |  2 ++
 webapp/locales/en.json                             |  2 ++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/webapp/components/FilterMenu/FilterMenuSection.vue b/webapp/components/FilterMenu/FilterMenuSection.vue
index 921bafff0..39c819563 100644
--- a/webapp/components/FilterMenu/FilterMenuSection.vue
+++ b/webapp/components/FilterMenu/FilterMenuSection.vue
@@ -4,13 +4,14 @@
 
     <ul class="filter-list">
       <slot name="filter-follower" />
+      <slot name="filter-posts-in-my-groups" />
     </ul>
     <ul class="filter-list">
       <slot name="filter-topics" />
     </ul>
     <!-- <aside class="sidebar">
-      <slot name="sidebar" />
-    </aside> -->
+         <slot name="sidebar" />
+         </aside> -->
     <!-- <div v-if="divider" class="divider" /> -->
     <ul class="filter-list">
       <slot name="filter-list" />
diff --git a/webapp/components/FilterMenu/FollowingFilter.vue b/webapp/components/FilterMenu/FollowingFilter.vue
index 7c2c2a282..93f0c05b4 100644
--- a/webapp/components/FilterMenu/FollowingFilter.vue
+++ b/webapp/components/FilterMenu/FollowingFilter.vue
@@ -10,6 +10,15 @@
           @click="toggleFilteredByFollowed(currentUser.id)"
         />
       </li>
+      <li class="item posts-in-my-groups-item">
+        <labeled-button
+          icon="users"
+          :label="$t('filter-menu.my-groups')"
+          :filled="filteredByPostsInMyGroups"
+          :title="$t('contribution.filterMyGroups')"
+          @click="toggleFilteredByMyGroups(currentUser.id)"
+        />
+      </li>
     </template>
   </filter-menu-section>
 </template>
@@ -28,12 +37,14 @@ export default {
   computed: {
     ...mapGetters({
       filteredByUsersFollowed: 'posts/filteredByUsersFollowed',
+      filteredByPostsInMyGroups: 'posts/filteredByPostsInMyGroups',
       currentUser: 'auth/user',
     }),
   },
   methods: {
     ...mapMutations({
       toggleFilteredByFollowed: 'posts/TOGGLE_FILTER_BY_FOLLOWED',
+      toggleFilteredByMyGroups: 'posts/TOGGLE_FILTER_BY_MY_GROUPS',
     }),
   },
 }
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 9ea733068..2c7d84354 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -273,6 +273,7 @@
       "myTopics": "Meine Themen",
       "noFilter": "Beiträge filtern"
     },
+    "filterMyGroups": "Beiträge in meinen Gruppen",
     "inappropriatePicture": "Dieses Bild kann für einige Menschen unangemessen sein.",
     "languageSelectLabel": "Sprache Deines Beitrags",
     "languageSelectText": "Sprache wählen",
@@ -380,6 +381,7 @@
     "filter-by": "Filtern nach ...",
     "following": "Nutzer denen ich folge",
     "languages": "Sprachen",
+    "my-groups": "Meinen Gruppen",
     "order": {
       "newest": {
         "hint": "Sortiere die Neuesten nach vorn",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 9e45396b8..87e7318c7 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -273,6 +273,7 @@
       "myTopics": "My topics",
       "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",
@@ -380,6 +381,7 @@
     "filter-by": "Filter by ...",
     "following": "Users I follow",
     "languages": "Languages",
+    "my-groups": "My groups",
     "order": {
       "newest": {
         "hint": "Sort posts by the newest first",