commit: 2e7029b67027dae7ee3202553c0c9e288c882730
parent: 090148ef6051ec2399fe47281db9f73955297d97
Author: Roger Braun <roger@rogerbraun.net>
Date: Mon, 12 Jun 2017 16:20:02 +0200
Display user timeline
Diffstat:
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git 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
@@ -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>
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
@@ -113,11 +113,11 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
let params = []
if (since) {
- params.push('since_id', since)
+ params.push(['since_id', since])
}
if (until) {
- params.push('max_id', until)
+ params.push(['max_id', until])
}
if (userId) {