Added follower count

This commit is contained in:
Josef Citrine 2016-06-07 19:31:32 +01:00
parent bd330a1089
commit 4714f04a80
4 changed files with 24 additions and 4 deletions

View file

@ -28,6 +28,7 @@ use Poniverse\Ponyfm\Http\Controllers\ApiControllerBase;
use Poniverse\Ponyfm\Models\Image;
use Poniverse\Ponyfm\Models\Track;
use Poniverse\Ponyfm\Models\User;
use Poniverse\Ponyfm\Models\Follower;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Response;
@ -173,6 +174,9 @@ class ArtistsController extends ApiControllerBase
$palette = ColorThief::getPalette($user->getAvatarUrl(Image::SMALL), 2);
$formatted_palette = array_map("Helpers::rgb2hex", $palette);
$followers = Follower::where('artist_id', $user->id)
->count();
return Response::json([
'artist' => [
'id' => $user->id,
@ -185,7 +189,7 @@ class ArtistsController extends ApiControllerBase
],
'avatar_colors' => $formatted_palette,
'created_at' => $user->created_at,
'followers' => [],
'followers' => $followers,
'following' => [],
'latest_tracks' => $latestTracks,
'comments' => $comments,

View file

@ -4,6 +4,13 @@
<img src="{{artist.avatars.normal}}">
<div class="artist-right">
<h1>{{artist.name}}<i class="fa fa-star admin-star" ng-show="::artist.isAdmin" data-title="Admin" bs-tooltip></i></h1>
<p class="follower-count">
<ng-pluralize count="artist.followers"
when="{'0': 'No followers',
'one': '1 follower',
'other': '{} followers'}">
</ng-pluralize>
</p>
<a href="#" class="btn btn-default" ng-class="{'btn-primary': !artist.user_data.is_following}" ng-show="auth.isLogged && auth.user.id != artist.id" pfm-eat-click ng-click="toggleFollow()">
<span ng-if="!artist.user_data.is_following">Follow</span>
<span ng-if="artist.user_data.is_following">Following!</span>

View file

@ -158,17 +158,21 @@
margin-left: 165px;
margin-top: 5px;
> h1 {
> h1, .follower-count {
font-size: 20pt;
color: #fff;
background: rgba(0,0,0,0.5);
display: inline;
padding: 5px 10px;
margin-bottom: 5px;
display: table;
}
> .follower-count {
font-size: 14pt;
}
> .btn {
display: table;
margin-top: 10px;
}
}
}

View file

@ -191,6 +191,11 @@
margin-top: 15px !important;
text-align: center;
> h1, .follower-count {
margin-left: auto;
margin-right: auto;
}
> .btn {
margin-left: auto;
margin-right: auto;