From c951a900ad3f165349c03777cc9e1d0b81ef0a3c Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 21 Apr 2023 12:03:34 +0200
Subject: [PATCH 01/18] add action radius select component

---
 .../components/Select/ActionRadiusSelect.vue  | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 webapp/components/Select/ActionRadiusSelect.vue

diff --git a/webapp/components/Select/ActionRadiusSelect.vue b/webapp/components/Select/ActionRadiusSelect.vue
new file mode 100644
index 000000000..100375a4e
--- /dev/null
+++ b/webapp/components/Select/ActionRadiusSelect.vue
@@ -0,0 +1,34 @@
+<template>
+  <select
+    class="select ds-input appearance--auto"
+    name="actionRadius"
+    :value="value"
+    @change="onActionRadiusChange"
+  >
+    <option
+      v-for="actionRadius in actionRadiusOptions"
+      :key="actionRadius"
+      :value="actionRadius"
+    >
+      {{ $t(`group.actionRadii.${actionRadius}`) }}
+    </option>
+  </select>
+</template>
+
+<script>
+export default {
+  name: 'ActionRadiusSelect',
+  props: ['value'],
+  data() {
+    const actionRadius = ''
+    return {
+      actionRadiusOptions: ['regional', 'national', 'continental', 'global'],
+    }
+  },
+  methods: {
+    onActionRadiusChange(event) {
+      this.$emit('change', event.target.value)
+    }
+  }
+}
+</script>

From 35bd3d2a611550fde76057e4810ec0c6983454f8 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 21 Apr 2023 12:11:06 +0200
Subject: [PATCH 02/18] use action radius select in group form

---
 webapp/components/Group/GroupForm.vue | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/webapp/components/Group/GroupForm.vue b/webapp/components/Group/GroupForm.vue
index cb407a3d9..843d256be 100644
--- a/webapp/components/Group/GroupForm.vue
+++ b/webapp/components/Group/GroupForm.vue
@@ -94,21 +94,10 @@
         <ds-text class="select-label">
           {{ $t('group.actionRadius') }}
         </ds-text>
-        <!-- TODO: move 'ds-select' from styleguide to main code and implement missing translation etc. functionality -->
-        <select
-          class="select ds-input appearance--auto"
-          name="actionRadius"
-          :value="formData.actionRadius"
-          @change="changeActionRadius($event)"
-        >
-          <option
-            v-for="actionRadius in actionRadiusOptions"
-            :key="actionRadius"
-            :value="actionRadius"
-          >
-            {{ $t(`group.actionRadii.${actionRadius}`) }}
-          </option>
-        </select>
+        <action-radius-select
+          v-model="formData.actionRadius"
+          @change.native="changeActionRadius($event)"
+        />
         <ds-chip
           size="base"
           :color="
@@ -121,8 +110,9 @@
             name="warning"
           />
         </ds-chip>
-
+        
         <!-- location -->
+        <!-- TODO: move 'ds-select' from styleguide to main code and implement missing translation etc. functionality -->
         <ds-select
           id="city"
           :label="$t('settings.data.labelCity') + locationNameLabelAddOnOldName"
@@ -187,6 +177,7 @@ import {
   DESCRIPTION_WITHOUT_HTML_LENGTH_MIN,
 } from '~/constants/groups.js'
 import Editor from '~/components/Editor/Editor'
+import ActionRadiusSelect from '~/components/Select/ActionRadiusSelect'
 import { queryLocations } from '~/graphql/location'
 
 let timeout
