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

Frontend ui refactor

app/Http/Controllers/InternalApiController.php

@@ -146,9 +146,6 @@ class InternalApiController extends Controller
 
         $posts = Status::select('id', 'caption', 'profile_id')
           ->whereHas('media')
-          ->whereHas('profile', function($q) {
-            $q->where('is_private', false);
-          })
           ->whereIsNsfw(false)
           ->whereVisibility('public')
           ->whereNotIn('profile_id', $following)

resources/views/layouts/partial/nav.blade.php

@@ -19,10 +19,13 @@
                     <li><a class="nav-link font-weight-bold text-primary" href="{{ route('login') }}" title="Login">{{ __('Login') }}</a></li>
                     <li><a class="nav-link font-weight-bold" href="{{ route('register') }}" title="Register">{{ __('Register') }}</a></li>
                 @else
-                    <li class="nav-item px-2">
+                    <li class="nav-item pr-2">
                         <a class="nav-link" href="{{route('discover')}}" title="Discover" data-toggle="tooltip" data-placement="bottom"><i class="far fa-compass fa-lg"></i></a>
                     </li>
-                    <li class="nav-item dropdown">
+                    <li class="nav-item pr-2">
+                        <a class="nav-link" href="{{route('notifications')}}" title="Notifications" data-toggle="tooltip" data-placement="bottom"><i class="fas fa-inbox fa-lg text"></i></a>
+                    </li>
+                    {{-- <li class="nav-item dropdown d-none d-md-block pr-2">
                         <a class="nav-link dropdown-toggle nav-notification" href="{{route('notifications')}}" id="nav-notification" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <i class="fas fa-inbox fa-lg text"></i>
                       </a>
@@ -33,7 +36,7 @@
                         <div class="dropdown-item disabled bg-light py-2">
                             <a href="{{route('notifications')}}" class="font-weight-bold mr-4" data-toggle="tooltip" title="Notifications"><i class="fas fa-inbox"></i></a>
                             {{-- <a href="#" class="text-muted font-weight-bold mr-4" data-toggle="tooltip" title="Direct Messages"><i class="far fa-envelope"></i></a>
-                            <a href="#" class="text-muted font-weight-bold mr-4" data-toggle="tooltip" title="Following Activity"><i class="fas fa-users"></i></a> --}}
+                            <a href="#" class="text-muted font-weight-bold mr-4" data-toggle="tooltip" title="Following Activity"><i class="fas fa-users"></i></a> -}}
                             <a href="{{route('follow-requests')}}" class="text-muted font-weight-bold" data-toggle="tooltip" title="Follow Requests"><i class="fas fa-user-plus"></i></a>
 
                             <span class="float-right">
@@ -41,8 +44,8 @@
                             </span>
                         </div>
                       </div>
-                  </li>
-                    <li class="nav-item px-2">
+                    </li> --}}
+                    <li class="nav-item pr-2">
                         <div title="Create new post" data-toggle="tooltip" data-placement="bottom">
                             <a href="{{route('compose')}}" class="nav-link" data-toggle="modal" data-target="#composeModal">
                               <i class="fas fa-camera-retro fa-lg text-primary"></i>

routes/web.php

@@ -119,7 +119,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
         Route::get('email', 'SettingsController@email')->name('settings.email');
         Route::get('notifications', 'SettingsController@notifications')->name('settings.notifications');
         Route::get('privacy', 'SettingsController@privacy')->name('settings.privacy');
-        Route::post('privacy', 'SettingsController@privacyStore')->middleware('throttle:25,1440');
+        Route::post('privacy', 'SettingsController@privacyStore')->middleware('throttle:50,1440');
         Route::get('privacy/muted-users', 'SettingsController@mutedUsers')->name('settings.privacy.muted-users');
         Route::post('privacy/muted-users', 'SettingsController@mutedUsersUpdate')->middleware('throttle:100,1440');
         Route::get('privacy/blocked-users', 'SettingsController@blockedUsers')->name('settings.privacy.blocked-users');