mirror/pixelfed
1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-02-04 13:32:28 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-04-29 19:38:07 -06:00 committed by GitHub
commit a9f60a6ff6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 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.

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

@ -25,11 +25,11 @@
<p class="align-middle"> <p class="align-middle">
<span class="font-weight-ultralight h3 mb-0">{{profile.username}}</span> <span class="font-weight-ultralight h3 mb-0">{{profile.username}}</span>
<span class="float-right mb-0" v-if="profile.id != user.id && user.hasOwnProperty('id')"> <span class="float-right mb-0" v-if="!loading && profile.id != user.id && user.hasOwnProperty('id')">
<a class="fas fa-cog fa-lg text-muted text-decoration-none" href="#" @click.prevent="visitorMenu"></a> <a class="fas fa-cog fa-lg text-muted text-decoration-none" href="#" @click.prevent="visitorMenu"></a>
</span> </span>
</p> </p>
<p v-if="profile.id == user.id && user.hasOwnProperty('id')"> <p v-if="!loading && profile.id == user.id && user.hasOwnProperty('id')">
<a class="btn btn-outline-dark py-0 px-4 mt-3" href="/settings/home">Edit Profile</a> <a class="btn btn-outline-dark py-0 px-4 mt-3" href="/settings/home">Edit Profile</a>
</p> </p>
<div v-if="profile.id != user.id && user.hasOwnProperty('id')"> <div v-if="profile.id != user.id && user.hasOwnProperty('id')">
@ -58,10 +58,10 @@
<span class="pl-4"> <span class="pl-4">
<a :href="'/users/'+profile.username+'.atom'" class="fas fa-rss fa-lg text-muted text-decoration-none"></a> <a :href="'/users/'+profile.username+'.atom'" class="fas fa-rss fa-lg text-muted text-decoration-none"></a>
</span> </span>
<span class="pl-4" v-if="owner"> <span class="pl-4" v-if="owner && user.hasOwnProperty('id')">
<a class="fas fa-cog fa-lg text-muted text-decoration-none" href="/settings/home"></a> <a class="fas fa-cog fa-lg text-muted text-decoration-none" href="/settings/home"></a>
</span> </span>
<span class="pl-4" v-if="profile.id != user.id && user.hasOwnProperty('id')"> <span class="pl-4" v-if="!owner && user.hasOwnProperty('id')">
<a class="fas fa-cog fa-lg text-muted text-decoration-none" href="#" @click.prevent="visitorMenu"></a> <a class="fas fa-cog fa-lg text-muted text-decoration-none" href="#" @click.prevent="visitorMenu"></a>
</span> </span>
<span v-if="profile.id != user.id && user.hasOwnProperty('id')"> <span v-if="profile.id != user.id && user.hasOwnProperty('id')">
@ -588,7 +588,8 @@ export default {
}, },
infiniteTimeline($state) { infiniteTimeline($state) {
if(this.loading || this.timeline < 9) { if(this.loading || this.timeline.length < 9) {
$state.complete();
return; return;
} }
let apiUrl = '/api/v1/accounts/' + this.profileId + '/statuses'; let apiUrl = '/api/v1/accounts/' + this.profileId + '/statuses';