Merge branch 'feature/instance-specific-panel' into 'develop'

add instance specific panel

See merge request pleroma/pleroma-fe!202

1 files changed, 9 insertions, 1 deletions

diff --git a/src/main.js b/src/main.js
index 7fb9a047..6f8c00f0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -88,10 +88,11 @@ window.fetch('/api/statusnet/config.json')
 window.fetch('/static/config.json')
   .then((res) => res.json())
   .then((data) => {
-    const {theme, background, logo} = data
+    const {theme, background, logo, showInstanceSpecificPanel} = data
     store.dispatch('setOption', { name: 'theme', value: theme })
     store.dispatch('setOption', { name: 'background', value: background })
     store.dispatch('setOption', { name: 'logo', value: logo })
+    store.dispatch('setOption', { name: 'showInstanceSpecificPanel', value: showInstanceSpecificPanel })
     if (data['chatDisabled']) {
       store.dispatch('disableChat')
     }
@@ -163,3 +164,10 @@ window.fetch('/static/emoji.json')
     })
     store.dispatch('setOption', { name: 'emoji', value: emoji })
   })
+
+window.fetch('/instance/panel.html')
+  .then((res) => res.text())
+  .then((html) => {
+    store.dispatch('setOption', { name: 'instanceSpecificPanelContent', value: html })
+  })
+