diff --git a/app/Handlers/Handler.php b/app/Handlers/Handler.php index be438540..dc470407 100644 --- a/app/Handlers/Handler.php +++ b/app/Handlers/Handler.php @@ -94,8 +94,8 @@ abstract class Handler implements AppHandler $sub->route('content.overview', trans('admin/mainMenu.contentPageOverview'), [], 20, ['icon' => 'fa fa-list']); }, 15, ['icon' => 'fa fa-database']); $menu->dropdown(trans('admin/mainMenu.fileManager'), function ($sub) { + $sub->route('upload.directories', trans('admin/mainMenu.directories'), [], 1, ['icon' => 'fa fa-folder']); $sub->route('upload.file', trans('admin/mainMenu.uploadFile'), [], 10, ['icon' => 'fa fa-file']); - $sub->route('upload.image', trans('admin/mainMenu.uploadImage'), [], 50, ['icon' => 'fa fa-image']); $sub->route('upload.overview', trans('admin/mainMenu.uploadedFiles'), [], 150, ['icon' => 'fa fa-files-o']); }, 25, ['icon' => 'fa fa-film']); $menu->dropdown(trans('admin/mainMenu.widgets'), function ($sub) { diff --git a/app/Http/Controllers/Admin/UploadFile.php b/app/Http/Controllers/Admin/UploadFile.php index 6dfc54f7..3c403615 100644 --- a/app/Http/Controllers/Admin/UploadFile.php +++ b/app/Http/Controllers/Admin/UploadFile.php @@ -24,10 +24,6 @@ class UploadFile extends Controller return view('admin/fileManager.newFile'); } - public function getImage() - { - } - /** * Uploads any file * @@ -65,15 +61,6 @@ class UploadFile extends Controller ->with('error', trans('admin/fileManager.' . $message)); } - /** - * Uploads only images - * - * @param UploadImageRequest $request - */ - public function postImage(UploadImageRequest $request) - { - } - /** * Send response about uploaded file as JSON * diff --git a/app/Http/routes.php b/app/Http/routes.php index 9758f27a..5a0141c2 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -58,8 +58,8 @@ Route::group([ Route::post('templates/copy', 'CopyTemplate@createCopy') ->name('templates.postCopy'); -// Route::get('templates/new/{pathId}', 'TemplateOverview@getPath') -// ->name('templates.new'); + // Route::get('templates/new/{pathId}', 'TemplateOverview@getPath') + // ->name('templates.new'); Route::get('templates/edit/{id}', 'EditTemplate@getEdit') ->name('templates.edit'); @@ -187,6 +187,12 @@ Route::group([ Route::get('upload/file', 'UploadFile@getFile') ->name('upload.file'); + Route::get('directories/overview/{id?}', 'DirectoriesOverview@getOverview') + ->name('upload.directories'); + + route::post('directories/new', 'CreateNewDirectory@postNew') + ->name('upload.postNewDirectory'); + Route::get('upload/detail/{id}', 'EditUploadedFile@getDetail') ->name('upload.detail'); @@ -196,9 +202,6 @@ Route::group([ Route::get('upload/delete/{id}', 'EditUploadedFile@deleteFile') ->name('upload.delete'); - Route::get('upload/image', 'UploadFile@getImage') - ->name('upload.image'); - Route::get('upload/overview/{type?}/{subtype?}', 'UploadedFilesOverview@getOverview') ->name('upload.overview');