mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-12-23 13:33:18 +00:00
Merge pull request #569 from pixelfed/frontend-ui-refactor
Frontend ui refactor
This commit is contained in:
commit
71f7fcdd28
10 changed files with 101 additions and 37 deletions
|
@ -6,12 +6,14 @@ use Illuminate\Http\Request;
|
||||||
use App\{
|
use App\{
|
||||||
DirectMessage,
|
DirectMessage,
|
||||||
Hashtag,
|
Hashtag,
|
||||||
|
Follower,
|
||||||
Like,
|
Like,
|
||||||
Media,
|
Media,
|
||||||
Notification,
|
Notification,
|
||||||
Profile,
|
Profile,
|
||||||
StatusHashtag,
|
StatusHashtag,
|
||||||
Status,
|
Status,
|
||||||
|
UserFilter,
|
||||||
};
|
};
|
||||||
use Auth,Cache;
|
use Auth,Cache;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
|
@ -122,8 +124,16 @@ class InternalApiController extends Controller
|
||||||
public function discover(Request $request)
|
public function discover(Request $request)
|
||||||
{
|
{
|
||||||
$profile = Auth::user()->profile;
|
$profile = Auth::user()->profile;
|
||||||
|
$pid = $profile->id;
|
||||||
$following = Cache::get('feature:discover:following:'.$profile->id, []);
|
//$following = Cache::get('feature:discover:following:'.$profile->id, []);
|
||||||
|
$following = Follower::whereProfileId($pid)->pluck('following_id');
|
||||||
|
|
||||||
|
$filtered = UserFilter::whereUserId($pid)
|
||||||
|
->whereFilterableType('App\Profile')
|
||||||
|
->whereIn('filter_type', ['mute', 'block'])
|
||||||
|
->pluck('filterable_id')->toArray();
|
||||||
|
$following = array_merge($following->push($pid)->toArray(), $filtered);
|
||||||
|
|
||||||
$people = Profile::select('id', 'name', 'username')
|
$people = Profile::select('id', 'name', 'username')
|
||||||
->with('avatar')
|
->with('avatar')
|
||||||
->inRandomOrder()
|
->inRandomOrder()
|
||||||
|
@ -141,7 +151,6 @@ class InternalApiController extends Controller
|
||||||
})
|
})
|
||||||
->whereIsNsfw(false)
|
->whereIsNsfw(false)
|
||||||
->whereVisibility('public')
|
->whereVisibility('public')
|
||||||
->where('profile_id', '<>', $profile->id)
|
|
||||||
->whereNotIn('profile_id', $following)
|
->whereNotIn('profile_id', $following)
|
||||||
->withCount(['comments', 'likes'])
|
->withCount(['comments', 'likes'])
|
||||||
->orderBy('created_at', 'desc')
|
->orderBy('created_at', 'desc')
|
||||||
|
|
|
@ -33,18 +33,14 @@ class SiteController extends Controller
|
||||||
{
|
{
|
||||||
$pid = Auth::user()->profile->id;
|
$pid = Auth::user()->profile->id;
|
||||||
// TODO: Use redis for timelines
|
// TODO: Use redis for timelines
|
||||||
$following = Cache::rememberForever("user:following:list:$pid", function() use($pid) {
|
|
||||||
$following = Follower::whereProfileId($pid)->pluck('following_id');
|
|
||||||
$following->push($pid);
|
|
||||||
return $following->toArray();
|
|
||||||
});
|
|
||||||
|
|
||||||
$filtered = Cache::rememberForever("user:filter:list:$pid", function() use($pid) {
|
$following = Follower::whereProfileId($pid)->pluck('following_id');
|
||||||
return UserFilter::whereUserId($pid)
|
$following->push($pid)->toArray();
|
||||||
|
|
||||||
|
$filtered = UserFilter::whereUserId($pid)
|
||||||
->whereFilterableType('App\Profile')
|
->whereFilterableType('App\Profile')
|
||||||
->whereIn('filter_type', ['mute', 'block'])
|
->whereIn('filter_type', ['mute', 'block'])
|
||||||
->pluck('filterable_id')->toArray();
|
->pluck('filterable_id')->toArray();
|
||||||
});
|
|
||||||
|
|
||||||
$timeline = Status::whereIn('profile_id', $following)
|
$timeline = Status::whereIn('profile_id', $following)
|
||||||
->whereNotIn('profile_id', $filtered)
|
->whereNotIn('profile_id', $filtered)
|
||||||
|
@ -53,6 +49,7 @@ class SiteController extends Controller
|
||||||
->orderBy('created_at', 'desc')
|
->orderBy('created_at', 'desc')
|
||||||
->withCount(['comments', 'likes', 'shares'])
|
->withCount(['comments', 'likes', 'shares'])
|
||||||
->simplePaginate(20);
|
->simplePaginate(20);
|
||||||
|
|
||||||
$type = 'personal';
|
$type = 'personal';
|
||||||
|
|
||||||
return view('timeline.template', compact('timeline', 'type'));
|
return view('timeline.template', compact('timeline', 'type'));
|
||||||
|
|
|
@ -27,14 +27,13 @@ class TimelineController extends Controller
|
||||||
// $timeline = Timeline::build()->local();
|
// $timeline = Timeline::build()->local();
|
||||||
$pid = Auth::user()->profile->id;
|
$pid = Auth::user()->profile->id;
|
||||||
|
|
||||||
$filtered = Cache::rememberForever("user:filter:list:$pid", function() use($pid) {
|
$private = Profile::whereIsPrivate(true)->where('id', '!=', $pid)->pluck('id');
|
||||||
return UserFilter::whereUserId($pid)
|
$filters = UserFilter::whereUserId($pid)
|
||||||
->whereFilterableType('App\Profile')
|
->whereFilterableType('App\Profile')
|
||||||
->whereIn('filter_type', ['mute', 'block'])
|
->whereIn('filter_type', ['mute', 'block'])
|
||||||
->pluck('filterable_id')->toArray();
|
->pluck('filterable_id')->toArray();
|
||||||
});
|
$filtered = array_merge($private->toArray(), $filters);
|
||||||
$private = Profile::whereIsPrivate(true)->pluck('id');
|
|
||||||
$filtered = array_merge($private->toArray(), $filtered);
|
|
||||||
$timeline = Status::whereHas('media')
|
$timeline = Status::whereHas('media')
|
||||||
->whereNotIn('profile_id', $filtered)
|
->whereNotIn('profile_id', $filtered)
|
||||||
->whereNull('in_reply_to_id')
|
->whereNull('in_reply_to_id')
|
||||||
|
|
|
@ -23,7 +23,7 @@ return [
|
||||||
| This value is the version of your PixelFed instance.
|
| This value is the version of your PixelFed instance.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'version' => '0.2.0',
|
'version' => '0.2.1',
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
BIN
public/js/components.js
vendored
BIN
public/js/components.js
vendored
Binary file not shown.
Binary file not shown.
|
@ -124,15 +124,29 @@
|
||||||
</div>
|
</div>
|
||||||
</a>
|
</a>
|
||||||
<div class="float-right">
|
<div class="float-right">
|
||||||
<!-- <div class="dropdown">
|
<div class="post-actions d-none">
|
||||||
|
<div class="dropdown">
|
||||||
<button class="btn btn-link text-dark no-caret dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Post options">
|
<button class="btn btn-link text-dark no-caret dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Post options">
|
||||||
<span class="fas fa-ellipsis-v text-muted"></span>
|
<span class="fas fa-ellipsis-v text-muted"></span>
|
||||||
</button>
|
</button>
|
||||||
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
|
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
|
||||||
<a class="dropdown-item font-weight-bold" href="#">View Exif</a>
|
<a class="dropdown-item font-weight-bold" :href="reportUrl()">Report</a>
|
||||||
<a class="dropdown-item font-weight-bold" href="{{$status->reportUrl()}}">Report</a>
|
<div class="dropdown-divider"></div>
|
||||||
|
<form method="post" action="/i/mute">
|
||||||
|
<input type="hidden" name="_token" value="">
|
||||||
|
<input type="hidden" name="type" value="user">
|
||||||
|
<input type="hidden" name="item" value="">
|
||||||
|
<button type="submit" class="dropdown-item btn btn-link font-weight-bold">Mute this user</button>
|
||||||
|
</form>
|
||||||
|
<form method="post" action="/i/block">
|
||||||
|
<input type="hidden" name="_token" value="">
|
||||||
|
<input type="hidden" name="type" value="user">
|
||||||
|
<input type="hidden" name="item" value="">
|
||||||
|
<button type="submit" class="dropdown-item btn btn-link font-weight-bold">Block this user</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div> -->
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-12 col-md-8 status-photo px-0">
|
<div class="col-12 col-md-8 status-photo px-0">
|
||||||
|
@ -155,13 +169,27 @@
|
||||||
</div>
|
</div>
|
||||||
</a>
|
</a>
|
||||||
<div class="float-right">
|
<div class="float-right">
|
||||||
|
<div class="post-actions d-none">
|
||||||
<div class="dropdown">
|
<div class="dropdown">
|
||||||
<button class="btn btn-link text-dark no-caret dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Post options">
|
<button class="btn btn-link text-dark no-caret dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Post options">
|
||||||
<span class="fas fa-ellipsis-v text-muted"></span>
|
<span class="fas fa-ellipsis-v text-muted"></span>
|
||||||
</button>
|
</button>
|
||||||
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
|
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
|
||||||
<a class="dropdown-item font-weight-bold show-exif">Show Exif</a>
|
<a class="dropdown-item font-weight-bold" :href="reportUrl()">Report</a>
|
||||||
<a class="dropdown-item font-weight-bold" href="#">Report</a>
|
<div class="dropdown-divider"></div>
|
||||||
|
<form method="post" action="/i/mute">
|
||||||
|
<input type="hidden" name="_token" value="">
|
||||||
|
<input type="hidden" name="type" value="user">
|
||||||
|
<input type="hidden" name="item" value="">
|
||||||
|
<button type="submit" class="dropdown-item btn btn-link font-weight-bold">Mute this user</button>
|
||||||
|
</form>
|
||||||
|
<form method="post" action="/i/block">
|
||||||
|
<input type="hidden" name="_token" value="">
|
||||||
|
<input type="hidden" name="type" value="user">
|
||||||
|
<input type="hidden" name="item" value="">
|
||||||
|
<button type="submit" class="dropdown-item btn btn-link font-weight-bold">Block this user</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -209,13 +237,16 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="timestamp">
|
<div class="timestamp">
|
||||||
<a v-bind:href="statusUrl" class="small text-muted">
|
<a v-bind:href="statusUrl" class="small text-muted">
|
||||||
November 1, 2018
|
{{timestampFormat()}}
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-footer bg-white sticky-md-bottom">
|
<div class="card-footer bg-white sticky-md-bottom">
|
||||||
<form class="comment-form" method="post" action="/i/comment" :data-id="statusId" data-truncate="false">
|
<div class="comment-form-guest">
|
||||||
|
<a href="/login">Login</a> to like or comment.
|
||||||
|
</div>
|
||||||
|
<form class="comment-form d-none" method="post" action="/i/comment" :data-id="statusId" data-truncate="false">
|
||||||
<input type="hidden" name="_token" value="">
|
<input type="hidden" name="_token" value="">
|
||||||
<input type="hidden" name="item" :value="statusId">
|
<input type="hidden" name="item" :value="statusId">
|
||||||
|
|
||||||
|
@ -290,7 +321,8 @@ export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
status: {},
|
status: {},
|
||||||
media: {}
|
media: {},
|
||||||
|
user: {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
@ -301,16 +333,42 @@ export default {
|
||||||
});
|
});
|
||||||
this.fetchData();
|
this.fetchData();
|
||||||
pixelfed.hydrateLikes();
|
pixelfed.hydrateLikes();
|
||||||
|
this.authCheck();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
authCheck() {
|
||||||
|
let authed = $('body').hasClass('loggedIn');
|
||||||
|
if(authed == true) {
|
||||||
|
$('.comment-form-guest').addClass('d-none');
|
||||||
|
$('.comment-form').removeClass('d-none');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
showMuteBlock() {
|
||||||
|
let sid = this.status.account.id;
|
||||||
|
console.log('sid :' + sid);
|
||||||
|
let uid = this.user.id;
|
||||||
|
console.log('uid :' + uid);
|
||||||
|
if(sid != uid) {
|
||||||
|
$('.post-actions').removeClass('d-none');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
reportUrl() {
|
||||||
|
return '/i/report?type=post&id=' + this.status.id;
|
||||||
|
},
|
||||||
|
timestampFormat() {
|
||||||
|
let ts = new Date(this.status.created_at);
|
||||||
|
return ts.toDateString();
|
||||||
|
},
|
||||||
fetchData() {
|
fetchData() {
|
||||||
let url = '/api/v2/profile/'+this.statusUsername+'/status/'+this.statusId;
|
let url = '/api/v2/profile/'+this.statusUsername+'/status/'+this.statusId;
|
||||||
axios.get(url)
|
axios.get(url)
|
||||||
.then(response => {
|
.then(response => {
|
||||||
let self = this;
|
let self = this;
|
||||||
self.status = response.data.status;
|
self.status = response.data.status;
|
||||||
|
self.user = response.data.user;
|
||||||
self.media = self.status.media_attachments;
|
self.media = self.status.media_attachments;
|
||||||
this.buildPresenter();
|
this.buildPresenter();
|
||||||
|
this.showMuteBlock();
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
if(!error.response) {
|
if(!error.response) {
|
||||||
$('.postPresenterLoader .lds-ring').attr('style','width:100%').addClass('pt-4 font-weight-bold text-muted').text('An error occured, cannot fetch media. Please try again later.');
|
$('.postPresenterLoader .lds-ring').attr('style','width:100%').addClass('pt-4 font-weight-bold text-muted').text('An error occured, cannot fetch media. Please try again later.');
|
||||||
|
@ -335,6 +393,11 @@ export default {
|
||||||
let status = this.status;
|
let status = this.status;
|
||||||
let media = this.media;
|
let media = this.media;
|
||||||
|
|
||||||
|
$('input[name="item"]').each(function(k, v) {
|
||||||
|
let el = $(v);
|
||||||
|
el.val(status.account.id);
|
||||||
|
});
|
||||||
|
|
||||||
$('.status-comment .comment-text').html(status.content);
|
$('.status-comment .comment-text').html(status.content);
|
||||||
|
|
||||||
if(container.children().length != 0) {
|
if(container.children().length != 0) {
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
@stack('styles')
|
@stack('styles')
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
<body class="">
|
<body class="{{Auth::check()?'loggedIn':''}}">
|
||||||
@include('layouts.partial.nav')
|
@include('layouts.partial.nav')
|
||||||
<main id="content">
|
<main id="content">
|
||||||
@yield('content')
|
@yield('content')
|
||||||
|
|
|
@ -12,9 +12,3 @@ use Illuminate\Http\Request;
|
||||||
| is assigned the "api" middleware group. Enjoy building your API!
|
| is assigned the "api" middleware group. Enjoy building your API!
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
Route::post('/users/{username}/inbox', 'FederationController@userInbox');
|
|
||||||
|
|
||||||
Route::group(['prefix' => 'api/v2'], function() {
|
|
||||||
Route::get('profile/{username}/status/{postid}', 'PublicApiController@status');
|
|
||||||
Route::get('comments/{username}/status/{postId}', 'PublicApiController@statusComments');
|
|
||||||
});
|
|
|
@ -46,6 +46,8 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
|
||||||
Route::get('notifications', 'InternalApiController@notifications');
|
Route::get('notifications', 'InternalApiController@notifications');
|
||||||
Route::post('notifications', 'InternalApiController@notificationMarkAllRead');
|
Route::post('notifications', 'InternalApiController@notificationMarkAllRead');
|
||||||
Route::get('discover', 'InternalApiController@discover');
|
Route::get('discover', 'InternalApiController@discover');
|
||||||
|
Route::get('profile/{username}/status/{postid}', 'PublicApiController@status');
|
||||||
|
Route::get('comments/{username}/status/{postId}', 'PublicApiController@statusComments');
|
||||||
});
|
});
|
||||||
Route::group(['prefix' => 'local'], function () {
|
Route::group(['prefix' => 'local'], function () {
|
||||||
Route::get('i/follow-suggestions', 'ApiController@followSuggestions');
|
Route::get('i/follow-suggestions', 'ApiController@followSuggestions');
|
||||||
|
|
Loading…
Reference in a new issue