UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-26 08:13:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-02-12 23:36:06 -07:00 committed by GitHub
commit 985af8c0a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 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.

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

@ -398,7 +398,7 @@
infiniteTimeline($state) { infiniteTimeline($state) {
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 == '/' ? homeTimeline : localTimeline; let apiUrl = this.scope == 'home' ? homeTimeline : localTimeline;
axios.get(apiUrl, { axios.get(apiUrl, {
params: { params: {
page: this.page, page: this.page,
@ -424,7 +424,7 @@
loadMore() { loadMore() {
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 == '/' ? homeTimeline : localTimeline; let apiUrl = this.scope == 'home' ? homeTimeline : localTimeline;
axios.get(apiUrl, { axios.get(apiUrl, {
params: { params: {
page: this.page, page: this.page,