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

- refactored user_scope to author

Browse Source 
- added author_id for future teams implementation
This commit is contained in:
Peter Papp
2021-03-19 11:27:58 +01:00
parent 19a75d2fb1
commit aa51484303
17 changed files with 176 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/SetupDevEnvironment.php
+50 -50
View File
@@ -174,7 +174,7 @@ class SetupDevEnvironment extends Command
$shared_folder = Folder::factory(Folder::class)
->create([
'user_id' => $user->id,
'user_scope' => 'master',
'author' => 'user',
'name' => 'Shared Folder',
'emoji' => [
"codes" => "1F680",
@@ -200,17 +200,17 @@ class SetupDevEnvironment extends Command
$peters_files = Folder::factory(Folder::class)
->create([
'user_id' => $user->id,
'parent_id' => $shared_folder->id,
'user_scope' => 'editor',
'name' => "Peter's Files",
'user_id' => $user->id,
'parent_id' => $shared_folder->id,
'author' => 'visitor',
'name' => "Peter's Files",
]);
// 2.
$random_pics = Folder::factory(Folder::class)
->create([
'user_id' => $user->id,
'user_scope' => 'master',
'author' => 'user',
'name' => 'Random Pics',
'emoji' => [
'codes' => '1F4F7',
@@ -225,11 +225,11 @@ class SetupDevEnvironment extends Command
$nature = Folder::factory(Folder::class)
->create([
'user_id' => $user->id,
'parent_id' => $random_pics->id,
'user_scope' => 'master',
'name' => "Nature",
'emoji' => [
'user_id' => $user->id,
'parent_id' => $random_pics->id,
'author' => 'user',
'name' => "Nature",
'emoji' => [
'codes' => '26F0',
'char' => '⛰',
'name' => 'mountain',
@@ -241,11 +241,11 @@ class SetupDevEnvironment extends Command
$apartments = Folder::factory(Folder::class)
->create([
'user_id' => $user->id,
'parent_id' => $random_pics->id,
'user_scope' => 'master',
'name' => "Apartments",
'emoji' => [
'user_id' => $user->id,
'parent_id' => $random_pics->id,
'author' => 'user',
'name' => "Apartments",
'emoji' => [
'codes' => '1F3E0',
'char' => '🏠',
'name' => 'house',
@@ -259,65 +259,65 @@ class SetupDevEnvironment extends Command
$playable_media = Folder::factory(Folder::class)
->create([
'user_id' => $user->id,
'user_scope' => 'master',
'author' => 'user',
'name' => 'Playable Media',
'created_at' => Carbon::now()->subMinutes(2),
]);
$video = Folder::factory(Folder::class)
->create([
'user_id' => $user->id,
'parent_id' => $playable_media->id,
'user_scope' => 'master',
'name' => "Video",
'user_id' => $user->id,
'parent_id' => $playable_media->id,
'author' => 'user',
'name' => "Video",
]);
$audio = Folder::factory(Folder::class)
->create([
'user_id' => $user->id,
'parent_id' => $playable_media->id,
'user_scope' => 'master',
'name' => "Audio",
'user_id' => $user->id,
'parent_id' => $playable_media->id,
'author' => 'user',
'name' => "Audio",
]);
// 4.
$multi_level = Folder::factory(Folder::class)
->create([
'user_id' => $user->id,
'user_scope' => 'master',
'author' => 'user',
'name' => 'Multi Level Folder',
'created_at' => Carbon::now()->subMinutes(3),
]);
$first_level = Folder::factory(Folder::class)
->create([
'user_id' => $user->id,
'parent_id' => $multi_level->id,
'user_scope' => 'master',
'name' => "First Level",
'user_id' => $user->id,
'parent_id' => $multi_level->id,
'author' => 'user',
'name' => "First Level",
]);
$second_level = Folder::factory(Folder::class)
->create([
'user_id' => $user->id,
'parent_id' => $first_level->id,
'user_scope' => 'master',
'name' => "Second Level",
'user_id' => $user->id,
'parent_id' => $first_level->id,
'author' => 'user',
'name' => "Second Level",
]);
$third_level = Folder::factory(Folder::class)
->create([
'user_id' => $user->id,
'parent_id' => $second_level->id,
'user_scope' => 'master',
'name' => "Third Level",
'user_id' => $user->id,
'parent_id' => $second_level->id,
'author' => 'user',
'name' => "Third Level",
]);
// 5.
$documents = Folder::factory(Folder::class)
->create([
'user_id' => $user->id,
'user_scope' => 'master',
'author' => 'user',
'name' => 'Documents',
'created_at' => Carbon::now()->subMinutes(4),
]);
@@ -337,7 +337,7 @@ class SetupDevEnvironment extends Command
$videohive = Folder::factory(Folder::class)
->create([
'user_id' => $user->id,
'user_scope' => 'master',
'author' => 'user',
'name' => 'Videohive by MakingCG',
'created_at' => Carbon::now()->subMinutes(5),
]);
@@ -388,7 +388,7 @@ class SetupDevEnvironment extends Command
'name' => $file['name'],
'basename' => $basename,
'type' => 'file',
'user_scope' => 'master',
'author' => 'user',
'mimetype' => $file['mimetype'],
'filesize' => rand(1000000, 4000000),
'created_at' => Carbon::now()->subMinutes(rand(1, 5)),
@@ -432,7 +432,7 @@ class SetupDevEnvironment extends Command
'name' => $file['name'],
'basename' => $basename,
'type' => 'file',
'user_scope' => 'master',
'author' => 'user',
'mimetype' => $file['mimetype'],
'filesize' => rand(1000000, 4000000),
'created_at' => Carbon::now()->subMinutes(rand(1, 5)),
@@ -466,7 +466,7 @@ class SetupDevEnvironment extends Command
'name' => $file['name'],
'basename' => $basename,
'type' => 'file',
'user_scope' => 'master',
'author' => 'user',
'mimetype' => $file['mimetype'],
'filesize' => rand(1000000, 4000000),
'created_at' => Carbon::now()->subMinutes(rand(1, 5)),
@@ -525,7 +525,7 @@ class SetupDevEnvironment extends Command
'name' => $file['name'],
'basename' => $basename,
'type' => 'file',
'user_scope' => 'editor',
'author' => 'visitor',
'mimetype' => $file['mimetype'],
'filesize' => rand(1000000, 4000000),
'created_at' => Carbon::now()->subMinutes(rand(1, 5)),
@@ -553,7 +553,7 @@ class SetupDevEnvironment extends Command
'name' => $file,
'basename' => $basename,
'type' => 'video',
'user_scope' => 'master',
'author' => 'user',
'mimetype' => 'mp4',
'filesize' => rand(1000000, 4000000),
'created_at' => Carbon::now()->subMinutes(rand(1, 5)),
@@ -578,7 +578,7 @@ class SetupDevEnvironment extends Command
'name' => $file,
'basename' => $basename,
'type' => 'video',
'user_scope' => 'master',
'author' => 'user',
'mimetype' => 'mp4',
'filesize' => rand(1000000, 4000000),
'created_at' => Carbon::now()->subMinutes(rand(1, 5)),
@@ -603,7 +603,7 @@ class SetupDevEnvironment extends Command
'name' => $file,
'basename' => $basename,
'type' => 'audio',
'user_scope' => 'master',
'author' => 'user',
'mimetype' => 'mp3',
'filesize' => rand(1000000, 4000000),
'created_at' => Carbon::now()->subMinutes(rand(1, 5)),
@@ -641,7 +641,7 @@ class SetupDevEnvironment extends Command
'name' => $file,
'basename' => $basename,
'type' => 'image',
'user_scope' => 'master',
'author' => 'user',
'mimetype' => 'jpg',
'filesize' => rand(1000000, 4000000),
'thumbnail' => $this->helper->create_image_thumbnail("files/$user->id/$basename", $file, $user->id),
@@ -675,7 +675,7 @@ class SetupDevEnvironment extends Command
'name' => $file,
'basename' => $basename,
'type' => 'image',
'user_scope' => 'master',
'author' => 'user',
'mimetype' => 'jpg',
'filesize' => rand(1000000, 4000000),
'thumbnail' => $this->helper->create_image_thumbnail("files/$user->id/$basename", $file, $user->id),
@@ -713,7 +713,7 @@ class SetupDevEnvironment extends Command
'name' => $file,
'basename' => $basename,
'type' => 'image',
'user_scope' => 'master',
'author' => 'user',
'mimetype' => 'jpg',
'filesize' => rand(1000000, 4000000),
'thumbnail' => $this->helper->create_image_thumbnail("files/$user->id/$basename", $file, $user->id),
app/Http/Controllers/FileManager/BrowseController.php
+1 -1
View File
@@ -162,7 +162,7 @@ class BrowseController extends Controller
{
return File::with(['parent'])
->where('user_id', Auth::id())
->whereUserScope('editor')
->whereAuthor('visitor')
->sortable()
->get();
}
app/Models/File.php
+4
View File
@@ -34,6 +34,10 @@ class File extends Model
'metadata' => 'array',
];
protected $hidden = [
'author_id'
];
/**
* Sortable columns
*
app/Models/Folder.php
+4
View File
@@ -31,6 +31,10 @@ class Folder extends Model
'emoji' => 'array',
];
protected $hidden = [
'author_id'
];
/**
* Sortable columns
*
app/Services/DemoService.php
+5 -12
View File
@@ -29,20 +29,16 @@ class DemoService
*/
function create_folder($request)
{
// Get variables
$user_scope = $request->user() ? $request->user()->token()->scopes[0] : 'editor';
$name = $request->has('name') ? $request->input('name') : 'New Folder';
return [
'user_id' => 1,
'id' => Str::uuid(),
'parent_id' => random_int(1000, 9999),
'name' => $name,
'name' => $request->name,
'type' => 'folder',
'user_scope' => $user_scope,
'author' => $request->user() ? 'user' : 'visitor',
'items' => '0',
'color' => isset($request->icon['color']) ? $request->icon['color'] : null,
'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'),
];
@@ -97,9 +93,6 @@ class DemoService
*/
function upload($request)
{
// Get user data
$user_scope = $request->user() ? $request->user()->token()->scopes[0] : 'editor';
// File
$file = $request->file('file');
$filename = Str::random() . '-' . str_replace(' ', '', $file->getClientOriginalName());
@@ -117,7 +110,7 @@ class DemoService
'filesize' => Metric::bytes($filesize)->format(),
'type' => $filetype,
'file_url' => 'https://vuefilemanager.hi5ve.digital/assets/vue-file-manager-preview.jpg',
'user_scope' => $user_scope,
'author' => $request->user() ? 'user' : 'visitor',
'created_at' => Carbon::now()->format('j M Y \a\t H:i'),
'updated_at' => Carbon::now()->format('j M Y \a\t H:i'),
];
app/Services/FileManagerService.php
+18 -28
View File
@@ -166,21 +166,13 @@ class FileManagerService
*/
public function create_folder($request, $shared = null)
{
// Get variables
//$user_scope = is_null($shared) ? $request->user()->token()->scopes[0] : 'editor';
$user_scope = is_null($shared) ? 'master' : 'editor';
$name = $request->has('name') ? $request->input('name') : 'New Folder';
$user_id = is_null($shared) ? Auth::id() : $shared->user_id;
return Folder::create([
'parent_id' => $request->parent_id,
'user_scope' => $user_scope,
'user_id' => $user_id,
'type' => 'folder',
'name' => $name,
'color' => $request->color ?? null,
'emoji' => $request->emoji ?? null,
'parent_id' => $request->parent_id,
'author' => $shared ? 'visitor' : 'user',
'user_id' => $shared ? $shared->user_id : Auth::id(),
'name' => $request->name,
'color' => $request->color ?? null,
'emoji' => $request->emoji ?? null,
]);;
}
@@ -196,7 +188,7 @@ class FileManagerService
public function rename_item($request, $id, $shared = null)
{
// Get user id
$user_id = is_null($shared) ? Auth::id() : $shared->user_id;
$user_id = $shared ? $shared->user_id : Auth::id();
// Get item
$item = get_item($request->type, $id, $user_id);
@@ -396,9 +388,7 @@ class FileManagerService
$disk_local = Storage::disk('local');
// Get user data
//$user_scope = is_null($shared) ? $request->user()->token()->scopes[0] : 'editor';
$user_scope = is_null($shared) ? 'master' : 'editor';
$user_id = is_null($shared) ? Auth::id() : $shared->user_id;
$user_id = $shared ? $shared->user_id : Auth::id();
// File Info
$file_size = $disk_local->size('chunks/' . $temp_filename);
@@ -427,16 +417,16 @@ class FileManagerService
// Return new file
return UserFile::create([
'mimetype' => get_file_type_from_mimetype($file_mimetype),
'type' => get_file_type($file_mimetype),
'folder_id' => $request->folder_id,
'metadata' => $metadata,
'name' => $user_file_name,
'basename' => $disk_file_name,
'user_scope' => $user_scope,
'thumbnail' => $thumbnail,
'filesize' => $file_size,
'user_id' => $user_id,
'mimetype' => get_file_type_from_mimetype($file_mimetype),
'type' => get_file_type($file_mimetype),
'folder_id' => $request->folder_id,
'metadata' => $metadata,
'name' => $user_file_name,
'basename' => $disk_file_name,
'author' => $shared ? 'visitor' : 'user',
'thumbnail' => $thumbnail,
'filesize' => $file_size,
'user_id' => $user_id,
]);
}
}