From 5539f20e443f82f407e37b42d9a5c76cfc08b692 Mon Sep 17 00:00:00 2001 From: kusowl Date: Tue, 13 Jan 2026 15:11:38 +0530 Subject: [PATCH] chore: pint reformat --- app/Enums/UserTypes.php | 6 ++++-- app/Http/Controllers/AuthenticatedUserController.php | 12 ++++++------ .../Controllers/Broker/BrokerDashboardController.php | 1 - app/Http/Controllers/BrokerDealController.php | 4 +++- app/Http/Controllers/RegisteredUserController.php | 6 +++--- app/Http/Middleware/HasRole.php | 7 ++----- ...26_01_08_133256_add_additional_fields_to_user.php | 3 ++- routes/web.php | 2 +- 8 files changed, 21 insertions(+), 20 deletions(-) diff --git a/app/Enums/UserTypes.php b/app/Enums/UserTypes.php index 1360980..7d703bd 100644 --- a/app/Enums/UserTypes.php +++ b/app/Enums/UserTypes.php @@ -24,9 +24,11 @@ public function label(): string public static function labels(): array { $labels = array_map(function ($enum) { - return ['value' => $enum->value, 'label' =>$enum->label()]; + return ['value' => $enum->value, 'label' => $enum->label()]; }, self::cases()); - return array_filter($labels, function ($kv) {return $kv['value'] !== self::Admin->value;}); + return array_filter($labels, function ($kv) { + return $kv['value'] !== self::Admin->value; + }); } } diff --git a/app/Http/Controllers/AuthenticatedUserController.php b/app/Http/Controllers/AuthenticatedUserController.php index 8a6a618..7995968 100644 --- a/app/Http/Controllers/AuthenticatedUserController.php +++ b/app/Http/Controllers/AuthenticatedUserController.php @@ -2,7 +2,6 @@ namespace App\Http\Controllers; - use App\Enums\UserStatus; use App\Enums\UserTypes; use App\Http\Requests\AuthenticateUserRequest; @@ -15,6 +14,7 @@ public function create() { return view('auth.login'); } + public function store(AuthenticateUserRequest $request) { $data = $request->validated(); @@ -23,21 +23,20 @@ public function store(AuthenticateUserRequest $request) if ($user->status !== UserStatus::Active->value) { Auth::logout(); + return back()->with('error', 'Your account is not active.'); } $request->session()->regenerate(); - $route = match ($user->role){ + $route = match ($user->role) { UserTypes::Admin->value => 'admin.dashboard', UserTypes::Broker->value => 'broker.dashboard', - UserTypes::User->value=> 'user.dashboard', + UserTypes::User->value => 'user.dashboard', }; return to_route($route); - } - else - { + } else { return back() ->withInput() ->with('error', 'Invalid Credentials'); @@ -49,6 +48,7 @@ public function destroy(Request $request) Auth::logout(); $request->session()->invalidate(); $request->session()->regenerateToken(); + return to_route('home'); } } diff --git a/app/Http/Controllers/Broker/BrokerDashboardController.php b/app/Http/Controllers/Broker/BrokerDashboardController.php index 8a2be20..3424b24 100644 --- a/app/Http/Controllers/Broker/BrokerDashboardController.php +++ b/app/Http/Controllers/Broker/BrokerDashboardController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers\Broker; use App\Http\Controllers\Controller; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; class BrokerDashboardController extends Controller diff --git a/app/Http/Controllers/BrokerDealController.php b/app/Http/Controllers/BrokerDealController.php index ed6e8cd..760f05a 100644 --- a/app/Http/Controllers/BrokerDealController.php +++ b/app/Http/Controllers/BrokerDealController.php @@ -6,7 +6,6 @@ use App\Models\Deal; use App\Models\DealCategory; use App\Services\FileService; -use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Storage; @@ -96,8 +95,10 @@ public function update(StoreBrokerDeal $request, Deal $deal, FileService $fileSe }); } catch (\Throwable $exception) { Log::error($exception->getMessage(), $exception->getTrace()); + return to_route('broker.dashboard')->with('error', 'Something gone wrong.'); } + return to_route('broker.dashboard')->with('success', 'Deal has been updated.'); } @@ -120,6 +121,7 @@ public function destroy(Deal $deal, FileService $fileService) return to_route('broker.dashboard')->with('error', 'Something gone wrong.'); } + return to_route('broker.dashboard')->with('success', 'Deal has been deleted.'); } } diff --git a/app/Http/Controllers/RegisteredUserController.php b/app/Http/Controllers/RegisteredUserController.php index 8ac22c7..0723eee 100644 --- a/app/Http/Controllers/RegisteredUserController.php +++ b/app/Http/Controllers/RegisteredUserController.php @@ -6,7 +6,6 @@ use App\Enums\UserTypes; use App\Http\Requests\StoreRegisterdUser; use App\Models\User; -use Illuminate\Http\Request; class RegisteredUserController extends Controller { @@ -15,12 +14,13 @@ public function create() return view('auth.register'); } - public function store(StoreRegisterdUser $request){ + public function store(StoreRegisterdUser $request) + { $data = $request->validated(); $status = UserStatus::Active->value; - if ($data['role'] === UserTypes::Broker->value){ + if ($data['role'] === UserTypes::Broker->value) { $status = UserStatus::Pending->value; } diff --git a/app/Http/Middleware/HasRole.php b/app/Http/Middleware/HasRole.php index c1bf836..13b28ac 100644 --- a/app/Http/Middleware/HasRole.php +++ b/app/Http/Middleware/HasRole.php @@ -2,10 +2,8 @@ namespace App\Http\Middleware; -use App\Enums\UserTypes; use Closure; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; use Symfony\Component\HttpFoundation\Response; class HasRole @@ -17,10 +15,9 @@ class HasRole */ public function handle(Request $request, Closure $next, string $role): Response { - if($request->user()->role === $role){ + if ($request->user()->role === $role) { return $next($request); - } - else{ + } else { abort('401'); } } diff --git a/database/migrations/2026_01_08_133256_add_additional_fields_to_user.php b/database/migrations/2026_01_08_133256_add_additional_fields_to_user.php index bf5746e..3867eab 100644 --- a/database/migrations/2026_01_08_133256_add_additional_fields_to_user.php +++ b/database/migrations/2026_01_08_133256_add_additional_fields_to_user.php @@ -6,7 +6,8 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class extends Migration { +return new class extends Migration +{ /** * Run the migrations. */ diff --git a/routes/web.php b/routes/web.php index 09db03c..4891c78 100644 --- a/routes/web.php +++ b/routes/web.php @@ -34,5 +34,5 @@ Route::get('dashboard', [BrokerDashboardController::class, 'index'])->name('dashboard'); Route::resource('deals', BrokerDealController::class); - }); + }); });