aboutsummaryrefslogtreecommitdiff
path: root/src/App.js
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-02-11 09:32:45 +0000
committerlambda <pleromagit@rogerbraun.net>2018-02-11 09:32:45 +0000
commitea6ee2aaa25741078e3a0f6f6ec7cfeb46d1b365 (patch)
tree45f4f3bc3b4fc2895a4f383f9f66b61f18634750 /src/App.js
parentb0f248c48384c888faef8fcf76ee8b3f8abfde8e (diff)
parentfe1044dfdfd565b0af7eed8e1f1b6ca02ca25e6a (diff)
Merge branch 'feature/instance-specific-panel' into 'develop'
add instance specific panel See merge request pleroma/pleroma-fe!202
Diffstat (limited to 'src/App.js')
-rw-r--r--src/App.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/App.js b/src/App.js
index 8e7acb42..e9248967 100644
--- a/src/App.js
+++ b/src/App.js
@@ -2,6 +2,7 @@ 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 InstanceSpecificPanel from './components/instance_specific_panel/instance_specific_panel.vue'
import ChatPanel from './components/chat_panel/chat_panel.vue'
export default {
@@ -11,7 +12,8 @@ export default {
NavPanel,
Notifications,
UserFinder,
- ChatPanel
+ ChatPanel,
+ InstanceSpecificPanel
},
data: () => ({
mobileActivePanel: 'timeline'
@@ -24,7 +26,8 @@ export default {
logoStyle () { return { 'background-image': `url(${this.$store.state.config.logo})` } },
style () { return { 'background-image': `url(${this.background})` } },
sitename () { return this.$store.state.config.name },
- chat () { return this.$store.state.chat.channel.state === 'joined' }
+ chat () { return this.$store.state.chat.channel.state === 'joined' },
+ showInstanceSpecificPanel () { return this.$store.state.config.showInstanceSpecificPanel }
},
methods: {
activatePanel (panelName) {