pleroma-fe

commit: 0e1295edea1426af992c25d5396612c2c0b67404
parent: 32df77c16a004bbf0ffb1b8ce64f4454d720dec6
Author: Shpuld Shpludson <shp@cock.li>
Date:   Tue, 19 Feb 2019 16:38:05 +0000

Merge branch 'follow-requests-for-locked-accounts' into 'develop'

Follow Request notification count for restricted accounts

See merge request pleroma/pleroma-fe!561
Diffstat:
M
src/components/nav_panel/nav_panel.vue
11
++++++++++-
M
src/components/side_drawer/side_drawer.vue
4
++++
M
src/services/entity_normalizer/entity_normalizer.service.js
3
+++

3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
@@ -19,7 +19,10 @@
         </li>
         <li v-if='currentUser && currentUser.locked'>
           <router-link :to="{ name: 'friend-requests' }">
-            {{ $t("nav.friend_requests") }}
+            {{ $t("nav.friend_requests")}}
+            <span v-if='currentUser.follow_request_count > 0' class="badge follow-request-count">
+              {{currentUser.follow_request_count}}
+            </span>
           </router-link>
         </li>
         <li>
@@ -52,6 +55,12 @@
   padding: 0;
 }
 
+.follow-request-count {
+  margin: -6px 10px;
+  background-color: $fallback--bg;
+  background-color: var(--input, $fallback--faint);
+}
+
 .nav-panel li {
   border-bottom: 1px solid;
   border-color: $fallback--border;
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
@@ -45,6 +45,10 @@
         <li v-if="currentUser && currentUser.locked" @click="toggleDrawer">
           <router-link to='/friend-requests'>
             {{ $t("nav.friend_requests") }}
+            <span v-if='currentUser.follow_request_count > 0' class="badge follow-request-count">
+              {{currentUser.follow_request_count}}
+            </span>
+
           </router-link>
         </li>
         <li @click="toggleDrawer">
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -117,6 +117,9 @@ export const parseUser = (data) => {
   output.statuses_count = data.statuses_count
   output.friends = []
   output.followers = []
+  if (data.pleroma) {
+    output.follow_request_count = data.pleroma.follow_request_count
+  }
 
   return output
 }