5 files changed, 54 insertions, 3 deletions
diff --git a/src/components/tag_timeline/tag_timeline.js b/src/components/tag_timeline/tag_timeline.js
new file mode 100644
index 00000000..43de4f49
--- /dev/null
+++ b/src/components/tag_timeline/tag_timeline.js
@@ -0,0 +1,26 @@
+import Timeline from '../timeline/timeline.vue'
+
+const TagTimeline = {
+  created () {
+    this.$store.commit('clearTimeline', { timeline: 'tag' })
+    this.$store.dispatch('startFetching', { 'tag': this.tag })
+  },
+  components: {
+    Timeline
+  },
+  computed: {
+    tag () { return this.$route.params.tag },
+    timeline () { return this.$store.state.statuses.timelines.tag }
+  },
+  watch: {
+    tag () {
+      this.$store.commit('clearTimeline', { timeline: 'tag' })
+      this.$store.dispatch('startFetching', { 'tag': this.tag })
+    }
+  },
+  destroyed () {
+    this.$store.dispatch('stopFetching', 'tag')
+  }
+}
+
+export default TagTimeline
diff --git a/src/components/tag_timeline/tag_timeline.js~ b/src/components/tag_timeline/tag_timeline.js~
new file mode 100644
index 00000000..084e69d3
--- /dev/null
+++ b/src/components/tag_timeline/tag_timeline.js~
@@ -0,0 +1,12 @@
+import Timeline from '../timeline/timeline.vue'
+
+const TagTimeline = {
+	components: {
+		Timeline
+	},
+	computed: {
+		timeline () { return this.$store.state.statuses.timelines.tag }
+	}
+};
+
+export default TagTimeline
diff --git a/src/components/tag_timeline/tag_timeline.vue b/src/components/tag_timeline/tag_timeline.vue
new file mode 100644
index 00000000..62bb579a
--- /dev/null
+++ b/src/components/tag_timeline/tag_timeline.vue
@@ -0,0 +1,5 @@
+<template>
+  <Timeline :title="tag" :timeline="timeline" :timeline-name="'tag'" :tag="tag" />
+</template>
+
+<script src='./tag_timeline.js'></script>
+\ No newline at end of file
diff --git a/src/components/tag_timeline/tag_timeline.vue~ b/src/components/tag_timeline/tag_timeline.vue~
new file mode 100644
index 00000000..158ae399
--- /dev/null
+++ b/src/components/tag_timeline/tag_timeline.vue~
@@ -0,0 +1,5 @@
+<template>
+  <div> timleinei </div>
+</template>
+
+<script src='./tag_timeline.js'></script>
+\ No newline at end of file
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 06435745..bd80d57b 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -8,7 +8,8 @@ const Timeline = {
     'timeline',
     'timelineName',
     'title',
-    'userId'
+    'userId',
+    'tag'
   ],
   computed: {
     timelineError () { return this.$store.state.statuses.error },
@@ -39,7 +40,8 @@ const Timeline = {
       credentials,
       timeline: this.timelineName,
       showImmediately,
-      userId: this.userId
+      userId: this.userId,
+      tag: this.tag
     })
 
     // don't fetch followers for public, friend, twkn
@@ -62,7 +64,8 @@ const Timeline = {
         timeline: this.timelineName,
         older: true,
         showImmediately: true,
-        userId: this.userId
+        userId: this.userId,
+        tag: this.tag
       }).then(() => store.commit('setLoading', { timeline: this.timelineName, value: false }))
     },
     fetchFollowers () {