UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-30 02:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-04-03 00:05:37 -06:00 committed by GitHub
commit 79c4803e88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/PublicApiController.php
View file

@ -248,6 +248,8 @@ class PublicApiController extends Controller
'is_nsfw', 'is_nsfw',
'scope', 'scope',
'local', 'local',
'reply_count',
'comments_disabled',
'created_at', 'created_at',
'updated_at' 'updated_at'
)->where('id', $dir, $id) )->where('id', $dir, $id)
@ -274,6 +276,8 @@ class PublicApiController extends Controller
'is_nsfw', 'is_nsfw',
'scope', 'scope',
'local', 'local',
'reply_count',
'comments_disabled',
'created_at', 'created_at',
'updated_at' 'updated_at'
)->whereIn('type', ['photo', 'photo:album', 'video', 'video:album']) )->whereIn('type', ['photo', 'photo:album', 'video', 'video:album'])
@ -348,6 +352,8 @@ class PublicApiController extends Controller
'is_nsfw', 'is_nsfw',
'scope', 'scope',
'local', 'local',
'reply_count',
'comments_disabled',
'created_at', 'created_at',
'updated_at' 'updated_at'
)->whereIn('type', ['photo', 'photo:album', 'video', 'video:album']) )->whereIn('type', ['photo', 'photo:album', 'video', 'video:album'])
@ -375,6 +381,8 @@ class PublicApiController extends Controller
'is_nsfw', 'is_nsfw',
'scope', 'scope',
'local', 'local',
'reply_count',
'comments_disabled',
'created_at', 'created_at',
'updated_at' 'updated_at'
)->whereIn('type', ['photo', 'photo:album', 'video', 'video:album']) )->whereIn('type', ['photo', 'photo:album', 'video', 'video:album'])

BIN
public/js/timeline.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

6
resources/assets/js/components/Timeline.vue
View file

@ -85,7 +85,7 @@
<div class="card-body"> <div class="card-body">
<div class="reactions my-1"> <div class="reactions my-1">
<h3 v-bind:class="[status.favourited ? 'fas fa-heart text-danger pr-3 m-0 cursor-pointer' : 'far fa-heart pr-3 m-0 like-btn cursor-pointer']" title="Like" v-on:click="likeStatus(status, $event)"></h3> <h3 v-bind:class="[status.favourited ? 'fas fa-heart text-danger pr-3 m-0 cursor-pointer' : 'far fa-heart pr-3 m-0 like-btn cursor-pointer']" title="Like" v-on:click="likeStatus(status, $event)"></h3>
<h3 class="far fa-comment pr-3 m-0 cursor-pointer" title="Comment" v-on:click="commentFocus(status, $event)"></h3> <h3 v-if="!status.comments_disabled" class="far fa-comment pr-3 m-0 cursor-pointer" title="Comment" v-on:click="commentFocus(status, $event)"></h3>
<h3 v-bind:class="[status.reblogged ? 'far fa-share-square pr-3 m-0 text-primary cursor-pointer' : 'far fa-share-square pr-3 m-0 share-btn cursor-pointer']" title="Share" v-on:click="shareStatus(status, $event)"></h3> <h3 v-bind:class="[status.reblogged ? 'far fa-share-square pr-3 m-0 text-primary cursor-pointer' : 'far fa-share-square pr-3 m-0 share-btn cursor-pointer']" title="Share" v-on:click="shareStatus(status, $event)"></h3>
</div> </div>
@ -100,7 +100,7 @@
<span v-html="status.content"></span> <span v-html="status.content"></span>
</p> </p>
</div> </div>
<div class="comments" v-if="status.id == replyId"> <div class="comments" v-if="status.id == replyId && !status.comments_disabled">
<p class="mb-0 d-flex justify-content-between align-items-top read-more" style="overflow-y: hidden;" v-for="(reply, index) in replies"> <p class="mb-0 d-flex justify-content-between align-items-top read-more" style="overflow-y: hidden;" v-for="(reply, index) in replies">
<span> <span>
<a class="text-dark font-weight-bold mr-1" :href="reply.account.url">{{reply.account.username}}</a> <a class="text-dark font-weight-bold mr-1" :href="reply.account.url">{{reply.account.username}}</a>
@ -593,7 +593,7 @@
}, },
commentFocus(status, $event) { commentFocus(status, $event) {
if(this.replyId == status.id) { if(this.replyId == status.id || status.comments_disabled) {
return; return;
} }
this.replies = {}; this.replies = {};