Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into hide-statistics

1 files changed, 12 insertions, 10 deletions

diff --git a/src/App.js b/src/App.js
index c455c18c..05e3eda3 100644
--- a/src/App.js
+++ b/src/App.js
@@ -2,8 +2,9 @@ import UserPanel from './components/user_panel/user_panel.vue'
 import NavPanel from './components/nav_panel/nav_panel.vue'
 import Notifications from './components/notifications/notifications.vue'
 import UserFinder from './components/user_finder/user_finder.vue'
-import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue'
 import InstanceSpecificPanel from './components/instance_specific_panel/instance_specific_panel.vue'
+import FeaturesPanel from './components/features_panel/features_panel.vue'
+import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue'
 import ChatPanel from './components/chat_panel/chat_panel.vue'
 
 export default {
@@ -13,8 +14,9 @@ export default {
     NavPanel,
     Notifications,
     UserFinder,
-    WhoToFollowPanel,
     InstanceSpecificPanel,
+    FeaturesPanel,
+    WhoToFollowPanel,
     ChatPanel
   },
   data: () => ({
@@ -34,9 +36,9 @@ export default {
   computed: {
     currentUser () { return this.$store.state.users.currentUser },
     background () {
-      return this.currentUser.background_image || this.$store.state.config.background
+      return this.currentUser.background_image || this.$store.state.instance.background
     },
-    enableMask () { return this.supportsMask && this.$store.state.config.logoMask },
+    enableMask () { return this.supportsMask && this.$store.state.instance.logoMask },
     logoStyle () {
       return {
         'visibility': this.enableMask ? 'hidden' : 'visible'
@@ -44,24 +46,24 @@ export default {
     },
     logoMaskStyle () {
       return this.enableMask ? {
-        'mask-image': `url(${this.$store.state.config.logo})`
+        'mask-image': `url(${this.$store.state.instance.logo})`
       } : {
         'background-color': this.enableMask ? '' : 'transparent'
       }
     },
     logoBgStyle () {
       return Object.assign({
-        'margin': `${this.$store.state.config.logoMargin} 0`
+        'margin': `${this.$store.state.instance.logoMargin} 0`
       }, this.enableMask ? {} : {
         'background-color': this.enableMask ? '' : 'transparent'
       })
     },
-    logo () { return this.$store.state.config.logo },
+    logo () { return this.$store.state.instance.logo },
     style () { return { 'background-image': `url(${this.background})` } },
-    sitename () { return this.$store.state.config.name },
+    sitename () { return this.$store.state.instance.name },
     chat () { return this.$store.state.chat.channel.state === 'joined' },
-    suggestionsEnabled () { return this.$store.state.config.suggestionsEnabled },
-    showInstanceSpecificPanel () { return this.$store.state.config.showInstanceSpecificPanel }
+    suggestionsEnabled () { return this.$store.state.instance.suggestionsEnabled },
+    showInstanceSpecificPanel () { return this.$store.state.instance.showInstanceSpecificPanel }
   },
   methods: {
     activatePanel (panelName) {