pleroma-fe

commit: 47a7a3ae6f0f00fab9c904c5c57cfadf2d25ef17
parent: 3ff39f9b392013856c26d63ef3a318b02287eb34
Author: Shpuld Shpludson <shp@cock.li>
Date:   Fri,  2 Feb 2018 05:36:35 +0000

Merge branch 'fix/show-fav-and-rt-counts' into 'develop'

Show fav/RT counts even if not logged in.

See merge request pleroma/pleroma-fe!199
Diffstat:
M
src/components/favorite_button/favorite_button.js
2
+-
M
src/components/favorite_button/favorite_button.vue
10
+++++++---
M
src/components/retweet_button/retweet_button.js
2
+-
M
src/components/retweet_button/retweet_button.vue
10
+++++++---
M
src/components/status/status.vue
18
++++++++----------

5 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/src/components/favorite_button/favorite_button.js b/src/components/favorite_button/favorite_button.js
@@ -1,5 +1,5 @@
 const FavoriteButton = {
-  props: ['status'],
+  props: ['status', 'loggedIn'],
   data () {
     return {
       animated: false
diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue
@@ -1,6 +1,10 @@
 <template>
-  <div>
-    <i :class='classes' class='favorite-button base09' @click.prevent='favorite()'/>
+  <div v-if="loggedIn">
+    <i :class='classes' class='favorite-button fav-active base09' @click.prevent='favorite()'/>
+    <span v-if='status.fave_num > 0'>{{status.fave_num}}</span>
+  </div>
+  <div v-else>
+    <i :class='classes' class='favorite-button base09'/>
     <span v-if='status.fave_num > 0'>{{status.fave_num}}</span>
   </div>
 </template>
@@ -8,7 +12,7 @@
 <script src="./favorite_button.js" ></script>
 
 <style lang='scss'>
-  .favorite-button {
+  .fav-active {
       cursor: pointer;
       animation-duration: 0.6s;
       &:hover {
diff --git a/src/components/retweet_button/retweet_button.js b/src/components/retweet_button/retweet_button.js
@@ -1,5 +1,5 @@
 const RetweetButton = {
-  props: ['status'],
+  props: ['status', 'loggedIn'],
   data () {
     return {
       animated: false
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
@@ -1,6 +1,10 @@
 <template>
-  <div>
-    <i :class='classes' class='icon-retweet base09' v-on:click.prevent='retweet()'></i>
+  <div v-if="loggedIn">
+    <i :class='classes' class='icon-retweet rt-active base09' v-on:click.prevent='retweet()'></i>
+    <span v-if='status.repeat_num > 0'>{{status.repeat_num}}</span>
+  </div>
+  <div v-else>
+    <i :class='classes' class='icon-retweet base09'></i>
     <span v-if='status.repeat_num > 0'>{{status.repeat_num}}</span>
   </div>
 </template>
@@ -9,7 +13,7 @@
 
 <style lang='scss'>
   @import '../../_variables.scss';
-  .icon-retweet {
+  .rt-active {
      cursor: pointer;
      animation-duration: 0.6s;
      &:hover {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
@@ -105,17 +105,15 @@
             </div>
           </div>
 
-          <div v-if="loggedIn">
-            <div class='status-actions'>
-              <div>
-                <a href="#" v-on:click.prevent="toggleReplying">
-                  <i class="base09 icon-reply" :class="{'icon-reply-active': replying}"></i>
-                </a>
-              </div>
-              <retweet-button :status=status></retweet-button>
-              <favorite-button :status=status></favorite-button>
-              <delete-button :status=status></delete-button>
+          <div class='status-actions'>
+            <div v-if="loggedIn">
+              <a href="#" v-on:click.prevent="toggleReplying">
+                <i class="base09 icon-reply" :class="{'icon-reply-active': replying}"></i>
+              </a>
             </div>
+            <retweet-button :loggedIn="loggedIn" :status=status></retweet-button>
+            <favorite-button :loggedIn="loggedIn" :status=status></favorite-button>
+            <delete-button :status=status></delete-button>
           </div>
         </div>
       </div>