From 1fecac9ba6350216bb02ef156aa1573b546cee7f Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
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 cb73d54d31..af4ffc08b6 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 @@
           <slot name="secondary-area"></slot>
         </div>
       </div>
-      <div class="user-card-third-area">
-        <slot name="third-area"></slot>
+      <div class="user-card-tertiary-area">
+        <slot name="tertiary-area"></slot>
       </div>
     </div>
   </div>
diff --git a/src/components/follow_card/follow_card.js b/src/components/follow_card/follow_card.js
index 85e6a6d209..425c9c3e8f 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 936307c4c7..e6933e3c93 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') : ''"
       >
-        <template v-if="progress">
+        <template v-if="inProgress">
           {{ $t('user_card.follow_progress') }}
         </template>
         <template v-else-if="requestSent">
@@ -18,8 +18,8 @@
           {{ $t('user_card.follow') }}
         </template>
       </button>
-      <button v-if="following" class="btn btn-default pressed" @click="unfollowUser" :disabled="progress">
-        <template v-if="progress">
+      <button v-if="following" class="btn btn-default pressed" @click="unfollowUser" :disabled="inProgress">
+        <template v-if="inProgress">
           {{ $t('user_card.follow_progress') }}
         </template>
         <template v-else>
@@ -27,7 +27,7 @@
         </template>
       </button>
     </template>
-    <template slot="third-area">
+    <template slot="tertiary-area">
       <span class="faint" v-if="!noFollowsYou && user.follows_you">
         {{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
       </span>
diff --git a/src/components/follow_request_card/follow_request_card.vue b/src/components/follow_request_card/follow_request_card.vue
index 945812fcfb..4e2f3bf883 100644
--- a/src/components/follow_request_card/follow_request_card.vue
+++ b/src/components/follow_request_card/follow_request_card.vue
@@ -1,6 +1,6 @@
 <template>
   <basic-user-card :user="user">
-    <template slot="third-area">
+    <template slot="tertiary-area">
       <div class="follow-request-card-action-buttons-container">
         <button class="btn btn-default" @click="approveUser">{{ $t('user_card.approve') }}</button>
         <button class="btn btn-default" @click="denyUser">{{ $t('user_card.deny') }}</button>