nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-28 11:00:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

controller refactoring part 22

Browse Source
This commit is contained in:
Peter Papp
2021-07-21 17:21:19 +02:00
parent d55f5c3b41
commit 9fb9b8a1b0
32 changed files with 105 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Domain/Items/Controllers/DeleteFileOrFolderController.php
+8 -9
View File
@@ -1,14 +1,11 @@
<?php
namespace Domain\Items\Controllers;
use App\Http\Controllers\Controller;
use Auth;
use Domain\Items\Actions\DeleteFileOrFolderAction;
use Domain\Items\Requests\DeleteItemRequest;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use Domain\Items\Requests\DeleteItemRequest;
use Domain\Items\Actions\DeleteFileOrFolderAction;
class DeleteFileOrFolderController extends Controller
{
@@ -18,9 +15,11 @@ class DeleteFileOrFolderController extends Controller
public function __invoke(
DeleteItemRequest $request,
DeleteFileOrFolderAction $deleteFileOrFolder,
): Response{
): Response {
abort_if(
is_demo_account(Auth::user()?->email), 204, 'Done.'
is_demo_account(Auth::user()?->email),
204,
'Done.'
);
foreach ($request->input('items') as $item) {
@@ -29,4 +28,4 @@ class DeleteFileOrFolderController extends Controller
return response('Done', 204);
}
}
}
src/Domain/Items/Controllers/MoveFileOrFolderController.php
+9 -13
View File
@@ -1,17 +1,11 @@
<?php
namespace Domain\Items\Controllers;
use App\Http\Controllers\Controller;
use Auth;
use Domain\Files\Models\File as UserFile;
use Domain\Folders\Models\Folder;
use Domain\Items\Actions\MoveFileOrFolderAction;
use Domain\Items\Requests\MoveItemRequest;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use Domain\Items\Requests\MoveItemRequest;
use Domain\Items\Actions\MoveFileOrFolderAction;
class MoveFileOrFolderController extends Controller
{
@@ -22,15 +16,17 @@ class MoveFileOrFolderController extends Controller
MoveItemRequest $request,
MoveFileOrFolderAction $moveFileOrFolder,
): Response {
abort_if(
is_demo_account(Auth::user()?->email), 204, 'Done.'
is_demo_account(Auth::user()?->email),
204,
'Done.'
);
($moveFileOrFolder)(
$request, $request->input('to_id')
$request,
$request->input('to_id')
);
return response('Done!', 204);
}
}
}
src/Domain/Items/Controllers/RenameFileOrFolderController.php
+7 -11
View File
@@ -1,15 +1,12 @@
<?php
namespace Domain\Items\Controllers;
use App\Http\Controllers\Controller;
use Auth;
use Domain\Folders\Actions\UpdateFolderPropertyAction;
use Domain\Items\Actions\RenameFileOrFolderAction;
use Domain\Items\Requests\RenameItemRequest;
use App\Http\Controllers\Controller;
use Illuminate\Database\Eloquent\Model;
use Domain\Items\Requests\RenameItemRequest;
use Domain\Items\Actions\RenameFileOrFolderAction;
use Domain\Folders\Actions\UpdateFolderPropertyAction;
use Support\Demo\Actions\FakeRenameFileOrFolderAction;
class RenameFileOrFolderController extends Controller
@@ -23,18 +20,17 @@ class RenameFileOrFolderController extends Controller
RenameFileOrFolderAction $renameFileOrFolder,
UpdateFolderPropertyAction $updateFolderProperty,
FakeRenameFileOrFolderAction $fakeRenameFileOrFolder,
): Model|array {
): Model | array {
if (is_demo_account(Auth::user()->email)) {
return ($fakeRenameFileOrFolder)($request, $id);
}
// If request contain icon or color, then change it
if ($request->filled('emoji') || $request->filled('color')) {
($updateFolderProperty)($request, $id);
($updateFolderProperty)($request, $id);
}
// Rename Item
return ($renameFileOrFolder)($request, $id);
}
}
}
src/Domain/Items/Controllers/VisitorDeleteFileOrFolderController.php
+10 -12
View File
@@ -1,16 +1,12 @@
<?php
namespace Domain\Items\Controllers;
use App\Http\Controllers\Controller;
use Domain\Items\Actions\DeleteFileOrFolderAction;
use Domain\Items\Actions\MoveFileOrFolderAction;
use Domain\Items\Requests\DeleteItemRequest;
use Domain\Sharing\Models\Share;
use Illuminate\Http\Response;
use Domain\Sharing\Models\Share;
use Support\Services\HelperService;
use App\Http\Controllers\Controller;
use Domain\Items\Requests\DeleteItemRequest;
use Domain\Items\Actions\DeleteFileOrFolderAction;
/**
* Delete item for guest user with edit permission
@@ -20,15 +16,17 @@ class VisitorDeleteFileOrFolderController extends Controller
public function __construct(
private HelperService $helper,
private DeleteFileOrFolderAction $deleteFileOrFolder,
) {}
) {
}
public function __invoke(
DeleteItemRequest $request,
Share $shared,
): Response {
abort_if(
is_demo_account($shared->user->email), 204, 'Done.'
is_demo_account($shared->user->email),
204,
'Done.'
);
// Check ability to access protected share record
@@ -56,4 +54,4 @@ class VisitorDeleteFileOrFolderController extends Controller
return response('Done', 204);
}
}
}
src/Domain/Items/Controllers/VisitorMoveFileOrFolderController.php
+10 -11
View File
@@ -1,16 +1,13 @@
<?php
namespace Domain\Items\Controllers;
use App\Http\Controllers\Controller;
use Domain\Files\Models\File;
use Domain\Items\Actions\MoveFileOrFolderAction;
use Domain\Items\Requests\MoveItemRequest;
use Domain\Sharing\Models\Share;
use Illuminate\Http\Response;
use Domain\Sharing\Models\Share;
use Support\Services\HelperService;
use App\Http\Controllers\Controller;
use Domain\Items\Requests\MoveItemRequest;
use Domain\Items\Actions\MoveFileOrFolderAction;
/**
* Move item for guest user with edit permission
@@ -20,15 +17,17 @@ class VisitorMoveFileOrFolderController extends Controller
public function __construct(
private HelperService $helper,
private MoveFileOrFolderAction $moveFileOrFolder,
) {}
) {
}
public function __invoke(
MoveItemRequest $request,
Share $shared,
): Response {
abort_if(
is_demo_account($shared->user->email), 204, 'Done.'
is_demo_account($shared->user->email),
204,
'Done.'
);
// Check ability to access protected share record
@@ -61,4 +60,4 @@ class VisitorMoveFileOrFolderController extends Controller
return response('Done!', 204);
}
}
}
src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php
+9 -12
View File
@@ -1,17 +1,14 @@
<?php
namespace Domain\Items\Controllers;
use App\Http\Controllers\Controller;
use Domain\Folders\Actions\UpdateFolderPropertyAction;
use Domain\Items\Actions\RenameFileOrFolderAction;
use Domain\Items\Requests\RenameItemRequest;
use Domain\Sharing\Models\Share;
use Illuminate\Http\Response;
use Support\Demo\Actions\FakeRenameFileOrFolderAction;
use Domain\Sharing\Models\Share;
use Support\Services\HelperService;
use App\Http\Controllers\Controller;
use Domain\Items\Requests\RenameItemRequest;
use Domain\Items\Actions\RenameFileOrFolderAction;
use Domain\Folders\Actions\UpdateFolderPropertyAction;
use Support\Demo\Actions\FakeRenameFileOrFolderAction;
/**
* Rename item for guest user with edit permission
@@ -23,14 +20,14 @@ class VisitorRenameFileOrFolderController extends Controller
private RenameFileOrFolderAction $renameFileOrFolder,
private UpdateFolderPropertyAction $updateFolderProperty,
private FakeRenameFileOrFolderAction $fakeRenameFileOrFolder,
) {}
) {
}
public function __invoke(
RenameItemRequest $request,
string $id,
Share $shared,
): Response {
// Return fake renamed item in demo
if (is_demo_account($shared->user->email)) {
return ($this->fakeRenameFileOrFolder)($request, $id);
@@ -69,4 +66,4 @@ class VisitorRenameFileOrFolderController extends Controller
return response($item, 201);
}
}
}