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

Frontend ui refactor
This commit is contained in:
daniel 2019-06-03 20:12:41 -06:00 committed by GitHub
commit bc2b5ec641
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions

BIN
public/js/loops.js vendored

Binary file not shown.

Binary file not shown.

View file

@ -16,7 +16,7 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<p class="username font-weight-bolder lead d-flex justify-content-between"><a :href="loop.account.url">{{loop.account.acct}}</a> <a :href="loop.url">{{timestamp(loop)}}</a></p> <p class="username font-weight-bolder lead d-flex justify-content-between"><a :href="loop.account.url">{{loop.account.acct}}</a> <a :href="loop.url">{{timestamp(loop)}}</a></p>
<p class="small text-muted text-truncate" v-html="loop.content ? loop.content : 'Untitled'"></p> <p class="small text-muted text-truncate" v-html="getTitle(loop)"></p>
<div class="small text-muted d-flex justify-content-between mb-0"> <div class="small text-muted d-flex justify-content-between mb-0">
<span>{{loop.favourites_count}} Likes</span> <span>{{loop.favourites_count}} Likes</span>
<span>{{loop.reblogs_count}} Shares</span> <span>{{loop.reblogs_count}} Shares</span>
@ -108,6 +108,10 @@ export default {
timestamp(loop) { timestamp(loop) {
let ts = new Date(loop.created_at); let ts = new Date(loop.created_at);
return ts.toLocaleDateString(); return ts.toLocaleDateString();
},
getTitle(loop) {
let content = loop.content ? loop.content : 'Untitled';
return content.trim();
} }
} }
} }