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 #975 from pixelfed/frontend-ui-refactor

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-03-07 00:44:46 -07:00 committed by GitHub
commit 8a2e731e56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/js/components.js vendored
View file

Binary file not shown.

BIN
public/js/status.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

2
resources/assets/js/components/PostComments.vue
View file

@ -24,7 +24,7 @@
</span> </span>
<span class="pl-2" style="min-width:38px"> <span class="pl-2" style="min-width:38px">
<span v-on:click="likeStatus(reply, $event)"><i v-bind:class="[reply.favourited ? 'fas fa-heart fa-sm text-danger':'far fa-heart fa-sm text-lighter']"></i></span> <span v-on:click="likeStatus(reply, $event)"><i v-bind:class="[reply.favourited ? 'fas fa-heart fa-sm text-danger':'far fa-heart fa-sm text-lighter']"></i></span>
<post-menu :status="reply" :profile="user" :size="'sm'" :modal="'true'" class="d-inline-block pl-2"></post-menu> <post-menu :status="reply" :profile="user" :size="'sm'" :modal="'true'" class="d-inline-block pl-2" v-on:deletePost="deleteComment(reply.id, index)"></post-menu>
</span> </span>
</p> </p>
</div> </div>

7
resources/assets/js/components/PostMenu.vue
View file

@ -62,7 +62,7 @@
<a class="list-group-item font-weight-bold" v-on:click="blockProfile(status)" href="#">Block Profile</a> <a class="list-group-item font-weight-bold" v-on:click="blockProfile(status)" href="#">Block Profile</a>
</span> </span>
<span v-if="statusOwner(status) == true || profile.is_admin == true"> <span v-if="statusOwner(status) == true || profile.is_admin == true">
<a class="list-group-item font-weight-bold text-danger" v-on:click="deletePost(status)">Delete</a> <a class="list-group-item font-weight-bold text-danger" v-on:click="deletePost">Delete</a>
</span> </span>
<span v-if="profile.is_admin == true"> <span v-if="profile.is_admin == true">
<a class="list-group-item font-weight-bold" v-on:click="moderatePost(status, 'autocw')" href="#"> <a class="list-group-item font-weight-bold" v-on:click="moderatePost(status, 'autocw')" href="#">
@ -152,8 +152,9 @@
} }
}, },
deletePost() {
deletePost(status, index) { this.$emit('deletePost');
$('#mt_pid_'+this.status.id).modal('hide');
}, },
moderatePost(status, action, $event) { moderatePost(status, action, $event) {