From 2e7029b67027dae7ee3202553c0c9e288c882730 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Mon, 12 Jun 2017 16:20:02 +0200
Subject: Display user timeline

---
 src/components/user_profile/user_profile.js  | 7 +++++--
 src/components/user_profile/user_profile.vue | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/components')

diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 4f35cf27..5eef2735 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -1,13 +1,15 @@
 import UserCardContent from '../user_card_content/user_card_content.vue'
+import Timeline from '../timeline/timeline.vue'
 
 const UserProfile = {
   created () {
     this.$store.dispatch('startFetching', ['user', this.userId])
   },
   destroyed () {
-    this.$store.dispatch('stopFetching', ['user', this.userId])
+    this.$store.dispatch('stopFetching', 'user')
   },
   computed: {
+    timeline () { return this.$store.state.statuses.timelines.user },
     userId () {
       return this.$route.params.id
     },
@@ -16,7 +18,8 @@ const UserProfile = {
     }
   },
   components: {
-    UserCardContent
+    UserCardContent,
+    Timeline
   }
 }
 
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index fe693c9d..0765b01c 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -1,6 +1,9 @@
 <template>
-  <div v-if="user" class="user-profile panel panel-default base00-background">
-    <user-card-content :user="user"></user-card-content>
+  <div>
+    <div v-if="user" class="user-profile panel panel-default base00-background">
+      <user-card-content :user="user"></user-card-content>
+    </div>
+    <Timeline :title="'User Timeline'" v-bind:timeline="timeline" v-bind:timeline-name="'user'"/>
   </div>
 </template>
 
-- 
cgit v1.2.3-70-g09d2