From cba1307e4bb4619c27ebe08a70c568a513f3340a Mon Sep 17 00:00:00 2001 From: Nyi Nyi Lwin Date: Mon, 16 Oct 2023 23:12:59 +0700 Subject: [PATCH] chore: update routes --- app/Http/Controllers/BucketController.php | 17 ++++-------- routes/api.php | 32 ++++++++++++++++++++--- routes/web.php | 22 +--------------- 3 files changed, 35 insertions(+), 36 deletions(-) diff --git a/app/Http/Controllers/BucketController.php b/app/Http/Controllers/BucketController.php index 60ba385..3039df3 100644 --- a/app/Http/Controllers/BucketController.php +++ b/app/Http/Controllers/BucketController.php @@ -6,6 +6,7 @@ use App\Http\Requests\UpdateBucketRequest; use App\Models\Bucket; use App\Services\BucketService; +use Illuminate\Database\Eloquent\Collection; class BucketController extends Controller { @@ -16,7 +17,7 @@ public function __construct(private readonly BucketService $service) /** * Display a listing of the resource. */ - public function index() + public function index(): Collection { return $this->service->index(); } @@ -26,23 +27,15 @@ public function index() * * @param CreateBucketRequest $request */ - public function store(CreateBucketRequest $request) + public function store(CreateBucketRequest $request): void { $this->service->store($request); } - /** - * Display the specified resource. - */ - public function show(Bucket $bucket) - { - $this->service->findById($bucket->getKey()); - } - /** * Update the specified resource in storage. */ - public function update(UpdateBucketRequest $request, Bucket $bucket) + public function update(UpdateBucketRequest $request, Bucket $bucket): void { $this->service->update($request, $bucket->getKey()); } @@ -50,7 +43,7 @@ public function update(UpdateBucketRequest $request, Bucket $bucket) /** * Remove the specified resource from storage. */ - public function destroy(Bucket $bucket) + public function destroy(Bucket $bucket): void { $this->service->destroy($bucket->getKey()); } diff --git a/routes/api.php b/routes/api.php index 889937e..9414129 100644 --- a/routes/api.php +++ b/routes/api.php @@ -1,6 +1,7 @@ get('/user', function (Request $request) { - return $request->user(); +Route::group([ + 'prefix' => 'buckets' +], function () { + Route::apiResource('', BucketController::class, [ + 'names' => [ + 'index' => 'buckets.index', + 'store' => 'buckets.store', + 'update' => 'buckets.update', + 'destroy' => 'buckets.destroy', + ], + 'except' => [ + 'show' + ] + ]); + + Route::get('{bucket}/files', [FileManagerController::class, 'getFiles'])->name('buckets.files'); + Route::post('{bucket}/folders', [FileManagerController::class, 'createFolder'])->name('buckets.folders.create'); + + Route::post('{bucket}/visibility', [FileManagerController::class, 'setVisibility'])->name('buckets.visibility'); + Route::get('{bucket}/download', [FileManagerController::class, 'download'])->name('buckets.download'); + + Route::post('{bucket}/files/upload', [FileManagerController::class, 'uploadFile'])->name('buckets.files.upload'); + Route::delete('{bucket}/files/delete', [FileManagerController::class, 'deleteFile'])->name('buckets.files.delete'); + Route::delete('{bucket}/folders/delete', [FileManagerController::class, 'deleteFolder'])->name('buckets.folders.delete'); + + Route::post('{bucket}/rename', [FileManagerController::class, 'rename'])->name('buckets.rename'); + Route::post('files/move', [FileManagerController::class, 'moveFile'])->name('buckets.files.move'); }); diff --git a/routes/web.php b/routes/web.php index 31adb22..0175394 100644 --- a/routes/web.php +++ b/routes/web.php @@ -19,24 +19,4 @@ Route::any('/tus/{any?}', function () { return app('tus-server')->send(); -})->where('any', '.*') - ->name('tus.url'); - -Route::group(['prefix' => 'api'], function () { - Route::apiResource('buckets', BucketController::class); - - Route::get('buckets/{bucket}/files', [FileManagerController::class, 'getFiles'])->name('buckets.files'); - - Route::post('buckets/{bucket}/folders', [FileManagerController::class, 'createFolder'])->name('buckets.folders.create'); - - Route::post('buckets/{bucket}/visibility', [FileManagerController::class, 'setVisibility'])->name('buckets.visibility'); - Route::get('buckets/{bucket}/download', [FileManagerController::class, 'download'])->name('buckets.download'); - - Route::post('buckets/{bucket}/files/upload', [FileManagerController::class, 'uploadFile'])->name('buckets.files.upload'); - Route::delete('buckets/{bucket}/files/delete', [FileManagerController::class, 'deleteFile'])->name('buckets.files.delete'); - Route::delete('buckets/{bucket}/folders/delete', [FileManagerController::class, 'deleteFolder'])->name('buckets.folders.delete'); - - Route::post('buckets/{bucket}/rename', [FileManagerController::class, 'rename'])->name('buckets.rename'); - - Route::post('buckets/files/move', [FileManagerController::class, 'moveFile'])->name('buckets.files.move'); -}); +})->where('any', '.*')->name('tus.url');