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

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

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

BIN
public/js/profile.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

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

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