Merge remote-tracking branch 'upstream/develop' into user-profile-overhault
* upstream/develop: (24 commits) Feature/bigger icons for mobile / #211 Fix oauth url Make user profile page cleaner Redirect to /main/all Move userProfile link to methods Fix user profile test Add temporary redirects Add local profile test Implement user_profile.spec.js Use babel polyfill in karma Use 'userProfileLink' to generate user-profile link Rollback disableDotRule Use "-1" in indexOf Add generateProfileLink Use "~" as a route namespace symbol Disable dot rule Pass userName instead of userId Typo in tests Fix redirect paths Fix typo ...
This commit is contained in:
commit
81c83566cd
40 changed files with 1855 additions and 789 deletions
|
@ -1,5 +1,6 @@
|
|||
import UserCardContent from '../user_card_content/user_card_content.vue'
|
||||
import StillImage from '../still-image/still-image.vue'
|
||||
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
|
||||
|
||||
const UserCard = {
|
||||
props: [
|
||||
|
@ -30,6 +31,9 @@ const UserCard = {
|
|||
denyUser () {
|
||||
this.$store.state.api.backendInteractor.denyUser(this.user.id)
|
||||
this.$store.dispatch('removeFollowRequest', this.user)
|
||||
},
|
||||
userProfileLink (user) {
|
||||
return generateProfileLink(user.id, user.screen_name)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -19,7 +19,8 @@
|
|||
{{ currentUser.id == user.id ? $t('user_card.its_you') : $t('user_card.follows_you') }}
|
||||
</span>
|
||||
</div>
|
||||
<router-link class='user-screen-name' :to="{ name: 'user-profile', params: { id: user.id } }">
|
||||
|
||||
<router-link class='user-screen-name' :to="userProfileLink(user)">
|
||||
@{{user.screen_name}}
|
||||
</router-link>
|
||||
</div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue