From bafebff655cb2d83cc8c6ccd8d2060d2662b3361 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 31 Mar 2023 17:42:21 +0000
Subject: [PATCH] Apply fixes from StyleCI

---
 app/Http/Controllers/Auth/ConfirmablePasswordController.php | 2 +-
 app/Logic/Macros/HtmlMacros.php                             | 2 +-
 routes/web.php                                              | 4 ----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Auth/ConfirmablePasswordController.php b/app/Http/Controllers/Auth/ConfirmablePasswordController.php
index 523ddda3c..19709068e 100644
--- a/app/Http/Controllers/Auth/ConfirmablePasswordController.php
+++ b/app/Http/Controllers/Auth/ConfirmablePasswordController.php
@@ -26,7 +26,7 @@ public function show(): View
     public function store(Request $request): RedirectResponse
     {
         if (! Auth::guard('web')->validate([
-            'email' => $request->user()->email,
+            'email'    => $request->user()->email,
             'password' => $request->password,
         ])) {
             throw ValidationException::withMessages([
diff --git a/app/Logic/Macros/HtmlMacros.php b/app/Logic/Macros/HtmlMacros.php
index 021db2fb9..0bef42d0d 100755
--- a/app/Logic/Macros/HtmlMacros.php
+++ b/app/Logic/Macros/HtmlMacros.php
@@ -73,7 +73,7 @@
  * @return string
  */
 HTML::macro('show_username', function () {
-    $the_username = (Auth::user()->name === Auth::user()->email) ? ((is_null(Auth::user()->first_name)) ? (Auth::user()->name) : (Auth::user()->first_name)) : (((is_null(Auth::user()->name)) ? (Auth::user()->email) : (Auth::user()->name)));
+    $the_username = (Auth::user()->name === Auth::user()->email) ? ((is_null(Auth::user()->first_name)) ? (Auth::user()->name) : (Auth::user()->first_name)) : ((is_null(Auth::user()->name)) ? (Auth::user()->email) : (Auth::user()->name));
 
     return $the_username;
 });
diff --git a/routes/web.php b/routes/web.php
index 1bf4c2dbd..59914f2de 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -26,7 +26,6 @@
 
 // Public Routes
 Route::group(['middleware' => ['web', 'activity', 'checkblocked']], function () {
-
     // Activation Routes
     Route::get('/activate', ['as' => 'activate', 'uses' => 'App\Http\Controllers\Auth\ActivateController@initial']);
 
@@ -44,7 +43,6 @@
 
 // Registered and Activated User Routes
 Route::group(['middleware' => ['auth', 'activated', 'activity', 'checkblocked']], function () {
-
     // Activation Routes
     Route::get('/activation-required', ['uses' => 'App\Http\Controllers\Auth\ActivateController@activationRequired'])->name('activation-required');
     // Route::get('/logout', ['uses' => 'App\Http\Controllers\Auth\LoginController@logout'])->name('logout');
@@ -52,7 +50,6 @@
 
 // Registered and Activated User Routes
 Route::group(['middleware' => ['auth', 'activated', 'activity', 'twostep', 'checkblocked']], function () {
-
     //  Homepage Route - Redirect based on user role is in controller.
     Route::get('/home', [
         'as'    => 'public.home',
@@ -69,7 +66,6 @@
 
 // Registered, activated, and is current user routes.
 Route::group(['middleware' => ['auth', 'activated', 'currentUser', 'activity', 'twostep', 'checkblocked']], function () {
-
     // User Profile and Account Routes
     Route::resource(
         'profile',