UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-23 13:33:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

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

11
app/Http/Controllers/ProfileController.php
View file

@ -68,6 +68,17 @@ class ProfileController extends Controller
} }
$is_admin = is_null($user->domain) ? $user->user->is_admin : false; $is_admin = is_null($user->domain) ? $user->user->is_admin : false;
$profile = $user; $profile = $user;
$settings = [
'crawlable' => $settings->crawlable,
'following' => [
'count' => $settings->show_profile_following_count,
'list' => $settings->show_profile_following
],
'followers' => [
'count' => $settings->show_profile_follower_count,
'list' => $settings->show_profile_followers
]
];
return view('profile.show', compact('user', 'profile', 'settings', 'owner', 'is_following', 'is_admin')); return view('profile.show', compact('user', 'profile', 'settings', 'owner', 'is_following', 'is_admin'));
} }

BIN
public/js/profile.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

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

@ -38,13 +38,13 @@
Posts Posts
</a> </a>
</div> </div>
<div class="font-weight-light pr-5"> <div v-if="profileSettings.followers.count" class="font-weight-light pr-5">
<a class="text-dark cursor-pointer" v-on:click="followersModal()"> <a class="text-dark cursor-pointer" v-on:click="followersModal()">
<span class="font-weight-bold">{{profile.followers_count}}</span> <span class="font-weight-bold">{{profile.followers_count}}</span>
Followers Followers
</a> </a>
</div> </div>
<div class="font-weight-light pr-5"> <div v-if="profileSettings.following.count" class="font-weight-light pr-5">
<a class="text-dark cursor-pointer" v-on:click="followingModal()"> <a class="text-dark cursor-pointer" v-on:click="followingModal()">
<span class="font-weight-bold">{{profile.following_count}}</span> <span class="font-weight-bold">{{profile.following_count}}</span>
Following Following
@ -318,7 +318,8 @@
<script type="text/javascript"> <script type="text/javascript">
export default { export default {
props: [ props: [
'profile-id' 'profile-id',
'profile-settings'
], ],
data() { data() {
return { return {
@ -671,6 +672,9 @@ export default {
}, },
followingModal() { followingModal() {
if(this.profileSettings.following.list == false) {
return;
}
if(this.following.length > 0) { if(this.following.length > 0) {
this.$refs.followingModal.show(); this.$refs.followingModal.show();
return; return;
@ -691,6 +695,9 @@ export default {
}, },
followersModal() { followersModal() {
if(this.profileSettings.followers.list == false) {
return;
}
if(this.followers.length > 0) { if(this.followers.length > 0) {
this.$refs.followerModal.show(); this.$refs.followerModal.show();
return; return;