deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Route cosmetic layout updates, and standardise on using /home to redirect back to the homescreen, and standardise usage of redirect()

Browse Source
This commit is contained in:
Deon George
2025-05-16 13:58:20 +10:00
parent 256e4c6260
commit 8d72c1ceb5
10 changed files with 57 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
routes/web.php
View File

@@ -18,8 +18,7 @@ use App\Http\Controllers\{AdminController,
SearchController,
ServiceController,
SupplierController,
UserController,
Wholesale\ReportController};
UserController};
use App\Models\Supplier;
/*
@@ -42,8 +41,8 @@ Auth::routes([
'confirm' => false, // for additional password confirmations
'verify' => false, // for email verification
]);
Route::get('logout',[LoginController::class,'logout'])
->name('logout-get');
// Auth::routes doesnt provide a get /logout path, so we'll specify it here
Route::get('logout',[LoginController::class,'logout']);
// Frontend Routes (Non-Authed Users)
Route::view('/','theme.frontend.metronic.welcome.home');
@@ -54,21 +53,35 @@ Route::redirect('passkey/loggedin','/u/home');
Route::get('search',[SearchController::class,'search']);
Route::get('pay/paypal/authorise',[PaypalController::class,'authorise']);
Route::get('pay/paypal/cancel',[PaypalController::class,'cancel']);
Route::get('pay/paypal/capture',[PaypalController::class,'capture']);
// Paypal paths
Route::controller(PaypalController::class)
->prefix('pay/paypal')
->group(function() {
Route::get('authorise','authorise');
Route::get('cancel','cancel');
Route::get('capture','capture');
});
// Account linking to OPENID host
Route::get('auth/{socialProvider}',[SocialLoginController::class,'redirectToProvider']);
Route::get('auth/{socialProvider}/callback',[SocialLoginController::class,'handleProviderCallback']);
Route::get('auth/{socialProvider}/token',[SocialLoginController::class,'handleBearerTokenCallback']);
Route::get('auth/{socialProvider}/link',[SocialLoginController::class,'link']);
Route::post('auth/{socialProvider}/linkcomplete',[SocialLoginController::class,'linkcomplete']);
Route::controller(PaypalController::class)
->prefix('auth')
->group(function() {
Route::get('{socialProvider}','redirectToProvider');
Route::get('{socialProvider}/callback','handleProviderCallback');
Route::get('{socialProvider}/token','handleBearerTokenCallback');
Route::get('{socialProvider}/link','link');
Route::post('{socialProvider}/linkcomplete','linkcomplete');
});
// Return from user switch
Route::get('admin/switch/stop',[SwitchUserController::class,'switch_stop'])
// User Switch
Route::controller(SwitchUserController::class)
->prefix('switch')
->middleware('auth')
->name('switch.stop');
->group(function() {
Route::get('stop','switch_stop');
Route::get('start/{user}','switch_start')
->middleware(['role:reseller','can:assume,user']);
});
// Our Admin Routes - for wholesalers
Route::group(['middleware'=>['auth','role:wholesaler'],'prefix'=>'a'],function() {
@@ -137,11 +150,6 @@ Route::group(['middleware'=>['auth','role:wholesaler'],'prefix'=>'a'],function()
// Our Reseller Routes
Route::group(['middleware'=>['auth','role:reseller'],'prefix'=>'r'],function() {
// Enable user switch
Route::get('switch/start/{user}',[SwitchUserController::class,'switch_start'])
->middleware('can:assume,user')
->name('switch.start');
// Reseller Reports
Route::group(['prefix'=>'report'],function() {
Route::view('charge/pending','theme.backend.adminlte.charge.pending');