nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-05-18 19:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

frontend function consolidation part 1

Browse Source
This commit is contained in:
Peter Papp
2021-03-16 08:31:42 +01:00
parent 803cc089bd
commit 1bb59854ea
26 changed files with 1855 additions and 1879 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/SetupDevEnvironment.php
+32
View File
@@ -117,6 +117,14 @@ class SetupDevEnvironment extends Command
'user_id' => $user->id,
'user_scope' => 'master',
'name' => 'Shared Folder',
'emoji' => [
"codes" => "1F680",
"char" => "\ud83d\ude80",
"name" => "rocket",
"category" => "Travel & Places (transport-air)",
"group" => "Travel & Places",
"subgroup" => "transport-air"
],
]);
Share::factory(Share::class)
@@ -143,6 +151,14 @@ class SetupDevEnvironment extends Command
'user_id' => $user->id,
'user_scope' => 'master',
'name' => 'Random Pics',
'emoji' => [
'codes' => '1F4F7',
'char' => '📷',
'name' => 'camera',
'category' => 'Objects (light & video)',
'group' => 'Objects',
'subgroup' => 'light & video',
],
]);
$nature = Folder::factory(Folder::class)
@@ -151,6 +167,14 @@ class SetupDevEnvironment extends Command
'parent_id' => $random_pics->id,
'user_scope' => 'master',
'name' => "Nature",
'emoji' => [
'codes' => '26F0',
'char' => '⛰',
'name' => 'mountain',
'category' => 'Travel & Places (place-geographic)',
'group' => 'Travel & Places',
'subgroup' => 'place-geographic',
],
]);
$apartments = Folder::factory(Folder::class)
@@ -159,6 +183,14 @@ class SetupDevEnvironment extends Command
'parent_id' => $random_pics->id,
'user_scope' => 'master',
'name' => "Apartments",
'emoji' => [
'codes' => '1F3E0',
'char' => '🏠',
'name' => 'house',
'category' => 'Travel & Places (place-building)',
'group' => 'Travel & Places',
'subgroup' => 'place-building',
],
]);
// 3.
app/Http/Controllers/FileManager/EditItemsController.php
+14 -14
View File
@@ -47,7 +47,7 @@ class EditItemsController extends Controller
}
// Check permission to create folder for authenticated editor
if ($request->user()->tokenCan('editor')) {
/*if ($request->user()->tokenCan('editor')) {
// check if shared_token cookie exist
if (!$request->hasCookie('shared_token')) abort('401');
@@ -57,7 +57,7 @@ class EditItemsController extends Controller
// Check access to requested directory
$this->helper->check_item_access($request->parent_id, $shared);
}
}*/
// Create new folder
return $this->filemanager->create_folder($request);
@@ -79,7 +79,7 @@ class EditItemsController extends Controller
}
// Check permission to rename item for authenticated editor
if ($request->user()->tokenCan('editor')) {
/*if ($request->user()->tokenCan('editor')) {
// check if shared_token cookie exist
if (!$request->hasCookie('shared_token')) abort('401');
@@ -96,7 +96,7 @@ class EditItemsController extends Controller
} else {
$this->helper->check_item_access($item->folder_id, $shared);
}
}
}*/
// If request have a change folder icon values set the folder icon
if ($request->type === 'folder' && ($request->filled('emoji') || $request->filled('color'))) {
@@ -125,7 +125,7 @@ class EditItemsController extends Controller
foreach ($request->input('items') as $item) {
// Check permission to delete item for authenticated editor
if ($request->user()->tokenCan('editor')) {
/*if ($request->user()->tokenCan('editor')) {
// Prevent force delete for non-master users
if ($item['force_delete']) abort('401');
@@ -145,7 +145,7 @@ class EditItemsController extends Controller
} else {
$this->helper->check_item_access($item->folder_id, $shared);
}
}
}*/
// Delete item
$this->filemanager->delete_item($item, $item['id']);
@@ -169,7 +169,7 @@ class EditItemsController extends Controller
}
// Check permission to upload for authenticated editor
if ($request->user()->tokenCan('editor')) {
/*if ($request->user()->tokenCan('editor')) {
// check if shared_token cookie exist
if (!$request->hasCookie('shared_token')) abort('401');
@@ -179,7 +179,7 @@ class EditItemsController extends Controller
// Check access to requested directory
$this->helper->check_item_access($request->parent_id, $shared);
}
}*/
// Return new uploaded file
return $this->filemanager->upload($request);
@@ -202,7 +202,7 @@ class EditItemsController extends Controller
$to_id = $request->input('to_id');
// Check permission to upload for authenticated editor
if ($request->user()->tokenCan('editor')) {
/*if ($request->user()->tokenCan('editor')) {
// check if shared_token cookie exist
if (!$request->hasCookie('shared_token')) abort('401');
@@ -212,7 +212,7 @@ class EditItemsController extends Controller
// Check access to requested directory
$this->helper->check_item_access($to_id, $shared);
}
}*/
// Move item
$this->filemanager->move($request, $to_id);
@@ -232,7 +232,7 @@ class EditItemsController extends Controller
$user_id = Auth::id();
// Check permission to download for authenticated editor
if ($request->user()->tokenCan('editor')) {
/*if ($request->user()->tokenCan('editor')) {
// check if shared_token cookie exist
if (!$request->hasCookie('shared_token')) abort('401');
@@ -242,7 +242,7 @@ class EditItemsController extends Controller
// Check access to requested directory
$this->helper->check_item_access($id, $shared);
}
}*/
// Get folder
$folder = Folder::whereUserId($user_id)
@@ -270,7 +270,7 @@ class EditItemsController extends Controller
public function zip_multiple_files(Request $request)
{
// Check permission to upload for authenticated editor
if ($request->user()->tokenCan('editor')) {
/*if ($request->user()->tokenCan('editor')) {
// check if shared_token cookie exist
if (!$request->hasCookie('shared_token')) abort('401');
@@ -286,7 +286,7 @@ class EditItemsController extends Controller
// Check access to requested directory
$this->helper->check_item_access($file_parent_folders, $shared);
}
}*/
// Get requested files
$files = File::whereUserId(Auth::id())
app/Http/Controllers/Sharing/BrowseShareController.php
+1 -1
View File
@@ -73,7 +73,7 @@ class BrowseShareController extends Controller
->get();
// Get all children content
$foldersIds = Folder::with('folders:id,parent_id,unique_id,name')
$foldersIds = Folder::with('folders:id,parent_id,id,name')
->where('user_id', $shared->user_id)
->where('parent_id', $shared->item_id)
->get();
app/Http/Requests/FileFunctions/UploadRequest.php
-1
View File
@@ -26,7 +26,6 @@ class UploadRequest extends FormRequest
public function rules()
{
return [
'is_last' => 'sometimes|boolean',
'folder_id' => 'uuid|nullable',
'file' => ['required', 'file', new MimetypeBlacklistValidation]
];
app/Services/DemoService.php
+13 -15
View File
@@ -35,15 +35,14 @@ class DemoService
return [
'user_id' => 1,
'id' => random_int(1000, 9999),
'id' => Str::uuid(),
'parent_id' => random_int(1000, 9999),
'name' => $name,
'type' => 'folder',
'unique_id' => random_int(1000, 9999),
'user_scope' => $user_scope,
'items' => '0',
'icon_color' => isset($request->icon['color']) ? $request->icon['color'] : null,
'icon_emoji' => isset($request->icon['emoji']) ? $request->icon['emoji'] : null,
'color' => isset($request->icon['color']) ? $request->icon['color'] : null,
'emoji' => isset($request->icon['emoji']) ? $request->icon['emoji'] : null,
'updated_at' => Carbon::now()->format('j M Y \a\t H:i'),
'created_at' => Carbon::now()->format('j M Y \a\t H:i'),
];
@@ -53,38 +52,38 @@ class DemoService
* Rename item name
*
* @param RenameItemRequest $request
* @param $unique_id
* @param $id
* @return mixed
*/
function rename_item($request, $unique_id)
function rename_item($request, $id)
{
// Get item
if ($request->type === 'folder') {
$item = Folder::where('unique_id', $unique_id)
$item = Folder::where('id', $id)
->where('user_id', 1)
->first();
} else {
$item = File::where('unique_id', $unique_id)
$item = File::where('id', $id)
->where('user_id', 1)
->first();
}
if ($item) {
$item->name = $request->name;
$item->icon_emoji = $request->icon['emoji'] ?? null;
$item->icon_color = $request->icon['color'] ?? null;
$item->emoji = $request->icon['emoji'] ?? null;
$item->color = $request->icon['color'] ?? null;
return $item;
} else {
return [
'unique_id' => $request->unique_id,
'name' => $request->name,
'type' => $request->type,
'id' => $request->id,
'name' => $request->name,
'type' => $request->type,
];
}
}
@@ -109,8 +108,7 @@ class DemoService
$filetype = get_file_type($file->getMimeType());
return [
'id' => random_int(1000, 9999),
'unique_id' => random_int(1000, 9999),
'id' => Str::uuid(),
'folder_id' => $request->parent_id,
'thumbnail' => 'data:' . $request->file('file')->getMimeType() . ';base64, ' . base64_encode(file_get_contents($request->file('file'))),
'name' => $file->getClientOriginalName(),
app/Services/FileManagerService.php
+4 -4
View File
@@ -179,8 +179,8 @@ class FileManagerService
'user_id' => $user_id,
'type' => 'folder',
'name' => $name,
'icon_color' => isset($request->icon['color']) ? $request->icon['color'] : null,
'icon_emoji' => isset($request->icon['emoji']) ? $request->icon['emoji'] : null,
'color' => $request->color ?? null,
'emoji' => $request->emoji ?? null,
]);;
}
@@ -284,7 +284,7 @@ class FileManagerService
}
// Delete item
if ($item['type'] === 'file') {
if ($item['type'] !== 'folder') {
// Get file
$file = UserFile::withTrashed()
@@ -346,7 +346,7 @@ class FileManagerService
}
// Move file
if ($item['type'] === 'file') {
if ($item['type'] !== 'folder') {
UserFile::find($item['id'])
->update([
'folder_id' => $to_id