Index: app/Exports/DepartmentsExport.php =================================================================== --- app/Exports/DepartmentsExport.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) +++ app/Exports/DepartmentsExport.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -0,0 +1,46 @@ +id, + $row->name, + $row->code, + $row->no_of_folders, + $row->user_id . ' - ' . User::find($row->user_id)->username, + $row->created_at, + $row->updated_at + ]; + return $fields; + } + + public function headings(): array + { + return [ + 'ID', + 'Name', + 'Code', + 'Number of folders', + 'Created by ID - Username', + 'Created at', + 'Updated at', + ]; + } +} Index: app/Exports/FilesExport.php =================================================================== --- app/Exports/FilesExport.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ app/Exports/FilesExport.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -5,5 +5,4 @@ use App\Models\File; use App\Models\Folder; -use App\Models\User; use Maatwebsite\Excel\Concerns\FromCollection; use Maatwebsite\Excel\Concerns\WithHeadings; @@ -26,5 +25,5 @@ $row->location, $row->getSize($row->location) . ' MB', - $row->Folder::find($row->folder_id)->name . ' - ' . Folder::find($row->folder_id)->arch_id, + $row->folder_id . ' - ' . Folder::find($row->folder_id)->name . ' - ' . Folder::find($row->folder_id)->arch_id, $row->created_at, $row->updated_at @@ -40,5 +39,5 @@ 'Location', 'Size', - 'Folder - Archive ID', + 'ID - Folder - Archive ID', 'Created at', 'Updated at' Index: app/Exports/FoldersExport.php =================================================================== --- app/Exports/FoldersExport.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ app/Exports/FoldersExport.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -5,4 +5,5 @@ use App\Models\Department; use App\Models\Folder; +use App\Models\User; use Maatwebsite\Excel\Concerns\FromCollection; use Maatwebsite\Excel\Concerns\WithHeadings; @@ -26,5 +27,5 @@ $row->note, $row->location, - $row->User::find($row->user_id)->username, + $row->user_id . ' - ' . User::find($row->user_id)->username, $row->Department::find($row->department_id)->name . ' - ' . Department::find($row->department_id)->code, $row->is_important, @@ -43,5 +44,5 @@ 'Note', 'Location', - 'Created by', + 'Created by ID - Username', 'Department name - code', 'Is important', Index: app/Exports/UsersExport.php =================================================================== --- app/Exports/UsersExport.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ app/Exports/UsersExport.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -28,5 +28,5 @@ $row->phone_number, $row->is_confirmed, - $row->Role::find($row->role_id)->name, + $row->role_id . ' - ' . Role::find($row->role_id)->name, $row->where('id', $row->created_by)->pluck('username')->first(), $row->created_at, @@ -46,5 +46,5 @@ 'Phone number', 'Is confirmed', - 'Role', + 'Role ID - Username', 'Created by', 'Created at', Index: app/Http/Controllers/Dashboard/DepartmentsController.php =================================================================== --- app/Http/Controllers/Dashboard/DepartmentsController.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ app/Http/Controllers/Dashboard/DepartmentsController.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -147,5 +147,5 @@ if(!$flag) { $zip->close(); - $headers = array('Content-Type' => 'application/octet-stream',); + $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); @@ -153,5 +153,5 @@ else { Alert::flash("All departments are empty", "warning"); - return redirect()->route("dashboard.departments.index"); + return redirect()->back(); } } @@ -186,5 +186,5 @@ else{ Alert::flash("This department has no files", "warning"); - return redirect()->route("dashboard.departments.index"); + return redirect()->back(); } Index: app/Http/Controllers/Dashboard/ExportExcelController.php =================================================================== --- app/Http/Controllers/Dashboard/ExportExcelController.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ app/Http/Controllers/Dashboard/ExportExcelController.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -3,4 +3,5 @@ namespace App\Http\Controllers\Dashboard; +use App\Exports\DepartmentsExport; use App\Exports\FilesExport; use App\Exports\FoldersExport; @@ -32,3 +33,10 @@ } + + public function ExportDepartments() + { + return Excel::download(new DepartmentsExport(), Carbon::now()->format('d.m.Y - H:i') . ' - departments.xlsx'); + + } + } Index: app/Http/Controllers/Dashboard/FilesController.php =================================================================== --- app/Http/Controllers/Dashboard/FilesController.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ app/Http/Controllers/Dashboard/FilesController.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -26,5 +26,5 @@ "textExt" => array("txt", "doc", "docx"), "imageExt" => array("png", "jpg", "jpeg"), - "fileTypes" => '.' . implode(',.', explode(',', explode(':', FileType::find('1')->mimes)[1])) + "fileTypes" => '.' . implode(',.', explode(',', FileType::find('1')->mimes)) ]); } @@ -35,4 +35,5 @@ $file->delete(); Storage::disk('uploads')->delete($file->location); + $file->folder()->decrement('no_of_files'); Alert::flash($file->name . " deleted successfully"); @@ -59,4 +60,5 @@ $newFile->location = $location . DIRECTORY_SEPARATOR . $fileName; $newFile->folder()->associate($folder); + $newFile->folder()->increment('no_of_files'); $newFile->save(); } @@ -65,10 +67,10 @@ Alert::flash("New files added successfully"); - return redirect()->route("dashboard.files.index"); + return redirect()->back(); } else { Alert::flash("No files were uploaded", "error"); - return redirect()->route("dashboard.files.index"); + return redirect()->back(); } } Index: app/Http/Controllers/Dashboard/FoldersController.php =================================================================== --- app/Http/Controllers/Dashboard/FoldersController.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ app/Http/Controllers/Dashboard/FoldersController.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -39,4 +39,7 @@ $folders = $foldersInDeptSort->orderBy('name', 'asc')->paginate(12); } + else if ($request->query('sort') == 'no_of_files') { + $folders = $foldersInDeptSort->orderBy('no_of_files', 'desc')->paginate(12); + } else if($request->query('sort') == 'count'){ $total = $foldersInDeptSort->folder->files->count(); @@ -52,4 +55,7 @@ else if ($request->query('sort') == 'name') { $folders = Folder::orderBy('name', 'asc')->paginate(12); + } + else if ($request->query('sort') == 'no_of_files') { + $folders = Folder::orderBy('no_of_files', 'desc')->paginate(12); } else if ($request->query('sort') == 'important') { @@ -97,5 +103,5 @@ "deptName" => $deptName, "deptCode" => $deptCode, - "fileTypes" => '.' . implode(',.', explode(',', explode(':', FileType::find('1')->mimes)[1])) + "fileTypes" => '.' . implode(',.', explode(',', FileType::find('1')->mimes)) ]); @@ -117,4 +123,5 @@ $folder->user()->associate($user); $folder->department()->associate($department); + $folder->department()->increment('no_of_folders'); $folder->arch_id = $request->arch_id; @@ -149,4 +156,5 @@ $newFile->location = $location . DIRECTORY_SEPARATOR . $fileName; $newFile->folder()->associate($folder); + $newFile->folder()->increment('no_of_files'); $newFile->save(); } @@ -155,5 +163,5 @@ Alert::flash("New folder created successfully"); - return redirect()->route("dashboard.folders.index"); + return redirect()->back(); } @@ -177,7 +185,7 @@ $department = Department::find($request->department); - $folder->department()->associate($department); - - $oldLocation = $folder->department->location . DIRECTORY_SEPARATOR . $folder->name; + $folder->department()->increment('no_of_folders'); + + $oldLocation = $folder->location; $folder->name = $request->name; @@ -186,32 +194,44 @@ $folder->updated_at = Carbon::now(); - $location = $folder->department->location . DIRECTORY_SEPARATOR . $request->name; - - if ($folder->isDirty('name')) { - if (!Storage::disk('uploads')->has($location)) { - Storage::disk('uploads')->move($oldLocation, $location); - foreach($files as $file){ - $file->location = $location . DIRECTORY_SEPARATOR . $file->name; + $newLocation = Department::find($request->department)->location . DIRECTORY_SEPARATOR . $request->name; + + if($folder->department_id != $request->department){ + $folder->department()->decrement('no_of_folders'); + if (!Storage::disk('uploads')->has($newLocation)) { + Storage::disk('uploads')->move($oldLocation, $newLocation); + foreach($files as $file) { + $file->location = $newLocation . DIRECTORY_SEPARATOR . $file->name; $file->save(); } } } + if($folder->isDirty('name')) { + if (!Storage::disk('uploads')->has($newLocation)) { + Storage::disk('uploads')->move($oldLocation, $newLocation); + foreach($files as $file) { + $file->location = $newLocation . DIRECTORY_SEPARATOR . $file->name; + $file->save(); + } + } + } + + $folder->department()->associate($department); + + $folder->location = $newLocation; if ($request->has('file_item')) { foreach ($request->file_item as $file) { $fileName = $folder->name . '-' . uniqid() . '.' . $file->getClientOriginalExtension(); - $file->storeAs($location . DIRECTORY_SEPARATOR, $fileName); + $file->storeAs($newLocation . DIRECTORY_SEPARATOR, $fileName); $newFile = new File(); $newFile->name = $fileName; - $newFile->location = $location . DIRECTORY_SEPARATOR . $fileName; + $newFile->location = $newLocation . DIRECTORY_SEPARATOR . $fileName; $newFile->folder()->associate($folder); + $newFile->folder()->increment('no_of_files'); $newFile->save(); } } - $folder->location = $location; - $folder->save(); - Alert::flash("Folder edited successfully"); @@ -246,8 +266,10 @@ $location = $folder->department->location . DIRECTORY_SEPARATOR . $folder->name; Storage::disk('uploads')->deleteDirectory($location); + $folder->department()->decrement('no_of_folders'); Alert::flash($folder->name . " deleted successfully"); + return redirect()->back(); } Alert::flash($folder->name . " is important", "error"); - return redirect()->route("dashboard.folders.index"); + return redirect()->back(); } @@ -306,5 +328,5 @@ } else { - $files = File::where('folder_id', $id)->paginate(10); + $files = File::where('folder_id', $id)->paginate(12); } @@ -317,5 +339,5 @@ "imageExt" => array("png", "jpg", "jpeg"), "folders" => $folders, - "fileTypes" => '.' . implode(',.', explode(',', explode(':', FileType::find('1')->mimes)[1])) + "fileTypes" => '.' . implode(',.', explode(',', FileType::find('1')->mimes)) ]); } Index: app/Http/Controllers/Dashboard/IndexController.php =================================================================== --- app/Http/Controllers/Dashboard/IndexController.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ app/Http/Controllers/Dashboard/IndexController.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -9,4 +9,6 @@ use App\Models\User; use App\Http\Controllers\Controller; +use Carbon\Carbon; +use Illuminate\Support\Facades\DB; class IndexController extends Controller @@ -18,10 +20,28 @@ ); + $date = Carbon::today()->subDays(5); + $recentFiles = File::where('created_at', '>=', $date)->get(); + + $year = ['2021','2022','2023','2024', '2025']; + + $file = []; + foreach ($year as $key => $value) { + $file[] = File::where(DB::raw("DATE_FORMAT(created_at, '%Y')"),$value)->count(); + } + return view("dashboard.index")->with([ "counters" => $counters, + "largestDepartments" => Department::orderBy('no_of_folders', 'desc')->limit(10)->get(), + "folders" => Folder::all(), + "files" => File::all(), + "recentFiles" => $recentFiles, + "year" => json_encode($year,JSON_NUMERIC_CHECK), + "file" => json_encode($file,JSON_NUMERIC_CHECK), "departments" => Department::all(), - "folders" => Folder::all(), - "files" => File::all() - ]); + "excelExt" => array("xls", "xlsx", "xls", "csv"), + "textExt" => array("txt", "doc", "docx"), + "imageExt" => array("png", "jpg", "jpeg"), + + ]); } } Index: app/Http/Controllers/Dashboard/SettingsController.php =================================================================== --- app/Http/Controllers/Dashboard/SettingsController.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ app/Http/Controllers/Dashboard/SettingsController.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -77,6 +77,4 @@ } - - public function fileTypes(FileTypeRequest $request) { Index: app/Models/Department.php =================================================================== --- app/Models/Department.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ app/Models/Department.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -14,5 +14,5 @@ protected $table = "departments"; - protected $fillable = ["name", "code", "location", "user_id"]; + protected $fillable = ["name", "code", "location", "user_id", "no_of_folders"]; protected $casts = [ Index: app/Models/File.php =================================================================== --- app/Models/File.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ app/Models/File.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -3,4 +3,5 @@ namespace App\Models; +use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Storage; @@ -8,4 +9,6 @@ class File extends Model { + use HasFactory; + protected $table = "files"; protected $fillable = ["name", "location", "document_id"]; Index: database/factories/DepartmentFactory.php =================================================================== --- database/factories/DepartmentFactory.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ database/factories/DepartmentFactory.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -4,7 +4,9 @@ use App\Models\Department; +use App\Models\Folder; use Carbon\Carbon; use Illuminate\Database\Eloquent\Factories\Factory; use Illuminate\Support\Facades\Storage; +use function Sodium\increment; class DepartmentFactory extends Factory @@ -24,12 +26,13 @@ public function definition() { - $location = $this->faker->unique()->numberBetween(1, 15); + $location = $this->faker->unique()->numberBetween(10, 25); Storage::disk('uploads')->makeDirectory('Departments/' . $location); return [ - 'name' => "Department" . $this->faker->unique()->firstName(), + 'name' => "Department" . ' ' . $this->faker->unique()->firstName(), 'code' => $location, 'location' => 'Departments' . DIRECTORY_SEPARATOR . $location, - 'user_id' => $this->faker->numberBetween('1', '2'), - 'created_at' => Carbon::now() + 'no_of_folders' => 0, + 'user_id' => "1", + 'created_at' => $this->faker->dateTime() ]; } Index: database/factories/FileFactory.php =================================================================== --- database/factories/FileFactory.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) +++ database/factories/FileFactory.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -0,0 +1,40 @@ +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 c6b84df06586305606df5b76204a64cdc63b09a2) +++ database/factories/FolderFactory.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -6,4 +6,5 @@ use App\Models\Folder; use Carbon\Carbon; +use Faker\Provider\DateTime; use Illuminate\Database\Eloquent\Factories\Factory; use Illuminate\Support\Facades\Storage; @@ -27,4 +28,5 @@ $deptId = $this->faker->numberBetween('1', '15'); + $deptCode = Department::find($deptId)->code; $name = $this->faker->unique()->firstName(); @@ -33,9 +35,8 @@ Storage::disk('uploads')->makeDirectory($location); - return [ 'arch_id' => $deptCode . "/" . $this->faker->unique()->randomNumber(), 'name' => $name, - 'note' => $this->faker->realText(), + 'note' => "This a note field", 'location' => $location, 'user_id' => $this->faker->numberBetween('1', '2'), Index: database/factories/UserFactory.php =================================================================== --- database/factories/UserFactory.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ database/factories/UserFactory.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -26,7 +26,7 @@ 'name' => $this->faker->firstName(), 'surname' => $this->faker->lastName(), - 'username' => $this->faker->userName(), + 'username' => $this->faker->unique()->userName(), 'password' => $this->faker->password(), - 'email' => $this->faker->email(), + 'email' => $this->faker->unique()->email(), 'phone_number' => $this->faker->phoneNumber(), 'role_id' => $this->faker->numberBetween(1, 2), @@ -35,5 +35,5 @@ 'is_forgot_password' => $this->faker->boolean, 'created_by' => "1", - 'created_at' => Carbon::now() + 'created_at' => now() ]; } Index: database/migrations/2021_09_29_121244_create_departments_table.php =================================================================== --- database/migrations/2021_09_29_121244_create_departments_table.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ database/migrations/2021_09_29_121244_create_departments_table.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -16,8 +16,9 @@ Schema::create('departments', function (Blueprint $table) { $table->increments('id'); - $table->integer("user_id")->unsigned(); $table->string("name"); $table->string("code"); + $table->integer("user_id")->unsigned(); $table->string("location"); + $table->integer("no_of_folders")->default(0); $table->timestamps(); Index: database/migrations/2021_10_06_103305_create_folders_table.php =================================================================== --- database/migrations/2021_10_06_103305_create_folders_table.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ database/migrations/2021_10_06_103305_create_folders_table.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -20,4 +20,5 @@ $table->text("note")->nullable(); $table->string("location"); + $table->integer("no_of_files")->default(0); $table->integer("user_id")->unsigned(); $table->integer("department_id")->unsigned(); Index: database/migrations/2021_10_21_144552_create_file_types_table.php =================================================================== --- database/migrations/2021_10_21_144552_create_file_types_table.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ database/migrations/2021_10_21_144552_create_file_types_table.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -16,5 +16,5 @@ Schema::create('file_types', function (Blueprint $table) { $table->increments('id'); - $table->string("mimes")->default('mimes:'); + $table->string("mimes")->default('jpg,jpeg,png,pdf,docx,xls,xlsx,txt,ppt,pptx'); $table->integer("max_size"); $table->integer("user_id")->unsigned(); Index: database/seeders/DatabaseSeeder.php =================================================================== --- database/seeders/DatabaseSeeder.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ database/seeders/DatabaseSeeder.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -19,6 +19,7 @@ $this->call(UsersTableSeeder::class); $this->call(DepartmentsTableSeeder::class); - $this->call(FileTypeSeeder::class); + $this->call(FileTypesTableSeeder::class); $this->call(FoldersTableSeeder::class); + $this->call(FilesTableSeeder::class); } } Index: database/seeders/DepartmentsTableSeeder.php =================================================================== --- database/seeders/DepartmentsTableSeeder.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ database/seeders/DepartmentsTableSeeder.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -4,4 +4,6 @@ use App\Models\Department; +use App\Models\Folder; +use App\Models\User; use Carbon\Carbon; use Illuminate\Database\Seeder; Index: tabase/seeders/FileTypeSeeder.php =================================================================== --- database/seeders/FileTypeSeeder.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ (revision ) @@ -1,24 +1,0 @@ -insert([ - "mimes" => "mimes:jpg,jpeg,png,pdf,docx,xls,xlsx,txt,ppt,pptx", - "max_size" => "5000", - "user_id" => "1", - "created_at" => Carbon::now() - ]); - } -} Index: database/seeders/FileTypesTableSeeder.php =================================================================== --- database/seeders/FileTypesTableSeeder.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) +++ database/seeders/FileTypesTableSeeder.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -0,0 +1,24 @@ +insert([ + "mimes" => "jpg,jpeg,png,pdf,docx,xls,xlsx,txt,ppt,pptx", + "max_size" => "5000", + "user_id" => "1", + "created_at" => Carbon::now() + ]); + } +} Index: database/seeders/FilesTableSeeder.php =================================================================== --- database/seeders/FilesTableSeeder.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) +++ database/seeders/FilesTableSeeder.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -0,0 +1,19 @@ +count(50)->create(); + } +} Index: database/seeders/FoldersTableSeeder.php =================================================================== --- database/seeders/FoldersTableSeeder.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ database/seeders/FoldersTableSeeder.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -3,4 +3,5 @@ namespace Database\Seeders; +use App\Models\Department; use App\Models\Folder; use Carbon\Carbon; @@ -16,5 +17,10 @@ public function run() { - Folder::factory()->count(300)->create(); + Folder::factory()->count(500)->create(); + $folders = Folder::all(); + + foreach ($folders as $folder) { + $folder->department()->increment('no_of_folders'); + } } } Index: database/seeders/UsersTableSeeder.php =================================================================== --- database/seeders/UsersTableSeeder.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ database/seeders/UsersTableSeeder.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -27,8 +27,8 @@ "is_confirmed" => true, "created_by" => "1", - "created_at" => Carbon::now() + "created_at" => now() ]); - User::factory()->count(20)->create(); + User::factory()->count(50)->create(); } Index: public/assets/js/app.js =================================================================== --- public/assets/js/app.js (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ public/assets/js/app.js (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -898,6 +898,6 @@ /***/ (function(module, exports, __webpack_require__) { -__webpack_require__(/*! C:\wamp64\www\themeforest\nago\resources\js\app.js */"./resources/js/app.js"); -module.exports = __webpack_require__(/*! C:\wamp64\www\themeforest\nago\public\assets\sass\app.scss */"./public/assets/sass/app.scss"); +__webpack_require__("./resources/js/app.js"); +module.exports = __webpack_require__("./public/assets/sass/app.scss"); @@ -1015,4 +1015,15 @@ }); + function hasNew(response) { + + for(var i=0; i Download files + Export table @@ -57,7 +56,7 @@ {{$department->id }} - {{ $department->name }} + $department->id]) }}" class="text-linkedin">{{ $department->name }} {{ $department->code }} - {{ $department->folder->count() }} + {{ $department->no_of_folders }} {{ $department->getCreatedByName() }} {{ date('d.m.Y - H:i', strtotime($department->created_at)) }} Index: resources/views/dashboard/files/index.blade.php =================================================================== --- resources/views/dashboard/files/index.blade.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ resources/views/dashboard/files/index.blade.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -2,6 +2,4 @@ @section("title", "SaveSpace - Files") - -@section('pageTitle', 'Files') @section('head') Index: resources/views/dashboard/folders/files.blade.php =================================================================== --- resources/views/dashboard/folders/files.blade.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ resources/views/dashboard/folders/files.blade.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -2,7 +2,4 @@ @section("title", "SaveSpace - Folder") - -@section('pageTitle', 'SaveSpace - Folder') - @section('content') @@ -103,5 +100,5 @@
- + Rename @@ -147,5 +144,5 @@
- + @empty +
No items found
+ @endforelse + + - @empty -
No items found
- @endforelse @@ -266,69 +328,4 @@ - - Index: resources/views/dashboard/folders/index.blade.php =================================================================== --- resources/views/dashboard/folders/index.blade.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ resources/views/dashboard/folders/index.blade.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -2,6 +2,4 @@ @section("title", "SaveSpace - Folders") - -@section('pageTitle', 'SaveSpace - Folders') @section('content') @@ -93,7 +91,9 @@ Date Name + Number of files @else Date Name + Number of files @endif @@ -240,4 +240,32 @@ + + @empty +
No items found
+ @endforelse + @if(!Request::query('search')) Index: resources/views/dashboard/index.blade.php =================================================================== --- resources/views/dashboard/index.blade.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ resources/views/dashboard/index.blade.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -1,17 +1,11 @@ @extends('layouts.app') +@section("title", "SaveSpace - Dashboard") + @section('head') - - - - - - @endsection - -@section('pageTitle', 'Dashboard') @section('content') @@ -58,5 +52,5 @@
-

