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

Add option to hide features panel

See merge request pleroma/pleroma-fe!529
This commit is contained in:
Shpuld Shpludson 2019-02-06 04:21:06 +00:00
commit 68e5360229
5 changed files with 9 additions and 4 deletions

View File

@ -81,7 +81,8 @@ export default {
}, },
unseenNotificationsCount () { unseenNotificationsCount () {
return this.unseenNotifications.length return this.unseenNotifications.length
} },
showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel }
}, },
methods: { methods: {
scrollToTop () { scrollToTop () {

View File

@ -29,7 +29,7 @@
<user-panel></user-panel> <user-panel></user-panel>
<nav-panel></nav-panel> <nav-panel></nav-panel>
<instance-specific-panel v-if="showInstanceSpecificPanel"></instance-specific-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> <who-to-follow-panel v-if="currentUser && suggestionsEnabled"></who-to-follow-panel>
<notifications v-if="currentUser"></notifications> <notifications v-if="currentUser"></notifications>
</div> </div>

View File

@ -7,6 +7,9 @@ const About = {
InstanceSpecificPanel, InstanceSpecificPanel,
FeaturesPanel, FeaturesPanel,
TermsOfServicePanel TermsOfServicePanel
},
computed: {
showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel }
} }
} }

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="sidebar"> <div class="sidebar">
<instance-specific-panel></instance-specific-panel> <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> <terms-of-service-panel></terms-of-service-panel>
</div> </div>
</template> </template>

View File

@ -30,7 +30,8 @@ const defaultState = {
interfaceLanguage: browserLocale, interfaceLanguage: browserLocale,
scopeCopy: undefined, // instance default scopeCopy: undefined, // instance default
subjectLineBehavior: undefined, // instance default subjectLineBehavior: undefined, // instance default
alwaysShowSubjectInput: undefined // instance default alwaysShowSubjectInput: undefined, // instance default
showFeaturesPanel: true
} }
const config = { const config = {