Index: app/Http/Controllers/Dashboard/DepartmentsController.php =================================================================== --- app/Http/Controllers/Dashboard/DepartmentsController.php (revision fa80fbe2f106a5fad16aa99198a590aa5fa14143) +++ app/Http/Controllers/Dashboard/DepartmentsController.php (revision 94f05dcdae6255fd3aa74c6925f9286ee591bb91) @@ -47,5 +47,4 @@ $users = User::all(); - Notification::send($users, new NewDepartmentCreated("New department created")); $department->save(); @@ -127,6 +126,4 @@ try { $files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path)); - $flag = false; - foreach ($files as $file) { @@ -154,13 +151,14 @@ $department = Department::find($id); - $FileSystem = new Filesystem(); - $zip_file = Storage::disk('uploads')->path('Department.zip'); + $zip_file=Storage::disk('uploads')->path('Department.zip'); $zip = new \ZipArchive(); $zip->open($zip_file, \ZipArchive::CREATE | \ZipArchive::OVERWRITE); - $path = Storage::disk('uploads')->path($department->location) . DIRECTORY_SEPARATOR; + $path = Storage::disk('uploads')->path($department->location); - try{ + try { $files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path)); foreach ($files as $file) { + + // We're skipping all subfolders if (!$file->isDir()) { $filePath = $file->getRealPath(); @@ -169,14 +167,14 @@ $zip->addFile($filePath, $relativePath); } + } $zip->close(); - $headers = array('Content-Type' => 'application/octet-stream',); - $zip_new_name = Carbon::now()->format('d.m.Y - H:i') . $department->name . '.zip'; + $headers = array('Content-Type' => 'application/octet-stream'); + $zip_new_name = Carbon::now()->format('d.m.Y - H:i') . '- Departments.zip'; return response()->download($zip_file, $zip_new_name, $headers); } - } - catch(\Exception $e) { - Alert::flash("This department has no files", "warning"); + catch(\Exception $e){ + Alert::flash("All departments are empty", "warning"); return redirect()->back(); - } + } } } Index: app/Http/Controllers/Dashboard/FoldersController.php =================================================================== --- app/Http/Controllers/Dashboard/FoldersController.php (revision fa80fbe2f106a5fad16aa99198a590aa5fa14143) +++ app/Http/Controllers/Dashboard/FoldersController.php (revision 94f05dcdae6255fd3aa74c6925f9286ee591bb91) @@ -163,5 +163,5 @@ Alert::flash("New folder created successfully"); - return redirect()->back(); + return redirect()->route("dashboard.folders.index"); } Index: app/Http/Requests/Dashboard/FolderRequest.php =================================================================== --- app/Http/Requests/Dashboard/FolderRequest.php (revision fa80fbe2f106a5fad16aa99198a590aa5fa14143) +++ app/Http/Requests/Dashboard/FolderRequest.php (revision 94f05dcdae6255fd3aa74c6925f9286ee591bb91) @@ -41,5 +41,5 @@ $arch_id = $this->request->get('arch_id'); - $deptId = explode('/', $arch_id)[0]; + $deptCode = explode('/', $arch_id)[0]; $archNum = explode('/', $arch_id)[1]; @@ -48,8 +48,9 @@ } - if ($deptId !== Department::find($this->request->get('department'))->code) { + if ($deptCode != Department::find($this->request->get('department'))->code) { $fail("Folder Archive ID field format is invalid"); } - } catch (\Exception $e) { + } + catch (\Exception $e) { $fail("Please enter folders Archive ID"); } Index: config/filesystems.php =================================================================== --- config/filesystems.php (revision fa80fbe2f106a5fad16aa99198a590aa5fa14143) +++ config/filesystems.php (revision 94f05dcdae6255fd3aa74c6925f9286ee591bb91) @@ -33,5 +33,5 @@ 'local' => [ 'driver' => 'local', - 'root' => public_path() . DIRECTORY_SEPARATOR . 'uploads', + 'root' => storage_path() . DIRECTORY_SEPARATOR . 'app' . DIRECTORY_SEPARATOR . 'public', 'permissions' => [ 'file' => [ @@ -53,5 +53,5 @@ 'public' => [ 'driver' => 'local', - 'root' => storage_path('app/public'), + 'root' => storage_path() . DIRECTORY_SEPARATOR . 'app' . DIRECTORY_SEPARATOR . 'public', 'url' => env('APP_URL').'/storage', 'visibility' => 'public', @@ -60,5 +60,5 @@ 'uploads' => [ 'driver' => 'local', - 'root' => public_path() . '/uploads', + 'root' => storage_path() . DIRECTORY_SEPARATOR . 'app' . DIRECTORY_SEPARATOR . 'public', ], Index: tabase/factories/FileFactory.php =================================================================== --- database/factories/FileFactory.php (revision fa80fbe2f106a5fad16aa99198a590aa5fa14143) +++ (revision ) @@ -1,40 +1,0 @@ -faker->numberBetween('1', '500'); - - $folder = Folder::find($folderId); - $name = $folder->name . ' - ' . $this->faker->unique()->date() . '.png'; - - $location = $folder->location . DIRECTORY_SEPARATOR . $name; - - return [ - "folder_id" => $folderId, - "name" => $name, - "location" => $location, - "created_at" => $this->faker->dateTime() - ]; - } -} Index: database/factories/FolderFactory.php =================================================================== --- database/factories/FolderFactory.php (revision fa80fbe2f106a5fad16aa99198a590aa5fa14143) +++ database/factories/FolderFactory.php (revision 94f05dcdae6255fd3aa74c6925f9286ee591bb91) @@ -27,7 +27,6 @@ public function definition() { - $deptId = 15; - $deptCode = Department::find($deptId)->code; + $deptCode = Department::find(1)->code; $name = $this->faker->unique()->firstName(); @@ -42,5 +41,5 @@ 'location' => $location, 'user_id' => 1, - 'department_id' => $deptId, + 'department_id' => 1, 'is_important' => $this->faker->boolean, 'created_at' => now() Index: database/seeders/DatabaseSeeder.php =================================================================== --- database/seeders/DatabaseSeeder.php (revision fa80fbe2f106a5fad16aa99198a590aa5fa14143) +++ database/seeders/DatabaseSeeder.php (revision 94f05dcdae6255fd3aa74c6925f9286ee591bb91) @@ -18,7 +18,7 @@ $this->call(RolesPermissionsTableSeeder::class); $this->call(UsersTableSeeder::class); - //$this->call(DepartmentsTableSeeder::class); + $this->call(DepartmentsTableSeeder::class); $this->call(FileTypesTableSeeder::class); - //$this->call(FoldersTableSeeder::class); + $this->call(FoldersTableSeeder::class); //$this->call(FilesTableSeeder::class); } Index: database/seeders/FoldersTableSeeder.php =================================================================== --- database/seeders/FoldersTableSeeder.php (revision fa80fbe2f106a5fad16aa99198a590aa5fa14143) +++ database/seeders/FoldersTableSeeder.php (revision 94f05dcdae6255fd3aa74c6925f9286ee591bb91) @@ -17,5 +17,5 @@ public function run() { - Folder::factory()->count(500)->create(); + Folder::factory()->count(5)->create(); $folders = Folder::all(); Index: resources/views/dashboard/files/index.blade.php =================================================================== --- resources/views/dashboard/files/index.blade.php (revision fa80fbe2f106a5fad16aa99198a590aa5fa14143) +++ resources/views/dashboard/files/index.blade.php (revision 94f05dcdae6255fd3aa74c6925f9286ee591bb91) @@ -76,7 +76,7 @@ @else @if(in_array(explode('.', $file->name)[1], $imageExt))
- +
- image + image
Index: resources/views/dashboard/folders/files.blade.php =================================================================== --- resources/views/dashboard/folders/files.blade.php (revision fa80fbe2f106a5fad16aa99198a590aa5fa14143) +++ resources/views/dashboard/folders/files.blade.php (revision 94f05dcdae6255fd3aa74c6925f9286ee591bb91) @@ -10,6 +10,6 @@
@if(auth()->user()->hasPermission('manage_all_folders')) - - Upload + + Edit folder @endif @@ -44,5 +44,5 @@
- Upload + Edit folder
@@ -88,7 +88,7 @@ @else @if(in_array(explode('.', $file->name)[1], $imageExt))
- +
- image + image
Index: resources/views/dashboard/index.blade.php =================================================================== --- resources/views/dashboard/index.blade.php (revision fa80fbe2f106a5fad16aa99198a590aa5fa14143) +++ resources/views/dashboard/index.blade.php (revision 94f05dcdae6255fd3aa74c6925f9286ee591bb91) @@ -145,7 +145,7 @@ @else @if(in_array(explode('.', $file->name)[1], $imageExt))
- +
- image + image