chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

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

Frontend ui refactor
This commit is contained in:
daniel 2019-04-03 00:05:37 -06:00 committed by GitHub
parent 82102376fe 7e3d93a8c2
commit 79c4803e88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 5 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',
'scope',
'local',
'reply_count',
'comments_disabled',
'created_at',
'updated_at'
)->where('id', $dir, $id)
@ -274,6 +276,8 @@ class PublicApiController extends Controller
'is_nsfw',
'scope',
'local',
'reply_count',
'comments_disabled',
'created_at',
'updated_at'
)->whereIn('type', ['photo', 'photo:album', 'video', 'video:album'])
@ -348,6 +352,8 @@ class PublicApiController extends Controller
'is_nsfw',
'scope',
'local',
'reply_count',
'comments_disabled',
'created_at',
'updated_at'
)->whereIn('type', ['photo', 'photo:album', 'video', 'video:album'])
@ -375,6 +381,8 @@ class PublicApiController extends Controller
'is_nsfw',
'scope',
'local',
'reply_count',
'comments_disabled',
'created_at',
'updated_at'
)->whereIn('type', ['photo', 'photo:album', 'video', 'video:album'])

2
public/js/timeline.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -10,5 +10,5 @@
"/js/profile.js": "/js/profile.js?id=be1a00c4bf3ad5449ba9",
"/js/search.js": "/js/search.js?id=df9027d746934eb442f0",
"/js/status.js": "/js/status.js?id=305d8cb21b4c817bbcb7",
"/js/timeline.js": "/js/timeline.js?id=3f82696a8664e306a8d0"
"/js/timeline.js": "/js/timeline.js?id=db7c841e880fc6585ef7"
}

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

@ -85,7 +85,7 @@
<div class="card-body">
<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 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>
</div>
@ -100,7 +100,7 @@
<span v-html="status.content"></span>
</p>
</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">
<span>
<a class="text-dark font-weight-bold mr-1" :href="reply.account.url">{{reply.account.username}}</a>
@ -593,7 +593,7 @@
},
commentFocus(status, $event) {
if(this.replyId == status.id) {
if(this.replyId == status.id || status.comments_disabled) {
return;
}
this.replies = {};