diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 1e824fbea0..58e808b351 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -18,8 +18,10 @@

{{status.user.name}} - {{status.user.screen_name}} - > {{status.in_reply_to_screen_name}} + {{status.user.screen_name}} + > + {{status.in_reply_to_screen_name}} + - diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js new file mode 100644 index 0000000000..4d52bc95fa --- /dev/null +++ b/src/components/user_profile/user_profile.js @@ -0,0 +1,17 @@ +import UserCardContent from '../user_card_content/user_card_content.vue' +import { find } from 'lodash' + +const UserProfile = { + computed: { + user () { + const id = this.$route.params.id + const user = find(this.$store.state.users.users, {id}) + return user + } + }, + components: { + UserCardContent + } +} + +export default UserProfile diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue new file mode 100644 index 0000000000..767982c508 --- /dev/null +++ b/src/components/user_profile/user_profile.vue @@ -0,0 +1,14 @@ + + + + + diff --git a/src/main.js b/src/main.js index 4c7437034b..048706d574 100644 --- a/src/main.js +++ b/src/main.js @@ -7,6 +7,7 @@ import PublicAndExternalTimeline from './components/public_and_external_timeline import FriendsTimeline from './components/friends_timeline/friends_timeline.vue' import Conversation from './components/conversation/conversation.vue' import Mentions from './components/mentions/mentions.vue' +import UserProfile from './components/user_profile/user_profile.vue' import statusesModule from './modules/statuses.js' import usersModule from './modules/users.js' @@ -37,6 +38,7 @@ const routes = [ { path: '/main/public', component: PublicTimeline }, { path: '/main/friends', component: FriendsTimeline }, { name: 'conversation', path: '/notice/:id', component: Conversation }, + { name: 'user-profile', path: '/users/:id', component: UserProfile }, { name: 'mentions', path: '/:username/mentions', component: Mentions } ] diff --git a/src/modules/users.js b/src/modules/users.js index fd2d6e81cf..1821e0f2ad 100644 --- a/src/modules/users.js +++ b/src/modules/users.js @@ -4,6 +4,7 @@ import { map, each, find, merge } from 'lodash' // TODO: Unify with mergeOrAdd in statuses.js export const mergeOrAdd = (arr, item) => { + if (!item) { return false } const oldItem = find(arr, {id: item.id}) if (oldItem) { // We already have this, so only merge the new info.