@@ -196,6 +187,7 @@ export default {
   components: {
     CategoriesSelect,
     Editor,
+    ActionRadiusSelect,
   },
   props: {
     update: {
@@ -216,7 +208,6 @@ export default {
       categoriesActive: this.$env.CATEGORIES_ACTIVE,
       disabled: false,
       groupTypeOptions: ['public', 'closed', 'hidden'],
-      actionRadiusOptions: ['regional', 'national', 'continental', 'global'],
       loadingGeo: false,
       cities: [],
       formData: {

From 94656a901b6581749da1bf45f856150359a079af Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Fri, 21 Apr 2023 12:34:41 +0200
Subject: [PATCH 03/18] linting

---
 webapp/components/Group/GroupForm.vue           |  2 +-
 webapp/components/Select/ActionRadiusSelect.vue | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/webapp/components/Group/GroupForm.vue b/webapp/components/Group/GroupForm.vue
index 843d256be..71ec49a26 100644
--- a/webapp/components/Group/GroupForm.vue
+++ b/webapp/components/Group/GroupForm.vue
@@ -110,7 +110,7 @@
             name="warning"
           />
         </ds-chip>
-        
+
         <!-- location -->
         <!-- TODO: move 'ds-select' from styleguide to main code and implement missing translation etc. functionality -->
         <ds-select
diff --git a/webapp/components/Select/ActionRadiusSelect.vue b/webapp/components/Select/ActionRadiusSelect.vue
index 100375a4e..81fae1749 100644
--- a/webapp/components/Select/ActionRadiusSelect.vue
+++ b/webapp/components/Select/ActionRadiusSelect.vue
@@ -5,11 +5,7 @@
     :value="value"
     @change="onActionRadiusChange"
   >
-    <option
-      v-for="actionRadius in actionRadiusOptions"
-      :key="actionRadius"
-      :value="actionRadius"
-    >
+    <option v-for="actionRadius in actionRadiusOptions" :key="actionRadius" :value="actionRadius">
       {{ $t(`group.actionRadii.${actionRadius}`) }}
     </option>
   </select>
@@ -20,7 +16,6 @@ export default {
   name: 'ActionRadiusSelect',
   props: ['value'],
   data() {
-    const actionRadius = ''
     return {
       actionRadiusOptions: ['regional', 'national', 'continental', 'global'],
     }
@@ -28,7 +23,7 @@ export default {
   methods: {
     onActionRadiusChange(event) {
       this.$emit('change', event.target.value)
-    }
-  }
+    },
+  },
 }
 </script>

From a780f43d821d88d61a9ee387a76fce16164de8cd Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 25 Apr 2023 11:07:00 +0200
Subject: [PATCH 04/18] use object notation for props

---
 webapp/components/Select/ActionRadiusSelect.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/webapp/components/Select/ActionRadiusSelect.vue b/webapp/components/Select/ActionRadiusSelect.vue
index 81fae1749..01a0990de 100644
--- a/webapp/components/Select/ActionRadiusSelect.vue
+++ b/webapp/components/Select/ActionRadiusSelect.vue
@@ -14,7 +14,11 @@
 <script>
 export default {
   name: 'ActionRadiusSelect',
-  props: ['value'],
+  props: {
+    value: {
+      required: true,
+    }
+  },
   data() {
     return {
       actionRadiusOptions: ['regional', 'national', 'continental', 'global'],

From 3244f3f86d1e8c09e0fd49f43c49f0a3aa8b85ab Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 25 Apr 2023 12:35:46 +0200
Subject: [PATCH 05/18] feat(webapp): group categories on posts

---
 .../CategoriesSelect/CategoriesSelect.vue     | 145 +++----
 .../ContributionForm/ContributionForm.vue     | 367 +++++++++---------
 2 files changed, 264 insertions(+), 248 deletions(-)

diff --git a/webapp/components/CategoriesSelect/CategoriesSelect.vue b/webapp/components/CategoriesSelect/CategoriesSelect.vue
index 4f7a555a3..5d6963d36 100644
--- a/webapp/components/CategoriesSelect/CategoriesSelect.vue
+++ b/webapp/components/CategoriesSelect/CategoriesSelect.vue
@@ -10,9 +10,9 @@
       :icon="category.icon"
       size="small"
       v-tooltip="{
-        content: $t(`contribution.category.description.${category.slug}`),
-        placement: 'bottom-start',
-      }"
+             content: $t(`contribution.category.description.${category.slug}`),
+             placement: 'bottom-start',
+             }"
     >
       {{ $t(`contribution.category.name.${category.slug}`) }}
     </base-button>
@@ -20,75 +20,82 @@
 </template>
 
 <script>
-import CategoryQuery from '~/graphql/CategoryQuery'
-import { CATEGORIES_MAX } from '~/constants/categories.js'
-import xor from 'lodash/xor'
-import SortCategories from '~/mixins/sortCategoriesMixin.js'
+ import CategoryQuery from '~/graphql/CategoryQuery'
+ import { CATEGORIES_MAX } from '~/constants/categories.js'
+ import xor from 'lodash/xor'
+ import SortCategories from '~/mixins/sortCategoriesMixin.js'
 
-export default {
-  inject: {
-    $parentForm: {
-      default: null,
-    },
-  },
-  mixins: [SortCategories],
-  props: {
-    existingCategoryIds: { type: Array, default: () => [] },
-    model: { type: String, required: true },
-  },
-  data() {
-    return {
-      categories: null,
-      selectedMax: CATEGORIES_MAX,
-      selectedCategoryIds: this.existingCategoryIds,
-    }
-  },
-  computed: {
-    selectedCount() {
-      return this.selectedCategoryIds.length
-    },
-    reachedMaximum() {
-      return this.selectedCount >= this.selectedMax
-    },
-  },
-  methods: {
-    toggleCategory(id) {
-      this.selectedCategoryIds = xor(this.selectedCategoryIds, [id])
-      if (this.$parentForm) {
-        this.$parentForm.update(this.model, this.selectedCategoryIds)
-      }
-    },
-    isActive(id) {
-      return this.selectedCategoryIds.includes(id)
-    },
-    isDisabled(id) {
-      return !!(this.reachedMaximum && !this.isActive(id))
-    },
-    categoryButtonsId(categoryId) {
-      return `category-buttons-${categoryId}`
-    },
-  },
-  apollo: {
-    Category: {
-      query() {
-        return CategoryQuery()
-      },
-      result({ data: { Category } }) {
-        this.categories = this.sortCategories(Category)
-      },
-    },
-  },
-}
+ export default {
+   inject: {
+     $parentForm: {
+       default: null,
+     },
+   },
+   mixins: [SortCategories],
+   props: {
+     existingCategoryIds: { type: Array, default: () => [] },
+     model: { type: String, required: true },
+   },
+   data() {
+     return {
+       categories: null,
+       selectedMax: CATEGORIES_MAX,
+       selectedCategoryIds: this.existingCategoryIds,
+     }
+   },
+   watch: {
+     existingCategoryIds() {
+       console.log('existingCategoryIds', this.selectedCategoryIds)
+       if (!this.selectedCategoryIds.length)
+         this.selectedCategoryIds = this.existingCategoryIds
+     },
+   },
+   computed: {
+     selectedCount() {
+       return this.selectedCategoryIds.length
+     },
+     reachedMaximum() {
+       return this.selectedCount >= this.selectedMax
+     },
+   },
+   methods: {
+     toggleCategory(id) {
+       this.selectedCategoryIds = xor(this.selectedCategoryIds, [id])
+       if (this.$parentForm) {
+         this.$parentForm.update(this.model, this.selectedCategoryIds)
+       }
+     },
+     isActive(id) {
+       return this.selectedCategoryIds.includes(id)
+     },
+     isDisabled(id) {
+       return !!(this.reachedMaximum && !this.isActive(id))
+     },
+     categoryButtonsId(categoryId) {
+       return `category-buttons-${categoryId}`
+     },
+   },
+   apollo: {
+     Category: {
+       query() {
+         return CategoryQuery()
+       },
+       result({ data: { Category } }) {
+         this.categories = this.sortCategories(Category)
+       },
+     },
+   },
+ }
 </script>
 
 <style lang="scss">
-.categories-select {
-  display: flex;
-  flex-wrap: wrap;
+ .categories-select {
+   display: flex;
+   flex-wrap: wrap;
 
-  > .base-button {
-    margin-right: $space-xx-small;
-    margin-bottom: $space-xx-small;
-  }
-}
+   > .base-button {
+     margin-right: $space-xx-small;
+     margin-bottom: $space-xx-small;
+   }
+ }
 </style>
diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 8863fbc8a..2933ca018 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -94,188 +94,197 @@
 </template>
 
 <script>
-import gql from 'graphql-tag'
-import { mapGetters } from 'vuex'
-import Editor from '~/components/Editor/Editor'
-import PostMutations from '~/graphql/PostMutations.js'
-import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect'
-import ImageUploader from '~/components/Uploader/ImageUploader'
-import links from '~/constants/links.js'
-import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue'
+ import gql from 'graphql-tag'
+ import { mapGetters } from 'vuex'
+ import Editor from '~/components/Editor/Editor'
+ import PostMutations from '~/graphql/PostMutations.js'
+ import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect'
+ import ImageUploader from '~/components/Uploader/ImageUploader'
+ import links from '~/constants/links.js'
+ import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue'
 
-export default {
-  components: {
-    Editor,
-    ImageUploader,
-    PageParamsLink,
-    CategoriesSelect,
-  },
-  props: {
-    contribution: {
-      type: Object,
-      default: () => ({}),
-    },
-    group: {
-      type: Object,
-      default: () => null,
-    },
-  },
-  data() {
-    const { title, content, image, categories } = this.contribution
-    const {
-      sensitive: imageBlurred = false,
-      aspectRatio: imageAspectRatio = null,
-      type: imageType = null,
-    } = image || {}
+ export default {
+   components: {
+     Editor,
+     ImageUploader,
+     PageParamsLink,
+     CategoriesSelect,
+   },
+   props: {
+     contribution: {
+       type: Object,
+       default: () => ({}),
+     },
+     group: {
+       type: Object,
+       default: () => null,
+     },
+   },
+   data() {
+     const { title, content, image, categories } = this.contribution
+     const {
+       sensitive: imageBlurred = false,
+       aspectRatio: imageAspectRatio = null,
+       type: imageType = null,
+     } = image || {}
 
-    return {
-      categoriesActive: this.$env.CATEGORIES_ACTIVE,
-      links,
-      formData: {
-        title: title || '',
-        content: content || '',
-        image: image || null,
-        imageAspectRatio,
-        imageType,
-        imageBlurred,
-        categoryIds: categories ? categories.map((category) => category.id) : [],
-      },
-      formSchema: {
-        title: { required: true, min: 3, max: 100 },
-        content: { required: true },
-        imageBlurred: { required: false },
-        categoryIds: {
-          type: 'array',
-          required: this.categoriesActive,
-          validator: (_, value = []) => {
-            if (this.categoriesActive && (value.length === 0 || value.length > 3)) {
-              return [new Error(this.$t('common.validations.categories'))]
-            }
-            return []
-          },
-        },
-      },
-      loading: false,
-      users: [],
-      hashtags: [],
-      imageUpload: null,
-    }
-  },
-  computed: {
-    ...mapGetters({
-      currentUser: 'auth/user',
-    }),
-    contentLength() {
-      return this.$filters.removeHtml(this.formData.content).length
-    },
-    groupId() {
-      return this.group && this.group.id
-    },
-    showGroupHint() {
-      return this.groupId && ['closed', 'hidden'].includes(this.group.groupType)
-    },
-    groupName() {
-      return this.group && this.group.name
-    },
-  },
-  methods: {
-    submit() {
-      let image = null
-      const { title, content, categoryIds } = this.formData
-      if (this.formData.image) {
-        image = {
-          sensitive: this.formData.imageBlurred,
-        }
-        if (this.imageUpload) {
-          image.upload = this.imageUpload
-          image.aspectRatio = this.formData.imageAspectRatio
-          image.type = this.formData.imageType
-        }
-      }
-      this.loading = true
-      this.$apollo
-        .mutate({
-          mutation: this.contribution.id ? PostMutations().UpdatePost : PostMutations().CreatePost,
-          variables: {
-            title,
-            content,
-            categoryIds,
-            id: this.contribution.id || null,
-            image,
-            groupId: this.groupId,
-          },
-        })
-        .then(({ data }) => {
-          this.loading = false
-          this.$toast.success(this.$t('contribution.success'))
-          const result = data[this.contribution.id ? 'UpdatePost' : 'CreatePost']
+     return {
+       categoriesActive: this.$env.CATEGORIES_ACTIVE,
+       links,
+       formData: {
+         title: title || '',
+         content: content || '',
+         image: image || null,
+         imageAspectRatio,
+         imageType,
+         imageBlurred,
+         categoryIds: categories ? categories.map((category) => category.id) : []
+       },
+       formSchema: {
+         title: { required: true, min: 3, max: 100 },
+         content: { required: true },
+         imageBlurred: { required: false },
+         categoryIds: {
+           type: 'array',
+           required: this.categoriesActive,
+           validator: (_, value = []) => {
+             if (this.categoriesActive && (value.length === 0 || value.length > 3)) {
+               return [new Error(this.$t('common.validations.categories'))]
+             }
+             return []
+           },
+         },
+       },
+       loading: false,
+       users: [],
+       hashtags: [],
+       imageUpload: null,
+     }
+   },
+   computed: {
+     ...mapGetters({
+       currentUser: 'auth/user',
+     }),
+     contentLength() {
+       return this.$filters.removeHtml(this.formData.content).length
+     },
+     groupId() {
+       return this.group && this.group.id
+     },
+     showGroupHint() {
+       return this.groupId && ['closed', 'hidden'].includes(this.group.groupType)
+     },
+     groupName() {
+       return this.group && this.group.name
+     },
+     groupCategories() {
+       return this.group && this.group.categories
+     },
+   },
+   watch: {
+     groupCategories() {
+       console.log('groupCategories', this.groupCategories)
+       if (!this.formData.categoryIds && this.groupCategories) this.formData.categoryIds = this.groupCategories
+     },
+   },
+   methods: {
+     submit() {
+       let image = null
+       const { title, content, categoryIds } = this.formData
+       if (this.formData.image) {
+         image = {
+           sensitive: this.formData.imageBlurred,
+         }
+         if (this.imageUpload) {
+           image.upload = this.imageUpload
+           image.aspectRatio = this.formData.imageAspectRatio
+           image.type = this.formData.imageType
+         }
+       }
+       this.loading = true
+       this.$apollo
+           .mutate({
+             mutation: this.contribution.id ? PostMutations().UpdatePost : PostMutations().CreatePost,
+             variables: {
+               title,
+               content,
+               categoryIds,
+               id: this.contribution.id || null,
+               image,
+               groupId: this.groupId,
+             },
+           })
+           .then(({ data }) => {
+             this.loading = false
+             this.$toast.success(this.$t('contribution.success'))
+             const result = data[this.contribution.id ? 'UpdatePost' : 'CreatePost']
 
-          this.$router.push({
-            name: 'post-id-slug',
-            params: { id: result.id, slug: result.slug },
-          })
-        })
-        .catch((err) => {
-          this.$toast.error(err.message)
-          this.loading = false
-        })
-    },
-    updateEditorContent(value) {
-      this.$refs.contributionForm.update('content', value)
-    },
-    addHeroImage(file) {
-      this.formData.image = null
-      if (file) {
-        const reader = new FileReader()
-        reader.onload = ({ target }) => {
-          this.formData.image = {
-            ...this.formData.image,
-            url: target.result,
-          }
-        }
-        reader.readAsDataURL(file)
-        this.imageUpload = file
-      }
-    },
-    addImageAspectRatio(aspectRatio) {
-      this.formData.imageAspectRatio = aspectRatio
-    },
-    addImageType(imageType) {
-      this.formData.imageType = imageType
-    },
-  },
-  apollo: {
-    User: {
-      query() {
-        return gql`
-          query {
-            User(orderBy: slug_asc) {
-              id
-              slug
-            }
-          }
-        `
-      },
-      result({ data: { User } }) {
-        this.users = User
-      },
-    },
-    Tag: {
-      query() {
-        return gql`
-          query {
-            Tag(orderBy: id_asc) {
-              id
-            }
-          }
-        `
-      },
-      result({ data: { Tag } }) {
-        this.hashtags = Tag
-      },
-    },
-  },
-}
+             this.$router.push({
+               name: 'post-id-slug',
+               params: { id: result.id, slug: result.slug },
+             })
+           })
+           .catch((err) => {
+             this.$toast.error(err.message)
+             this.loading = false
+           })
+     },
+     updateEditorContent(value) {
+       this.$refs.contributionForm.update('content', value)
+     },
+     addHeroImage(file) {
+       this.formData.image = null
+       if (file) {
+         const reader = new FileReader()
+         reader.onload = ({ target }) => {
+           this.formData.image = {
+             ...this.formData.image,
+             url: target.result,
+           }
+         }
+         reader.readAsDataURL(file)
+         this.imageUpload = file
+       }
+     },
+     addImageAspectRatio(aspectRatio) {
+       this.formData.imageAspectRatio = aspectRatio
+     },
+     addImageType(imageType) {
+       this.formData.imageType = imageType
+     },
+   },
+   apollo: {
+     User: {
+       query() {
+         return gql`
+           query {
+             User(orderBy: slug_asc) {
+               id
+               slug
+             }
+           }
+         `
+       },
+       result({ data: { User } }) {
+         this.users = User
+       },
+     },
+     Tag: {
+       query() {
+         return gql`
+           query {
+             Tag(orderBy: id_asc) {
+               id
+             }
+           }
+         `
+       },
+       result({ data: { Tag } }) {
+         this.hashtags = Tag
+       },
+     },
+   },
+ }
 </script>
 
 <style lang="scss">

From 282d701e90bcc4600806d15430edc56aae86682c Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Apr 2023 12:44:47 +0200
Subject: [PATCH 06/18] show avatar for group members

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

diff --git a/webapp/graphql/groups.js b/webapp/graphql/groups.js
index bb5292675..6aedc205d 100644
--- a/webapp/graphql/groups.js
+++ b/webapp/graphql/groups.js
@@ -207,6 +207,9 @@ export const groupMembersQuery = () => {
         name
         slug
         myRoleInGroup
+        avatar {
+          url
+        }
       }
     }
   `

From 8df7d5d265b0c5ba16f167a213631d765d2f985e Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 25 Apr 2023 13:27:25 +0200
Subject: [PATCH 07/18] get it working

---
 .../CategoriesSelect/CategoriesSelect.vue     | 153 +++----
 .../ContributionForm/ContributionForm.vue     | 376 +++++++++---------
 2 files changed, 265 insertions(+), 264 deletions(-)

diff --git a/webapp/components/CategoriesSelect/CategoriesSelect.vue b/webapp/components/CategoriesSelect/CategoriesSelect.vue
index 5d6963d36..91fb7704c 100644
--- a/webapp/components/CategoriesSelect/CategoriesSelect.vue
+++ b/webapp/components/CategoriesSelect/CategoriesSelect.vue
@@ -10,9 +10,9 @@
       :icon="category.icon"
       size="small"
       v-tooltip="{
-             content: $t(`contribution.category.description.${category.slug}`),
-             placement: 'bottom-start',
-             }"
+        content: $t(`contribution.category.description.${category.slug}`),
+        placement: 'bottom-start',
+      }"
     >
       {{ $t(`contribution.category.name.${category.slug}`) }}
     </base-button>
@@ -20,82 +20,83 @@
 </template>
 
 <script>
- import CategoryQuery from '~/graphql/CategoryQuery'
- import { CATEGORIES_MAX } from '~/constants/categories.js'
- import xor from 'lodash/xor'
- import SortCategories from '~/mixins/sortCategoriesMixin.js'
+import CategoryQuery from '~/graphql/CategoryQuery'
+import { CATEGORIES_MAX } from '~/constants/categories.js'
+import xor from 'lodash/xor'
+import SortCategories from '~/mixins/sortCategoriesMixin.js'
 
- export default {
-   inject: {
-     $parentForm: {
-       default: null,
-     },
-   },
-   mixins: [SortCategories],
-   props: {
-     existingCategoryIds: { type: Array, default: () => [] },
-     model: { type: String, required: true },
-   },
-   data() {
-     return {
-       categories: null,
-       selectedMax: CATEGORIES_MAX,
-       selectedCategoryIds: this.existingCategoryIds,
-     }
-   },
-   watch: {
-     existingCategoryIds() {
-       console.log('existingCategoryIds', this.selectedCategoryIds)
-       if (!this.selectedCategoryIds.length)
-         this.selectedCategoryIds = this.existingCategoryIds
-     },
-   },
-   computed: {
-     selectedCount() {
-       return this.selectedCategoryIds.length
-     },
-     reachedMaximum() {
-       return this.selectedCount >= this.selectedMax
-     },
-   },
-   methods: {
-     toggleCategory(id) {
-       this.selectedCategoryIds = xor(this.selectedCategoryIds, [id])
-       if (this.$parentForm) {
-         this.$parentForm.update(this.model, this.selectedCategoryIds)
-       }
-     },
-     isActive(id) {
-       return this.selectedCategoryIds.includes(id)
-     },
-     isDisabled(id) {
-       return !!(this.reachedMaximum && !this.isActive(id))
-     },
-     categoryButtonsId(categoryId) {
-       return `category-buttons-${categoryId}`
-     },
-   },
-   apollo: {
-     Category: {
-       query() {
-         return CategoryQuery()
-       },
-       result({ data: { Category } }) {
-         this.categories = this.sortCategories(Category)
-       },
-     },
-   },
- }
+export default {
+  inject: {
+    $parentForm: {
+      default: null,
+    },
+  },
+  mixins: [SortCategories],
+  props: {
+    existingCategoryIds: { type: Array, default: () => [] },
+    model: { type: String, required: true },
+  },
+  data() {
+    return {
+      categories: null,
+      selectedMax: CATEGORIES_MAX,
+      selectedCategoryIds: this.existingCategoryIds,
+    }
+  },
+  watch: {
+    existingCategoryIds() {
+      if (!this.selectedCategoryIds.length && this.existingCategoryIds.length) {
+        this.selectedCategoryIds = this.existingCategoryIds
+        this.$forceUpdate()
+      }
+    },
+  },
+  computed: {
+    selectedCount() {
+      return this.selectedCategoryIds.length
+    },
+    reachedMaximum() {
+      return this.selectedCount >= this.selectedMax
+    },
+  },
+  methods: {
+    toggleCategory(id) {
+      this.selectedCategoryIds = xor(this.selectedCategoryIds, [id])
+      if (this.$parentForm) {
+        this.$parentForm.update(this.model, this.selectedCategoryIds)
+      }
+    },
+    isActive(id) {
+      return this.selectedCategoryIds.includes(id)
+    },
+    isDisabled(id) {
+      return !!(this.reachedMaximum && !this.isActive(id))
+    },
+    categoryButtonsId(categoryId) {
+      return `category-buttons-${categoryId}`
+    },
+  },
+  apollo: {
+    Category: {
+      query() {
+        return CategoryQuery()
+      },
+      result({ data: { Category } }) {
+        this.categories = this.sortCategories(Category)
+      },
+    },
+  },
+}
 </script>
 
 <style lang="scss">
- .categories-select {
-   display: flex;
-   flex-wrap: wrap;
+.categories-select {
+  display: flex;
+  flex-wrap: wrap;
 
-   > .base-button {
-     margin-right: $space-xx-small;
-     margin-bottom: $space-xx-small;
-   }
- }
+  > .base-button {
+    margin-right: $space-xx-small;
+    margin-bottom: $space-xx-small;
+  }
+}
 </style>
diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 2933ca018..a031baa28 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -94,197 +94,197 @@
 </template>
 
 <script>
- import gql from 'graphql-tag'
- import { mapGetters } from 'vuex'
- import Editor from '~/components/Editor/Editor'
- import PostMutations from '~/graphql/PostMutations.js'
- import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect'
- import ImageUploader from '~/components/Uploader/ImageUploader'
- import links from '~/constants/links.js'
- import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue'
+import gql from 'graphql-tag'
+import { mapGetters } from 'vuex'
+import Editor from '~/components/Editor/Editor'
+import PostMutations from '~/graphql/PostMutations.js'
+import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect'
+import ImageUploader from '~/components/Uploader/ImageUploader'
+import links from '~/constants/links.js'
+import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue'
 
- export default {
-   components: {
-     Editor,
-     ImageUploader,
-     PageParamsLink,
-     CategoriesSelect,
-   },
-   props: {
-     contribution: {
-       type: Object,
-       default: () => ({}),
-     },
-     group: {
-       type: Object,
-       default: () => null,
-     },
-   },
-   data() {
-     const { title, content, image, categories } = this.contribution
-     const {
-       sensitive: imageBlurred = false,
-       aspectRatio: imageAspectRatio = null,
-       type: imageType = null,
-     } = image || {}
+export default {
+  components: {
+    Editor,
+    ImageUploader,
+    PageParamsLink,
+    CategoriesSelect,
+  },
+  props: {
+    contribution: {
+      type: Object,
+      default: () => ({}),
+    },
+    group: {
+      type: Object,
+      default: () => null,
+    },
+  },
+  data() {
+    const { title, content, image, categories } = this.contribution
+    const {
+      sensitive: imageBlurred = false,
+      aspectRatio: imageAspectRatio = null,
+      type: imageType = null,
+    } = image || {}
 
-     return {
-       categoriesActive: this.$env.CATEGORIES_ACTIVE,
-       links,
-       formData: {
-         title: title || '',
-         content: content || '',
-         image: image || null,
-         imageAspectRatio,
-         imageType,
-         imageBlurred,
-         categoryIds: categories ? categories.map((category) => category.id) : []
-       },
-       formSchema: {
-         title: { required: true, min: 3, max: 100 },
-         content: { required: true },
-         imageBlurred: { required: false },
-         categoryIds: {
-           type: 'array',
-           required: this.categoriesActive,
-           validator: (_, value = []) => {
-             if (this.categoriesActive && (value.length === 0 || value.length > 3)) {
-               return [new Error(this.$t('common.validations.categories'))]
-             }
-             return []
-           },
-         },
-       },
-       loading: false,
-       users: [],
-       hashtags: [],
-       imageUpload: null,
-     }
-   },
-   computed: {
-     ...mapGetters({
-       currentUser: 'auth/user',
-     }),
-     contentLength() {
-       return this.$filters.removeHtml(this.formData.content).length
-     },
-     groupId() {
-       return this.group && this.group.id
-     },
-     showGroupHint() {
-       return this.groupId && ['closed', 'hidden'].includes(this.group.groupType)
-     },
-     groupName() {
-       return this.group && this.group.name
-     },
-     groupCategories() {
-       return this.group && this.group.categories
-     },
-   },
-   watch: {
-     groupCategories() {
-       console.log('groupCategories', this.groupCategories)
-       if (!this.formData.categoryIds && this.groupCategories) this.formData.categoryIds = this.groupCategories
-     },
-   },
-   methods: {
-     submit() {
-       let image = null
-       const { title, content, categoryIds } = this.formData
-       if (this.formData.image) {
-         image = {
-           sensitive: this.formData.imageBlurred,
-         }
-         if (this.imageUpload) {
-           image.upload = this.imageUpload
-           image.aspectRatio = this.formData.imageAspectRatio
-           image.type = this.formData.imageType
-         }
-       }
-       this.loading = true
-       this.$apollo
-           .mutate({
-             mutation: this.contribution.id ? PostMutations().UpdatePost : PostMutations().CreatePost,
-             variables: {
-               title,
-               content,
-               categoryIds,
-               id: this.contribution.id || null,
-               image,
-               groupId: this.groupId,
-             },
-           })
-           .then(({ data }) => {
-             this.loading = false
-             this.$toast.success(this.$t('contribution.success'))
-             const result = data[this.contribution.id ? 'UpdatePost' : 'CreatePost']
+    return {
+      categoriesActive: this.$env.CATEGORIES_ACTIVE,
+      links,
+      formData: {
+        title: title || '',
+        content: content || '',
+        image: image || null,
+        imageAspectRatio,
+        imageType,
+        imageBlurred,
+        categoryIds: categories ? categories.map((category) => category.id) : [], // : this.groupCategories.map((cat) => cat.id) || [],
+      },
+      formSchema: {
+        title: { required: true, min: 3, max: 100 },
+        content: { required: true },
+        imageBlurred: { required: false },
+        categoryIds: {
+          type: 'array',
+          required: this.categoriesActive,
+          validator: (_, value = []) => {
+            if (this.categoriesActive && (value.length === 0 || value.length > 3)) {
+              return [new Error(this.$t('common.validations.categories'))]
+            }
+            return []
+          },
+        },
+      },
+      loading: false,
+      users: [],
+      hashtags: [],
+      imageUpload: null,
+    }
+  },
+  computed: {
+    ...mapGetters({
+      currentUser: 'auth/user',
+    }),
+    contentLength() {
+      return this.$filters.removeHtml(this.formData.content).length
+    },
+    groupId() {
+      return this.group && this.group.id
+    },
+    showGroupHint() {
+      return this.groupId && ['closed', 'hidden'].includes(this.group.groupType)
+    },
+    groupName() {
+      return this.group && this.group.name
+    },
+    groupCategories() {
+      return this.group && this.group.categories //  && group.categories.map((cat) => cat.id )
+    },
+  },
+  watch: {
+    groupCategories() {
+      if (!this.formData.categoryIds.length && this.groupCategories)
+        this.formData.categoryIds = this.groupCategories.map((cat) => cat.id)
+    },
+  },
+  methods: {
+    submit() {
+      let image = null
+      const { title, content, categoryIds } = this.formData
+      if (this.formData.image) {
+        image = {
+          sensitive: this.formData.imageBlurred,
+        }
+        if (this.imageUpload) {
+          image.upload = this.imageUpload
+          image.aspectRatio = this.formData.imageAspectRatio
+          image.type = this.formData.imageType
+        }
+      }
+      this.loading = true
+      this.$apollo
+        .mutate({
+          mutation: this.contribution.id ? PostMutations().UpdatePost : PostMutations().CreatePost,
+          variables: {
+            title,
+            content,
+            categoryIds,
+            id: this.contribution.id || null,
+            image,
+            groupId: this.groupId,
+          },
+        })
+        .then(({ data }) => {
+          this.loading = false
+          this.$toast.success(this.$t('contribution.success'))
+          const result = data[this.contribution.id ? 'UpdatePost' : 'CreatePost']
 
-             this.$router.push({
-               name: 'post-id-slug',
-               params: { id: result.id, slug: result.slug },
-             })
-           })
-           .catch((err) => {
-             this.$toast.error(err.message)
-             this.loading = false
-           })
-     },
-     updateEditorContent(value) {
-       this.$refs.contributionForm.update('content', value)
-     },
-     addHeroImage(file) {
-       this.formData.image = null
-       if (file) {
-         const reader = new FileReader()
-         reader.onload = ({ target }) => {
-           this.formData.image = {
-             ...this.formData.image,
-             url: target.result,
-           }
-         }
-         reader.readAsDataURL(file)
-         this.imageUpload = file
-       }
-     },
-     addImageAspectRatio(aspectRatio) {
-       this.formData.imageAspectRatio = aspectRatio
-     },
-     addImageType(imageType) {
-       this.formData.imageType = imageType
-     },
-   },
-   apollo: {
-     User: {
-       query() {
-         return gql`
-           query {
-             User(orderBy: slug_asc) {
-               id
-               slug
-             }
-           }
-         `
-       },
-       result({ data: { User } }) {
-         this.users = User
-       },
-     },
-     Tag: {
-       query() {
-         return gql`
-           query {
-             Tag(orderBy: id_asc) {
-               id
-             }
-           }
-         `
-       },
-       result({ data: { Tag } }) {
-         this.hashtags = Tag
-       },
-     },
-   },
- }
+          this.$router.push({
+            name: 'post-id-slug',
+            params: { id: result.id, slug: result.slug },
+          })
+        })
+        .catch((err) => {
+          this.$toast.error(err.message)
+          this.loading = false
+        })
+    },
+    updateEditorContent(value) {
+      this.$refs.contributionForm.update('content', value)
+    },
+    addHeroImage(file) {
+      this.formData.image = null
+      if (file) {
+        const reader = new FileReader()
+        reader.onload = ({ target }) => {
+          this.formData.image = {
+            ...this.formData.image,
+            url: target.result,
+          }
+        }
+        reader.readAsDataURL(file)
+        this.imageUpload = file
+      }
+    },
+    addImageAspectRatio(aspectRatio) {
+      this.formData.imageAspectRatio = aspectRatio
+    },
+    addImageType(imageType) {
+      this.formData.imageType = imageType
+    },
+  },
+  apollo: {
+    User: {
+      query() {
+        return gql`
+          query {
+            User(orderBy: slug_asc) {
+              id
+              slug
+            }
+          }
+        `
+      },
+      result({ data: { User } }) {
+        this.users = User
+      },
+    },
+    Tag: {
+      query() {
+        return gql`
+          query {
+            Tag(orderBy: id_asc) {
+              id
+            }
+          }
+        `
+      },
+      result({ data: { Tag } }) {
+        this.hashtags = Tag
+      },
+    },
+  },
+}
 </script>
 
 <style lang="scss">

From 1a4398eaf97b8e449eeb7fbced4dfcd877267a23 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 25 Apr 2023 13:32:42 +0200
Subject: [PATCH 08/18] remove comments

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

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index a031baa28..f740e1f05 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -138,7 +138,7 @@ export default {
         imageAspectRatio,
         imageType,
         imageBlurred,
-        categoryIds: categories ? categories.map((category) => category.id) : [], // : this.groupCategories.map((cat) => cat.id) || [],
+        categoryIds: categories ? categories.map((category) => category.id) : [],
       },
       formSchema: {
         title: { required: true, min: 3, max: 100 },
@@ -178,7 +178,7 @@ export default {
       return this.group && this.group.name
     },
     groupCategories() {
-      return this.group && this.group.categories //  && group.categories.map((cat) => cat.id )
+      return this.group && this.group.categories
     },
   },
   watch: {

From 6298194db3cb887b095059976a9f0ebab2c1c7cf Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 25 Apr 2023 14:11:00 +0200
Subject: [PATCH 09/18] fix updating of group type and action radius changes to
 the form

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

diff --git a/webapp/components/Group/GroupForm.vue b/webapp/components/Group/GroupForm.vue
index 71ec49a26..be8ef3c79 100644
--- a/webapp/components/Group/GroupForm.vue
+++ b/webapp/components/Group/GroupForm.vue
@@ -318,10 +318,10 @@ export default {
       return false
     },
     changeGroupType(event) {
-      this.formData.groupType = event.target.value
+      this.$refs.groupForm.update('groupType', event.target.value)
     },
     changeActionRadius(event) {
-      this.formData.actionRadius = event.target.value
+      this.$refs.groupForm.update('actionRadius', event.target.value)
     },
     updateEditorDescription(value) {
       this.$refs.groupForm.update('description', value)

From 4e76f0c712d83fc9d00a9f1874a88d62705d7452 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 25 Apr 2023 15:18:07 +0200
Subject: [PATCH 10/18] linting

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

diff --git a/webapp/components/Select/ActionRadiusSelect.vue b/webapp/components/Select/ActionRadiusSelect.vue
index 01a0990de..0a090e0a5 100644
--- a/webapp/components/Select/ActionRadiusSelect.vue
+++ b/webapp/components/Select/ActionRadiusSelect.vue
@@ -17,7 +17,7 @@ export default {
   props: {
     value: {
       required: true,
-    }
+    },
   },
   data() {
     return {

From 28e92c25b7ff74aaa4b32381b09bfba76999a9a3 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 25 Apr 2023 15:19:00 +0200
Subject: [PATCH 11/18] add unit tests to action radius select

---
 .../Select/ActionRadiusSelect.spec.js         | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 webapp/components/Select/ActionRadiusSelect.spec.js

diff --git a/webapp/components/Select/ActionRadiusSelect.spec.js b/webapp/components/Select/ActionRadiusSelect.spec.js
new file mode 100644
index 000000000..7629ac788
--- /dev/null
+++ b/webapp/components/Select/ActionRadiusSelect.spec.js
@@ -0,0 +1,37 @@
+import { shallowMount } from '@vue/test-utils'
+import ActionRadiusSelect from './ActionRadiusSelect'
+
+const localVue = global.localVue
+const propsData = { value: 'regional' }
+
+describe('ActionRadiusSelect.', () => {
+  let wrapper
+  let mocks
+
+  beforeEach(() => {
+    mocks = {
+      $t: jest.fn(),
+    }
+  })
+
+  describe('mount', () => {
+    const Wrapper = () => {
+      return shallowMount(ActionRadiusSelect, { propsData, mocks, localVue })
+    }
+
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+    it('renders the select', () => {
+      expect(wrapper.findComponent(ActionRadiusSelect).exists()).toBe(true)
+    })
+
+    describe('when an option is selected', () => {
+      it('emits a change event with the new value', () => {
+        const select = wrapper.find('select')
+        select.trigger('change')
+        expect(wrapper.emitted().change[0]).toEqual(['regional'])
+      })
+    })
+  })
+})

From 60f18c1167745f4385ccce0617cf6714dd27c0be Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 25 Apr 2023 17:13:09 +0200
Subject: [PATCH 12/18] remove comments

---
 webapp/components/Group/GroupForm.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/webapp/components/Group/GroupForm.vue b/webapp/components/Group/GroupForm.vue
index be8ef3c79..52437d644 100644
--- a/webapp/components/Group/GroupForm.vue
+++ b/webapp/components/Group/GroupForm.vue
@@ -37,8 +37,6 @@
         <ds-text class="select-label">
           {{ $t('group.type') }}
         </ds-text>
-        <!-- TODO: change it has to be implemented later -->
-        <!-- TODO: move 'ds-select' from style guide to main code and implement missing translation etc. functionality -->
         <select
           class="select ds-input appearance--auto"
           name="groupType"

From 43ed69803639da47a093edcdc049016108124b69 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 25 Apr 2023 17:31:34 +0200
Subject: [PATCH 13/18] add missing option to action radius select

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

diff --git a/webapp/components/Select/ActionRadiusSelect.vue b/webapp/components/Select/ActionRadiusSelect.vue
index 0a090e0a5..88c3e6e82 100644
--- a/webapp/components/Select/ActionRadiusSelect.vue
+++ b/webapp/components/Select/ActionRadiusSelect.vue
@@ -21,7 +21,7 @@ export default {
   },
   data() {
     return {
-      actionRadiusOptions: ['regional', 'national', 'continental', 'global'],
+      actionRadiusOptions: ['regional', 'national', 'continental', 'global', 'interplanetary'],
     }
   },
   methods: {

From 531bbc907361919eba4ec31529e139d6eabb0059 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 25 Apr 2023 18:04:52 +0200
Subject: [PATCH 14/18] remove option from action radius select

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

diff --git a/webapp/components/Select/ActionRadiusSelect.vue b/webapp/components/Select/ActionRadiusSelect.vue
index 88c3e6e82..0a090e0a5 100644
--- a/webapp/components/Select/ActionRadiusSelect.vue
+++ b/webapp/components/Select/ActionRadiusSelect.vue
@@ -21,7 +21,7 @@ export default {
   },
   data() {
     return {
-      actionRadiusOptions: ['regional', 'national', 'continental', 'global', 'interplanetary'],
+      actionRadiusOptions: ['regional', 'national', 'continental', 'global'],
     }
   },
   methods: {

From d675958a1f81d317d8fe6a7fce1d9f2b60244262 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 26 Apr 2023 10:57:07 +0200
Subject: [PATCH 15/18] fix docker-compose for rebranding deployment

---
 deployment/docker-compose.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
index a0dda4dc0..973dc6ac5 100644
--- a/deployment/docker-compose.yml
+++ b/deployment/docker-compose.yml
@@ -65,10 +65,10 @@ services:
   
   backend:
     image: ocelotsocialnetwork/backend-branded:local-${CONFIGURATION}
-    container_name: backend
+    container_name: backend-branded
     build:
       dockerfile: src/docker/backend.Dockerfile
-      target: branded-branded
+      target: branded
       context: .
       args:
         - CONFIGURATION=$CONFIGURATION
@@ -143,7 +143,7 @@ services:
 
   neo4j:
     image: ocelotsocialnetwork/neo4j-community:latest
-    container_name: neo4j
+    container_name: neo4j-branded
     networks:
       - test-network
     volumes:

From 5fbdab68884fc2bd0d32e802df0a4e97ff387f38 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Thu, 27 Apr 2023 12:33:55 +0200
Subject: [PATCH 16/18] v2.6.0

---
 CHANGELOG.md                           | 38 +++++++++++++++++++++++++-
 backend/package.json                   |  2 +-
 package.json                           |  2 +-
 webapp/maintenance/source/package.json |  2 +-
 webapp/package.json                    |  2 +-
 5 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 361ccb183..7030227c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,13 +4,49 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [2.6.0](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/2.5.1...2.6.0)
+
+- fix(other): docker-compose for rebranding deployment [`#6265`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6265)
+- feat(webapp): default categories of group for posts in group [`#6259`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6259)
+- refactor(webapp): make action radius select in group form a reusable component [`#6244`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6244)
+- fix(webapp): show avatar for group members [`#6258`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6258)
+- fix(webapp): fix search for 3 chars [`#6256`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6256)
+- fix(backend): group posts cannot be pinned [`#6242`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6242)
+- Bump metascraper-soundcloud from 5.33.5 to 5.34.2 in /backend [`#6213`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6213)
+- refactor(other): refactor test workflows [`#6151`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6151)
+- fix(other): deployment fix typo, update stage.ocelot.social reference [`#6230`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6230)
+- fix(other): bump metascraper-url from 5.33.5 to 5.34.2 in /backend [`#6217`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6217)
+- fix(other): workflow typo [`#6235`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6235)
+- feat(other): publish stage.yunite.me hook [`#6234`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6234)
+- fix(other): reduce kubernetes memory limits [`#6229`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6229)
+- fix(other): deployment for branded image with custom names [`#6228`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6228)
+- Bump node from 19.8.1-alpine3.17 to 19.9.0-alpine3.17 in /backend [`#6219`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6219)
+- Bump node from 19.8.1-alpine3.17 to 19.9.0-alpine3.17 in /webapp [`#6220`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6220)
+- feat(other): deployment pod resources [`#6132`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6132)
+- Bump @babel/core from 7.12.17 to 7.21.4 in /webapp [`#6215`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6215)
+- Bump jsonwebtoken from 8.5.1 to 9.0.0 in /webapp [`#6079`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6079)
+- Bump jest from 29.4.2 to 29.5.0 in /webapp [`#6094`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6094)
+- Bump babel-jest from 29.4.2 to 29.5.0 in /webapp [`#6095`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6095)
+- Bump neode from 0.4.8 to 0.4.9 in /backend [`#6075`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6075)
+- Bump node from 19.4.0-alpine3.17 to 19.8.1-alpine3.17 in /webapp [`#6155`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6155)
+- Bump node from 19.4.0-alpine3.17 to 19.8.1-alpine3.17 in /backend [`#6156`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6156)
+- Bump @babel/core from 7.9.0 to 7.21.4 [`#6200`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6200)
+- Bump @babel/preset-env from 7.12.7 to 7.21.4 [`#6204`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6204)
+- Bump expect from 25.3.0 to 29.5.0 [`#6098`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6098)
+- separate test workflows [`3533a36`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/3533a36cdc811c0e1dae218fbc2184f7c4bc3951)
+- get it working [`8df7d5d`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/8df7d5d265b0c5ba16f167a213631d765d2f985e)
+- feat(webapp): group categories on posts [`3244f3f`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/3244f3f86d1e8c09e0fd49f43c49f0a3aa8b85ab)
+
 #### [2.5.1](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/2.5.0...2.5.1)
 
+> 23 March 2023
+
+- chore(other): release v2.5.1 – fix filter menu width [`#6180`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6180)
 - feat(webapp): add tooltips to all menu icons [`#6185`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6185)
 - fix(webapp): popup filter max-width [`#6177`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6177)
 - Add tooltip to header notifications menu [`28505a5`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/28505a5b181008ebcde6fa58b7a4a8459a492018)
 - Add tooltip to header avatar menu [`4c0469f`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/4c0469f61a3c2fae23e50c6a5a2a91b63fac149a)
-- Add tooltip to locale switch menu [`26b90fc`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/26b90fce4704e537126fd15ad950ea04e14890ba)
+- Release v2.5.1 - fix filter menu width [`08def14`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/08def14cafef7816d8e43f1896430400bda9635d)
 
 #### [2.5.0](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/2.4.0...2.5.0)
 
diff --git a/backend/package.json b/backend/package.json
index f32881357..3fe3bb21d 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-backend",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "description": "GraphQL Backend for ocelot.social",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",
diff --git a/package.json b/package.json
index d217d5b1d..7002e99f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "description": "Free and open source software program code available to run social networks.",
   "author": "ocelot.social Community",
   "license": "MIT",
diff --git a/webapp/maintenance/source/package.json b/webapp/maintenance/source/package.json
index c069f09bf..48b6f7d29 100644
--- a/webapp/maintenance/source/package.json
+++ b/webapp/maintenance/source/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ocelot-social/maintenance",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "description": "Maintenance page for ocelot.social",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",
diff --git a/webapp/package.json b/webapp/package.json
index 751f91afa..095cb12ee 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-webapp",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "description": "ocelot.social Frontend",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",

From 02566a6e936f13dfa6f6ad597838ad22efd5ef19 Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Tue, 2 May 2023 15:49:26 +0200
Subject: [PATCH 17/18] fixed hardcoded z-index of overlay, filter and add-btn

---
 webapp/assets/_new/styles/tokens.scss | 2 ++
 webapp/assets/styles/main.scss        | 4 ++--
 webapp/pages/index.vue                | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss
index 66bd03ecc..863e0e0b7 100644
--- a/webapp/assets/_new/styles/tokens.scss
+++ b/webapp/assets/_new/styles/tokens.scss
@@ -336,10 +336,12 @@ $ease-in-sharp: cubic-bezier(0.895, 0.03, 0.685, 0.22);
  */
 
 $z-index-modal: 9999;
+$z-index-overlay: 9000;
 $z-index-dropdown: 8888;
 $z-index-page-submenu: 2500;
 $z-index-page-header: 2000;
 $z-index-page-sidebar: 1500;
+$z-index-sticky-float: 150;
 $z-index-sticky: 100;
 $z-index-post-teaser-link: 5;
 $z-index-surface: 1;
diff --git a/webapp/assets/styles/main.scss b/webapp/assets/styles/main.scss
index 144701f83..b726758c7 100644
--- a/webapp/assets/styles/main.scss
+++ b/webapp/assets/styles/main.scss
@@ -95,7 +95,7 @@ blockquote {
   box-shadow: $box-shadow-base;
   position: fixed;
   width: 100%;
-  z-index: 10;
+  z-index: $z-index-page-submenu;
 
   a {
     outline: none;
@@ -131,7 +131,7 @@ hr {
   left: 0;
   position: fixed;
   background: rgba(0, 0, 0, 0.15);
-  z-index: 99;
+  z-index: $z-index-overlay;
   pointer-events: none;
   transition: opacity 150ms ease-out;
   transition-delay: 50ms;
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 490b1ec8f..7f5bdab1b 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -318,7 +318,7 @@ export default {
   height: 54px;
   width: 54px;
   font-size: 26px;
-  z-index: 100;
+  z-index: $z-index-sticky-float;
   position: fixed;
   bottom: -5px;
   left: 98vw;
@@ -330,7 +330,7 @@ export default {
   height: 54px;
   width: 54px;
   font-size: 26px;
-  z-index: 100;
+  z-index: $z-index-sticky-float;
   position: fixed;
   top: 80px;
   box-shadow: $box-shadow-x-large;
@@ -344,7 +344,7 @@ export default {
 .filterButtonMenu {
   width: 95%;
   position: fixed;
-  z-index: 6;
+  z-index: $z-index-sticky;
   margin-top: -35px;
   padding: 20px 10px 20px 10px;
   background-color: #f5f4f6;
@@ -361,6 +361,7 @@ export default {
   max-height: 950px;
   overflow: auto;
   padding-bottom: 0px;
+  z-index: $z-index-page-submenu;
 }
 @media screen and (min-height: 401px) {
   #my-filter {
@@ -410,7 +411,6 @@ export default {
     height: 44px;
     width: 44px;
     font-size: 23px;
-    z-index: 10;
   }
   .ds-grid {
     padding-top: 1em;

From f4efe245a760372e1fbaa24b231d065101affade Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 8 May 2023 13:06:18 +0200
Subject: [PATCH 18/18] properly render avatars in group settings

---
 webapp/components/Group/GroupMember.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/webapp/components/Group/GroupMember.vue b/webapp/components/Group/GroupMember.vue
index d6c09746e..62a2bf187 100644
--- a/webapp/components/Group/GroupMember.vue
+++ b/webapp/components/Group/GroupMember.vue
@@ -10,7 +10,7 @@
             params: { id: scope.row.id, slug: scope.row.slug },
           }"
         >
-          <ds-avatar online size="small" :name="scope.row.name"></ds-avatar>
+          <profile-avatar :profile="scope.row" size="small" />
         </nuxt-link>
       </template>
       <template #name="scope">
@@ -80,9 +80,13 @@
 </template>
 <script>
 import { changeGroupMemberRoleMutation, removeUserFromGroupMutation } from '~/graphql/groups.js'
+import ProfileAvatar from '~/components/_new/generic/ProfileAvatar/ProfileAvatar'
 
 export default {
   name: 'GroupMember',
+  components: {
+    ProfileAvatar,
+  },
   props: {
     groupId: {
       type: String,