From 8197d9271dc661f8559b994458635ee6f8cce3a7 Mon Sep 17 00:00:00 2001 From: Bhargav <46953122+bhargavraviya@users.noreply.github.com> Date: Wed, 18 Sep 2024 13:39:13 +0530 Subject: [PATCH 1/2] change route for laravel 11 --- routes/voyager.php | 119 ++++++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 56 deletions(-) diff --git a/routes/voyager.php b/routes/voyager.php index 2b806c2aa8..5bb1dd4424 100644 --- a/routes/voyager.php +++ b/routes/voyager.php @@ -1,5 +1,6 @@ 'voyager.'], function () { event(new Routing()); - $namespacePrefix = '\\'.config('voyager.controllers.namespace').'\\'; + $namespacePrefix = config('voyager.controllers.namespace'); - Route::get('login', ['uses' => $namespacePrefix.'VoyagerAuthController@login', 'as' => 'login']); - Route::post('login', ['uses' => $namespacePrefix.'VoyagerAuthController@postLogin', 'as' => 'postlogin']); + Route::get('login', [$namespacePrefix . '\VoyagerAuthController', 'login'])->name('login'); + Route::post('login', [$namespacePrefix . '\VoyagerAuthController', 'postLogin'])->name('postlogin'); Route::group(['middleware' => 'admin.user'], function () use ($namespacePrefix) { event(new RoutingAdmin()); // Main Admin and Logout Route - Route::get('/', ['uses' => $namespacePrefix.'VoyagerController@index', 'as' => 'dashboard']); - Route::post('logout', ['uses' => $namespacePrefix.'VoyagerController@logout', 'as' => 'logout']); - Route::post('upload', ['uses' => $namespacePrefix.'VoyagerController@upload', 'as' => 'upload']); + Route::get('/', [$namespacePrefix . '\VoyagerController', 'index'])->name('dashboard'); + Route::post('logout', [$namespacePrefix . '\VoyagerController', 'logout'])->name('logout'); + Route::post('upload', [$namespacePrefix . '\VoyagerController', 'upload'])->name('upload'); - Route::get('profile', ['uses' => $namespacePrefix.'VoyagerUserController@profile', 'as' => 'profile']); + Route::get('profile', [$namespacePrefix . '\VoyagerUserController', 'profile'])->name('profile'); try { foreach (Voyager::model('DataType')::all() as $dataType) { $breadController = $dataType->controller - ? Str::start($dataType->controller, '\\') - : $namespacePrefix.'VoyagerBaseController'; - - Route::get($dataType->slug.'/order', $breadController.'@order')->name($dataType->slug.'.order'); - Route::post($dataType->slug.'/action', $breadController.'@action')->name($dataType->slug.'.action'); - Route::post($dataType->slug.'/order', $breadController.'@update_order')->name($dataType->slug.'.update_order'); - Route::get($dataType->slug.'/{id}/restore', $breadController.'@restore')->name($dataType->slug.'.restore'); - Route::get($dataType->slug.'/relation', $breadController.'@relation')->name($dataType->slug.'.relation'); - Route::post($dataType->slug.'/remove', $breadController.'@remove_media')->name($dataType->slug.'.media.remove'); - Route::resource($dataType->slug, $breadController, ['parameters' => [$dataType->slug => 'id']]); + ? Str::start($dataType->controller, '\\') + : $namespacePrefix . '\VoyagerBaseController'; + $commanSlug = $dataType->slug; + Route::get($commanSlug . '/order', [$namespacePrefix . $breadController, 'order'])->name($commanSlug . '.order'); + Route::post($commanSlug . '/action', [$namespacePrefix . $breadController, 'action'])->name($commanSlug . '.action'); + Route::post($commanSlug . '/order', [$namespacePrefix . $breadController, 'update_order'])->name($commanSlug . '.update_order'); + Route::get($commanSlug . '/{id}/restore', [$namespacePrefix . $breadController, 'restore'])->name($commanSlug . '.restore'); + Route::get($commanSlug . '/relation', [$namespacePrefix . $breadController, 'relation'])->name($commanSlug . '.relation'); + Route::post($commanSlug . '/remove', [$namespacePrefix . $breadController, 'remove_media'])->name($commanSlug . '.media.remove'); + + Route::resource($commanSlug, $breadController)->parameters([$commanSlug => 'id']); } } catch (\InvalidArgumentException $e) { - throw new \InvalidArgumentException("Custom routes hasn't been configured because: ".$e->getMessage(), 1); + throw new \InvalidArgumentException("Custom routes hasn't been configured because: " . $e->getMessage(), 1); } catch (\Exception $e) { // do nothing, might just be because table not yet migrated. } @@ -59,17 +61,18 @@ Route::group([ 'as' => 'menus.', 'prefix' => 'menus/{menu}', - ], function () use ($namespacePrefix) { - Route::get('builder', ['uses' => $namespacePrefix.'VoyagerMenuController@builder', 'as' => 'builder']); - Route::post('order', ['uses' => $namespacePrefix.'VoyagerMenuController@order_item', 'as' => 'order_item']); + 'controller' => $namespacePrefix . '\VoyagerMenuController', + ], function () { + Route::get('builder', 'builder')->name('builder'); + Route::post('order', 'order_item')->name('order_item'); Route::group([ 'as' => 'item.', 'prefix' => 'item', - ], function () use ($namespacePrefix) { - Route::delete('{id}', ['uses' => $namespacePrefix.'VoyagerMenuController@delete_menu', 'as' => 'destroy']); - Route::post('/', ['uses' => $namespacePrefix.'VoyagerMenuController@add_item', 'as' => 'add']); - Route::put('/', ['uses' => $namespacePrefix.'VoyagerMenuController@update_item', 'as' => 'update']); + ], function () { + Route::delete('{id}', 'delete_menu')->name('destroy'); + Route::post('/', 'add_item')->name('add'); + Route::put('/', 'update_item')->name('update'); }); }); @@ -77,63 +80,67 @@ Route::group([ 'as' => 'settings.', 'prefix' => 'settings', - ], function () use ($namespacePrefix) { - Route::get('/', ['uses' => $namespacePrefix.'VoyagerSettingsController@index', 'as' => 'index']); - Route::post('/', ['uses' => $namespacePrefix.'VoyagerSettingsController@store', 'as' => 'store']); - Route::put('/', ['uses' => $namespacePrefix.'VoyagerSettingsController@update', 'as' => 'update']); - Route::delete('{id}', ['uses' => $namespacePrefix.'VoyagerSettingsController@delete', 'as' => 'delete']); - Route::get('{id}/move_up', ['uses' => $namespacePrefix.'VoyagerSettingsController@move_up', 'as' => 'move_up']); - Route::get('{id}/move_down', ['uses' => $namespacePrefix.'VoyagerSettingsController@move_down', 'as' => 'move_down']); - Route::put('{id}/delete_value', ['uses' => $namespacePrefix.'VoyagerSettingsController@delete_value', 'as' => 'delete_value']); + 'controller' => $namespacePrefix . '\VoyagerSettingsController', + ], function () { + Route::get('/', 'index')->name('index'); + Route::post('/', 'store')->name('store'); + Route::put('/', 'update')->name('update'); + Route::delete('{id}', 'delete')->name('delete'); + Route::get('{id}/move_up', 'move_up')->name('move_up'); + Route::get('{id}/move_down', 'move_down')->name('move_down'); + Route::put('{id}/delete_value', 'delete_value')->name('delete_value'); }); // Admin Media Route::group([ 'as' => 'media.', 'prefix' => 'media', - ], function () use ($namespacePrefix) { - Route::get('/', ['uses' => $namespacePrefix.'VoyagerMediaController@index', 'as' => 'index']); - Route::post('files', ['uses' => $namespacePrefix.'VoyagerMediaController@files', 'as' => 'files']); - Route::post('new_folder', ['uses' => $namespacePrefix.'VoyagerMediaController@new_folder', 'as' => 'new_folder']); - Route::post('delete_file_folder', ['uses' => $namespacePrefix.'VoyagerMediaController@delete', 'as' => 'delete']); - Route::post('move_file', ['uses' => $namespacePrefix.'VoyagerMediaController@move', 'as' => 'move']); - Route::post('rename_file', ['uses' => $namespacePrefix.'VoyagerMediaController@rename', 'as' => 'rename']); - Route::post('upload', ['uses' => $namespacePrefix.'VoyagerMediaController@upload', 'as' => 'upload']); - Route::post('crop', ['uses' => $namespacePrefix.'VoyagerMediaController@crop', 'as' => 'crop']); + 'controller' => $namespacePrefix . '\VoyagerMediaController', + ], function () { + Route::get('/', 'index')->name('index'); + Route::post('files', 'files')->name('files'); + Route::post('new_folder', 'new_folder')->name('new_folder'); + Route::post('delete_file_folder', 'delete')->name('delete'); + Route::post('move_file', 'move')->name('move'); + Route::post('rename_file', 'rename')->name('rename'); + Route::post('upload', 'upload')->name('upload'); + Route::post('crop', 'crop')->name('crop'); }); // BREAD Routes Route::group([ 'as' => 'bread.', 'prefix' => 'bread', - ], function () use ($namespacePrefix) { - Route::get('/', ['uses' => $namespacePrefix.'VoyagerBreadController@index', 'as' => 'index']); - Route::get('{table}/create', ['uses' => $namespacePrefix.'VoyagerBreadController@create', 'as' => 'create']); - Route::post('/', ['uses' => $namespacePrefix.'VoyagerBreadController@store', 'as' => 'store']); - Route::get('{table}/edit', ['uses' => $namespacePrefix.'VoyagerBreadController@edit', 'as' => 'edit']); - Route::put('{id}', ['uses' => $namespacePrefix.'VoyagerBreadController@update', 'as' => 'update']); - Route::delete('{id}', ['uses' => $namespacePrefix.'VoyagerBreadController@destroy', 'as' => 'delete']); - Route::post('relationship', ['uses' => $namespacePrefix.'VoyagerBreadController@addRelationship', 'as' => 'relationship']); - Route::get('delete_relationship/{id}', ['uses' => $namespacePrefix.'VoyagerBreadController@deleteRelationship', 'as' => 'delete_relationship']); + 'controller' => $namespacePrefix . '\VoyagerBreadController', + ], function () { + Route::get('/', 'index')->name('index'); + Route::get('{table}/create', 'create')->name('create'); + Route::post('/', 'store')->name('store'); + Route::get('{table}/edit', 'edit')->name('edit'); + Route::put('{id}', 'update')->name('update'); + Route::delete('{id}', 'destroy')->name('delete'); + Route::post('relationship', 'addRelationship')->name('relationship'); + Route::get('delete_relationship/{id}', 'deleteRelationship')->name('delete_relationship'); }); // Database Routes - Route::resource('database', $namespacePrefix.'VoyagerDatabaseController'); + Route::resource('database', $namespacePrefix . '\VoyagerDatabaseController'); // Compass Routes Route::group([ 'as' => 'compass.', 'prefix' => 'compass', - ], function () use ($namespacePrefix) { - Route::get('/', ['uses' => $namespacePrefix.'VoyagerCompassController@index', 'as' => 'index']); - Route::post('/', ['uses' => $namespacePrefix.'VoyagerCompassController@index', 'as' => 'post']); + 'controller' => $namespacePrefix . '\VoyagerCompassController', + ], function () { + Route::get('/', 'index')->name('index'); + Route::post('/', 'index')->name('post'); }); event(new RoutingAdminAfter()); }); //Asset Routes - Route::get('voyager-assets', ['uses' => $namespacePrefix.'VoyagerController@assets', 'as' => 'voyager_assets']); + Route::get('voyager-assets', [$namespacePrefix . '\VoyagerController', 'assets'])->name('voyager_assets'); event(new RoutingAfter()); }); From 56e674b0dcd3e546162e481ab9cf0bbf36280090 Mon Sep 17 00:00:00 2001 From: Bobby Iliev Date: Mon, 14 Oct 2024 15:43:04 +0300 Subject: [PATCH 2/2] Install dpes updates (#5915) --- package-lock.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package-lock.json b/package-lock.json index 8314af63a3..4a80bf264a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,7 @@ "requires": true, "packages": { "": { + "name": "voyager", "dependencies": { "ace-builds": "^1.12.3", "animate.css": "^4.1.1",