aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhakabahitoyo <hakabahitoyo@example.com>2018-03-28 17:45:35 +0900
committerhakabahitoyo <hakabahitoyo@example.com>2018-03-28 17:45:35 +0900
commit5a97cfb9599fb33b15f878869b940444234e3534 (patch)
tree4697212934530da61816576bafbfa6eecf72d065 /src
parentcaad81800963730f9d3ef1325bf5f55dd29fde9a (diff)
who-to-follow-panel using internal user link
Diffstat (limited to 'src')
-rw-r--r--src/components/who_to_follow_panel/who_to_follow_panel.js34
-rw-r--r--src/components/who_to_follow_panel/who_to_follow_panel.vue6
2 files changed, 18 insertions, 22 deletions
diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.js b/src/components/who_to_follow_panel/who_to_follow_panel.js
index 2d376ef9..43cd3e2d 100644
--- a/src/components/who_to_follow_panel/who_to_follow_panel.js
+++ b/src/components/who_to_follow_panel/who_to_follow_panel.js
@@ -19,44 +19,40 @@ function showWhoToFollow (panel, users, aHost, aUser) {
} else {
img = '/images/avi.png'
}
- var link = 'https://' + host + '/users/' + username
var name = username + '@' + host
if ((!user.following) &&
(!user.blacklisted) &&
(!(host === aHost && username === aUser))) {
if (index === 0) {
panel.img1 = img
- panel.link1 = link
panel.name1 = name
- this.$store.state.api.backendInteractor.externalProfile(name)
+ panel.$store.state.api.backendInteractor.externalProfile(name)
.then((externalUser) => {
if (!externalUser.error) {
- this.$store.commit('addNewUsers', [externalUser])
- panel.link1 = 'https://' + host + '/users/' + externalUser.id
- }
- })
+ panel.$store.commit('addNewUsers', [externalUser])
+ panel.link1 = '/users/' + externalUser.id
+ }
+ })
} else if (index === 1) {
panel.img2 = img
- panel.link2 = link
panel.name2 = name
- this.$store.state.api.backendInteractor.externalProfile(name)
+ panel.$store.state.api.backendInteractor.externalProfile(name)
.then((externalUser) => {
if (!externalUser.error) {
- this.$store.commit('addNewUsers', [externalUser])
- panel.link2 = 'https://' + host + '/users/' + externalUser.id
- }
- })
+ panel.$store.commit('addNewUsers', [externalUser])
+ panel.link2 = '/users/' + externalUser.id
+ }
+ })
} else if (index === 2) {
panel.img3 = img
- panel.link3 = link
panel.name3 = name
- this.$store.state.api.backendInteractor.externalProfile(name)
+ panel.$store.state.api.backendInteractor.externalProfile(name)
.then((externalUser) => {
if (!externalUser.error) {
- this.$store.commit('addNewUsers', [externalUser])
- panel.link3 = 'https://' + host + '/users/' + externalUser.id
- }
- })
+ panel.$store.commit('addNewUsers', [externalUser])
+ panel.link3 = '/users/' + externalUser.id
+ }
+ })
}
index = index + 1
if (index > 2) {
diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.vue b/src/components/who_to_follow_panel/who_to_follow_panel.vue
index fff966ab..56adbf41 100644
--- a/src/components/who_to_follow_panel/who_to_follow_panel.vue
+++ b/src/components/who_to_follow_panel/who_to_follow_panel.vue
@@ -8,9 +8,9 @@
</div>
<div class="panel-body who-to-follow">
<p>
- <img v-bind:src="img1"/> <a v-bind:href="link1" target="_blank">{{ name1 }}</a><br>
- <img v-bind:src="img2"/> <a v-bind:href="link2" target="_blank">{{ name2 }}</a><br>
- <img v-bind:src="img3"/> <a v-bind:href="link3" target="_blank">{{ name3 }}</a><br>
+ <img v-bind:src="img1"/> <a v-bind:href="link1">{{ name1 }}</a><br>
+ <img v-bind:src="img2"/> <a v-bind:href="link2">{{ name2 }}</a><br>
+ <img v-bind:src="img3"/> <a v-bind:href="link3">{{ name3 }}</a><br>
<img v-bind:src="$store.state.config.logo"> <a v-bind:href="moreUrl" target="_blank">More</a>
</p>
</div>