Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups

# Conflicts:
#	webapp/layouts/default.vue

.github/ISSUE_TEMPLATE.md

@@ -1,3 +1,5 @@
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
+
 <!--
 Please take a look at the issue templates at https://github.com/Ocelot-Social-Community/Ocelot-Social/issues/new/choose
 before submitting a new issue. Following one of the issue templates will ensure maintainers can route your request efficiently.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,11 +1,10 @@
 ---
-name: "\U0001F41B Bug Report"
-about: Create a report to help us to improve.
-title: "\U0001F41B [Bug] XXX"
+name: 🐛 Bug report
+about: Create a report to help us improve
 labels: bug
-assignees: ''
-
+title: 🐛 [Bug] 
 ---
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
 
-## :bug: Bug Report
+## 🐛 Bugreport
 <!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the bug is.-->

.github/ISSUE_TEMPLATE/devops_ticket.md

@@ -1,11 +1,10 @@
 ---
-name: "\U0001F4A5 DevOps Ticket"
-about: Help us manage our deployed app.
-title: "\U0001F4A5 [DevOps] XXX"
+name: 💥 DevOps ticket
+about: Help us manage our deployed Software.
 labels: devops
-assignees: ''
-
+title: 💥 [DevOps]
 ---
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
 
-## 💥 DevOps Ticket
+## 💥 DevOps ticket
 <!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the problem is.-->

.github/ISSUE_TEMPLATE/epic.md

@@ -1,15 +1,13 @@
 ---
-name: "\U0001F31F Epic"
-about: Define a big development step.
-title: "\U0001F31F [EPIC] XXX"
+name: 🌟 Epic
+about: Define a big development Step
 labels: epic
-assignees: ''
-
+title: 🌟 [EPIC] 
 ---
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
 
 <!-- THIS ISSUE-TYPE IS NOT FOR YOU! -->
-<!-- If you need an answer right away, visit the ocelot.social Discord:
-https://discord.gg/AJSX9DCSUA -->
+<!-- Proceed only if you know what you are doing - have a chat with Project's Team first -->
 
 ## 🌟 EPIC
 <!-- Describe your Epic in detail. Include screenshots and drawings -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,11 +1,10 @@
 ---
-name: "\U0001F680 Feature Request"
-about: Suggest an idea for this project.
-title: "\U0001F680 [Feature] XXX"
+name: 🚀 Feature request
+about: Suggest an idea for this project
 labels: feature
-assignees: ''
-
+title: 🚀 [Feature] 
 ---
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
 
-## :rocket: Feature Request
+## 🚀 Feature
 <!-- Give a short summary of the Feature. Use Screenshots if you want. -->

.github/ISSUE_TEMPLATE/question.md

@@ -1,15 +1,13 @@
 ---
-name: "\U0001F4AC Question"
-about: If you need help understanding ocelot.social.
-title: "\U0001F4AC [Question] XXX"
+name: 💬 Question
+about: If you need help understanding our Software.
 labels: question
-assignees: ''
-
+title: 💬 [Question] 
 ---
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
 
-<!-- Chat with ocelot.social team -->
-<!-- If you need an answer right away, visit the ocelot.social Discord:
-https://discord.gg/AJSX9DCSUA -->
+<!-- Question the project's team -->
+<!-- If you need an answer right away, consider to take other means of communication with the project's team -->
 
 ## 💬 Question
 <!-- Describe your Question in detail. Include screenshots and drawings if needed. -->

.github/ISSUE_TEMPLATE/refactor_ticket.md

@@ -1,11 +1,10 @@
 ---
-name: "\U0001F527 Refactor"
+name: 🔧 Refactor ticket
 about: Help us improve our code by refactoring it.
-title: "\U0001F527 [Refactor] XXX"
 labels: refactor
-assignees: ''
-
+title: 🔧 [Refactor]
 ---
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
 
-## 🔧 Refactor
+## 🔧 Refactor ticket
 <!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the problem is.-->

.github/ISSUE_TEMPLATE/release.md

@@ -0,0 +1,13 @@
+---
+name: 🎂 Release
+about: Define a Release
+labels: release
+title: 🎂 [RELEASE] 
+---
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
+
+<!-- THIS ISSUE-TYPE IS NOT FOR YOU! -->
+<!-- Proceed only if you know what you are doing - have a chat with Project's Team first -->
+
+## 🎂 RELEASE
+<!-- Describe your Release in detail. Include screenshots and drawings -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +1,15 @@
-## 🍰 Pull Request
+<!-- You can find the latest issue templates here https://github.com/ulfgebhardt/issue-templates -->
+
+## 🍰 Pullrequest
 <!-- Describe the Pullrequest. Use Screenshots if possible. -->
 
-XXX
-
 ### Issues
-<!-- Which Issues does this fix, which are related? -->
-
+<!-- Which Issues does this fix, which are related?
 - fixes #XXX
 - relates #XXX
+-->
+- None
 
 ### Todo
 <!-- In case some parts are still missing, list them here. -->
-
-- [ ] XXX list here …
+- [X] None

webapp/components/FilterMenu/FilterMenu.vue

@@ -14,6 +14,7 @@
       <div class="filter-menu-options">
         <h2 class="title">{{ $t('filter-menu.filter-by') }}</h2>
         <following-filter />
+        <categories-filter v-if="categoriesActive" />
       </div>
       <div class="filter-menu-options">
         <h2 class="title">{{ $t('filter-menu.order-by') }}</h2>
@@ -28,12 +29,19 @@ import Dropdown from '~/components/Dropdown'
 import { mapGetters } from 'vuex'
 import FollowingFilter from './FollowingFilter'
 import OrderByFilter from './OrderByFilter'
+import CategoriesFilter from './CategoriesFilter'
 
 export default {
   components: {
     Dropdown,
     FollowingFilter,
     OrderByFilter,
+    CategoriesFilter,
+  },
+  data() {
+    return {
+      categoriesActive: this.$env.CATEGORIES_ACTIVE,
+    }
   },
   props: {
     placement: { type: String },

webapp/layouts/default.vue

@@ -28,15 +28,6 @@
                 </ds-text>
               </nuxt-link>
             </ds-flex-item>
-            <ds-flex-item
-              v-if="categoriesActive && isLoggedIn"
-              :class="{ 'hide-mobile-menu': !toggleMobileMenu }"
-              style="flex-grow: 0; flex-basis: auto; margin-right: 20px"
-            >
-              <client-only>
-                <categories-menu></categories-menu>
-              </client-only>
-            </ds-flex-item>
             <ds-flex-item
               :width="{ base: '40%', sm: '40%', md: '40%', lg: '0%' }"
               class="mobile-hamburger-menu"
@@ -125,7 +116,6 @@ import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import SearchField from '~/components/features/SearchField/SearchField.vue'
 import Modal from '~/components/Modal'
 import AvatarMenu from '~/components/AvatarMenu/AvatarMenu'
-import CategoriesMenu from '~/components/FilterMenu/CategoriesMenu'
 import FilterMenu from '~/components/FilterMenu/FilterMenu.vue'
 import GroupButton from '~/components/Group/GroupButton'
 import InviteButton from '~/components/InviteButton/InviteButton'
@@ -143,7 +133,6 @@ export default {
     FilterMenu,
     PageFooter,
     InviteButton,
-    CategoriesMenu,
     GroupButton,
   },
   mixins: [seo],