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

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

Frontend ui refactor
This commit is contained in:
daniel 2019-02-24 22:13:39 -07:00 committed by GitHub
parent 4eb11f44e6 caac0a02d1
commit 18110d9020
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/profile.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -6,7 +6,7 @@
"/js/components.js": "/js/components.js?id=42433de4ebbff72c4293",
"/js/discover.js": "/js/discover.js?id=95091dda6723ab05dbb5",
"/js/micro.js": "/js/micro.js?id=178479fb6990f8806257",
"/js/profile.js": "/js/profile.js?id=1c8f0ba44bfd283f13c8",
"/js/profile.js": "/js/profile.js?id=488dcd99d616ca9ef8de",
"/js/status.js": "/js/status.js?id=096927f9312b1d7bb1b0",
"/js/timeline.js": "/js/timeline.js?id=4101fb6ac1673f3e0abd"
}

2
resources/assets/js/components/Profile.vue
View File

@ -352,6 +352,7 @@ export default {
fetchProfile() {
axios.get('/api/v1/accounts/' + this.profileId).then(res => {
this.profile = res.data;
this.loading = false;
});
axios.get('/api/v1/accounts/verify_credentials').then(res => {
this.user = res.data;
@ -401,7 +402,6 @@ export default {
this.timeline.push(...data);
this.timelinePage += 1;
$state.loaded();
this.loading = false;
} else {
$state.complete();
}