nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-18 16:22:14 +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

2
.env.testing
View File

@@ -1,5 +1,5 @@
APP_NAME=Laravel
APP_ENV=testing
APP_ENV=local
APP_KEY=base64:47yorkyoH3qCrKKO4eG6LpZUogoTC51qey5vYq/O3AM=
APP_DEBUG=true
APP_URL=http://localhost

32
app/Console/Commands/SetupDevEnvironment.php
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.

28
app/Http/Controllers/FileManager/EditItemsController.php
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())

2
app/Http/Controllers/Sharing/BrowseShareController.php
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();

1
app/Http/Requests/FileFunctions/UploadRequest.php
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]
];

24
app/Services/DemoService.php
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,36 +52,36 @@ 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,
'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(),

8
app/Services/FileManagerService.php
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

115
public/mix-manifest.json
View File

@@ -3,8 +3,8 @@
"/css/app.css": "/css/app.css",
"/chunks/admin.js": "/chunks/admin.js?id=d2e6acc904b1c1a9387b",
"/chunks/admin-account.js": "/chunks/admin-account.js?id=b306bc83a32911dc7bbc",
"/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js?id=f8aa71af8223ad1df2a0",
"/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js?id=bc5af3a7a82d95c71c52",
"/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js?id=5842ebc2d92f96d9a14e",
"/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~7cf65924.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~7cf65924.js?id=e1ae154ca60eff2f45be",
"/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared-page.js?id=dfc7c9e8edb8146d9bd0",
"/chunks/app-appearance.js": "/chunks/app-appearance.js?id=bc5212d24fc85d890346",
"/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js?id=1ae1e65bb6a5ed7c3e10",
@@ -29,7 +29,7 @@
"/chunks/environment-setup.js": "/chunks/environment-setup.js?id=b835f8fdedb4bc19f4a5",
"/chunks/files.js": "/chunks/files.js?id=9b47294bd85e1f1db78e",
"/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/user-subscription.js?id=bfc9bbbc5c50bc21cad7",
"/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=b60552f07141e4e4d4a6",
"/chunks/files~chunks/shared-files~chunks/shared-page.js": "/chunks/files~chunks/shared-files~chunks/shared-page.js?id=6a7f5d7c260bb41b6f75",
"/chunks/files~chunks/shared-page.js": "/chunks/files~chunks/shared-page.js?id=c869bb74e66efcad0288",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=7f6474e743f5e147705a",
"/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=7e924ee2e747d16a2810",
@@ -57,12 +57,11 @@
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=c6b88005b133268ed88f",
"/chunks/shared-files.js": "/chunks/shared-files.js?id=e6f7de2910d85a2dd3e4",
"/chunks/shared-page.js": "/chunks/shared-page.js?id=04a3534a1a31f006d7de",
"/chunks/sign-in.js": "/chunks/sign-in.js?id=7990aa527e933e0f0ebf",
"/chunks/sign-in.js": "/chunks/sign-in.js?id=af61663f3e69eae3e5ee",
"/chunks/sign-up.js": "/chunks/sign-up.js?id=2bc6c1353362c0063d45",
"/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=8bfaa10b8499114b79a2",
"/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=1790ab9aa493a483cf3c",
"/chunks/subscription-service.js": "/chunks/subscription-service.js?id=8fc09aa45881d0c04e17",
"/chunks/upgrade.js": "/chunks/upgrade.js?id=6f401f5d12d22bfde1c9",
"/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=8a1684e4910b4729ce56",
"/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=94cfb5164e5e7f0c2943",
"/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=2ce4b7a0ff69e192a968",
@@ -75,71 +74,43 @@
"/chunks/user-storage.js": "/chunks/user-storage.js?id=d989f56de65842d84727",
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=ce13a0e7a3ee2b607278",
"/chunks/users.js": "/chunks/users.js?id=b26ed0a3ad0087236fd9",
"/js/main.acd102588e8a8be37f5a.hot-update.js": "/js/main.acd102588e8a8be37f5a.hot-update.js",
"/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js?id=5842ebc2d92f96d9a14e",
"/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~7cf65924.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~7cf65924.js?id=e1ae154ca60eff2f45be",
"/chunks/upgrade.acd102588e8a8be37f5a.hot-update.js": "/chunks/upgrade.acd102588e8a8be37f5a.hot-update.js",
"/js/main.50cf26e4dfe081f6e9d8.hot-update.js": "/js/main.50cf26e4dfe081f6e9d8.hot-update.js",
"/chunks/setup-wizard.50cf26e4dfe081f6e9d8.hot-update.js": "/chunks/setup-wizard.50cf26e4dfe081f6e9d8.hot-update.js",
"/chunks/settings.cee80629f3ef6d9a48d3.hot-update.js": "/chunks/settings.cee80629f3ef6d9a48d3.hot-update.js",
"/chunks/profile.b8afc7952982a4fd4d0e.hot-update.js": "/chunks/profile.b8afc7952982a4fd4d0e.hot-update.js",
"/chunks/profile.c6e207e3f2b5aa2cfff3.hot-update.js": "/chunks/profile.c6e207e3f2b5aa2cfff3.hot-update.js",
"/chunks/profile.192c927aaed6e7cbdc00.hot-update.js": "/chunks/profile.192c927aaed6e7cbdc00.hot-update.js",
"/chunks/profile.87eff7a19b5e01529315.hot-update.js": "/chunks/profile.87eff7a19b5e01529315.hot-update.js",
"/chunks/dashboard.95d674ae20c836e40e96.hot-update.js": "/chunks/dashboard.95d674ae20c836e40e96.hot-update.js",
"/chunks/dashboard.4faee9d07770e137375f.hot-update.js": "/chunks/dashboard.4faee9d07770e137375f.hot-update.js",
"/chunks/dashboard.1f3f20e8f882567968b5.hot-update.js": "/chunks/dashboard.1f3f20e8f882567968b5.hot-update.js",
"/chunks/dashboard.975afd2837cb09ec3d93.hot-update.js": "/chunks/dashboard.975afd2837cb09ec3d93.hot-update.js",
"/chunks/dashboard.c44958949b4aa0440320.hot-update.js": "/chunks/dashboard.c44958949b4aa0440320.hot-update.js",
"/chunks/dashboard.7584873af2dfc8636e4d.hot-update.js": "/chunks/dashboard.7584873af2dfc8636e4d.hot-update.js",
"/chunks/dashboard.7dd853280ea6d580a0fc.hot-update.js": "/chunks/dashboard.7dd853280ea6d580a0fc.hot-update.js",
"/chunks/users.3cb9c0872f96ecbf98f0.hot-update.js": "/chunks/users.3cb9c0872f96ecbf98f0.hot-update.js",
"/chunks/users.79bdec551cc28db9798e.hot-update.js": "/chunks/users.79bdec551cc28db9798e.hot-update.js",
"/chunks/users.5f63771757ee59c71ab7.hot-update.js": "/chunks/users.5f63771757ee59c71ab7.hot-update.js",
"/chunks/users.67da0a6baae8b441589b.hot-update.js": "/chunks/users.67da0a6baae8b441589b.hot-update.js",
"/chunks/user.3fddfa5cd493ba39284d.hot-update.js": "/chunks/user.3fddfa5cd493ba39284d.hot-update.js",
"/chunks/user.138e6b07b04d718ef7b4.hot-update.js": "/chunks/user.138e6b07b04d718ef7b4.hot-update.js",
"/chunks/user.076cb56294ad6ec281a6.hot-update.js": "/chunks/user.076cb56294ad6ec281a6.hot-update.js",
"/chunks/user.22613097b84c3ddb703c.hot-update.js": "/chunks/user.22613097b84c3ddb703c.hot-update.js",
"/chunks/user.851daea4573084138b30.hot-update.js": "/chunks/user.851daea4573084138b30.hot-update.js",
"/chunks/user.ee41abbb94245be22dd2.hot-update.js": "/chunks/user.ee41abbb94245be22dd2.hot-update.js",
"/chunks/user.3f1437b24d3353d099a4.hot-update.js": "/chunks/user.3f1437b24d3353d099a4.hot-update.js",
"/chunks/user.1d618db9e20455d8bf22.hot-update.js": "/chunks/user.1d618db9e20455d8bf22.hot-update.js",
"/chunks/user-detail.f6d70e1f13d33dcfcae7.hot-update.js": "/chunks/user-detail.f6d70e1f13d33dcfcae7.hot-update.js",
"/chunks/user-delete.6fba20937425844d9cf5.hot-update.js": "/chunks/user-delete.6fba20937425844d9cf5.hot-update.js",
"/chunks/user-storage.4fbcc4fac1376d1e478e.hot-update.js": "/chunks/user-storage.4fbcc4fac1376d1e478e.hot-update.js",
"/chunks/user-storage.146ee3ac909f1fb1f5c3.hot-update.js": "/chunks/user-storage.146ee3ac909f1fb1f5c3.hot-update.js",
"/chunks/user-detail.bf5b21de12e279d5e41d.hot-update.js": "/chunks/user-detail.bf5b21de12e279d5e41d.hot-update.js",
"/chunks/user-invoices.bf5b21de12e279d5e41d.hot-update.js": "/chunks/user-invoices.bf5b21de12e279d5e41d.hot-update.js",
"/chunks/user-password.bf5b21de12e279d5e41d.hot-update.js": "/chunks/user-password.bf5b21de12e279d5e41d.hot-update.js",
"/chunks/user-storage.3d71713649a1be81cc7a.hot-update.js": "/chunks/user-storage.3d71713649a1be81cc7a.hot-update.js",
"/chunks/user-subscription.759a864602c6db4bd639.hot-update.js": "/chunks/user-subscription.759a864602c6db4bd639.hot-update.js",
"/chunks/user-create.df9e613449e0abc9c927.hot-update.js": "/chunks/user-create.df9e613449e0abc9c927.hot-update.js",
"/chunks/invoices.5198b050405708b07643.hot-update.js": "/chunks/invoices.5198b050405708b07643.hot-update.js",
"/chunks/pages.fecc0d5d9a54471490cc.hot-update.js": "/chunks/pages.fecc0d5d9a54471490cc.hot-update.js",
"/chunks/plan-create.ca500945cbeeb35e4763.hot-update.js": "/chunks/plan-create.ca500945cbeeb35e4763.hot-update.js",
"/chunks/plans.ca500945cbeeb35e4763.hot-update.js": "/chunks/plans.ca500945cbeeb35e4763.hot-update.js",
"/chunks/dashboard.ae8b35b4b0e457789953.hot-update.js": "/chunks/dashboard.ae8b35b4b0e457789953.hot-update.js",
"/chunks/page-edit.ae8b35b4b0e457789953.hot-update.js": "/chunks/page-edit.ae8b35b4b0e457789953.hot-update.js",
"/chunks/plan.ae8b35b4b0e457789953.hot-update.js": "/chunks/plan.ae8b35b4b0e457789953.hot-update.js",
"/chunks/plan-delete.ae8b35b4b0e457789953.hot-update.js": "/chunks/plan-delete.ae8b35b4b0e457789953.hot-update.js",
"/chunks/plan-settings.ae8b35b4b0e457789953.hot-update.js": "/chunks/plan-settings.ae8b35b4b0e457789953.hot-update.js",
"/chunks/plan-subscribers.ae8b35b4b0e457789953.hot-update.js": "/chunks/plan-subscribers.ae8b35b4b0e457789953.hot-update.js",
"/chunks/plans.ae8b35b4b0e457789953.hot-update.js": "/chunks/plans.ae8b35b4b0e457789953.hot-update.js",
"/chunks/app-payments.fbf17904c778df71a5a2.hot-update.js": "/chunks/app-payments.fbf17904c778df71a5a2.hot-update.js",
"/chunks/app-appearance.8f581dd73cc45c256cab.hot-update.js": "/chunks/app-appearance.8f581dd73cc45c256cab.hot-update.js",
"/chunks/app-billings.8f581dd73cc45c256cab.hot-update.js": "/chunks/app-billings.8f581dd73cc45c256cab.hot-update.js",
"/chunks/app-email.8f581dd73cc45c256cab.hot-update.js": "/chunks/app-email.8f581dd73cc45c256cab.hot-update.js",
"/chunks/app-index.8f581dd73cc45c256cab.hot-update.js": "/chunks/app-index.8f581dd73cc45c256cab.hot-update.js",
"/chunks/app-others.8f581dd73cc45c256cab.hot-update.js": "/chunks/app-others.8f581dd73cc45c256cab.hot-update.js",
"/js/main.8b15852e6652ad7df4c4.hot-update.js": "/js/main.8b15852e6652ad7df4c4.hot-update.js",
"/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~152bcf79.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~152bcf79.js?id=1a78f1864cdc370970bf",
"/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~e724aa94.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~e724aa94.js?id=bef61fb2d7f2feeedb08",
"/chunks/user-delete.8b15852e6652ad7df4c4.hot-update.js": "/chunks/user-delete.8b15852e6652ad7df4c4.hot-update.js",
"/js/main.89fde28708af035907b2.hot-update.js": "/js/main.89fde28708af035907b2.hot-update.js",
"/chunks/user-delete.89fde28708af035907b2.hot-update.js": "/chunks/user-delete.89fde28708af035907b2.hot-update.js",
"/chunks/app-appearance.547cc213dbf1b7f47fa1.hot-update.js": "/chunks/app-appearance.547cc213dbf1b7f47fa1.hot-update.js",
"/chunks/profile.db40feee26819d8809b4.hot-update.js": "/chunks/profile.db40feee26819d8809b4.hot-update.js",
"/chunks/profile.aa9ff62154eb1cc577e3.hot-update.js": "/chunks/profile.aa9ff62154eb1cc577e3.hot-update.js",
"/chunks/settings-storage.d3303207e2c793d85f99.hot-update.js": "/chunks/settings-storage.d3303207e2c793d85f99.hot-update.js"
"/chunks/sign-in.c0df83f38f9620d6ab71.hot-update.js": "/chunks/sign-in.c0df83f38f9620d6ab71.hot-update.js",
"/js/main.7417dde29297cbd69e55.hot-update.js": "/js/main.7417dde29297cbd69e55.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.8944cc718ff4bb32d069.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.8944cc718ff4bb32d069.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.fb8368ad554a2a428564.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.fb8368ad554a2a428564.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.40f9fae6c45f2df25a52.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.40f9fae6c45f2df25a52.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.11878cb3a23571f05616.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.11878cb3a23571f05616.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.a495ff2c47ac8a06dbdd.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.a495ff2c47ac8a06dbdd.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.88c9c728c54e69b1c225.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.88c9c728c54e69b1c225.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.7cd76b38051b485334e2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.7cd76b38051b485334e2.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.ebde209595425d6ecefd.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.ebde209595425d6ecefd.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.619d37953ce70f2d9c97.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.619d37953ce70f2d9c97.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.e4e435f6df4e15c1e40f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.e4e435f6df4e15c1e40f.hot-update.js",
"/js/main.20864a59a92c0129339a.hot-update.js": "/js/main.20864a59a92c0129339a.hot-update.js",
"/js/main.a0ecc5181365124d1abd.hot-update.js": "/js/main.a0ecc5181365124d1abd.hot-update.js",
"/js/main.a91c6d3b956ef3d3f1e8.hot-update.js": "/js/main.a91c6d3b956ef3d3f1e8.hot-update.js",
"/js/main.4ba0741466b2fd877fa5.hot-update.js": "/js/main.4ba0741466b2fd877fa5.hot-update.js",
"/js/main.e2cefad0246806b24af4.hot-update.js": "/js/main.e2cefad0246806b24af4.hot-update.js",
"/js/main.72c2861585470c2a2c10.hot-update.js": "/js/main.72c2861585470c2a2c10.hot-update.js",
"/js/main.8446252ef7ddc3afec51.hot-update.js": "/js/main.8446252ef7ddc3afec51.hot-update.js",
"/js/main.6b03f320410161b90310.hot-update.js": "/js/main.6b03f320410161b90310.hot-update.js",
"/js/main.2b6a3e1a38b1bf0feeb4.hot-update.js": "/js/main.2b6a3e1a38b1bf0feeb4.hot-update.js",
"/js/main.3a61d5e4304773dce727.hot-update.js": "/js/main.3a61d5e4304773dce727.hot-update.js",
"/js/main.e6c48ba61975e4559b26.hot-update.js": "/js/main.e6c48ba61975e4559b26.hot-update.js",
"/js/main.962fe0e076ecadbfa271.hot-update.js": "/js/main.962fe0e076ecadbfa271.hot-update.js",
"/js/main.d094301f874d238bb30e.hot-update.js": "/js/main.d094301f874d238bb30e.hot-update.js",
"/js/main.5ce03add9ec3ed119589.hot-update.js": "/js/main.5ce03add9ec3ed119589.hot-update.js",
"/js/main.b9dbc0aab87a27bcc71c.hot-update.js": "/js/main.b9dbc0aab87a27bcc71c.hot-update.js",
"/js/main.591858a32599e4d84561.hot-update.js": "/js/main.591858a32599e4d84561.hot-update.js",
"/js/main.b77927912541bb4e014d.hot-update.js": "/js/main.b77927912541bb4e014d.hot-update.js",
"/js/main.9697569c85fd0f645f8a.hot-update.js": "/js/main.9697569c85fd0f645f8a.hot-update.js",
"/js/main.b58aab39213782fa858f.hot-update.js": "/js/main.b58aab39213782fa858f.hot-update.js",
"/js/main.4ed545e82dc5273ba538.hot-update.js": "/js/main.4ed545e82dc5273ba538.hot-update.js",
"/js/main.ff207924ea2f4585a5cc.hot-update.js": "/js/main.ff207924ea2f4585a5cc.hot-update.js",
"/js/main.66e9ba4410158801c974.hot-update.js": "/js/main.66e9ba4410158801c974.hot-update.js",
"/js/main.0970ccdf59cbd34da77e.hot-update.js": "/js/main.0970ccdf59cbd34da77e.hot-update.js",
"/js/main.f7286199453d4271e692.hot-update.js": "/js/main.f7286199453d4271e692.hot-update.js",
"/js/main.de3eaa7ec85c41a75abc.hot-update.js": "/js/main.de3eaa7ec85c41a75abc.hot-update.js",
"/js/main.d211f3e62bc08a5fd565.hot-update.js": "/js/main.d211f3e62bc08a5fd565.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page.d211f3e62bc08a5fd565.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page.d211f3e62bc08a5fd565.hot-update.js"
}

