diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 4c38a2319..74e84f63e 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -47,7 +47,8 @@ class ProfileController extends Controller }); if ($user->is_private == true) { - abort(404); + $profile = null; + return view('profile.private', compact('user')); } $owner = false; diff --git a/resources/assets/js/components/Profile.vue b/resources/assets/js/components/Profile.vue index d846dcaa3..c00e9676d 100644 --- a/resources/assets/js/components/Profile.vue +++ b/resources/assets/js/components/Profile.vue @@ -703,6 +703,11 @@ this.fetchProfile(); let u = new URLSearchParams(window.location.search); let forceMetro = localStorage.getItem('pf_metro_ui.exp.forceMetro') == 'true'; + + if(u.has('ui') && u.get('ui') == 'moment' && this.layout != 'moment') { + this.layout = 'moment'; + } + if(forceMetro == true || u.has('ui') && u.get('ui') == 'metro' && this.layout != 'metro') { this.layout = 'metro'; } @@ -739,10 +744,6 @@ } }); } - if(window.outerWidth < 576) { - $('nav.navbar').hide(); - this.isMobile = true; - } }, updated() { diff --git a/resources/views/profile/partial/private-info.blade.php b/resources/views/profile/partial/private-info.blade.php index 7965955f8..ae0862d18 100644 --- a/resources/views/profile/partial/private-info.blade.php +++ b/resources/views/profile/partial/private-info.blade.php @@ -1,107 +1,97 @@
- {{$user->name}} - @if($user->remote_url) - REMOTE PROFILE - @endif -
-{{$user->bio}}
- -- {{__('profile.privateProfileWarning')}} -
++ {{__('profile.privateProfileWarning')}} +
- @if(!Auth::check()) -{{ __('profile.alreadyFollow', ['username'=>$user->username])}}
- -{{__('profile.loginToSeeProfile')}}
- @endif -{{ __('profile.alreadyFollow', ['username'=>$user->username])}}
+ +{{__('profile.loginToSeeProfile')}}
+ @endif +