diff --git a/routes/admin.php b/routes/admin.php index 476130b49..f82188205 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -14,7 +14,7 @@ Route::get('/', [Admin\BaseController::class, 'index'])->name('admin.index'); | Endpoint: /admin/api | */ -Route::group(['prefix' => 'api'], function () { +Route::prefix('api')->group(function () { Route::get('/', [Admin\ApiController::class, 'index'])->name('admin.api.index'); Route::get('/new', [Admin\ApiController::class, 'create'])->name('admin.api.new'); @@ -31,7 +31,7 @@ Route::group(['prefix' => 'api'], function () { | Endpoint: /admin/databases | */ -Route::group(['prefix' => 'databases'], function () { +Route::prefix('databases')->group(function () { Route::get('/', [Admin\DatabaseController::class, 'index'])->name('admin.databases'); Route::get('/view/{host:id}', [Admin\DatabaseController::class, 'view'])->name('admin.databases.view'); @@ -48,7 +48,7 @@ Route::group(['prefix' => 'databases'], function () { | Endpoint: /admin/settings | */ -Route::group(['prefix' => 'settings'], function () { +Route::prefix('settings')->group(function () { Route::get('/', [Admin\Settings\IndexController::class, 'index'])->name('admin.settings'); Route::get('/mail', [Admin\Settings\MailController::class, 'index'])->name('admin.settings.mail'); Route::get('/advanced', [Admin\Settings\AdvancedController::class, 'index'])->name('admin.settings.advanced'); @@ -68,7 +68,7 @@ Route::group(['prefix' => 'settings'], function () { | Endpoint: /admin/users | */ -Route::group(['prefix' => 'users'], function () { +Route::prefix('users')->group(function () { Route::get('/', [Admin\UserController::class, 'index'])->name('admin.users'); Route::get('/accounts.json', [Admin\UserController::class, 'json'])->name('admin.users.json'); Route::get('/new', [Admin\UserController::class, 'create'])->name('admin.users.new'); @@ -88,12 +88,12 @@ Route::group(['prefix' => 'users'], function () { | Endpoint: /admin/servers | */ -Route::group(['prefix' => 'servers'], function () { +Route::prefix('servers')->group(function () { Route::get('/', [Admin\Servers\ServerController::class, 'index'])->name('admin.servers'); Route::get('/new', [Admin\Servers\CreateServerController::class, 'index'])->name('admin.servers.new'); Route::get('/view/{server:id}', [Admin\Servers\ServerViewController::class, 'index'])->name('admin.servers.view'); - Route::group(['middleware' => [ServerInstalled::class]], function () { + Route::middleware(ServerInstalled::class)->group(function () { Route::get('/view/{server:id}/details', [Admin\Servers\ServerViewController::class, 'details'])->name('admin.servers.view.details'); Route::get('/view/{server:id}/build', [Admin\Servers\ServerViewController::class, 'build'])->name('admin.servers.view.build'); Route::get('/view/{server:id}/startup', [Admin\Servers\ServerViewController::class, 'startup'])->name('admin.servers.view.startup'); @@ -131,7 +131,7 @@ Route::group(['prefix' => 'servers'], function () { | Endpoint: /admin/nodes | */ -Route::group(['prefix' => 'nodes'], function () { +Route::prefix('nodes')->group(function () { Route::get('/', [Admin\Nodes\NodeController::class, 'index'])->name('admin.nodes'); Route::get('/new', [Admin\NodesController::class, 'create'])->name('admin.nodes.new'); Route::get('/view/{node:id}', [Admin\Nodes\NodeViewController::class, 'index'])->name('admin.nodes.view'); @@ -162,7 +162,7 @@ Route::group(['prefix' => 'nodes'], function () { | Endpoint: /admin/mounts | */ -Route::group(['prefix' => 'mounts'], function () { +Route::prefix('mounts')->group(function () { Route::get('/', [Admin\MountController::class, 'index'])->name('admin.mounts'); Route::get('/view/{mount:id}', [Admin\MountController::class, 'view'])->name('admin.mounts.view'); @@ -184,7 +184,7 @@ Route::group(['prefix' => 'mounts'], function () { | Endpoint: /admin/eggs | */ -Route::group(['prefix' => 'eggs'], function () { +Route::prefix('eggs')->group(function () { Route::controller(Admin\Eggs\EggController::class)->group(function () { Route::get('/', 'index')->name('admin.eggs'); Route::get('/new', 'create')->name('admin.eggs.new'); diff --git a/routes/api-application.php b/routes/api-application.php index 35a5b43df..983a9a493 100644 --- a/routes/api-application.php +++ b/routes/api-application.php @@ -11,7 +11,7 @@ use App\Http\Controllers\Api\Application; | Endpoint: /api/application/users | */ -Route::group(['prefix' => '/users'], function () { +Route::prefix('/users')->group(function () { Route::get('/', [Application\Users\UserController::class, 'index'])->name('api.application.users'); Route::get('/{user:id}', [Application\Users\UserController::class, 'view'])->name('api.application.users.view'); Route::get('/external/{external_id}', [Application\Users\ExternalUserController::class, 'index'])->name('api.application.users.external'); @@ -30,7 +30,7 @@ Route::group(['prefix' => '/users'], function () { | Endpoint: /api/application/nodes | */ -Route::group(['prefix' => '/nodes'], function () { +Route::prefix('/nodes')->group(function () { Route::get('/', [Application\Nodes\NodeController::class, 'index'])->name('api.application.nodes'); Route::get('/deployable', Application\Nodes\NodeDeploymentController::class); Route::get('/{node:id}', [Application\Nodes\NodeController::class, 'view'])->name('api.application.nodes.view'); @@ -41,7 +41,7 @@ Route::group(['prefix' => '/nodes'], function () { Route::delete('/{node:id}', [Application\Nodes\NodeController::class, 'delete']); - Route::group(['prefix' => '/{node:id}/allocations'], function () { + Route::prefix('/{node:id}/allocations')->group(function () { Route::get('/', [Application\Nodes\AllocationController::class, 'index'])->name('api.application.allocations'); Route::post('/', [Application\Nodes\AllocationController::class, 'store']); Route::delete('/{allocation:id}', [Application\Nodes\AllocationController::class, 'delete'])->name('api.application.allocations.view'); @@ -56,7 +56,7 @@ Route::group(['prefix' => '/nodes'], function () { | Endpoint: /api/application/servers | */ -Route::group(['prefix' => '/servers'], function () { +Route::prefix('/servers')->group(function () { Route::get('/', [Application\Servers\ServerController::class, 'index'])->name('api.application.servers'); Route::get('/{server:id}', [Application\Servers\ServerController::class, 'view'])->name('api.application.servers.view'); Route::get('/external/{external_id}', [Application\Servers\ExternalServerController::class, 'index'])->name('api.application.servers.external'); @@ -74,7 +74,7 @@ Route::group(['prefix' => '/servers'], function () { Route::delete('/{server:id}/{force?}', [Application\Servers\ServerController::class, 'delete']); // Database Management Endpoint - Route::group(['prefix' => '/{server:id}/databases'], function () { + Route::prefix('/{server:id}/databases')->group(function () { Route::get('/', [Application\Servers\DatabaseController::class, 'index'])->name('api.application.servers.databases'); Route::get('/{database:id}', [Application\Servers\DatabaseController::class, 'view'])->name('api.application.servers.databases.view'); @@ -93,7 +93,7 @@ Route::group(['prefix' => '/servers'], function () { | Endpoint: /api/application/eggs | */ -Route::group(['prefix' => '/eggs'], function () { +Route::prefix('/eggs')->group(function () { Route::get('/', [Application\Eggs\EggController::class, 'index'])->name('api.application.eggs.eggs'); Route::get('/{egg:id}', [Application\Eggs\EggController::class, 'view'])->name('api.application.eggs.eggs.view'); }); diff --git a/routes/api-client.php b/routes/api-client.php index 740871e81..af20e9bd4 100644 --- a/routes/api-client.php +++ b/routes/api-client.php @@ -51,14 +51,7 @@ Route::prefix('/account')->middleware(AccountSubject::class)->group(function () | Endpoint: /api/client/servers/{server} | */ -Route::group([ - 'prefix' => '/servers/{server}', - 'middleware' => [ - ServerSubject::class, - AuthenticateServerAccess::class, - ResourceBelongsToServer::class, - ], -], function () { +Route::prefix('/servers/{server}')->middleware(ServerSubject::class, AuthenticateServerAccess::class, ResourceBelongsToServer::class)->group(function () { Route::get('/', [Client\Servers\ServerController::class, 'index'])->name('api:client:server.view'); Route::get('/websocket', Client\Servers\WebsocketController::class)->name('api:client:server.ws'); Route::get('/resources', Client\Servers\ResourceUtilizationController::class)->name('api:client:server.resources'); @@ -67,14 +60,14 @@ Route::group([ Route::post('/command', [Client\Servers\CommandController::class, 'index']); Route::post('/power', [Client\Servers\PowerController::class, 'index']); - Route::group(['prefix' => '/databases'], function () { + Route::prefix('/databases')->group(function () { Route::get('/', [Client\Servers\DatabaseController::class, 'index']); Route::post('/', [Client\Servers\DatabaseController::class, 'store']); Route::post('/{database}/rotate-password', [Client\Servers\DatabaseController::class, 'rotatePassword']); Route::delete('/{database}', [Client\Servers\DatabaseController::class, 'delete']); }); - Route::group(['prefix' => '/files'], function () { + Route::prefix('/files')->group(function () { Route::get('/list', [Client\Servers\FileController::class, 'directory']); Route::get('/contents', [Client\Servers\FileController::class, 'contents']); Route::get('/download', [Client\Servers\FileController::class, 'download']); @@ -90,7 +83,7 @@ Route::group([ Route::get('/upload', Client\Servers\FileUploadController::class); }); - Route::group(['prefix' => '/schedules'], function () { + Route::prefix('/schedules')->group(function () { Route::get('/', [Client\Servers\ScheduleController::class, 'index']); Route::post('/', [Client\Servers\ScheduleController::class, 'store']); Route::get('/{schedule}', [Client\Servers\ScheduleController::class, 'view']); @@ -103,7 +96,7 @@ Route::group([ Route::delete('/{schedule}/tasks/{task}', [Client\Servers\ScheduleTaskController::class, 'delete']); }); - Route::group(['prefix' => '/network'], function () { + Route::prefix('/network')->group(function () { Route::get('/allocations', [Client\Servers\NetworkAllocationController::class, 'index']); Route::post('/allocations', [Client\Servers\NetworkAllocationController::class, 'store']); Route::post('/allocations/{allocation}', [Client\Servers\NetworkAllocationController::class, 'update']); @@ -111,7 +104,7 @@ Route::group([ Route::delete('/allocations/{allocation}', [Client\Servers\NetworkAllocationController::class, 'delete']); }); - Route::group(['prefix' => '/users'], function () { + Route::prefix('/users')->group(function () { Route::get('/', [Client\Servers\SubuserController::class, 'index']); Route::post('/', [Client\Servers\SubuserController::class, 'store']); Route::get('/{user}', [Client\Servers\SubuserController::class, 'view']); @@ -119,7 +112,7 @@ Route::group([ Route::delete('/{user}', [Client\Servers\SubuserController::class, 'delete']); }); - Route::group(['prefix' => '/backups'], function () { + Route::prefix('/backups')->group(function () { Route::get('/', [Client\Servers\BackupController::class, 'index']); Route::post('/', [Client\Servers\BackupController::class, 'store']); Route::get('/{backup}', [Client\Servers\BackupController::class, 'view']); @@ -129,12 +122,12 @@ Route::group([ Route::delete('/{backup}', [Client\Servers\BackupController::class, 'delete']); }); - Route::group(['prefix' => '/startup'], function () { + Route::prefix('/startup')->group(function () { Route::get('/', [Client\Servers\StartupController::class, 'index']); Route::put('/variable', [Client\Servers\StartupController::class, 'update']); }); - Route::group(['prefix' => '/settings'], function () { + Route::prefix('/settings')->group(function () { Route::post('/rename', [Client\Servers\SettingsController::class, 'rename']); Route::post('/reinstall', [Client\Servers\SettingsController::class, 'reinstall']); Route::put('/docker-image', [Client\Servers\SettingsController::class, 'dockerImage']); diff --git a/routes/api-remote.php b/routes/api-remote.php index 08d10b654..d7b63c097 100644 --- a/routes/api-remote.php +++ b/routes/api-remote.php @@ -10,7 +10,7 @@ Route::get('/servers', [Remote\Servers\ServerDetailsController::class, 'list']); Route::post('/servers/reset', [Remote\Servers\ServerDetailsController::class, 'resetState']); Route::post('/activity', Remote\ActivityProcessingController::class); -Route::group(['prefix' => '/servers/{server:uuid}'], function () { +Route::prefix('/servers/{server:uuid}')->group(function () { Route::get('/', Remote\Servers\ServerDetailsController::class); Route::get('/install', [Remote\Servers\ServerInstallController::class, 'index']); Route::post('/install', [Remote\Servers\ServerInstallController::class, 'store']); @@ -21,7 +21,7 @@ Route::group(['prefix' => '/servers/{server:uuid}'], function () { Route::post('/transfer/success', [Remote\Servers\ServerTransferController::class, 'success']); }); -Route::group(['prefix' => '/backups'], function () { +Route::prefix('/backups')->group(function () { Route::get('/{backup}', Remote\Backups\BackupRemoteUploadController::class); Route::post('/{backup}', [Remote\Backups\BackupStatusController::class, 'index']); Route::post('/{backup}/restore', [Remote\Backups\BackupStatusController::class, 'restore']);