From c67f39ee44cfbe6b56d4618193f1d0897ed5337b Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 30 Mar 2023 14:15:23 +0000 Subject: [PATCH] Adopt class based routes --- app/Providers/RouteServiceProvider.php | 12 ------------ routes/api.php | 8 ++++---- routes/web.php | 4 ++-- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 68c30279c..316c32790 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -7,15 +7,6 @@ use Illuminate\Support\Facades\Route; class RouteServiceProvider extends ServiceProvider { - /** - * This namespace is applied to your controller routes. - * - * In addition, it is set as the URL generator's root namespace. - * - * @var string - */ - protected $namespace = 'App\Http\Controllers'; - public const HOME = '/'; /** @@ -54,7 +45,6 @@ class RouteServiceProvider extends ServiceProvider protected function mapWebRoutes() { Route::middleware('web') - ->namespace($this->namespace) ->group(base_path('routes/web.php')); } @@ -69,7 +59,6 @@ class RouteServiceProvider extends ServiceProvider { Route::prefix('api') ->middleware('api') - ->namespace($this->namespace) ->group(base_path('routes/api.php')); } @@ -84,7 +73,6 @@ class RouteServiceProvider extends ServiceProvider { Route::prefix('rss') ->middleware('api') - ->namespace($this->namespace) ->group(base_path('routes/rss.php')); } } diff --git a/routes/api.php b/routes/api.php index 93ab7da2d..c57a8105f 100644 --- a/routes/api.php +++ b/routes/api.php @@ -15,17 +15,17 @@ use App\Http\Controllers\Api\ApiController; use App\Http\Controllers\Api\ApiInformController; use App\Http\Controllers\Api\ApiV2Controller; -Route::prefix('v1')->namespace('Api')->group(function () { +Route::prefix('v1')->group(function () { Route::get('api', [ApiController::class, 'api']); Route::post('api', [ApiController::class, 'api']); }); -Route::prefix('v2')->namespace('Api')->group(function () { +Route::prefix('v2')->group(function () { Route::get('capabilities', [ApiV2Controller::class, 'capabilities']); Route::post('capabilities', [ApiV2Controller::class, 'capabilities']); }); -Route::prefix('v2')->namespace('Api')->middleware('auth:api', 'throttle:rate_limit,1')->group(function () { +Route::prefix('v2')->middleware('auth:api', 'throttle:rate_limit,1')->group(function () { Route::get('movies', [ApiV2Controller::class, 'movie']); Route::post('movies', [ApiV2Controller::class, 'movie']); Route::get('search', [ApiV2Controller::class, 'apiSearch']); @@ -38,7 +38,7 @@ Route::prefix('v2')->namespace('Api')->middleware('auth:api', 'throttle:rate_lim Route::post('details', [ApiV2Controller::class, 'details']); }); -Route::prefix('inform')->namespace('Api')->middleware('auth:api')->group(function () { +Route::prefix('inform')->middleware('auth:api')->group(function () { Route::get('release', [ApiInformController::class, 'release']); Route::post('release', [ApiInformController::class, 'release']); }); diff --git a/routes/web.php b/routes/web.php index a5051cf26..881372736 100644 --- a/routes/web.php +++ b/routes/web.php @@ -247,7 +247,7 @@ Route::get('forum-delete/{id}', [ForumController::class, 'destroy'])->middleware Route::post('forum-delete/{id}', [ForumController::class, 'destroy'])->middleware('role:Admin'); -Route::middleware('role:Admin', '2fa')->prefix('admin')->namespace('Admin')->group(function () { +Route::middleware('role:Admin', '2fa')->prefix('admin')->group(function () { Route::get('index', [AdminPageController::class, 'index']); Route::get('anidb-delete/{id}', [AdminAnidbController::class, 'destroy']); Route::post('anidb-delete/{id}', [AdminAnidbController::class, 'destroy']); @@ -366,7 +366,7 @@ Route::middleware('role:Admin', '2fa')->prefix('admin')->namespace('Admin')->gro Route::post('group-list-inactive', [AdminGroupController::class, 'inactive']); }); -Route::middleware('role_or_permission:Admin|Moderator|edit release')->prefix('admin')->namespace('Admin')->group(function () { +Route::middleware('role_or_permission:Admin|Moderator|edit release')->prefix('admin')->group(function () { Route::get('release-edit', [AdminReleasesController::class, 'edit']); Route::post('release-edit', [AdminReleasesController::class, 'edit']); });