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

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

Frontend ui refactor
This commit is contained in:
daniel 2019-03-07 00:44:46 -07:00 committed by GitHub
parent 5a94ed7ba7 45065458e3
commit 8a2e731e56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/components.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/status.js vendored
View File

File diff suppressed because one or more lines are too long

4
public/mix-manifest.json
View File

@ -3,10 +3,10 @@
"/js/app.js": "/js/app.js?id=a51da95c2b9df7cf8de2",
"/css/app.css": "/css/app.css?id=da1490bc71c86824a5d8",
"/css/appdark.css": "/css/appdark.css?id=75eb957c4cbdd84b6016",
"/js/components.js": "/js/components.js?id=99bc9b36168562483246",
"/js/components.js": "/js/components.js?id=fe7e6d95339a03a9b03f",
"/js/discover.js": "/js/discover.js?id=75fb12b06ee23fa05186",
"/js/micro.js": "/js/micro.js?id=178479fb6990f8806257",
"/js/profile.js": "/js/profile.js?id=dce4efc17bd33c44997c",
"/js/status.js": "/js/status.js?id=d15b5bae5db49835c166",
"/js/status.js": "/js/status.js?id=d3866ac390bc28d9bcc1",
"/js/timeline.js": "/js/timeline.js?id=8a3d417eb838a7219cc9"
}

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

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