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

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

Frontend ui refactor
This commit is contained in:
daniel 2019-02-14 20:50:49 -07:00 committed by GitHub
parent 8a928d6099 eb33e95e3f
commit 661917b3e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Util/Lexer/RestrictedNames.php
View File

@ -152,7 +152,11 @@ class RestrictedNames
'imgs', 'imgs',
'image', 'image',
'images', 'images',
'invite',
'invites',
'js', 'js',
'lab',
'labs',
'legal', 'legal',
'live', 'live',
'login', 'login',

2
public/js/timeline.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -8,5 +8,5 @@
"/js/micro.js": "/js/micro.js?id=69703f96f09e6ff04be6", "/js/micro.js": "/js/micro.js?id=69703f96f09e6ff04be6",
"/js/profile.js": "/js/profile.js?id=dd006b565cac9962d5ad", "/js/profile.js": "/js/profile.js?id=dd006b565cac9962d5ad",
"/js/status.js": "/js/status.js?id=281d075819ccc5ea794d", "/js/status.js": "/js/status.js?id=281d075819ccc5ea794d",
"/js/timeline.js": "/js/timeline.js?id=b39c002c3f282231ef11" "/js/timeline.js": "/js/timeline.js?id=7570d505d9ba051522f5"
} }

10
resources/assets/js/components/Timeline.vue
View File

@ -166,12 +166,12 @@
<a :href="profile.url"> <a :href="profile.url">
<img class="mr-3 rounded-circle box-shadow" :src="profile.avatar || '/storage/avatars/default.png'" alt="avatar" width="64px" height="64px"> <img class="mr-3 rounded-circle box-shadow" :src="profile.avatar || '/storage/avatars/default.png'" alt="avatar" width="64px" height="64px">
</a> </a>
<div class="media-body d-flex justify-content-between"> <div class="media-body d-flex justify-content-between word-break">
<div> <div>
<p class="mb-0 px-0 font-weight-bold"><a :href="profile.url" class="text-dark">&commat;{{profile.username}}</a></p> <p class="mb-0 px-0 font-weight-bold"><a :href="profile.url" class="text-dark">&commat;{{profile.username}}</a></p>
<p class="my-0 text-muted text-truncate pb-0">{{profile.display_name}}</p> <p class="my-0 text-muted pb-0">{{profile.display_name}}</p>
</div> </div>
<div> <div class="ml-2">
<a :class="[optionMenuState == true ? 'text-primary' :'text-muted']" v-on:click="toggleOptionsMenu()"><i class="fas fa-cog"></i></a> <a :class="[optionMenuState == true ? 'text-primary' :'text-muted']" v-on:click="toggleOptionsMenu()"><i class="fas fa-cog"></i></a>
</div> </div>
</div> </div>
@ -353,6 +353,9 @@
} else { } else {
window.ls.set('pixelfed-classicui-settings', this.modes); window.ls.set('pixelfed-classicui-settings', this.modes);
} }
if(cachedSettings.notify == true) {
this.fetchNotifications();
}
}); });
}, },
@ -367,7 +370,6 @@
$('.profile-card .loader').addClass('d-none'); $('.profile-card .loader').addClass('d-none');
$('.profile-card .contents').removeClass('d-none'); $('.profile-card .contents').removeClass('d-none');
$('.profile-card .card-footer').removeClass('d-none'); $('.profile-card .card-footer').removeClass('d-none');
this.fetchNotifications();
}).catch(err => { }).catch(err => {
swal( swal(
'Oops, something went wrong', 'Oops, something went wrong',