therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use 'userProfileLink' to generate user-profile link

Browse source
This commit is contained in:
Maxim Filippov 2018-12-13 19:57:11 +03:00
parent 70c48a076d
commit e4a34cc4d4
14 changed files with 58 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/user_card_content/user_card_content.js
View file

@ -1,5 +1,6 @@
import StillImage from '../still-image/still-image.vue'
import { hex2rgb } from '../../services/color_convert/color_convert.js'
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
export default {
props: [ 'user', 'switcher', 'selected', 'hideBio', 'activatePanel' ],
@ -40,6 +41,9 @@ export default {
const days = Math.ceil((new Date() - new Date(this.user.created_at)) / (60 * 60 * 24 * 1000))
return Math.round(this.user.statuses_count / days)
},
userProfileLink (user) {
return generateProfileLink(user.id, user.screen_name)
},
userHighlightType: {
get () {
const data = this.$store.state.config.highlight[this.user.screen_name]

4
src/components/user_card_content/user_card_content.vue
View file

@ -9,13 +9,13 @@
<i class="icon-link-ext usersettings"></i>
</a>
<div class='container'>
<router-link :to="{ name: 'user-profile', params: { name: user.screen_name } }">
<router-link :to="userProfileLink(user)">
<StillImage class="avatar" :src="user.profile_image_url_original"/>
</router-link>
<div class="name-and-screen-name">
<div :title="user.name" class='user-name' v-if="user.name_html" v-html="user.name_html"></div>
<div :title="user.name" class='user-name' v-else>{{user.name}}</div>
<router-link class='user-screen-name' :to="{ name: 'user-profile', params: { name: user.screen_name } }">
<router-link class='user-screen-name' :to="userProfileLink(user)">
<span>@{{user.screen_name}}</span><span v-if="user.locked"><i class="icon icon-lock"></i></span>
<span v-if="!hideUserStatsLocal" class="dailyAvg">{{dailyAvg}} {{ $t('user_card.per_day') }}</span>
</router-link>