72
resources/js/components/FilesView/ContextMenu.vue
View File

@@ -21,25 +21,25 @@
<div v-if="$isThisLocation(['trash', 'trash-root']) && $checkPermission('master') && !showFromPreview" id="menu-list" class="menu-options">
<!-- Single options -->
<OptionGroup v-if="multiSelectContextMenu">
<OptionGroup v-if="isMultiSelectContextMenu">
<Option @click.native="restoreItem" v-if="item" :title="$t('context_menu.restore')" icon="restore" />
<Option @click.native="deleteItem" v-if="item" :title="$t('context_menu.delete')" icon="trash" />
<Option @click.native="emptyTrash" :title="$t('context_menu.empty_trash')" icon="empty-trash" />
</OptionGroup>
<OptionGroup v-if="item && multiSelectContextMenu">
<OptionGroup v-if="item && isMultiSelectContextMenu">
<Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail" />
<Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download" />
</OptionGroup>
<!-- Multi options -->
<OptionGroup v-if="!multiSelectContextMenu">
<OptionGroup v-if="!isMultiSelectContextMenu">
<Option @click.native="restoreItem" v-if="item" :title="$t('context_menu.restore')" icon="restore" />
<Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
<Option @click.native="emptyTrash" :title="$t('context_menu.empty_trash')" icon="empty-trash" />
</OptionGroup>
<OptionGroup v-if="item && !multiSelectContextMenu && !hasFolder">
<OptionGroup v-if="item && !isMultiSelectContextMenu && !hasFolder">
<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
</OptionGroup>
</div>
@@ -48,37 +48,37 @@
<div v-if="$isThisLocation(['shared']) && $checkPermission('master') && !showFromPreview" id="menu-list" class="menu-options">
<!-- Single options -->
<OptionGroup class="menu-option-group" v-if="item && isFolder && multiSelectContextMenu">
<OptionGroup class="menu-option-group" v-if="item && isFolder && isMultiSelectContextMenu">
<Option @click.native="addToFavourites" :title="isInFavourites
? $t('context_menu.remove_from_favourites')
: $t('context_menu.add_to_favourites')" icon="favourites" />
</OptionGroup>
<OptionGroup v-if="item && multiSelectContextMenu">
<OptionGroup v-if="item && isMultiSelectContextMenu">
<Option @click.native="renameItem" :title="$t('context_menu.rename')" icon="rename" />
<Option @click.native="shareItem" :title=" item.shared ? $t('context_menu.share_edit'): $t('context_menu.share')" icon="share" />
<Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
</OptionGroup>
<OptionGroup v-if="item && multiSelectContextMenu">
<OptionGroup v-if="item && isMultiSelectContextMenu">
<Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail" />
<Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download" />
<Option @click.native="downloadFolder" v-if="isFolder" :title="$t('context_menu.zip_folder')" icon="zip-folder" />
</OptionGroup>
<!-- Multi options -->
<OptionGroup class="menu-option-group" v-if="item && !hasFile && !multiSelectContextMenu">
<OptionGroup class="menu-option-group" v-if="item && !hasFile && !isMultiSelectContextMenu">
<Option @click.native="addToFavourites" :title="isInFavourites
? $t('context_menu.remove_from_favourites')
: $t('context_menu.add_to_favourites')" icon="favourites" />
</OptionGroup>
<OptionGroup v-if="item && !multiSelectContextMenu">
<OptionGroup v-if="item && !isMultiSelectContextMenu">
<Option @click.native="shareCancel" :title="$t('context_menu.share_cancel')" icon="share" />
<Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
</OptionGroup>
<OptionGroup v-if="item && !multiSelectContextMenu && !hasFolder">
<OptionGroup v-if="item && !isMultiSelectContextMenu && !hasFolder">
<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
</OptionGroup>
</div>
@@ -87,17 +87,17 @@
<div v-if="$isThisLocation(['base', 'participant_uploads', 'latest']) && $checkPermission('master') && !showFromPreview" id="menu-list" class="menu-options">
<!-- No Files options -->
<OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && multiSelectContextMenu && !item">
<OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && isMultiSelectContextMenu && !item">
<Option @click.native="createFolder" :title="$t('context_menu.create_folder')" icon="create-folder" />
</OptionGroup>
<!-- Single options -->
<OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && item && multiSelectContextMenu && isFolder">
<OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && item && isMultiSelectContextMenu && isFolder">
<Option @click.native="addToFavourites" :title="isInFavourites ? $t('context_menu.remove_from_favourites') : $t('context_menu.add_to_favourites')" icon="favourites" />
</OptionGroup>
<OptionGroup v-if="item && multiSelectContextMenu">
<OptionGroup v-if="item && isMultiSelectContextMenu">
<Option @click.native="renameItem" :title="$t('context_menu.rename')" icon="rename" />
<Option @click.native="moveItem" v-if="!$isThisLocation(['latest'])" :title="$t('context_menu.move')" icon="move-item" />
<Option @click.native="shareItem" :title="item.shared
@@ -107,25 +107,25 @@
</OptionGroup>
<OptionGroup v-if="item && multiSelectContextMenu ">
<OptionGroup v-if="item && isMultiSelectContextMenu ">
<Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail" />
<Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download" />
<Option @click.native="downloadFolder" v-if="isFolder" :title="$t('context_menu.zip_folder')" icon="zip-folder" />
</OptionGroup>
<!-- Multi options -->
<OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && !multiSelectContextMenu && item && !hasFile">
<OptionGroup v-if="!$isThisLocation(['participant_uploads', 'latest']) && !isMultiSelectContextMenu && item && !hasFile">
<Option @click.native="addToFavourites" :title=" isInFavourites
? $t('context_menu.remove_from_favourites')
: $t('context_menu.add_to_favourites')" icon="favourites" />
</OptionGroup>
<OptionGroup v-if="item && !multiSelectContextMenu">
<OptionGroup v-if="item && !isMultiSelectContextMenu">
<Option @click.native="moveItem" v-if="!$isThisLocation(['latest'])" :title="$t('context_menu.move')" icon="move-item" />
<Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
</OptionGroup>
<OptionGroup v-if="item && !multiSelectContextMenu && !hasFolder">
<OptionGroup v-if="item && !isMultiSelectContextMenu && !hasFolder">
<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
</OptionGroup>
</div>
@@ -134,19 +134,19 @@
<div v-if="$isThisLocation(['base', 'public']) && $checkPermission('editor') && !showFromPreview " id="menu-list" class="menu-options">
<!-- No Files options -->
<OptionGroup v-if="multiSelectContextMenu && !item">
<OptionGroup v-if="isMultiSelectContextMenu && !item">
<Option @click.native="createFolder" :title="$t('context_menu.create_folder')" icon="create-folder" />
</OptionGroup>
<!-- Single options -->
<OptionGroup v-if="item && multiSelectContextMenu">
<OptionGroup v-if="item && isMultiSelectContextMenu">
<Option @click.native="renameItem" :title=" $t('context_menu.rename')" icon="rename" />
<Option @click.native="moveItem" :title="$t('context_menu.move')" icon="move-item" />
<Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
</OptionGroup>
<OptionGroup v-if="item && multiSelectContextMenu">
<OptionGroup v-if="item && isMultiSelectContextMenu">
<Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail" />
<Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download" />
<Option @click.native="downloadFolder" v-if="isFolder" :title="$t('context_menu.zip_folder')" icon="zip-folder" />
@@ -154,12 +154,12 @@
<!-- Multi options -->
<OptionGroup v-if="item && !multiSelectContextMenu">
<OptionGroup v-if="item && !isMultiSelectContextMenu">
<Option @click.native="moveItem" :title="$t('context_menu.move')" icon="move-item" />
<Option @click.native="deleteItem" :title="$t('context_menu.delete')" icon="trash" />
</OptionGroup>
<OptionGroup v-if="item && !multiSelectContextMenu && !hasFolder">
<OptionGroup v-if="item && !isMultiSelectContextMenu && !hasFolder">
<Option @click.native="downloadItem" :title="$t('context_menu.download')" icon="download" />
</OptionGroup>
</div>
@@ -168,14 +168,14 @@
<div v-if="$isThisLocation(['base', 'public']) && $checkPermission('visitor') && !showFromPreview" id="menu-list" class="menu-options">
<!-- Single options -->
<OptionGroup v-if="item && multiSelectContextMenu">
<OptionGroup v-if="item && isMultiSelectContextMenu">
<Option @click.native="ItemDetail" :title="$t('context_menu.detail')" icon="detail" />
<Option @click.native="downloadItem" v-if="!isFolder" :title="$t('context_menu.download')" icon="download" />
<Option @click.native="downloadFolder" v-if="isFolder" :title="$t('context_menu.zip_folder')" icon="zip-folder" />
</OptionGroup>
<!-- Multi options -->
<OptionGroup v-if="!multiSelectContextMenu && item ">
<OptionGroup v-if="!isMultiSelectContextMenu && item ">
<Option @click.native="downloadItem" v-if="!hasFolder" :title="$t('context_menu.download')" icon="download" />
<Option v-if="hasFolder" :title="$t('context_menu.no_options')" icon="no-options" class="no-options" />
</OptionGroup>
@@ -199,20 +199,12 @@ export default {
computed: {
...mapGetters(['user', 'fileInfoDetail']),
hasFolder() {
// Check if selected items includes some folder
if (this.fileInfoDetail.find(item => item.type === 'folder'))
return true
return this.fileInfoDetail.find(item => item.type === 'folder')
},
hasFile() {
// Check if selected items includes some files
if (this.fileInfoDetail.find(item => item.type !== 'folder'))
return true
return this.fileInfoDetail.find(item => item.type !== 'folder')
},
multiSelectContextMenu() {
isMultiSelectContextMenu() {
// If is context Menu open on multi selected items open just options for the multi selected items
if (this.fileInfoDetail.length > 1 && this.fileInfoDetail.includes(this.item))
@@ -221,10 +213,9 @@ export default {
// If is context Menu open for the non selected item open options for the single item
if (this.fileInfoDetail.length < 2 || !this.fileInfoDetail.includes(this.item))
return true
},
favourites() {
return this.user.relationships.favourites.data.attributes.folders
return this.user.data.relationships.favourites.data.attributes.folders
},
isFolder() {
return this.item && this.item.type === 'folder'
@@ -241,7 +232,7 @@ export default {
return this.item && this.item.type === 'image'
},
isInFavourites() {
return this.favourites.find((el) => el.unique_id == this.item.unique_id)
return this.favourites.find((el) => el.id === this.item.id)
}
},
data() {
@@ -253,7 +244,6 @@ export default {
positionY: 0
}
},
methods: {
downloadFolder() {
this.$store.dispatch('downloadFolder', this.item)
@@ -293,7 +283,7 @@ export default {
// Check if folder is in favourites and then add/remove from favourites
if (
this.favourites &&
!this.favourites.find(el => el.unique_id == this.item.unique_id)
!this.favourites.find(el => el.id === this.item.id)
) {
// Add to favourite folder that is not selected
if (!this.fileInfoDetail.includes(this.item)) {
@@ -419,10 +409,8 @@ export default {
this.isVisible = false
this.showFromPreview = false
this.item = undefined
})
events.$on('contextMenu:show', (event, item) => {
// Store item
this.item = item

8
resources/js/components/FilesView/FileItemGrid.vue
View File

@@ -88,16 +88,16 @@ export default {
folderEmojiOrColor() {
// If folder have set some color
if (this.item.icon_color) {
if (this.item.color) {
this.$nextTick(() => {
this.$refs[`folder${this.item.id}`].firstElementChild.style.fill = this.item.icon_color
this.$refs[`folder${this.item.id}`].firstElementChild.style.fill = this.item.color
})
return false
}
// If folder have set some emoji
if (this.item.icon_emoji)
return this.item.icon_emoji
if (this.item.emoji)
return this.item.emoji
},
isClicked() {

2
resources/js/components/FilesView/FileItemList.vue
View File

@@ -289,7 +289,7 @@ export default {
})
// Change item name
events.$on('change:name', (item) => {
events.$on('change:name', item => {
if (this.item.id === item.id) this.itemName = item.name
})
}

2
resources/js/components/FilesView/FilePreviewNavigationPanel.vue
View File

@@ -48,7 +48,7 @@ export default {
showingImageIndex() {
let activeIndex = ''
this.filteredFiles.filter((element, index) => {
if (element.unique_id == this.fileInfoDetail[0].unique_id) {
if (element.id === this.fileInfoDetail[0].id) {
activeIndex = index + 1
}
})

8
resources/js/components/FilesView/FolderIcon.vue
View File

@@ -20,9 +20,9 @@
export default {
name: 'FolderIcon',
props: [
'item',
'folderIcon',
'location'
'location',
'item',
],
components: {
Emoji
@@ -37,7 +37,7 @@
return this.folderIcon.emoji ? this.folderIcon.emoji : false
// Return emoji if is already set
return this.item.icon_emoji ? this.item.icon_emoji : false
return this.item.emoji ? this.item.emoji : false
},
color() {
// Return color if is changed from rename popup
@@ -45,7 +45,7 @@
return this.folderIcon.color ? this.folderIcon.color : false
// Return color if is already set
return this.item.icon_color ? this.item.icon_color : false
return this.item.color ? this.item.color : false
}
}
}

17
resources/js/components/Others/EmojiPicker.vue
View File

@@ -25,13 +25,14 @@
<!-- Emojis List -->
<transition name="slide-in">
<div v-if="selectOpen">
<!-- Spinner -->
<div v-if="!loadedList" class="emoji-wrapper">
<div v-if="!isLoadedEmojis" class="emoji-wrapper">
<Spinner />
</div>
<!-- List -->
<div v-if="loadedList && emojis" class="emoji-wrapper">
<div v-if="isLoadedEmojis && emojis" class="emoji-wrapper">
<!-- Search input -->
<input @click.stop @input="searchEmojis" v-model="searchInput" class="emoji-input" :placeholder="$t('popup_rename.search_emoji_input_placeholder')">
@@ -100,7 +101,7 @@ export default {
searchInput: '',
filteredEmojis: [],
selectOpen: false,
loadedList: false,
isLoadedEmojis: false,
filteredEmojisLoaded: true,
groupInView: 'Smileys & Emotion',
}
@@ -150,8 +151,7 @@ export default {
}, 800),
openList() {
this.loadedList = false
this.isLoadedEmojis = false
this.selectOpen = !this.selectOpen
@@ -160,14 +160,15 @@ export default {
axios.get('/assets/emojis.json')
.then(response => {
this.$store.commit('LOAD_EMOJIS_LIST', response.data[0])
this.$store.commit('LOAD_EMOJIS_LIST', response.data)
})
.finally(() => this.isLoadedEmojis = true)
}
// Simulate loading for the emojisList processing
if (this.emojis) {
setTimeout(() => {
this.loadedList = true
this.isLoadedEmojis = true
}, 20);
}
@@ -199,7 +200,7 @@ export default {
this.selectOpen = false
this.loadedList = false
this.isLoadedEmojis = false
})
}
}

13
resources/js/components/Others/MoveItem.vue
View File

@@ -18,7 +18,7 @@
:subtitle="this.fileInfoDetail.length + ' ' + $tc('file_detail.items', this.fileInfoDetail.length)"
v-if="fileInfoDetail.length > 1 && !noSelectedItem" />
<TreeMenu :disabled-by-id="pickedItem" :depth="1" :nodes="items" v-for="items in navigation" :key="items.unique_id"/>
<TreeMenu :disabled-by-id="pickedItem" :depth="1" :nodes="items" v-for="items in navigation" :key="items.id" />
</div>
</PopupContent>
@@ -83,7 +83,7 @@
if (!this.selectedFolder) return
//Prevent to move items to the same parent
if(this.fileInfoDetail.find(item => item.parent_id === this.selectedFolder.unique_id)) return
if (this.fileInfoDetail.find(item => item.parent_id === this.selectedFolder.id)) return
// Move item
if (!this.noSelectedItem) {
@@ -107,7 +107,7 @@
// Select folder in tree
events.$on('pick-folder', folder => {
if (folder.unique_id === this.pickedItem.unique_id) {
if (folder.id === this.pickedItem.id) {
this.selectedFolder = undefined
} else {
this.selectedFolder = folder
@@ -118,6 +118,7 @@
events.$on('popup:open', args => {
if (args.name !== 'move') return
// Show tree spinner
this.isLoadingTree = true
@@ -131,6 +132,7 @@
this.pickedItem = args.item[0]
this.noSelectedItem = true
}
if (this.fileInfoDetail.includes(args.item[0])) {
this.pickedItem = this.fileInfoDetail[0]
this.noSelectedItem = false
@@ -156,17 +158,21 @@
.item-thumbnail {
margin-bottom: 20px;
}
.multiple-selected {
padding: 0 20px;;
margin-bottom: 20px;
/deep/ .text {
.title {
color: $text;
}
.count {
color: $text-muted;
}
}
/deep/ .icon-wrapper {
.icon {
stroke: $theme;
@@ -180,6 +186,7 @@
.title {
color: $dark_mode_text_primary;
}
.count {
color: $dark_mode_text_secondary;
}

24
resources/js/components/Others/RenameItem.vue
View File

@@ -7,7 +7,7 @@
<PopupContent>
<!--Item Thumbnail-->
<ThumbnailItem class="item-thumbnail" :item="pickedItem" info="metadata" :setFolderIcon="setFolderIcon"/>
<ThumbnailItem class="item-thumbnail" :item="pickedItem" info="metadata" :setFolderIcon="folderIcon" />
<!--Form to set sharing-->
<ValidationObserver @submit.prevent="changeName" ref="renameForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
@@ -27,17 +27,16 @@
<SetFolderIcon v-if="isMoreOptions" :folderData="pickedItem" />
<ActionButton v-if="pickedItem.type === 'folder'" @click.native.stop="moreOptions" :icon="isMoreOptions ? 'x' : 'pencil-alt'">{{ moreOptionsTitle }}</ActionButton>
</ValidationObserver>
</PopupContent>
<!--Actions-->
<PopupActions>
<ButtonBase class="popup-button" @click.native="$closePopup()" button-style="secondary">{{ $t('popup_move_item.cancel') }}
<ButtonBase class="popup-button" @click.native="$closePopup()" button-style="secondary">
{{ $t('popup_move_item.cancel') }}
</ButtonBase>
<ButtonBase class="popup-button" @click.native="changeName" button-style="theme">{{ $t('popup_share_edit.save') }}
<ButtonBase class="popup-button" @click.native="changeName" button-style="theme">
{{ $t('popup_share_edit.save') }}
</ButtonBase>
</PopupActions>
</PopupWrapper>
@@ -85,7 +84,7 @@ export default {
return {
pickedItem: undefined,
isMoreOptions: false,
setFolderIcon: undefined
folderIcon: undefined
}
},
methods: {
@@ -99,9 +98,14 @@ export default {
id: this.pickedItem.id,
type: this.pickedItem.type,
name: this.pickedItem.name,
icon: this.setFolderIcon ? this.setFolderIcon : null
}
if (this.folderIcon.emoji)
item['emoji'] = this.folderIcon.emoji
if (this.folderIcon.color)
item['color'] = this.folderIcon.color
// Rename item request
this.$store.dispatch('renameItem', item)
@@ -125,14 +129,14 @@ export default {
this.isMoreOptions = false
this.setFolderIcon = undefined
this.folderIcon = undefined
// Store picked item
this.pickedItem = args.item
})
events.$on('setFolderIcon', (icon) => {
this.setFolderIcon = icon
this.folderIcon = icon
})
}
}

12
resources/js/components/Others/SetFolderIcon.vue
View File

@@ -47,7 +47,6 @@ export default {
},
watch: {
selectedColor() {
let color = {'color': this.selectedColor}
if (this.selectedColor) {
@@ -55,7 +54,6 @@ export default {
this.selectedEmoji = undefined
events.$emit('setFolderIcon', color)
}
},
selectedEmoji() {
@@ -72,20 +70,20 @@ export default {
if (this.folderData) {
// If folder have already set some color set this color to selected color
this.folderData.icon_color ? this.selectedColor = this.folderData.icon_color : ''
this.folderData.color ? this.selectedColor = this.folderData.color : ''
// If folder have already set some emojit set this emoji to selected emoji
this.folderData.icon_emoji ? this.selectedEmoji = this.folderData.icon_emoji : ''
this.folderData.emoji ? this.selectedEmoji = this.folderData.emoji : ''
}
},
destroyed() {
if (this.folderData) {
// After close SetFolderIcon set the saved folder icon for thumbnail
let color = {'color': this.folderData.icon_color }
let emoji = {'emoji': this.folderData.icon_emoji }
let color = {'color': this.folderData.color}
let emoji = {'emoji': this.folderData.emoji}
events.$emit('setFolderIcon', this.folderData.icon_emoji ? emoji : color )
events.$emit('setFolderIcon', this.folderData.emoji ? emoji : color)
}
}
}

10
resources/js/components/Others/TreeMenu.vue
View File

@@ -1,6 +1,6 @@
<template>
<!--Folder Icon-->
<div class="folder-item-wrapper" :class="{'is-inactive': disabledById && disabledById.unique_id === nodes.unique_id || !disableId} ">
<div class="folder-item-wrapper" :class="{'is-inactive': disabledById && disabledById.id === nodes.id || !disableId} ">
<div class="folder-item" :class="{'is-selected': isSelected}" @click="getFolder" :style="indent">
<chevron-right-icon @click.stop="showTree" size="17" class="icon-arrow" :class="{'is-opened': isVisible, 'is-visible': nodes.folders.length !== 0}"></chevron-right-icon>
@@ -9,7 +9,7 @@
<span class="label">{{ nodes.name }}</span>
</div>
<TreeMenu :disabled-by-id="disabledById" :depth="depth + 1" v-if="isVisible" :nodes="item" v-for="item in nodes.folders" :key="item.unique_id" />
<TreeMenu :disabled-by-id="disabledById" :depth="depth + 1" v-if="isVisible" :nodes="item" v-for="item in nodes.folders" :key="item.id" />
</div>
</template>
@@ -39,7 +39,7 @@
let canBeShow = true
if(this.fileInfoDetail.includes(this.disabledById)){
this.fileInfoDetail.map(item => {
if(item.unique_id === this.nodes.unique_id) {
if(item.id === this.nodes.id) {
canBeShow = false
}
})
@@ -73,7 +73,7 @@
events.$on('pick-folder', node => {
this.isSelected = false
if (this.nodes.unique_id == node.unique_id)
if (this.nodes.id === node.id)
this.isSelected = true
})
@@ -81,7 +81,7 @@
events.$on('show-folder-item', node => {
this.isSelected = false
if (this.nodes.unique_id == node.unique_id)
if (this.nodes.id === node.id)
this.isSelected = true
})
}

4
resources/js/helpers.js vendored
View File

@@ -85,7 +85,7 @@ const Helpers = {
// Push items to file queue
[...files].map(item => {
this.$store.commit('ADD_FILES_TO_QUEUE', {
parent_id: store.getters.currentFolder.id,
folder_id: store.getters.currentFolder.id,
file: item,
})
});
@@ -106,7 +106,7 @@ const Helpers = {
// Push items to file queue
[...event.dataTransfer.items].map(item => {
this.$store.commit('ADD_FILES_TO_QUEUE', {
parent_id: parent_id,
folder_id: parent_id,
file: item.getAsFile(),
})
});

2
resources/js/store/modules/app.js vendored
View File

@@ -991,6 +991,7 @@ const actions = {
}
},
}
const mutations = {
LOAD_EMOJIS_LIST(state, data) {
state.emojis = data
@@ -1028,6 +1029,7 @@ const mutations = {
state.requestedPlan = plan
},
}
const getters = {
fileInfoVisible: state => state.fileInfoPanelVisible,
FilePreviewType: state => state.FilePreviewType,

19
resources/js/store/modules/fileBrowser.js vendored
View File

@@ -88,7 +88,6 @@ const actions = {
commit('LOADING_STATE', {loading: true, data: []})
commit('FLUSH_FOLDER_HISTORY')
let currentFolder = {
name: i18n.t('sidebar.my_shared'),
location: 'shared',
@@ -98,7 +97,7 @@ const actions = {
commit('STORE_CURRENT_FOLDER', currentFolder)
axios
.get(getters.api + '/browse/shared-all' + getters.sorting.URI)
.get(getters.api + '/browse/shared' + getters.sorting.URI)
.then(response => {
commit('LOADING_STATE', {loading: false, data: response.data})
commit('STORE_PREVIOUS_FOLDER', currentFolder)
@@ -118,7 +117,7 @@ const actions = {
})
axios
.get(getters.api + '/browse/participant-uploads' + getters.sorting.URI)
.get(getters.api + '/browse/participants' + getters.sorting.URI)
.then(response => {
commit('LOADING_STATE', {loading: false, data: response.data})
@@ -139,7 +138,7 @@ const actions = {
commit('STORE_CURRENT_FOLDER', trash)
axios
.get(getters.api + '/trash' + getters.sorting.URI)
.get(getters.api + '/browse/trash' + getters.sorting.URI)
.then(response => {
commit('LOADING_STATE', {loading: false, data: response.data})
commit('STORE_PREVIOUS_FOLDER', trash)
@@ -156,9 +155,9 @@ const actions = {
let route = undefined
if (getters.sharedDetail && getters.sharedDetail.protected)
route = '/api/search/private'
route = '/api/browse/search/private'
else if (getters.sharedDetail && !getters.sharedDetail.protected)
route = '/api/search/public/' + router.currentRoute.params.token
route = '/api/browse/search/public/' + router.currentRoute.params.token
else
route = '/api/browse/search'
@@ -179,9 +178,9 @@ const actions = {
let route = undefined
if (getters.sharedDetail && getters.sharedDetail.protected)
route = '/api/navigation/private'
route = '/api/browse/navigation/private'
else if (getters.sharedDetail && !getters.sharedDetail.protected)
route = '/api/navigation/public/' + router.currentRoute.params.token
route = '/api/browse/navigation/public/' + router.currentRoute.params.token
else
route = '/api/browse/navigation'
@@ -234,8 +233,8 @@ const mutations = {
state.data.find(item => {
if (item.id === updatedFile.id) {
item.name = updatedFile.name
item.icon_color = updatedFile.icon_color ? updatedFile.icon_color : null
item.icon_emoji = updatedFile.icon_emoji ? updatedFile.icon_emoji : null
item.color = updatedFile.color ? updatedFile.color : null
item.emoji = updatedFile.emoji ? updatedFile.emoji : null
}
})
},

40
resources/js/store/modules/fileFunctions.js vendored
View File

@@ -4,14 +4,12 @@ import { events } from '@/bus'
import {last} from 'lodash'
import axios from 'axios'
import Vue from 'vue'
import store from '../index'
const defaultState = {
processingPopup: undefined,
fileQueue: [],
filesInQueueTotal: 0,
filesInQueueUploaded: 0,
isProcessingFile: false,
uploadingProgress: 0
}
@@ -26,8 +24,8 @@ const actions = {
// Get route
let route = getters.sharedDetail && !getters.sharedDetail.protected
? '/api/zip-folder/' + folder.id + '/public/' + router.currentRoute.params.token
: '/api/zip-folder/' + folder.id
? '/api/zip/folder/' + folder.id + '/public/' + router.currentRoute.params.token
: '/api/zip/folder/' + folder.id
axios.get(route)
.then(response => {
@@ -49,8 +47,8 @@ const actions = {
// Get route
let route = getters.sharedDetail && !getters.sharedDetail.protected
? '/api/zip/public/' + router.currentRoute.params.token
: '/api/zip'
? '/api/zip/files/public/' + router.currentRoute.params.token
: '/api/zip/files'
commit('PROCESSING_POPUP', {
title: i18n.t('popup_zipping.title'),
@@ -80,7 +78,6 @@ const actions = {
items = getters.fileInfoDetail
items.forEach(data => itemsToMove.push({
'force_delete': data.deleted_at ? true : false,
'id': data.id,
'type': data.type
}))
@@ -91,12 +88,11 @@ const actions = {
// Get route
let route = getters.sharedDetail && !getters.sharedDetail.protected
? '/api/move/public/' + router.currentRoute.params.token
? '/api/editor/move/public/' + router.currentRoute.params.token
: '/api/move'
axios
.post(route, {
_method: 'post',
to_id: to_item.id,
items: itemsToMove
})
@@ -117,7 +113,7 @@ const actions = {
// Get route
let route = getters.sharedDetail && !getters.sharedDetail.protected
? '/api/create-folder/public/' + router.currentRoute.params.token
? '/api/editor/create-folder/public/' + router.currentRoute.params.token
: '/api/create-folder'
axios
@@ -152,14 +148,12 @@ const actions = {
// Get route
let route = getters.sharedDetail && !getters.sharedDetail.protected
? '/api/rename-item/' + data.id + '/public/' + router.currentRoute.params.token
: '/api/rename-item/' + data.id
? '/api/editor/rename/' + data.id + '/public/' + router.currentRoute.params.token
: '/api/rename/' + data.id
axios
.post(route, {
name: data.name,
type: data.type,
icon: data.icon,
...data,
_method: 'patch'
})
.then(response => {
@@ -177,7 +171,7 @@ const actions = {
// Get route
let route = getters.sharedDetail && !getters.sharedDetail.protected
? '/api/upload/public/' + router.currentRoute.params.token
? '/api/editor/upload/public/' + router.currentRoute.params.token
: '/api/upload'
// Create cancel token for axios cancellation
@@ -292,9 +286,9 @@ const actions = {
commit('CLEAR_FILEINFO_DETAIL')
axios
.post(getters.api + '/trash/restore-items', {
.post(getters.api + '/trash/restore', {
to_home: restoreToHome,
data: itemToRestore
items: itemToRestore
})
.then(
// Remove file
@@ -346,13 +340,12 @@ const actions = {
// Get route
let route = getters.sharedDetail && !getters.sharedDetail.protected
? '/api/remove-item/public/' + router.currentRoute.params.token
: '/api/remove-item'
? '/api/editor/remove/public/' + router.currentRoute.params.token
: '/api/remove'
axios
.post(route, {
_method: 'post',
data: itemsToDelete
items: itemsToDelete
})
.then(() => {
@@ -387,14 +380,13 @@ const actions = {
commit('LOADING_STATE', {loading: true, data: []})
axios
.post(getters.api + '/trash/empty-trash', {
.post(getters.api + '/trash/dump', {
_method: 'delete'
})
.then(() => {
commit('LOADING_STATE', {loading: false, data: []})
events.$emit('scrollTop')
// Remove file preview
commit('CLEAR_FILEINFO_DETAIL')
})
.catch(() => Vue.prototype.$isSomethingWrong())

9
resources/js/store/modules/sharing.js vendored
View File

@@ -81,8 +81,7 @@ const actions = {
})
axios
.post('/api/share/cancel', {
_method: 'post',
.post('/api/share/revoke', {
tokens: tokens
})
.then(() => {
@@ -90,7 +89,7 @@ const actions = {
items.forEach(item => {
// Remove item from file browser
if ( getters.currentFolder , getters.currentFolder.location === 'shared' ) {
if ( getters.currentFolder && getters.currentFolder.location === 'shared' ) {
commit('REMOVE_ITEM', item.id)
}
@@ -112,8 +111,8 @@ const actions = {
getSingleFile: ({commit, state}) => {
let route = state.sharedDetail.protected
? '/api/files/private'
: '/api/files/' + router.currentRoute.params.token + '/public'
? '/api/browse/files/private'
: '/api/browse/files/' + router.currentRoute.params.token + '/public'
axios.get(route)
.then(response => {

2
resources/js/store/modules/userAuth.js vendored
View File

@@ -93,7 +93,7 @@ const actions = {
context.commit('ADD_TO_FAVOURITES', pushToFavorites)
axios
.post(context.getters.api + '/browse/folders/favourites', {
.post(context.getters.api + '/folders/favourites', {
folders: addFavourites
})
.catch(() => {

4
resources/js/views/Auth/SignIn.vue
View File

@@ -210,10 +210,10 @@
this.$scrollTop()
this.$store.commit('PROCESSING_POPUP', undefined)
if (this.config.isDemo) {
//if (this.config.isDemo) {
this.loginEmail = 'howdy@hi5ve.digital'
this.loginPassword = 'vuefilemanager'
}
//}
}
}
</script>

46
tests/Feature/Accounts/UserAccountTest.php
View File

@@ -109,10 +109,16 @@ class UserAccountTest extends TestCase
"stripe_customer" => false,
"email" => $user->email,
"role" => $user->role,
"folders" => [],
"storage" => [
"used" => 0,
"used_formatted" => "0.00%",
"capacity" => "5",
"capacity_formatted" => "5GB",
],
"created_at_formatted" => format_date($user->created_at, '%d. %B. %Y'),
"created_at" => $user->created_at->toJson(),
"updated_at" => $user->updated_at->toJson(),
]
],
"relationships" => [
"settings" => [
@@ -121,48 +127,28 @@ class UserAccountTest extends TestCase
"type" => "settings",
"attributes" => [
'avatar' => $user->settings->avatar,
'billing_name' => $user->settings->name,
'billing_address' => $user->settings->address,
'billing_state' => $user->settings->state,
'billing_city' => $user->settings->city,
'billing_postal_code' => $user->settings->postal_code,
'billing_country' => $user->settings->country,
'billing_phone_number' => $user->settings->phone_number,
'name' => $user->settings->name,
'address' => $user->settings->address,
'state' => $user->settings->state,
'city' => $user->settings->city,
'postal_code' => $user->settings->postal_code,
'country' => $user->settings->country,
'phone_number' => $user->settings->phone_number,
'timezone' => $user->settings->timezone
]
]
],
"storage" => [
"data" => [
"id" => "1",
"type" => "storage",
"attributes" => [
"used" => 0,
"used_formatted" => "0.00%",
"capacity" => "5",
"capacity_formatted" => "5GB",
]
]
],
"favourites" => [
"data" => [
"id" => "1",
"type" => "folders_favourite",
"id" => (string)$user->id,
"type" => "favourite_folders",
"attributes" => [
"folders" => []
]
]
],
"tree" => [
"data" => [
"id" => "1",
"type" => "folders_tree",
"attributes" => [
"folders" => [],
]
]
],
]
]);
}
}