fediport/pixelfed
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-05-13 00:11:40 -06:00 committed by GitHub
parent eb0c8e02bb d46ae1e628
commit 14925b2f0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 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

@ -8,7 +8,7 @@
"/js/compose.js": "/js/compose.js?id=041385233a3b1ed64d28",
"/js/developers.js": "/js/developers.js?id=1359f11c7349301903f8",
"/js/discover.js": "/js/discover.js?id=75fb12b06ee23fa05186",
"/js/profile.js": "/js/profile.js?id=374b0a3f3fec1282aa55",
"/js/profile.js": "/js/profile.js?id=71deeec272baa24f40b8",
"/js/search.js": "/js/search.js?id=0d3d080dc05f4f49b204",
"/js/status.js": "/js/status.js?id=2c1a0fafcf34f573f537",
"/js/timeline.js": "/js/timeline.js?id=2ae0450ee62c22f3839f"

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

@ -511,8 +511,9 @@
export default {
props: [
'profile-id',
'profile-layout',
'profile-settings',
'profile-layout'
'profile-username'
],
data() {
return {
@ -541,6 +542,10 @@ export default {
beforeMount() {
this.fetchRelationships();
this.fetchProfile();
if(window.outerWidth < 576 && window.history.length > 2) {
$('nav.navbar').hide();
$('body').prepend('<div class="bg-white p-3 border-bottom"><div class="d-flex justify-content-between align-items-center"><div onclick="window.history.back();"><i class="fas fa-chevron-left fa-lg"></i></div><div class="font-weight-bold">' + this.profileUsername + '</div><div><i class="fas fa-chevron-right text-white fa-lg"></i></div></div></div>');
}
},
mounted() {

2
resources/views/profile/show.blade.php
View file

@ -7,7 +7,7 @@
</div>
@endif
<profile profile-id="{{$profile->id}}" :profile-settings="{{json_encode($settings)}}" profile-layout="{{$profile->profile_layout ?? 'metro'}}"></profile>
<profile profile-id="{{$profile->id}}" profile-username="{{$profile->username}}" :profile-settings="{{json_encode($settings)}}" profile-layout="{{$profile->profile_layout ?? 'metro'}}"></profile>
@if($profile->website)
<a class="d-none" href="{{$profile->website}}" rel="me">{{$profile->website}}</a>
@endif