controller refactoring part 5

routes/admin.php

@@ -1,12 +1,12 @@
 <?php
 
 use Domain\Admin\Controllers\UserController;
-use Domain\Pages\Controllers\PagesController;
 use Domain\Plans\Controllers\PlansController;
 use Domain\Admin\Controllers\InvoiceController;
 use Domain\Admin\Controllers\DashboardController;
-use Domain\Settings\Controllers\SettingController;
+use Domain\Pages\Controllers\AdminPagesController;
 use Domain\Localization\Controllers\LanguageController;
+use Domain\Settings\Controllers\AdminSettingsController;
 
 // Dashboard
 Route::group(['prefix' => 'dashboard'], function () {
@@ -40,9 +40,9 @@ Route::group(['prefix' => 'plans'], function () {
 
 // Pages
 Route::group(['prefix' => 'pages'], function () {
-    Route::patch('/{page}', [PagesController::class, 'update']);
-    Route::get('/{page}', [PagesController::class, 'show']);
-    Route::get('/', [PagesController::class, 'index']);
+    Route::patch('/{page}', [AdminPagesController::class, 'update']);
+    Route::get('/{page}', [AdminPagesController::class, 'show']);
+    Route::get('/', [AdminPagesController::class, 'index']);
 });
 
 // Invoices
@@ -50,11 +50,11 @@ Route::get('/invoices', [InvoiceController::class, 'index']);
 
 // Settings
 Route::group(['prefix' => 'settings'], function () {
-    Route::get('/flush-cache', [SettingController::class, 'flush_cache']);
-    Route::post('/stripe', [SettingController::class, 'set_stripe']);
-    Route::post('/email', [SettingController::class, 'set_email']);
-    Route::patch('/', [SettingController::class, 'update']);
-    Route::get('/', [SettingController::class, 'show']);
+    Route::get('/flush-cache', [AdminSettingsController::class, 'flush_cache']);
+    Route::post('/stripe', [AdminSettingsController::class, 'set_stripe']);
+    Route::post('/email', [AdminSettingsController::class, 'set_email']);
+    Route::patch('/', [AdminSettingsController::class, 'update']);
+    Route::get('/', [AdminSettingsController::class, 'show']);
 });
 
 // Language

routes/api.php

@@ -1,7 +1,8 @@
 <?php
 
 use App\Users\Actions\CreateNewUserAction;
-use Domain\Homepage\Controllers\SendContactMessageController;
+use Domain\Files\Controllers\UploadFilesController;
+use Domain\Pages\Controllers\PagesController;
 use Domain\Sharing\Controllers\ShareController;
 use Domain\Items\Controllers\EditItemsController;
 use Domain\Trash\Controllers\DumpTrashController;
@@ -9,23 +10,31 @@ use App\Users\Controllers\ResetPasswordController;
 use Domain\Zipping\Controllers\ZipFilesController;
 use App\Users\Controllers\ForgotPasswordController;
 use Domain\Folders\Controllers\FavouriteController;
+use Domain\Plans\Controllers\ActivePlansController;
+use Domain\Settings\Controllers\SettingsController;
 use Domain\Zipping\Controllers\ZipFolderController;
-use Domain\Homepage\Controllers\AppFunctionsController;
+use Domain\Folders\Controllers\CreateFolderController;
 use Domain\Sharing\Controllers\ShareViaEmailController;
 use Domain\Trash\Controllers\RestoreTrashContentController;
 use Domain\Browsing\Controllers\BrowseLatestFilesController;
 use Domain\Browsing\Controllers\BrowseSharedItemsController;
 use Domain\Browsing\Controllers\BrowseTrashContentController;
+use Domain\Homepage\Controllers\SendContactMessageController;
 use Domain\Browsing\Controllers\BrowseFolderContentController;
 use Domain\Folders\Controllers\NavigationFolderTreeController;
 use Domain\Browsing\Controllers\SearchFilesAndFoldersController;
 use Domain\Browsing\Controllers\BrowseParticipantsUploadsController;
 
 // Pages
-Route::get('/content', [AppFunctionsController::class, 'get_setting_columns']);
+Route::apiResource('/page', PagesController::class);
+
+// Homepage
 Route::post('/contact', SendContactMessageController::class);
-Route::get('/page/{page}', [AppFunctionsController::class, 'get_page']);
-Route::get('/pricing', [AppFunctionsController::class, 'get_storage_plans']);
+Route::get('/pricing', ActivePlansController::class);
+Route::get('/settings', SettingsController::class);
+
+// Register user
+Route::post('/register', CreateNewUserAction::class);
 
 // Password reset
 Route::group(['prefix' => 'password'], function () {
@@ -33,9 +42,6 @@ Route::group(['prefix' => 'password'], function () {
     Route::post('/reset', [ResetPasswordController::class, 'reset']);
 });
 
-// Register user
-Route::post('/register', CreateNewUserAction::class);
-
 // User master Routes
 Route::group(['middleware' => ['auth:sanctum']], function () {
     // Browse
@@ -55,24 +61,25 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
         Route::delete('/dump', DumpTrashController::class);
     });
 
+    // Share
+    Route::group(['prefix' => 'share'], function () {
+        Route::post('/{token}/email', ShareViaEmailController::class);
+        Route::apiResource('/', ShareController::class);
+    });
+
     // Favourites
     Route::apiResource('/folders/favourites', FavouriteController::class);
-
-    // Share
-    Route::post('/share/{token}/email', ShareViaEmailController::class);
-    Route::apiResource('/share', ShareController::class);
 });
 
 // User master,editor routes
 Route::group(['middleware' => ['auth:sanctum']], function () {
-    Route::post('/create-folder', [EditItemsController::class, 'create_folder']);
+    Route::post('/create-folder', CreateFolderController::class);
+    Route::post('/upload', UploadFilesController::class);
+
     Route::patch('/rename/{id}', [EditItemsController::class, 'rename_item']);
     Route::post('/remove', [EditItemsController::class, 'delete_item']);
-    Route::post('/upload', [EditItemsController::class, 'upload']);
     Route::post('/move', [EditItemsController::class, 'move']);
 
-    Route::group(['prefix' => '/zip'], function () {
-        Route::post('/files', ZipFilesController::class);
-        Route::get('/folder/{id}', ZipFolderController::class);
-    });
+    Route::get('/zip/folder/{id}', ZipFolderController::class);
+    Route::post('/zip/files', ZipFilesController::class);
 });

routes/web.php

@@ -2,11 +2,11 @@
 
 use Domain\Admin\Controllers\InvoiceController;
 use Domain\Homepage\Controllers\IndexController;
-use Domain\Localization\Controllers\CurrentLocalizationController;
 use Domain\Sharing\Controllers\BrowseShareController;
 use Domain\Homepage\Controllers\AppFunctionsController;
 use Domain\SetupWizard\Controllers\SetupWizardController;
 use Domain\Subscriptions\Controllers\StripeWebhookController;
+use Domain\Localization\Controllers\CurrentLocalizationController;
 
 Route::post('/stripe/webhook', [StripeWebhookController::class, 'handleWebhook']);
 Route::post('/admin-setup', [SetupWizardController::class, 'create_admin_account']);