UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-23 06:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #481 from pixelfed/frontend-ui-refactor

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2018-09-22 21:21:23 -06:00 committed by GitHub
commit b113d67f4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/Http/Controllers/DiscoverController.php
View file

@ -27,10 +27,12 @@ class DiscoverController extends Controller
$pid = Auth::user()->profile->id; $pid = Auth::user()->profile->id;
$following = Cache::remember('feature:discover:following:'.$pid, 15, function() use($pid) { $following = Cache::remember('feature:discover:following:'.$pid, 720, function() use($pid) {
$following = Follower::whereProfileId($pid) $following = Follower::select('following_id')
->pluck('following_id'); ->whereProfileId($pid)
$filtered = UserFilter::whereUserId($pid) ->pluck('following_id');
$filtered = UserFilter::select('filterable_id')
->whereUserId($pid)
->whereFilterableType('App\Profile') ->whereFilterableType('App\Profile')
->whereIn('filter_type', ['mute', 'block']) ->whereIn('filter_type', ['mute', 'block'])
->pluck('filterable_id'); ->pluck('filterable_id');
@ -43,7 +45,7 @@ class DiscoverController extends Controller
}); });
$people = Cache::remember('feature:discover:people:'.$pid, 15, function() use($following) { $people = Cache::remember('feature:discover:people:'.$pid, 15, function() use($following) {
return Profile::inRandomOrder() return Profile::select('id', 'name', 'username')->inRandomOrder()
->whereHas('statuses') ->whereHas('statuses')
->whereNull('domain') ->whereNull('domain')
->whereNotIn('id', $following) ->whereNotIn('id', $following)
@ -52,13 +54,14 @@ class DiscoverController extends Controller
->get(); ->get();
}); });
$posts = Status::whereHas('media') $posts = Status::select('id', 'caption', 'profile_id')
->whereHas('media')
->whereHas('profile', function($q) { ->whereHas('profile', function($q) {
$q->where('is_private', false); $q->where('is_private', false);
}) })
->whereIsNsfw(false) ->whereIsNsfw(false)
->whereVisibility('public') ->whereVisibility('public')
->where('profile_id', '!=', $pid) ->where('profile_id', '<>', $pid)
->whereNotIn('profile_id', $following) ->whereNotIn('profile_id', $following)
->withCount(['comments', 'likes']) ->withCount(['comments', 'likes'])
->orderBy('created_at', 'desc') ->orderBy('created_at', 'desc')

9
resources/views/settings/security/2fa/setup.blade.php
View file

@ -43,7 +43,14 @@
<p>Please scan the QR code and then enter the 6 digit code in the form below. Keep in mind the code changes every 30 seconds, and is only good for 1 minute.</p> <p>Please scan the QR code and then enter the 6 digit code in the form below. Keep in mind the code changes every 30 seconds, and is only good for 1 minute.</p>
<div class="card"> <div class="card">
<div class="card-body text-center"> <div class="card-body text-center">
<img src="{{$qrcode}}"> <div class="pb-3">
<p class="font-weight-bold">QR Code</p>
<img src="{{$qrcode}}" class="img-fluid" width="200px">
</div>
<div>
<p class="font-weight-bold">OTP Secret</p>
<input type="text" class="form-control" value="{{ $user->{'2fa_secret'} }}" disabled>
</div>
</div> </div>
<div class="card-body"> <div class="card-body">
<form id="confirm-code"> <form id="confirm-code">