aboutsummaryrefslogtreecommitdiff
path: root/src/components/public_and_external_timeline
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2016-11-07 11:56:14 +0100
committerRoger Braun <roger@rogerbraun.net>2016-11-07 11:56:14 +0100
commitcf972e968cd1e059c4a7a05a9a3d42f3da05414b (patch)
tree2d7d9ee5408397f1ac5d36fa98943158d5a105c4 /src/components/public_and_external_timeline
parentacc439f26684d3d188542e904190532ac781c936 (diff)
parent83e7add2c7cd3d7b878c82ffb86e09479bff3500 (diff)
Merge branch 'master' of ssh.gitgud.io:lambadalambda/pleroma-fe
Diffstat (limited to 'src/components/public_and_external_timeline')
-rw-r--r--src/components/public_and_external_timeline/public_and_external_timeline.js11
-rw-r--r--src/components/public_and_external_timeline/public_and_external_timeline.vue10
2 files changed, 21 insertions, 0 deletions
diff --git a/src/components/public_and_external_timeline/public_and_external_timeline.js b/src/components/public_and_external_timeline/public_and_external_timeline.js
new file mode 100644
index 00000000..138118ad
--- /dev/null
+++ b/src/components/public_and_external_timeline/public_and_external_timeline.js
@@ -0,0 +1,11 @@
+import Timeline from '../timeline/timeline.vue'
+const PublicAndExternalTimeline = {
+ components: {
+ Timeline
+ },
+ computed: {
+ timeline () { return this.$store.state.statuses.timelines.publicAndExternal }
+ }
+}
+
+export default PublicAndExternalTimeline
diff --git a/src/components/public_and_external_timeline/public_and_external_timeline.vue b/src/components/public_and_external_timeline/public_and_external_timeline.vue
new file mode 100644
index 00000000..94cdaf17
--- /dev/null
+++ b/src/components/public_and_external_timeline/public_and_external_timeline.vue
@@ -0,0 +1,10 @@
+<template>
+ <div class="timeline panel panel-default">
+ <div class="panel-heading">THE WHOLE KNOWN NETWORK</div>
+ <div class="panel-body">
+ <Timeline v-bind:timeline="timeline" v-bind:timeline-name="'publicAndExternal'"/>
+ </div>
+ </div>
+</template>
+
+<script src="./public_and_external_timeline.js"></script>