chore: pint reformat
This commit is contained in:
parent
a248d3fc79
commit
5539f20e44
@ -24,9 +24,11 @@ public function label(): string
|
|||||||
public static function labels(): array
|
public static function labels(): array
|
||||||
{
|
{
|
||||||
$labels = array_map(function ($enum) {
|
$labels = array_map(function ($enum) {
|
||||||
return ['value' => $enum->value, 'label' =>$enum->label()];
|
return ['value' => $enum->value, 'label' => $enum->label()];
|
||||||
}, self::cases());
|
}, 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;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Http\Controllers;
|
namespace App\Http\Controllers;
|
||||||
|
|
||||||
|
|
||||||
use App\Enums\UserStatus;
|
use App\Enums\UserStatus;
|
||||||
use App\Enums\UserTypes;
|
use App\Enums\UserTypes;
|
||||||
use App\Http\Requests\AuthenticateUserRequest;
|
use App\Http\Requests\AuthenticateUserRequest;
|
||||||
@ -15,6 +14,7 @@ public function create()
|
|||||||
{
|
{
|
||||||
return view('auth.login');
|
return view('auth.login');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function store(AuthenticateUserRequest $request)
|
public function store(AuthenticateUserRequest $request)
|
||||||
{
|
{
|
||||||
$data = $request->validated();
|
$data = $request->validated();
|
||||||
@ -23,21 +23,20 @@ public function store(AuthenticateUserRequest $request)
|
|||||||
|
|
||||||
if ($user->status !== UserStatus::Active->value) {
|
if ($user->status !== UserStatus::Active->value) {
|
||||||
Auth::logout();
|
Auth::logout();
|
||||||
|
|
||||||
return back()->with('error', 'Your account is not active.');
|
return back()->with('error', 'Your account is not active.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$request->session()->regenerate();
|
$request->session()->regenerate();
|
||||||
|
|
||||||
$route = match ($user->role){
|
$route = match ($user->role) {
|
||||||
UserTypes::Admin->value => 'admin.dashboard',
|
UserTypes::Admin->value => 'admin.dashboard',
|
||||||
UserTypes::Broker->value => 'broker.dashboard',
|
UserTypes::Broker->value => 'broker.dashboard',
|
||||||
UserTypes::User->value=> 'user.dashboard',
|
UserTypes::User->value => 'user.dashboard',
|
||||||
};
|
};
|
||||||
|
|
||||||
return to_route($route);
|
return to_route($route);
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
return back()
|
return back()
|
||||||
->withInput()
|
->withInput()
|
||||||
->with('error', 'Invalid Credentials');
|
->with('error', 'Invalid Credentials');
|
||||||
@ -49,6 +48,7 @@ public function destroy(Request $request)
|
|||||||
Auth::logout();
|
Auth::logout();
|
||||||
$request->session()->invalidate();
|
$request->session()->invalidate();
|
||||||
$request->session()->regenerateToken();
|
$request->session()->regenerateToken();
|
||||||
|
|
||||||
return to_route('home');
|
return to_route('home');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,7 +3,6 @@
|
|||||||
namespace App\Http\Controllers\Broker;
|
namespace App\Http\Controllers\Broker;
|
||||||
|
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
|
|
||||||
class BrokerDashboardController extends Controller
|
class BrokerDashboardController extends Controller
|
||||||
|
|||||||
@ -6,7 +6,6 @@
|
|||||||
use App\Models\Deal;
|
use App\Models\Deal;
|
||||||
use App\Models\DealCategory;
|
use App\Models\DealCategory;
|
||||||
use App\Services\FileService;
|
use App\Services\FileService;
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
use Illuminate\Support\Facades\Storage;
|
use Illuminate\Support\Facades\Storage;
|
||||||
@ -96,8 +95,10 @@ public function update(StoreBrokerDeal $request, Deal $deal, FileService $fileSe
|
|||||||
});
|
});
|
||||||
} catch (\Throwable $exception) {
|
} catch (\Throwable $exception) {
|
||||||
Log::error($exception->getMessage(), $exception->getTrace());
|
Log::error($exception->getMessage(), $exception->getTrace());
|
||||||
|
|
||||||
return to_route('broker.dashboard')->with('error', 'Something gone wrong.');
|
return to_route('broker.dashboard')->with('error', 'Something gone wrong.');
|
||||||
}
|
}
|
||||||
|
|
||||||
return to_route('broker.dashboard')->with('success', 'Deal has been updated.');
|
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('error', 'Something gone wrong.');
|
||||||
}
|
}
|
||||||
|
|
||||||
return to_route('broker.dashboard')->with('success', 'Deal has been deleted.');
|
return to_route('broker.dashboard')->with('success', 'Deal has been deleted.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,7 +6,6 @@
|
|||||||
use App\Enums\UserTypes;
|
use App\Enums\UserTypes;
|
||||||
use App\Http\Requests\StoreRegisterdUser;
|
use App\Http\Requests\StoreRegisterdUser;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use Illuminate\Http\Request;
|
|
||||||
|
|
||||||
class RegisteredUserController extends Controller
|
class RegisteredUserController extends Controller
|
||||||
{
|
{
|
||||||
@ -15,12 +14,13 @@ public function create()
|
|||||||
return view('auth.register');
|
return view('auth.register');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function store(StoreRegisterdUser $request){
|
public function store(StoreRegisterdUser $request)
|
||||||
|
{
|
||||||
$data = $request->validated();
|
$data = $request->validated();
|
||||||
|
|
||||||
$status = UserStatus::Active->value;
|
$status = UserStatus::Active->value;
|
||||||
|
|
||||||
if ($data['role'] === UserTypes::Broker->value){
|
if ($data['role'] === UserTypes::Broker->value) {
|
||||||
$status = UserStatus::Pending->value;
|
$status = UserStatus::Pending->value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -2,10 +2,8 @@
|
|||||||
|
|
||||||
namespace App\Http\Middleware;
|
namespace App\Http\Middleware;
|
||||||
|
|
||||||
use App\Enums\UserTypes;
|
|
||||||
use Closure;
|
use Closure;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
|
|
||||||
class HasRole
|
class HasRole
|
||||||
@ -17,10 +15,9 @@ class HasRole
|
|||||||
*/
|
*/
|
||||||
public function handle(Request $request, Closure $next, string $role): Response
|
public function handle(Request $request, Closure $next, string $role): Response
|
||||||
{
|
{
|
||||||
if($request->user()->role === $role){
|
if ($request->user()->role === $role) {
|
||||||
return $next($request);
|
return $next($request);
|
||||||
}
|
} else {
|
||||||
else{
|
|
||||||
abort('401');
|
abort('401');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,7 +6,8 @@
|
|||||||
use Illuminate\Database\Schema\Blueprint;
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
use Illuminate\Support\Facades\Schema;
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
return new class extends Migration {
|
return new class extends Migration
|
||||||
|
{
|
||||||
/**
|
/**
|
||||||
* Run the migrations.
|
* Run the migrations.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -34,5 +34,5 @@
|
|||||||
Route::get('dashboard', [BrokerDashboardController::class, 'index'])->name('dashboard');
|
Route::get('dashboard', [BrokerDashboardController::class, 'index'])->name('dashboard');
|
||||||
|
|
||||||
Route::resource('deals', BrokerDealController::class);
|
Route::resource('deals', BrokerDealController::class);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user