#482 - add subscribe button

src/components/subscribe_button/subscribe_button.js

@@ -0,0 +1,26 @@
+export default {
+  props: [ 'user' ],
+  data () {
+    return {
+      inProgress: false
+    }
+  },
+  methods: {
+    subscribe () {
+      this.inProgress = true
+      this.$store.state.api.backendInteractor.subscribeUser(this.user.id)
+        .then((updated) => {
+          console.log(updated)
+          this.inProgress = false
+        })
+    },
+    unsubscribe () {
+      this.inProgress = true
+      this.$store.state.api.backendInteractor.unsubscribeUser(this.user.id)
+        .then((updated) => {
+          console.log(updated)
+          this.inProgress = false
+        })
+    }
+  }
+}

src/components/subscribe_button/subscribe_button.vue

@@ -0,0 +1,22 @@
+<template>
+  <div>
+    <button
+      @click.prevent="subscribe"
+      class="btn btn-default follow-card-follow-button"
+      :disabled="inProgress"
+      v-if="!user.subscribing"
+    >
+      Subscribe
+    </button>
+    <button
+      @click.prevent="unsubscribe"
+      class="btn btn-default follow-card-follow-button pressed"
+      :disabled="inProgress"
+      v-else
+    >
+      Subscribing!
+    </button>
+  </div>
+</template>
+
+<script src="./subscribe_button.js"></script>

src/components/user_card/user_card.js

@@ -1,5 +1,6 @@
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import RemoteFollow from '../remote_follow/remote_follow.vue'
+import SubscribeButton from '../subscribe_button/subscribe_button.vue'
 import ModerationTools from '../moderation_tools/moderation_tools.vue'
 import { hex2rgb } from '../../services/color_convert/color_convert.js'
 import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate'
