diff options
Diffstat (limited to 'src/client/components')
| -rw-r--r-- | src/client/components/notification.vue | 7 | ||||
| -rw-r--r-- | src/client/components/user-list.vue | 6 | ||||
| -rw-r--r-- | src/client/components/user-preview.vue | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/client/components/notification.vue b/src/client/components/notification.vue index e325f0adb6..6a9129e38e 100644 --- a/src/client/components/notification.vue +++ b/src/client/components/notification.vue @@ -37,7 +37,7 @@ <router-link v-if="notification.type === 'quote'" class="text" :to="notification.note | notePage" :title="getNoteSummary(notification.note)"> <mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="nowrap" :custom-emojis="notification.note.emojis"/> </router-link> - <span v-if="notification.type === 'follow'" class="text" style="opacity: 0.6;">{{ $t('youGotNewFollower') }}</span> + <span v-if="notification.type === 'follow'" class="text" style="opacity: 0.6;">{{ $t('youGotNewFollower') }}<div v-if="!nowrap"><mk-follow-button :user="notification.user"/></div></span> <span v-if="notification.type === 'followRequestAccepted'" class="text" style="opacity: 0.6;">{{ $t('followRequestAccepted') }}</span> <span v-if="notification.type === 'receiveFollowRequest'" class="text" style="opacity: 0.6;">{{ $t('receiveFollowRequest') }}<div v-if="!nowrap && !followRequestDone"><button class="_textButton" @click="acceptFollowRequest()">{{ $t('accept') }}</button> | <button class="_textButton" @click="rejectFollowRequest()">{{ $t('reject') }}</button></div></span> </div> @@ -50,10 +50,13 @@ import { faPlus, faQuoteLeft, faQuoteRight, faRetweet, faReply, faAt, faCheck } import { faClock } from '@fortawesome/free-regular-svg-icons'; import getNoteSummary from '../../misc/get-note-summary'; import XReactionIcon from './reaction-icon.vue'; +import MkFollowButton from './follow-button.vue'; +import i18n from '../i18n'; export default Vue.extend({ + i18n, components: { - XReactionIcon + XReactionIcon, MkFollowButton }, props: { notification: { diff --git a/src/client/components/user-list.vue b/src/client/components/user-list.vue index 14a96f3c6f..a0c16266eb 100644 --- a/src/client/components/user-list.vue +++ b/src/client/components/user-list.vue @@ -20,7 +20,7 @@ <span v-else class="empty">{{ $t('noAccountDescription') }}</span> </div> </div> - <x-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/> + <mk-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/> </div> <button class="more" :class="{ fetching: moreFetching }" v-if="more" @click="fetchMore()" :disabled="moreFetching"> <template v-if="moreFetching"><fa icon="spinner" pulse fixed-width/></template>{{ moreFetching ? $t('@.loading') : $t('@.load-more') }} @@ -34,14 +34,14 @@ import Vue from 'vue'; import i18n from '../i18n'; import paging from '../scripts/paging'; import MkContainer from './ui/container.vue'; -import XFollowButton from './follow-button.vue'; +import MkFollowButton from './follow-button.vue'; export default Vue.extend({ i18n, components: { MkContainer, - XFollowButton, + MkFollowButton, }, mixins: [ diff --git a/src/client/components/user-preview.vue b/src/client/components/user-preview.vue index f20335d02b..edaa54e8b9 100644 --- a/src/client/components/user-preview.vue +++ b/src/client/components/user-preview.vue @@ -21,7 +21,7 @@ <p>{{ $t('followers') }}</p><span>{{ u.followersCount }}</span> </div> </div> - <x-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && u.id != $store.state.i.id" :user="u" mini/> + <mk-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && u.id != $store.state.i.id" :user="u" mini/> </div> </transition> </template> @@ -30,13 +30,13 @@ import Vue from 'vue'; import i18n from '../i18n'; import parseAcct from '../../misc/acct/parse'; -import XFollowButton from './follow-button.vue'; +import MkFollowButton from './follow-button.vue'; export default Vue.extend({ i18n, components: { - XFollowButton + MkFollowButton }, props: { |