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

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-02-13 12:24:59 -07:00 committed by GitHub
commit b10cf02ef3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/js/timeline.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

6
resources/assets/js/components/Timeline.vue
View file

@ -138,7 +138,7 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="modes.infinite == false && !loading && feed.length > 0" class="pagination d-none"> <div v-if="modes.infinite == false && !loading && feed.length > 0" class="pagination">
<p class="btn btn-outline-secondary font-weight-bold btn-block" v-on:click="loadMore">Load more posts</p> <p class="btn btn-outline-secondary font-weight-bold btn-block" v-on:click="loadMore">Load more posts</p>
</div> </div>
<div v-if="!loading && scope == 'home' && feed.length == 0"> <div v-if="!loading && scope == 'home' && feed.length == 0">
@ -421,10 +421,11 @@
}); });
}, },
loadMore() { loadMore(event) {
let homeTimeline = '/api/v1/timelines/home'; let homeTimeline = '/api/v1/timelines/home';
let localTimeline = '/api/v1/timelines/public'; let localTimeline = '/api/v1/timelines/public';
let apiUrl = this.scope == 'home' ? homeTimeline : localTimeline; let apiUrl = this.scope == 'home' ? homeTimeline : localTimeline;
event.target.innerText = 'Loading...';
axios.get(apiUrl, { axios.get(apiUrl, {
params: { params: {
page: this.page, page: this.page,
@ -440,6 +441,7 @@
} }
this.page += 1; this.page += 1;
this.loading = false; this.loading = false;
event.target.innerText = 'Load more posts';
} else { } else {
} }
}); });