@@ -104,7 +105,8 @@ export default {
   components: {
     UserAvatar,
     RemoteFollow,
-    ModerationTools
+    ModerationTools,
+    SubscribeButton
   },
   methods: {
     followUser () {

src/components/user_card/user_card.vue

@@ -1,107 +1,41 @@
 <template>
-  <div
+<div class="user-card" :class="classes" :style="style">
-    class="user-card"
-    :class="classes"
-    :style="style"
-  >
   <div class="panel-heading">
-      <div class="user-info">
+    <div class='user-info'>
-        <div class="container">
+      <div class='container'>
         <router-link :to="userProfileLink(user)">
-            <UserAvatar
+          <UserAvatar :betterShadow="betterShadow" :user="user"/>
-              :better-shadow="betterShadow"
-              :user="user"
-            />
         </router-link>
         <div class="user-summary">
           <div class="top-line">
-              <!-- eslint-disable vue/no-v-html -->
+            <div :title="user.name" class='user-name' v-if="user.name_html" v-html="user.name_html"></div>
-              <div
+            <div :title="user.name" class='user-name' v-else>{{user.name}}</div>
-                v-if="user.name_html"
+            <router-link :to="{ name: 'user-settings' }" v-if="!isOtherUser">
-                :title="user.name"
+              <i class="button-icon icon-wrench usersettings" :title="$t('tool_tip.user_settings')"></i>
-                class="user-name"
-                v-html="user.name_html"
-              />
-              <!-- eslint-enable vue/no-v-html -->
-              <div
-                v-else
-                :title="user.name"
-                class="user-name"
-              >
-                {{ user.name }}
-              </div>
-              <router-link
-                v-if="!isOtherUser"
-                :to="{ name: 'user-settings' }"
-              >
-                <i
-                  class="button-icon icon-wrench usersettings"
-                  :title="$t('tool_tip.user_settings')"
-                />
             </router-link>
-              <a
+            <a :href="user.statusnet_profile_url" target="_blank" v-if="isOtherUser && !user.is_local">
-                v-if="isOtherUser && !user.is_local"
+              <i class="icon-link-ext usersettings"></i>
-                :href="user.statusnet_profile_url"
-                target="_blank"
-              >
-                <i class="icon-link-ext usersettings" />
             </a>
           </div>
 
           <div class="bottom-line">
-              <router-link
+            <router-link class="user-screen-name" :to="userProfileLink(user)">@{{user.screen_name}}</router-link>
-                class="user-screen-name"
+            <span class="alert staff" v-if="!hideBio && !!visibleRole">{{visibleRole}}</span>
-                :to="userProfileLink(user)"
+            <span v-if="user.locked"><i class="icon icon-lock"></i></span>
-              >
+            <span v-if="!hideUserStatsLocal && !hideBio" class="dailyAvg">{{dailyAvg}} {{ $t('user_card.per_day') }}</span>
-                @{{ user.screen_name }}
-              </router-link>
-              <span
-                v-if="!hideBio && !!visibleRole"
-                class="alert staff"
-              >{{ visibleRole }}</span>
-              <span v-if="user.locked"><i class="icon icon-lock" /></span>
-              <span
-                v-if="!hideUserStatsLocal && !hideBio"
-                class="dailyAvg"
-              >{{ dailyAvg }} {{ $t('user_card.per_day') }}</span>
           </div>
         </div>
       </div>
       <div class="user-meta">
-          <div
+        <div v-if="user.follows_you && loggedIn && isOtherUser" class="following">
-            v-if="user.follows_you && loggedIn && isOtherUser"
-            class="following"
-          >
           {{ $t('user_card.follows_you') }}
         </div>
-          <div
+        <div class="highlighter" v-if="isOtherUser && (loggedIn || !switcher)">
-            v-if="isOtherUser && (loggedIn || !switcher)"
-            class="highlighter"
-          >
           <!-- id's need to be unique, otherwise vue confuses which user-card checkbox belongs to -->
-            <input
+          <input class="userHighlightText" type="text" :id="'userHighlightColorTx'+user.id" v-if="userHighlightType !== 'disabled'" v-model="userHighlightColor"/>
-              v-if="userHighlightType !== 'disabled'"
+          <input class="userHighlightCl" type="color" :id="'userHighlightColor'+user.id" v-if="userHighlightType !== 'disabled'" v-model="userHighlightColor"/>
-              :id="'userHighlightColorTx'+user.id"
+          <label for="style-switcher" class='userHighlightSel select'>
-              v-model="userHighlightColor"
+            <select class="userHighlightSel" :id="'userHighlightSel'+user.id" v-model="userHighlightType">
-              class="userHighlightText"
-              type="text"
-            >
-            <input
-              v-if="userHighlightType !== 'disabled'"
-              :id="'userHighlightColor'+user.id"
-              v-model="userHighlightColor"
-              class="userHighlightCl"
-              type="color"
-            >
-            <label
-              for="style-switcher"
-              class="userHighlightSel select"
-            >
-              <select
-                :id="'userHighlightSel'+user.id"
-                v-model="userHighlightType"
-                class="userHighlightSel"
-              >
               <option value="disabled">No highlight</option>
               <option value="solid">Solid bg</option>
               <option value="striped">Striped bg</option>
@@ -111,22 +45,11 @@
           </label>
         </div>
       </div>
-        <div
+      <div v-if="isOtherUser" class="user-interactions">
-          v-if="isOtherUser"
+        <div class="follow" v-if="loggedIn">
-          class="user-interactions"
-        >
-          <div
-            v-if="loggedIn"
-            class="follow"
-          >
           <span v-if="user.following">
             <!--Following them!-->
-              <button
+            <button @click="unfollowUser" class="pressed" :disabled="followRequestInProgress" :title="$t('user_card.follow_unfollow')">
-                class="pressed"
-                :disabled="followRequestInProgress"
-                :title="$t('user_card.follow_unfollow')"
-                @click="unfollowUser"
-              >
               <template v-if="followRequestInProgress">
                 {{ $t('user_card.follow_progress') }}
               </template>
@@ -136,11 +59,7 @@
             </button>
           </span>
           <span v-if="!user.following">
-              <button
+            <button @click="followUser" :disabled="followRequestInProgress" :title="followRequestSent ? $t('user_card.follow_again') : ''">
-                :disabled="followRequestInProgress"
-                :title="followRequestSent ? $t('user_card.follow_again') : ''"
-                @click="followUser"
-              >
               <template v-if="followRequestInProgress">
                 {{ $t('user_card.follow_progress') }}
               </template>
@@ -153,106 +72,62 @@
             </button>
           </span>
         </div>
-          <div
+        <SubscribeButton :user="user" />
-            v-if="isOtherUser && loggedIn"
+        <div class='mute' v-if='isOtherUser && loggedIn'>
-            class="mute"
+          <span v-if='user.muted'>
-          >
+            <button @click="unmuteUser" class="pressed">
-            <span v-if="user.muted">
-              <button
-                class="pressed"
-                @click="unmuteUser"
-              >
               {{ $t('user_card.muted') }}
             </button>
           </span>
-            <span v-if="!user.muted">
+          <span v-if='!user.muted'>
             <button @click="muteUser">
               {{ $t('user_card.mute') }}
             </button>
           </span>
         </div>
-          <div v-if="!loggedIn && user.is_local">
+        <div v-if='!loggedIn && user.is_local'>
           <RemoteFollow :user="user" />
         </div>
-          <div
+        <div class='block' v-if='isOtherUser && loggedIn'>
-            v-if="isOtherUser && loggedIn"
+          <span v-if='user.statusnet_blocking'>
-            class="block"
+            <button @click="unblockUser" class="pressed">
-          >
-            <span v-if="user.statusnet_blocking">
-              <button
-                class="pressed"
-                @click="unblockUser"
-              >
               {{ $t('user_card.blocked') }}
             </button>
           </span>
-            <span v-if="!user.statusnet_blocking">
+          <span v-if='!user.statusnet_blocking'>
             <button @click="blockUser">
               {{ $t('user_card.block') }}
             </button>
           </span>
         </div>
-          <div
+        <div class='block' v-if='isOtherUser && loggedIn'>
-            v-if="isOtherUser && loggedIn"
-            class="block"
-          >
           <span>
             <button @click="reportUser">
               {{ $t('user_card.report') }}
             </button>
           </span>
         </div>
-          <ModerationTools
+        <ModerationTools :user='user' v-if='loggedIn.role === "admin"'/>
-            v-if="loggedIn.role === &quot;admin&quot;"
-            :user="user"
-          />
       </div>
     </div>
   </div>
-    <div
+  <div class="panel-body" v-if="!hideBio">
-      v-if="!hideBio"
+    <div v-if="!hideUserStatsLocal && switcher" class="user-counts">
-      class="panel-body"
+      <div class="user-count" v-on:click.prevent="setProfileView('statuses')">
-    >
-      <div
-        v-if="!hideUserStatsLocal && switcher"
-        class="user-counts"
-      >
-        <div
-          class="user-count"
-          @click.prevent="setProfileView('statuses')"
-        >
         <h5>{{ $t('user_card.statuses') }}</h5>
         <span>{{user.statuses_count}} <br></span>
       </div>
-        <div
+      <div class="user-count" v-on:click.prevent="setProfileView('friends')">
-          class="user-count"
-          @click.prevent="setProfileView('friends')"
-        >
         <h5>{{ $t('user_card.followees') }}</h5>
         <span>{{user.friends_count}}</span>
       </div>
-        <div
+      <div class="user-count" v-on:click.prevent="setProfileView('followers')">
-          class="user-count"
-          @click.prevent="setProfileView('followers')"
-        >
         <h5>{{ $t('user_card.followers') }}</h5>
         <span>{{user.followers_count}}</span>
       </div>
     </div>
-      <!-- eslint-disable vue/no-v-html -->
+    <p @click.prevent="linkClicked" v-if="!hideBio && user.description_html" class="user-card-bio" v-html="user.description_html"></p>
-      <p
+    <p v-else-if="!hideBio" class="user-card-bio">{{ user.description }}</p>
-        v-if="!hideBio && user.description_html"
-        class="user-card-bio"
-        @click.prevent="linkClicked"
-        v-html="user.description_html"
-      />
-      <!-- eslint-enable vue/no-v-html -->
-      <p
-        v-else-if="!hideBio"
-        class="user-card-bio"
-      >
-        {{ user.description }}
-      </p>
   </div>
 </div>
 </template>

src/modules/users.js

@@ -135,6 +135,7 @@ export const mutations = {
         user.following = relationship.following
         user.muted = relationship.muting
         user.statusnet_blocking = relationship.blocking
+        user.subscribing = relationship.subscribing
       }
     })
   },