From c8365254d7fc59e4a47bea85cb06d571eb6af507 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 7 Mar 2019 13:28:14 -0700 Subject: [PATCH 1/2] Fixes #977 --- app/Http/Controllers/ProfileController.php | 11 +++++++++++ resources/assets/js/components/Profile.vue | 13 ++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 86ba0ce52..3580fb6ac 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -68,6 +68,17 @@ class ProfileController extends Controller } $is_admin = is_null($user->domain) ? $user->user->is_admin : false; $profile = $user; + $settings = [ + 'crawlable' => $settings->crawlable, + 'following' => [ + 'count' => $settings->show_profile_following_count, + 'list' => $settings->show_profile_following + ], + 'followers' => [ + 'count' => $settings->show_profile_follower_count, + 'list' => $settings->show_profile_followers + ] + ]; return view('profile.show', compact('user', 'profile', 'settings', 'owner', 'is_following', 'is_admin')); } diff --git a/resources/assets/js/components/Profile.vue b/resources/assets/js/components/Profile.vue index 85b0b47e7..ff0aecdfb 100644 --- a/resources/assets/js/components/Profile.vue +++ b/resources/assets/js/components/Profile.vue @@ -38,13 +38,13 @@ Posts -
+ -
+
{{profile.following_count}} Following @@ -318,7 +318,8 @@