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

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

Frontend ui refactor
This commit is contained in:
daniel 2019-06-03 19:50:47 -06:00 committed by GitHub
parent 4d77a09966 21cbcb21d9
commit e26d5513ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 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=3e3276ee44e1d5a27d0b", "/js/loops.js": "/js/loops.js?id=37e6648f5124600735a1",
"/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",

20
resources/assets/js/components/LoopComponent.vue
View File

@ -12,15 +12,15 @@
<div class="col-12 col-md-4 mb-3" v-for="(loop, index) in loops"> <div class="col-12 col-md-4 mb-3" v-for="(loop, index) in loops">
<div class="card border border-success"> <div class="card border border-success">
<div class="embed-responsive embed-responsive-1by1"> <div class="embed-responsive embed-responsive-1by1">
<video class="embed-responsive-item" :src="videoSrc(loop)" preload="auto" loop @click="toggleVideo(loop, $event)"></video> <video class="embed-responsive-item" :src="videoSrc(loop)" preload="auto" width="100%" height="100%" loop @click="toggleVideo(loop, $event)"></video>
</div> </div>
<div class="card-body"> <div class="card-body">
<p class="username font-weight-bolder"><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" v-html="loop.content"></p> <p class="small text-muted text-truncate" v-html="loop.content ? loop.content : 'Untitled'"></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>
<span>0 Loops</span> <span>{{loop.reply_count}} Comments</span>
</div> </div>
</div> </div>
</div> </div>
@ -90,17 +90,17 @@ export default {
}); });
if(!el.playing) { if(!el.playing) {
el.play(); el.play();
this.incrementLoop(loop); //this.incrementLoop(loop);
} else { } else {
el.pause(); el.pause();
} }
}, },
incrementLoop(loop) { incrementLoop(loop) {
axios.post('/api/v2/loops/watch', { // axios.post('/api/v2/loops/watch', {
id: loop.id // id: loop.id
}).then(res => { // }).then(res => {
console.log(res.data); // console.log(res.data);
}); // });
}, },
timestamp(loop) { timestamp(loop) {
let ts = new Date(loop.created_at); let ts = new Date(loop.created_at);