Merge branch 'fix/add-option-to-hide-features-panel' into 'develop'

Add option to hide features panel

See merge request pleroma/pleroma-fe!529

5 files changed, 9 insertions, 4 deletions

diff --git a/src/App.js b/src/App.js
index 83a61d39..18bff2dd 100644
--- a/src/App.js
+++ b/src/App.js
@@ -81,7 +81,8 @@ export default {
     },
     unseenNotificationsCount () {
       return this.unseenNotifications.length
-    }
+    },
+    showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel }
   },
   methods: {
     scrollToTop () {
diff --git a/src/App.vue b/src/App.vue
index 833608ea..082c6cb6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -29,7 +29,7 @@
               <user-panel></user-panel>
               <nav-panel></nav-panel>
               <instance-specific-panel v-if="showInstanceSpecificPanel"></instance-specific-panel>
-              <features-panel v-if="!currentUser"></features-panel>
+              <features-panel v-if="!currentUser && showFeaturesPanel"></features-panel>
               <who-to-follow-panel v-if="currentUser && suggestionsEnabled"></who-to-follow-panel>
               <notifications v-if="currentUser"></notifications>
             </div>
diff --git a/src/components/about/about.js b/src/components/about/about.js
index b4433b4e..b1ce3c7d 100644
--- a/src/components/about/about.js
+++ b/src/components/about/about.js
@@ -7,6 +7,9 @@ const About = {
     InstanceSpecificPanel,
     FeaturesPanel,
     TermsOfServicePanel
+  },
+  computed: {
+    showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel }
   }
 }
 
diff --git a/src/components/about/about.vue b/src/components/about/about.vue
index bf87e0b8..13dec87c 100644
--- a/src/components/about/about.vue
+++ b/src/components/about/about.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="sidebar">
     <instance-specific-panel></instance-specific-panel>
-    <features-panel></features-panel>
+    <features-panel v-if="showFeaturesPanel"></features-panel>
     <terms-of-service-panel></terms-of-service-panel>
   </div>
 </template>
diff --git a/src/modules/config.js b/src/modules/config.js
index c9528f6f..526a7021 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -30,7 +30,8 @@ const defaultState = {
   interfaceLanguage: browserLocale,
   scopeCopy: undefined, // instance default
   subjectLineBehavior: undefined, // instance default
-  alwaysShowSubjectInput: undefined // instance default
+  alwaysShowSubjectInput: undefined, // instance default
+  showFeaturesPanel: true
 }
 
 const config = {