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

Fixes #1407

app/Http/Controllers/Settings/HomeSettings.php

@@ -147,9 +147,10 @@ trait HomeSettings
             $log->save();
 
             return redirect('/settings/home')->with('status', 'Password successfully updated!');
+        } else {
+            return redirect()->back()->with('error', 'There was an error with your request! Please try again.');
         }
 
-        return redirect('/settings/home')->with('error', 'There was an error with your request!');
     }
 
     public function email()

resources/views/settings/template.blade.php

@@ -13,6 +13,11 @@
             @endforeach
     </div>
 @endif
+@if (session('error'))
+    <div class="alert alert-danger px-3 h6 text-center">
+        {{ session('error') }}
+    </div>
+@endif
 
 <div class="container">
   <div class="col-12">