Merge remote-tracking branch 'upstream/develop' into develop

docs/CONFIGURATION.md

@@ -1,7 +1,7 @@
 # Pleroma-FE configuration and customization for instance administrators
 
-* *For user configuration, see USER_GUIDE.md*
-* *For local development server configuration, see HACKING.md*
+* *For user configuration, see [Pleroma-FE user guide](USER_GUIDE.md)*
+* *For local development server configuration, see [Hacking, tweaking, contributing](HACKING.md)*
 
 ## Where configuration is stored
 

docs/USER_GUIDE.md

@@ -1,3 +1,5 @@
+# Pleroma-FE user guide
+
 > Be prepared for breaking changes, unexpected behavior and this user guide becoming obsolete and wrong.
 
 > If there was no insanity
@@ -6,8 +8,6 @@
 >
 > --Catbag
 
-# Pleroma-FE user guide
-
 Pleroma-FE user interface is modeled after Qvitter which is modeled after older Twitter design. It provides a simple 2-column interface for microblogging. While being simple by default it also provides many powerful customization options.
 
 ## Posting, reading, basic functions.

src/components/follow_card/follow_card.js

@@ -9,8 +9,7 @@ const FollowCard = {
   ],
   data () {
     return {
-      inProgress: false,
-      requestSent: false
+      inProgress: false
     }
   },
   components: {
@@ -28,9 +27,8 @@ const FollowCard = {
   methods: {
     followUser () {
       this.inProgress = true
-      requestFollow(this.user, this.$store).then(({ sent }) => {
+      requestFollow(this.user, this.$store).then(() => {
         this.inProgress = false
-        this.requestSent = sent
       })
     },
     unfollowUser () {

src/components/follow_card/follow_card.vue

@@ -20,13 +20,13 @@
           v-if="!user.following"
           class="btn btn-default follow-card-follow-button"
           :disabled="inProgress"
-          :title="requestSent ? $t('user_card.follow_again') : ''"
+          :title="user.requested ? $t('user_card.follow_again') : ''"
           @click="followUser"
         >
           <template v-if="inProgress">
             {{ $t('user_card.follow_progress') }}
           </template>
-          <template v-else-if="requestSent">
+          <template v-else-if="user.requested">
             {{ $t('user_card.follow_sent') }}
           </template>
           <template v-else>