Skip to content

Commit 1e43f20

Browse files
DaneEverittDaneEveritt
committed
Fix up routes and controller names
1 parent 722fd61 commit 1e43f20

File tree

10 files changed

+58
-60
lines changed

10 files changed

+58
-60
lines changed

‎app/Http/Controllers/Admin/NodesController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function index(Request $request)
6060
* @param \Illuminate\Http\Request $request
6161
* @return \Illuminate\View\View|\Illuminate\Http\RedirectResponse
6262
*/
63-
public function new(Request $request)
63+
public function create(Request $request)
6464
{
6565
$locations = Models\Location::all();
6666
if (! $locations->count()) {
@@ -78,7 +78,7 @@ public function new(Request $request)
7878
* @param \Illuminate\Http\Request $request
7979
* @return \Illuminate\Http\RedirectResponse
8080
*/
81-
public function create(Request $request)
81+
public function store(Request $request)
8282
{
8383
try {
8484
$repo = new NodeRepository;

‎app/Http/Controllers/Admin/OptionController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class OptionController extends Controller
4444
* @param \Illuminate\Http\Request $request
4545
* @return \Illuminate\View\View
4646
*/
47-
public function new(Request $request)
47+
public function create(Request $request)
4848
{
4949
$services = Service::with('options')->get();
5050
Javascript::put(['services' => $services->keyBy('id')]);
@@ -58,7 +58,7 @@ public function new(Request $request)
5858
* @param \Illuminate\Http\Request $request
5959
* @return \Illuminate\Response\RedirectResponse
6060
*/
61-
public function create(Request $request)
61+
public function store(Request $request)
6262
{
6363
$repo = new OptionRepository;
6464

‎app/Http/Controllers/Admin/PackController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function index(Request $request)
6060
* @param \Illuminate\Http\Request $request
6161
* @return \Illuminate\View\View
6262
*/
63-
public function new(Request $request)
63+
public function create(Request $request)
6464
{
6565
return view('admin.packs.new', [
6666
'services' => Service::with('options')->get(),
@@ -86,7 +86,7 @@ public function newTemplate(Request $request)
8686
* @param \Illuminate\Http\Request $request
8787
* @return \Illuminate\View\View
8888
*/
89-
public function create(Request $request)
89+
public function store(Request $request)
9090
{
9191
$repo = new PackRepository;
9292

‎app/Http/Controllers/Admin/ServersController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function index(Request $request)
6363
* @param \Illuminate\Http\Request $request
6464
* @return \Illuminate\View\View
6565
*/
66-
public function new(Request $request)
66+
public function create(Request $request)
6767
{
6868
$services = Models\Service::with('options.packs', 'options.variables')->get();
6969
Javascript::put([
@@ -86,7 +86,7 @@ public function new(Request $request)
8686
* @param \Illuminate\Http\Request $request
8787
* @return \Illuminate\Response\RedirectResponse
8888
*/
89-
public function create(Request $request)
89+
public function store(Request $request)
9090
{
9191
try {
9292
$repo = new ServerRepository;
@@ -114,7 +114,7 @@ public function create(Request $request)
114114
* @param \Illuminate\Http\Request $request
115115
* @return array
116116
*/
117-
public function newServerNodes(Request $request)
117+
public function nodes(Request $request)
118118
{
119119
$nodes = Models\Node::with('allocations')->where('location_id', $request->input('location'))->get();
120120

‎app/Http/Controllers/Admin/ServiceController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function index(Request $request)
5454
* @param \Illuminate\Http\Request $request
5555
* @return \Illuminate\View\View
5656
*/
57-
public function new(Request $request)
57+
public function create(Request $request)
5858
{
5959
return view('admin.services.new');
6060
}
@@ -91,7 +91,7 @@ public function viewFunctions(Request $request, $id)
9191
* @param \Illuminate\Http\Request $request
9292
* @return \Illuminate\Http\RedirectResponse
9393
*/
94-
public function create(Request $request)
94+
public function store(Request $request)
9595
{
9696
$repo = new ServiceRepository;
9797

‎app/Http/Controllers/Admin/UserController.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class UserController extends Controller
4242
* @param \Illuminate\Http\Request $request
4343
* @return \Illuminate\View\View
4444
*/
45-
public function getIndex(Request $request)
45+
public function index(Request $request)
4646
{
4747
$users = User::withCount('servers');
4848

@@ -61,7 +61,7 @@ public function getIndex(Request $request)
6161
* @param \Illuminate\Http\Request $request
6262
* @return \Illuminate\View\View
6363
*/
64-
public function getNew(Request $request)
64+
public function create(Request $request)
6565
{
6666
return view('admin.users.new');
6767
}
@@ -73,7 +73,7 @@ public function getNew(Request $request)
7373
* @param int $id
7474
* @return \Illuminate\View\View
7575
*/
76-
public function getView(Request $request, $id)
76+
public function view(Request $request, $id)
7777
{
7878
return view('admin.users.view', [
7979
'user' => User::with('servers.node')->findOrFail($id),
@@ -87,7 +87,7 @@ public function getView(Request $request, $id)
8787
* @param int $id
8888
* @return \Illuminate\Http\RedirectResponse
8989
*/
90-
public function deleteUser(Request $request, $id)
90+
public function delete(Request $request, $id)
9191
{
9292
try {
9393
$repo = new UserRepository;
@@ -111,7 +111,7 @@ public function deleteUser(Request $request, $id)
111111
* @param \Illuminate\Http\Request $request
112112
* @return \Illuminate\Http\RedirectResponse
113113
*/
114-
public function postNew(Request $request)
114+
public function store(Request $request)
115115
{
116116
try {
117117
$user = new UserRepository;
@@ -139,7 +139,7 @@ public function postNew(Request $request)
139139
* @param int $id
140140
* @return \Illuminate\Http\RedirectResponse
141141
*/
142-
public function updateUser(Request $request, $id)
142+
public function update(Request $request, $id)
143143
{
144144
try {
145145
$repo = new UserRepository;
@@ -164,7 +164,7 @@ public function updateUser(Request $request, $id)
164164
* @param \Illuminate\Http\Request $request
165165
* @return \Pterodactyl\Models\User
166166
*/
167-
public function getJson(Request $request)
167+
public function json(Request $request)
168168
{
169169
return User::select('id', 'email', 'username', 'name_first', 'name_last')
170170
->search($request->input('q'))

‎app/Http/Controllers/Server/SubuserController.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class SubuserController extends Controller
4343
* @param string $uuid
4444
* @return \Illuminate\View\View
4545
*/
46-
public function getIndex(Request $request, $uuid)
46+
public function index(Request $request, $uuid)
4747
{
4848
$server = Models\Server::byUuid($uuid)->load('subusers.user');
4949
$this->authorize('list-subusers', $server);
@@ -65,7 +65,7 @@ public function getIndex(Request $request, $uuid)
6565
* @param int $id
6666
* @return \Illuminate\View\View
6767
*/
68-
public function getView(Request $request, $uuid, $id)
68+
public function view(Request $request, $uuid, $id)
6969
{
7070
$server = Models\Server::byUuid($uuid)->load('node');
7171
$this->authorize('view-subuser', $server);
@@ -94,7 +94,7 @@ public function getView(Request $request, $uuid, $id)
9494
* @param int $id
9595
* @return \Illuminate\Http\RedirectResponse
9696
*/
97-
public function postView(Request $request, $uuid, $id)
97+
public function update(Request $request, $uuid, $id)
9898
{
9999
$server = Models\Server::byUuid($uuid);
100100
$this->authorize('edit-subuser', $server);
@@ -139,7 +139,7 @@ public function postView(Request $request, $uuid, $id)
139139
* @param string $uuid
140140
* @return \Illuminate\View\View
141141
*/
142-
public function getNew(Request $request, $uuid)
142+
public function create(Request $request, $uuid)
143143
{
144144
$server = Models\Server::byUuid($uuid);
145145
$this->authorize('create-subuser', $server);
@@ -159,7 +159,7 @@ public function getNew(Request $request, $uuid)
159159
* @param string $uuid
160160
* @return \Illuminate\Http\RedirectResponse
161161
*/
162-
public function postNew(Request $request, $uuid)
162+
public function store(Request $request, $uuid)
163163
{
164164
$server = Models\Server::byUuid($uuid);
165165
$this->authorize('create-subuser', $server);
@@ -195,7 +195,7 @@ public function postNew(Request $request, $uuid)
195195
* @param int $id
196196
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response
197197
*/
198-
public function deleteSubuser(Request $request, $uuid, $id)
198+
public function delete(Request $request, $uuid, $id)
199199
{
200200
$server = Models\Server::byUuid($uuid);
201201
$this->authorize('delete-subuser', $server);

‎app/Http/Controllers/Server/TaskController.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class TaskController extends Controller
4242
* @param string $uuid
4343
* @return \Illuminate\View\View
4444
*/
45-
public function getIndex(Request $request, $uuid)
45+
public function index(Request $request, $uuid)
4646
{
4747
$server = Models\Server::byUuid($uuid)->load('tasks');
4848
$this->authorize('list-tasks', $server);
@@ -66,7 +66,7 @@ public function getIndex(Request $request, $uuid)
6666
* @param string $uuid
6767
* @return \Illuminate\View\View
6868
*/
69-
public function getNew(Request $request, $uuid)
69+
public function create(Request $request, $uuid)
7070
{
7171
$server = Models\Server::byUuid($uuid);
7272
$this->authorize('create-task', $server);
@@ -85,7 +85,7 @@ public function getNew(Request $request, $uuid)
8585
* @param string $uuid
8686
* @return \Illuminate\Http\RedirectResponse
8787
*/
88-
public function postNew(Request $request, $uuid)
88+
public function store(Request $request, $uuid)
8989
{
9090
$server = Models\Server::byUuid($uuid);
9191
$this->authorize('create-task', $server);
@@ -117,7 +117,7 @@ public function postNew(Request $request, $uuid)
117117
* @param int $id
118118
* @return \Illuminate\Http\JsonResponse
119119
*/
120-
public function deleteTask(Request $request, $uuid, $id)
120+
public function delete(Request $request, $uuid, $id)
121121
{
122122
$server = Models\Server::byUuid($uuid)->load('tasks');
123123
$this->authorize('delete-task', $server);
@@ -151,7 +151,7 @@ public function deleteTask(Request $request, $uuid, $id)
151151
* @param int $id
152152
* @return \Illuminate\Http\JsonResponse
153153
*/
154-
public function toggleTask(Request $request, $uuid, $id)
154+
public function toggle(Request $request, $uuid, $id)
155155
{
156156
$server = Models\Server::byUuid($uuid)->load('tasks');
157157
$this->authorize('toggle-task', $server);

‎routes/admin.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@
7979
|
8080
*/
8181
Route::group(['prefix' => 'users'], function () {
82-
Route::get('/', 'UserController@getIndex')->name('admin.users');
83-
Route::get('/accounts.json', 'UserController@getJson')->name('admin.users.json');
84-
Route::get('/new', 'UserController@getNew')->name('admin.users.new');
85-
Route::get('/view/{id}', 'UserController@getView')->name('admin.users.view');
82+
Route::get('/', 'UserController@index')->name('admin.users');
83+
Route::get('/accounts.json', 'UserController@json')->name('admin.users.json');
84+
Route::get('/new', 'UserController@create')->name('admin.users.new');
85+
Route::get('/view/{id}', 'UserController@view')->name('admin.users.view');
8686

87-
Route::post('/new', 'UserController@postNew');
88-
Route::post('/view/{id}', 'UserController@updateUser');
87+
Route::post('/new', 'UserController@store');
88+
Route::post('/view/{id}', 'UserController@update');
8989

90-
Route::delete('/view/{id}', 'UserController@deleteUser');
90+
Route::delete('/view/{id}', 'UserController@delete');
9191
});
9292

9393
/*
@@ -100,8 +100,8 @@
100100
*/
101101
Route::group(['prefix' => 'servers'], function () {
102102
Route::get('/', 'ServersController@index')->name('admin.servers');
103-
Route::get('/new', 'ServersController@new')->name('admin.servers.new');
104-
Route::get('/new/nodes', 'ServersController@newServerNodes')->name('admin.servers.new.nodes');
103+
Route::get('/new', 'ServersController@create')->name('admin.servers.new');
104+
Route::get('/new/nodes', 'ServersController@nodes')->name('admin.servers.new.nodes');
105105
Route::get('/view/{id}', 'ServersController@viewIndex')->name('admin.servers.view');
106106
Route::get('/view/{id}/details', 'ServersController@viewDetails')->name('admin.servers.view.details');
107107
Route::get('/view/{id}/build', 'ServersController@viewBuild')->name('admin.servers.view.build');
@@ -110,7 +110,7 @@
110110
Route::get('/view/{id}/manage', 'ServersController@viewManage')->name('admin.servers.view.manage');
111111
Route::get('/view/{id}/delete', 'ServersController@viewDelete')->name('admin.servers.view.delete');
112112

113-
Route::post('/new', 'ServersController@create');
113+
Route::post('/new', 'ServersController@store');
114114
Route::post('/view/{id}/details', 'ServersController@setDetails');
115115
Route::post('/view/{id}/details/container', 'ServersController@setContainer')->name('admin.servers.view.details.container');
116116
Route::post('/view/{id}/build', 'ServersController@updateBuild');
@@ -136,15 +136,15 @@
136136
*/
137137
Route::group(['prefix' => 'nodes'], function () {
138138
Route::get('/', 'NodesController@index')->name('admin.nodes');
139-
Route::get('/new', 'NodesController@new')->name('admin.nodes.new');
139+
Route::get('/new', 'NodesController@create')->name('admin.nodes.new');
140140
Route::get('/view/{id}', 'NodesController@viewIndex')->name('admin.nodes.view');
141141
Route::get('/view/{id}/settings', 'NodesController@viewSettings')->name('admin.nodes.view.settings');
142142
Route::get('/view/{id}/configuration', 'NodesController@viewConfiguration')->name('admin.nodes.view.configuration');
143143
Route::get('/view/{id}/allocation', 'NodesController@viewAllocation')->name('admin.nodes.view.allocation');
144144
Route::get('/view/{id}/servers', 'NodesController@viewServers')->name('admin.nodes.view.servers');
145145
Route::get('/view/{id}/settings/token', 'NodesController@setToken')->name('admin.nodes.view.configuration.token');
146146

147-
Route::post('/new', 'NodesController@create');
147+
Route::post('/new', 'NodesController@store');
148148
Route::post('/view/{id}/settings', 'NodesController@updateSettings');
149149
Route::post('/view/{id}/allocation', 'NodesController@createAllocation');
150150
Route::post('/view/{id}/allocation/remove', 'NodesController@allocationRemoveBlock')->name('admin.nodes.view.allocation.removeBlock');
@@ -164,16 +164,16 @@
164164
*/
165165
Route::group(['prefix' => 'services'], function () {
166166
Route::get('/', 'ServiceController@index')->name('admin.services');
167-
Route::get('/new', 'ServiceController@new')->name('admin.services.new');
167+
Route::get('/new', 'ServiceController@create')->name('admin.services.new');
168168
Route::get('/view/{id}', 'ServiceController@view')->name('admin.services.view');
169169
Route::get('/view/{id}/functions', 'ServiceController@viewFunctions')->name('admin.services.view.functions');
170-
Route::get('/option/new', 'OptionController@new')->name('admin.services.option.new');
170+
Route::get('/option/new', 'OptionController@create')->name('admin.services.option.new');
171171
Route::get('/option/{id}', 'OptionController@viewConfiguration')->name('admin.services.option.view');
172172
Route::get('/option/{id}/variables', 'OptionController@viewVariables')->name('admin.services.option.variables');
173173

174-
Route::post('/new', 'ServiceController@create');
174+
Route::post('/new', 'ServiceController@store');
175175
Route::post('/view/{id}', 'ServiceController@edit');
176-
Route::post('/option/new', 'OptionController@new');
176+
Route::post('/option/new', 'OptionController@store');
177177
Route::post('/option/{id}', 'OptionController@editConfiguration');
178178
Route::post('/option/{id}/variables', 'OptionController@createVariable');
179179
Route::post('/option/{id}/variables/{variable}', 'OptionController@editVariable')->name('admin.services.option.variables.edit');
@@ -191,11 +191,11 @@
191191
*/
192192
Route::group(['prefix' => 'packs'], function () {
193193
Route::get('/', 'PackController@index')->name('admin.packs');
194-
Route::get('/new', 'PackController@new')->name('admin.packs.new');
194+
Route::get('/new', 'PackController@create')->name('admin.packs.new');
195195
Route::get('/new/template', 'PackController@newTemplate')->name('admin.packs.new.template');
196196
Route::get('/view/{id}', 'PackController@view')->name('admin.packs.view');
197197

198-
Route::post('/new', 'PackController@create');
198+
Route::post('/new', 'PackController@store');
199199
Route::post('/view/{id}', 'PackController@update');
200200
Route::post('/view/{id}/export/{files?}', 'PackController@export')->name('admin.packs.view.export');
201201
});

‎routes/server.php‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@
7171
|
7272
*/
7373
Route::group(['prefix' => 'users'], function () {
74-
Route::get('/', 'SubuserController@getIndex')->name('server.subusers');
75-
Route::get('/new', 'SubuserController@getNew')->name('server.subusers.new');
76-
Route::get('/view/{id}', 'SubuserController@getView')->name('server.subusers.view');
74+
Route::get('/', 'SubuserController@index')->name('server.subusers');
75+
Route::get('/new', 'SubuserController@create')->name('server.subusers.new');
76+
Route::get('/view/{id}', 'SubuserController@view')->name('server.subusers.view');
7777

78-
Route::post('/new', 'SubuserController@postNew');
79-
Route::post('/view/{id}', 'SubuserController@postView');
78+
Route::post('/new', 'SubuserController@store');
79+
Route::post('/view/{id}', 'SubuserController@update');
8080

81-
Route::delete('/delete/{id}', 'SubuserController@deleteSubuser')->name('server.subusers.delete');
81+
Route::delete('/delete/{id}', 'SubuserController@delete')->name('server.subusers.delete');
8282
});
8383

8484
/*
@@ -90,15 +90,13 @@
9090
|
9191
*/
9292
Route::group(['prefix' => 'tasks'], function () {
93-
Route::get('/', 'TaskController@getIndex')->name('server.tasks');
94-
Route::get('/new', 'TaskController@getNew')->name('server.tasks.new');
95-
Route::get('/view/{id}', 'TaskController@getView')->name('server.tasks.view');
93+
Route::get('/', 'TaskController@index')->name('server.tasks');
94+
Route::get('/new', 'TaskController@create')->name('server.tasks.new');
9695

97-
Route::post('/new', 'TaskController@postNew');
98-
Route::post('/view/{id}', 'SubuserController@postView');
99-
Route::post('/toggle/{id}', 'TaskController@toggleTask')->name('server.tasks.toggle');
96+
Route::post('/new', 'TaskController@store');
97+
Route::post('/toggle/{id}', 'TaskController@toggle')->name('server.tasks.toggle');
10098

101-
Route::delete('/delete/{id}', 'TaskController@deleteTask')->name('server.tasks.delete');
99+
Route::delete('/delete/{id}', 'TaskController@delete')->name('server.tasks.delete');
102100
});
103101

104102
/*

0 commit comments

Comments
 (0)