commit: 68e53602299823067f696c8f0bdcfcd3fc4339d7
parent: 3d337a239e9fc5f1ca84131fc1bed68b1db53178
Author: Shpuld Shpludson <shp@cock.li>
Date: Wed, 6 Feb 2019 04:21:06 +0000
Merge branch 'fix/add-option-to-hide-features-panel' into 'develop'
Add option to hide features panel
See merge request pleroma/pleroma-fe!529
Diffstat:
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 = {