mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

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
parent 9483b58719 bf6c5a657f
commit bc2b5ec641
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/loops.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -8,7 +8,7 @@
"/js/compose.js": "/js/compose.js?id=f69f248dc1cfcb8ae092", "/js/compose.js": "/js/compose.js?id=f69f248dc1cfcb8ae092",
"/js/developers.js": "/js/developers.js?id=1359f11c7349301903f8", "/js/developers.js": "/js/developers.js?id=1359f11c7349301903f8",
"/js/discover.js": "/js/discover.js?id=0625385218493e556ccc", "/js/discover.js": "/js/discover.js?id=0625385218493e556ccc",
"/js/loops.js": "/js/loops.js?id=04604e13614f26617f27", "/js/loops.js": "/js/loops.js?id=0677173fdad43d0687ba",
"/js/profile.js": "/js/profile.js?id=257d02b221142438d173", "/js/profile.js": "/js/profile.js?id=257d02b221142438d173",
"/js/search.js": "/js/search.js?id=27e8be8bfef6be586d25", "/js/search.js": "/js/search.js?id=27e8be8bfef6be586d25",
"/js/status.js": "/js/status.js?id=fb2f77026b548814adc3", "/js/status.js": "/js/status.js?id=fb2f77026b548814adc3",

6
resources/assets/js/components/LoopComponent.vue
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();
} }
} }
} }