Total Folders

+

Number of folders

{{ $folders->count() }}

@@ -103,120 +97,13 @@
-
-
-
-
-
-
Revenue
- -
-
-
-

This Week

-
-

$235

- - - 1.9% - -
-
-
-

Last Week

-
-

$5,180

- - - 1.9% - -
-
-
-
-
-
- -
-
-
-
-
-
Hot Products
- -
-
-
-
    -
  • - Iphone -
    • -
  • - Samsung -
    • -
  • - Huawei -
    • -
  • - General Mobile -
    • -
  • - Xiaomi -
    • -
-
-
-
-
-
-
Recent Orders
+
Recent Files
- + -
- -
- Action - Another action - Something else here -
-
@@ -227,276 +114,140 @@ - ID - Product Name - Customer - Total Price - Status - Date - Action + + + Image + Name + Created at + Updated at + Folder name + Folder archive ID + Directory + Actions - - - 3145 - - - - grape - HP Pavilion 15-EC0005NT AMD - - - Dollie Bullock - $230 - - On pre-order (not paid) - - 2018/08/28 21:24:36 - - - - - - - - - - - - 7321 - - - - banana - Samsung Galaxy A51 128 GB - - - Holmes Hines - $300 - - Payment accepted - - 2018/08/28 21:24:36 - - - - - - - - - - - - 9342 - - - - cherry - Snopy SN-BT96 Pretty - - - Serena Glover - $250 - - Payment error - - 2018/08/28 21:24:36 - - - - - - - - - - - - 6416 - - - - papaya - Ultimate Ears Wonderboom - - - Dianne Prince - $550 - - Payment accepted - - 2018/08/28 21:24:36 - - - - - - - - - - - - 92327 - - - - pig - Canon Pixma E3140 Printer - - - Morgan Pitts - $280 - - Preparing the order - - 2018/08/28 21:24:36 - - - - - - - - - - - - 3013 - - - - pineapple - Canon 4000D 18-55 MM - - - Merrill Richardson - $128 - - Awaiting PayPal payment - - 2018/08/28 21:24:36 - - - - - - - - - - - - 10323 - - - - pomegranate - Lenovo Tab E10 TB-X104F 32GB 10.1" - - - Krista Mathis - $500 - - Shipped - - 2018/08/28 21:24:36 - - - - - - - - - - - - 4218 - - - - raspberry - Samsung 55Q60RAT 55" - - - Frankie Hewitt - $300 - - Remote payment accepted - - 2018/08/28 21:24:36 - - - - - - - - - - - - 3158 - - - - strawberry - Toshiba Canvio Basic 1TB 2.5" - - - Hayden Fitzgerald - $200 - - Delivered - - 2018/08/28 21:24:36 - - - - - - - - - - - - 9610 - - - - watermelon - Fms Wireless Controller - - - Cole Holcomb - $700 - - On pre-order (not paid) - - 2018/08/28 21:24:36 - - - - - - - - - + @foreach($recentFiles as $file) + + + + @if(in_array(explode('.', $file->name)[1], $excelExt)) +
+ +
+ @else @if(in_array(explode('.', $file->name)[1], $textExt)) +
+ +
+ @else @if(explode('.', $file->name)[1] == 'pdf') +
+ +
+ @else @if(in_array(explode('.', $file->name)[1], $imageExt)) +
+ +
+ image +
+ +
+ @else +
+ +
+ @endif + @endif + @endif + @endif + + + + {{ $file->name }} + {{ date('d.m.Y - H:i', strtotime($file->created_at)) }} + @if($file->updated_at==NULL) + / + @else + {{ date('d.m.Y - H:i', strtotime($file->updated_at)) }} + @endif + {{ \App\Models\Folder::find($file->folder_id)->name }} + {{ \App\Models\Folder::find($file->folder_id)->arch_id }} + + + + + + + + $file->id]) }}" class="text-danger ml-2"title="Download"> + + + + + + + + + + + @endforeach @@ -512,12 +263,6 @@
-
Activities
-
-
- -
-
-
-
+ +
@@ -527,6 +272,6 @@
-
Top Sales
- All Sales +
Largest departments
+ View
@@ -535,57 +280,20 @@ - Product - Total Sales + Department + Number of folders + @foreach($largestDepartments as $department) + - Apple + {{$department->name}} - 21 + + {{$department->no_of_folders}} + - - - Samsung New - - 52 - - - - Huawei - - 74 - - - - General Mobile - - 25 - - - - Xiaomi - - 11 - - - - Nokia - - 8 - - - - Sony - - 5 - - - - Alcatel - - 5 - + @endforeach @@ -594,390 +302,4 @@ - -
-
-
-
-
- Income Distribution - - USA - - USA - Germany - France - Italy - - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
StatesOrdersEarnings
California12,201$150,200.80 - - - -
Texas11,950$138,910.20 - - - -
Wyoming11,198$132,050.00 - - - -
Florida9,885$127,762.10 - - - -
New York21,198$432,410.00 - - - -
Montana2,885$7,100.00 - - - -
-
-
-
-
-
-
-
-
Revenue by Country
- -
-

