UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 14:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update Relationship settings, separate following and followers

Browse source
This commit is contained in:
Daniel Supernault 2019-06-16 17:38:23 -06:00
parent d2e14bda7b
commit 17fa86ad2f
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 116 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/Http/Controllers/Settings/RelationshipSettings.php
View file

@ -16,13 +16,20 @@ use Illuminate\Http\Request;
trait RelationshipSettings
{
public function relationshipsHome()
public function relationshipsHome(Request $request)
{
$mode = $request->input('mode') == 'following' ? 'following' : 'followers';
$profile = Auth::user()->profile;
$following = $profile->following()->simplePaginate(10);
$followers = $profile->followers()->simplePaginate(10);
return view('settings.relationships.home', compact('profile', 'following', 'followers'));
$following = $followers = [];
if($mode == 'following') {
$data = $profile->following()->simplePaginate(10);
} else {
$data = $profile->followers()->simplePaginate(10);
}
return view('settings.relationships.home', compact('profile', 'mode', 'data'));
}
}

42
resources/views/settings/relationships/home.blade.php
View file

@ -6,9 +6,18 @@
<h3 class="font-weight-bold">Followers & Following</h3>
</div>
<hr>
@if(empty($following) && empty($followers))
<p class="text-center lead pt-5 mt-5">You are not following anyone, or followed by anyone.</p>
@if(empty($data))
<p class="text-center lead pt-5 mt-5">You are not {{$mode == 'following' ? 'following anyone.' : 'followed by anyone.'}}</p>
@else
<ul class="nav nav-pills">
<li class="nav-item">
<a class="nav-link font-weight-bold {{$mode == 'followers' ? 'active' : ''}}" href="?mode=followers&page=1">Followers</a>
</li>
<li class="nav-item">
<a class="nav-link font-weight-bold {{$mode == 'following' ? 'active' : ''}}" href="?mode=following&page=1">Following</a>
</li>
</ul>
<hr>
<table class="table table-bordered">
<thead>
<tr>
@ -21,39 +30,32 @@
</tr>
</thead>
<tbody>
@foreach($followers as $follower)
@foreach($data as $follower)
<tr>
<th scope="row" class="pb-0 pt-1 my-0">
{{-- <input type="checkbox" class="form-control mr-1 check-row"> --}}
</th>
<td class="font-weight-bold">
<img src="{{$follower->avatarUrl()}}" width="20px" height="20px" class="rounded-circle border mr-2">{{$follower->username}}
<img src="{{$follower->avatarUrl()}}" width="20px" height="20px" class="rounded-circle border mr-2">
<span class="d-inline-block text-truncate" style="max-width: 160px;" title="{{$follower->username}}">{{$follower->username}}</span>
</td>
@if($mode == 'following')
<td class="text-center">Following</td>
<td class="text-center">
<a class="btn btn-outline-danger btn-sm py-0 action-btn" href="#" data-id="{{$follower->id}}" data-action="unfollow">Unfollow</a>
</td>
@else
<td class="text-center">Follower</td>
<td class="text-center">
<a class="btn btn-outline-primary btn-sm py-0 action-btn" href="#" data-id="{{$follower->id}}" data-action="mute">Mute</a>
<a class="btn btn-outline-danger btn-sm py-0 action-btn" href="#" data-id="{{$follower->id}}" data-action="block">Block</a>
</td>
</tr>
@endforeach
@foreach($following as $follower)
<tr>
<th scope="row" class="pb-0 pt-1 my-0">
<input type="checkbox" class="form-control mr-1 check-row">
</th>
<td class="font-weight-bold">
<img src="{{$follower->avatarUrl()}}" width="20px" height="20px" class="rounded-circle border mr-2">{{$follower->username}}
</td>
<td class="text-success text-center">Following</td>
<td class="text-center">
<a class="btn btn-outline-danger btn-sm py-0 action-btn" href="#" data-id="{{$follower->id}}" data-action="unfollow">Unfollow</a>
</td>
@endif
</tr>
@endforeach
</tbody>
</table>
<div class="d-flex justify-content-center">{{$following->links() ?? $followers->links()}}</div>
<div class="d-flex justify-content-center">{{$data->appends(['mode' => $mode])->links()}}</div>
@endif
@endsection