From 1fecac9ba6350216bb02ef156aa1573b546cee7f Mon Sep 17 00:00:00 2001 From: taehoon Date: Tue, 26 Feb 2019 10:14:12 -0500 Subject: [PATCH] Update naming --- src/components/basic_user_card/basic_user_card.vue | 4 ++-- src/components/follow_card/follow_card.js | 10 +++++----- src/components/follow_card/follow_card.vue | 10 +++++----- .../follow_request_card/follow_request_card.vue | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue index cb73d54d..af4ffc08 100644 --- a/src/components/basic_user_card/basic_user_card.vue +++ b/src/components/basic_user_card/basic_user_card.vue @@ -21,8 +21,8 @@ -
- +
+
diff --git a/src/components/follow_card/follow_card.js b/src/components/follow_card/follow_card.js index 85e6a6d2..425c9c3e 100644 --- a/src/components/follow_card/follow_card.js +++ b/src/components/follow_card/follow_card.js @@ -8,7 +8,7 @@ const FollowCard = { ], data () { return { - progress: false, + inProgress: false, requestSent: false, updated: false } @@ -25,17 +25,17 @@ const FollowCard = { }, methods: { followUser () { - this.progress = true + this.inProgress = true requestFollow(this.user, this.$store).then(({ sent, updated }) => { - this.progress = false + this.inProgress = false this.requestSent = sent this.updated = updated }) }, unfollowUser () { - this.progress = true + this.inProgress = true requestUnfollow(this.user, this.$store).then(({ updated }) => { - this.progress = false + this.inProgress = false this.updated = updated }) } diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue index 936307c4..e6933e3c 100644 --- a/src/components/follow_card/follow_card.vue +++ b/src/components/follow_card/follow_card.vue @@ -5,10 +5,10 @@ v-if="showFollow" class="btn btn-default" @click="followUser" - :disabled="progress" + :disabled="inProgress" :title="requestSent ? $t('user_card.follow_again') : ''" > -