Total Revenue

-

$469,453

-
-
-
-
-
-
-
-
-
-
    -
  • -
    - - Russia - - - 40% - -
    -
    • -
  • -
    - - Australia - - - 25% - -
    -
    • -
  • -
    - - China - - - 30% - -
    -
    • -
  • -
    - - Tunisia - - - 10% - -
    -
    • -
  • -
    - - Spain - - - 10% - -
    -
    • -
-
-
-
-
-
Reviews
-
- -
-
- - View All - -
-
-
- -
-
- @endsection @@ -1019,4 +341,38 @@ - + + @endsection Index: resources/views/dashboard/notifications/index.blade.php =================================================================== --- resources/views/dashboard/notifications/index.blade.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ resources/views/dashboard/notifications/index.blade.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -2,6 +2,4 @@ @section("title", "SaveSpace - Users") - -@section('pageTitle', 'Users') @section('head') Index: resources/views/dashboard/settings/index.blade.php =================================================================== --- resources/views/dashboard/settings/index.blade.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ resources/views/dashboard/settings/index.blade.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -2,6 +2,4 @@ @section("title", "User Settings") - -@section('pageTitle', 'User Settings') @section('content') Index: resources/views/dashboard/users/index.blade.php =================================================================== --- resources/views/dashboard/users/index.blade.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ resources/views/dashboard/users/index.blade.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -2,6 +2,4 @@ @section("title", "SaveSpace - Users") - -@section('pageTitle', 'Users') @section('head') @@ -42,10 +40,7 @@ Username Name - Email - Phone Number Created by Created at Updated at - Role Status Actions @@ -71,7 +66,9 @@ {{$user->username}} - {{$user->name .' '. $user->surname}} - {{$user->email}} - {{$user->phone_number}} + {{$user->name .' '. $user->surname}} +
{{$user->role->name}}
+
{{$user->email}}
+
{{$user->phone_number}}
+ {{ $user->getCreatedByName() }} {{ date('d.m.Y - H:i', strtotime($user->created_at)) }} @@ -81,5 +78,4 @@ {{ date('d.m.Y - H:i', strtotime($user->updated_at)) }} @endif - {{ $user->role->name }} @if(Cache::has('is_online' . $user->id)) @@ -99,5 +95,5 @@ @else - Admin + / @endif Index: resources/views/layouts/app.blade.php =================================================================== --- resources/views/layouts/app.blade.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ resources/views/layouts/app.blade.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -5,4 +5,5 @@ + @yield('title') @@ -18,4 +19,5 @@ + @@ -125,20 +127,32 @@
  • -
    - - - - -
    -
    -
    Notifications
    +{{--
    --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{--
    --}} +{{--
    --}} +{{--
    Notifications
    --}} +{{--
    --}} +{{--
    --}} +{{--

    No unread notifications

    --}} +{{--
    --}} +{{--
    --}} +{{-- See all--}} +{{--
    --}} +{{--
    --}} + +
    + + + + +
    +

    No unread notifications

    +
    + See all
    -
    -

    No unread notifications

    -
    -
    - See all
    -
    • Index: routes/web.php =================================================================== --- routes/web.php (revision c6b84df06586305606df5b76204a64cdc63b09a2) +++ routes/web.php (revision 4b7e2d354e16238fe8e560dc6dd0849218183335) @@ -85,4 +85,5 @@ Route::get('/departments/download-all','Dashboard\DepartmentsController@downloadAll')->name('dashboard.departments.downloadAll'); Route::get('/departments/{id}/download-department','Dashboard\DepartmentsController@downloadDepartment')->name('dashboard.departments.downloadDepartment'); + Route::get('departments/export', 'Dashboard\ExportExcelController@ExportDepartments')->name("dashboard.departments.export"); });