From 486d8de378f178c6ca2838eff2129ab9afe51229 Mon Sep 17 00:00:00 2001
From: Peter Papp <peterpapp@makingcg.com>
Date: Sun, 28 Feb 2021 16:50:28 +0100
Subject: [PATCH] web routes refactored

---
 routes/web.php              | 34 ++++++++++++++++++++--------------
 tests/Feature/ShareTest.php |  2 ++
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 7b713a97..07de74f8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,33 +1,39 @@
 <?php
 
-Route::post('/stripe/webhook', 'WebhookController@handleWebhook');
+use App\Http\Controllers\Admin\InvoiceController;
+use App\Http\Controllers\AppFunctionsController;
+use App\Http\Controllers\FileAccessController;
+use App\Http\Controllers\Sharing\FileSharingController;
+use App\Http\Controllers\WebhookController;
+
+Route::post('/stripe/webhook', [WebhookController::class, 'handleWebhook']);
 
 // App public files
-Route::get('/avatars/{avatar}', 'FileAccessController@get_avatar')->name('avatar');
-Route::get('/system/{image}', 'FileAccessController@get_system_image');
+Route::get('/avatars/{avatar}', [FileAccessController::class, 'get_avatar'])->name('avatar');
+Route::get('/system/{image}', [FileAccessController::class, 'get_system_image']);
 
 // Get public thumbnails and files
-Route::get('/thumbnail/{name}/public/{token}', 'FileAccessController@get_thumbnail_public');
-Route::get('/file/{name}/public/{token}', 'FileAccessController@get_file_public');
-Route::get('/zip/{id}/public/{token}', 'FileAccessController@get_zip_public')->name('zip_public');
+Route::get('/thumbnail/{name}/public/{token}', [FileAccessController::class, 'get_thumbnail_public']);
+Route::get('/file/{name}/public/{token}', [FileAccessController::class, 'get_file_public']);
+Route::get('/zip/{id}/public/{token}', [FileAccessController::class, 'get_zip_public'])->name('zip_public');
 
 // User master,editor,visitor access to image thumbnails and file downloads
 Route::group(['middleware' => ['auth:api', 'auth.shared', 'auth.master', 'scope:master,editor,visitor']], function () {
-    Route::get('/thumbnail/{name}', 'FileAccessController@get_thumbnail')->name('thumbnail');
-    Route::get('/file/{name}', 'FileAccessController@get_file')->name('file');
-    Route::get('/zip/{id}', 'FileAccessController@get_zip')->name('zip');
+    Route::get('/thumbnail/{name}', [FileAccessController::class, 'get_thumbnail'])->name('thumbnail');
+    Route::get('/file/{name}', [FileAccessController::class, 'get_file'])->name('file');
+    Route::get('/zip/{id}', [FileAccessController::class, 'get_zip'])->name('zip');
 });
 
 // Get user invoice
 Route::group(['middleware' => ['auth:api', 'auth.master', 'scope:master']], function () {
-    Route::get('/invoice/{customer}/{token}', 'Admin\InvoiceController@show');
+    Route::get('/invoice/{customer}/{token}', [InvoiceController::class, 'show']);
 });
 
 // Get og site for web crawlers
-if( Crawler::isCrawler()) {
-    Route::get('/shared/{token}', 'AppFunctionsController@og_site');
+if (Crawler::isCrawler()) {
+    Route::get('/shared/{token}', [AppFunctionsController::class, 'og_site']);
 } else {
-    Route::get('/shared/{token}', 'Sharing\FileSharingController@index');
+    Route::get('/shared/{token}', [FileSharingController::class, 'index']);
 }
 
-Route::get('/{any?}', 'AppFunctionsController@index')->where('any', '.*');
+Route::get('/{any?}', [AppFunctionsController::class, 'index'])->where('any', '.*');
diff --git a/tests/Feature/ShareTest.php b/tests/Feature/ShareTest.php
index 4917ac5d..c122944c 100644
--- a/tests/Feature/ShareTest.php
+++ b/tests/Feature/ShareTest.php
@@ -236,4 +236,6 @@ class ShareTest extends TestCase
             'item_id' => $folder->id
         ]);
     }
+
+    // TODO: napisat testy pre FileSharingController
 }