6 files changed, 37 insertions, 46 deletions
diff --git a/src/components/Hello.vue b/src/components/Hello.vue
deleted file mode 100644
index 58ca7687..00000000
--- a/src/components/Hello.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="hello">
-    <h1>{{ msg }}</h1>
-    <h2>Essential Links</h2>
-    <ul>
-      <li><a href="https://vuejs.org" target="_blank">Core Docs</a></li>
-      <li><a href="https://forum.vuejs.org" target="_blank">Forum</a></li>
-      <li><a href="https://gitter.im/vuejs/vue" target="_blank">Gitter Chat</a></li>
-      <li><a href="https://twitter.com/vuejs" target="_blank">Twitter</a></li>
-      <br>
-      <li><a href="http://vuejs-templates.github.io/webpack/" target="_blank">Docs for This Template</a></li>
-    </ul>
-    <h2>Ecosystem</h2>
-    <ul>
-      <li><a href="http://router.vuejs.org/" target="_blank">vue-router</a></li>
-      <li><a href="http://vuex.vuejs.org/" target="_blank">vuex</a></li>
-      <li><a href="http://vue-loader.vuejs.org/" target="_blank">vue-loader</a></li>
-      <li><a href="https://github.com/vuejs/awesome-vue" target="_blank">awesome-vue</a></li>
-    </ul>
-  </div>
-</template>
-
-<script src='./Hello.js' />
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-h1, h2 {
-  font-weight: normal;
-}
-
-ul {
-  list-style-type: none;
-  padding: 0;
-}
-
-li {
-  display: inline-block;
-  margin: 0 10px;
-}
-
-a {
-  color: #42b983;
-}
-</style>
diff --git a/src/components/hello/Hello.js b/src/components/hello/Hello.js
index 609bdbdc..c701c560 100644
--- a/src/components/hello/Hello.js
+++ b/src/components/hello/Hello.js
@@ -3,6 +3,6 @@ export default {
   data () {
     return {
       msg: 'Welcome to Your Vue.js app'
-    };
+    }
   }
-};
+}
diff --git a/src/components/public_timeline/public_timeline.js b/src/components/public_timeline/public_timeline.js
new file mode 100644
index 00000000..cac422ec
--- /dev/null
+++ b/src/components/public_timeline/public_timeline.js
@@ -0,0 +1,11 @@
+import Timeline from '../timeline/timeline.vue'
+const PublicTimeline = {
+  components: {
+    Timeline
+  },
+  computed: {
+    timeline () { return this.$store.state.statuses.timelines.public }
+  }
+}
+
+export default PublicTimeline
diff --git a/src/components/public_timeline/public_timeline.vue b/src/components/public_timeline/public_timeline.vue
new file mode 100644
index 00000000..0ed8baf8
--- /dev/null
+++ b/src/components/public_timeline/public_timeline.vue
@@ -0,0 +1,10 @@
+<template>
+  <div class="panel panel-default">
+    <div class="panel-heading">Public Timeline</div>
+    <div class="panel-body">
+      <Timeline v-bind:timeline="timeline" />
+    </div>
+  </div>
+</template>
+
+<script src="./public_timeline.js"></script>
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
new file mode 100644
index 00000000..727008ad
--- /dev/null
+++ b/src/components/timeline/timeline.js
@@ -0,0 +1,7 @@
+const Timeline = {
+  props: [
+    'timeline'
+  ]
+}
+
+export default Timeline;
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
new file mode 100644
index 00000000..cf712796
--- /dev/null
+++ b/src/components/timeline/timeline.vue
@@ -0,0 +1,7 @@
+<template>
+  <div class="timeline">
+    <h1>Timeline goes here</h1>
+    <h2 v-for="status in timeline.visibleStatuses">{{status.text}}</h2>
+  </div>
+</template>
+<script src="./timeline.js"></script>