Merge branch 'develop' into feature/service-changes
This commit is contained in:
Dane Everitt
commit
fc38b09e1f
169 changed files with 2268 additions and 2289 deletions
|
|
@ -2,7 +2,7 @@
|
|||
/**
|
||||
* Pterodactyl - Panel
|
||||
* Copyright (c) 2015 - 2016 Dane Everitt <dane@daneeveritt.com>
|
||||
* Some Modifications (c) 2015 Dylan Seidt <dylan.seidt@gmail.com>
|
||||
* Some Modifications (c) 2015 Dylan Seidt <dylan.seidt@gmail.com>.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
@ -22,13 +22,15 @@
|
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
namespace Pterodactyl\Http\Routes;
|
||||
|
||||
use Illuminate\Routing\Router;
|
||||
|
||||
class AdminRoutes {
|
||||
|
||||
public function map(Router $router) {
|
||||
class AdminRoutes
|
||||
{
|
||||
public function map(Router $router)
|
||||
{
|
||||
|
||||
// Admin Index
|
||||
$router->get('admin', [
|
||||
|
|
@ -36,9 +38,9 @@ class AdminRoutes {
|
|||
'middleware' => [
|
||||
'auth',
|
||||
'admin',
|
||||
'csrf'
|
||||
'csrf',
|
||||
],
|
||||
'uses' => 'Admin\BaseController@getIndex'
|
||||
'uses' => 'Admin\BaseController@getIndex',
|
||||
]);
|
||||
|
||||
$router->group([
|
||||
|
|
@ -46,15 +48,15 @@ class AdminRoutes {
|
|||
'middleware' => [
|
||||
'auth',
|
||||
'admin',
|
||||
'csrf'
|
||||
]
|
||||
'csrf',
|
||||
],
|
||||
], function () use ($router) {
|
||||
$router->get('/', [
|
||||
'as' => 'admin.settings',
|
||||
'uses' => 'Admin\BaseController@getSettings'
|
||||
'uses' => 'Admin\BaseController@getSettings',
|
||||
]);
|
||||
$router->post('/', [
|
||||
'uses' => 'Admin\BaseController@postSettings'
|
||||
'uses' => 'Admin\BaseController@postSettings',
|
||||
]);
|
||||
});
|
||||
|
||||
|
|
@ -63,48 +65,47 @@ class AdminRoutes {
|
|||
'middleware' => [
|
||||
'auth',
|
||||
'admin',
|
||||
'csrf'
|
||||
]
|
||||
'csrf',
|
||||
],
|
||||
], function () use ($router) {
|
||||
|
||||
// View All Accounts on System
|
||||
$router->get('/', [
|
||||
'as' => 'admin.users',
|
||||
'uses' => 'Admin\UserController@getIndex'
|
||||
'uses' => 'Admin\UserController@getIndex',
|
||||
]);
|
||||
|
||||
$router->get('/accounts.json', [
|
||||
'as' => 'admin.users.json',
|
||||
'uses' => 'Admin\UserController@getJson'
|
||||
'uses' => 'Admin\UserController@getJson',
|
||||
]);
|
||||
|
||||
// View Specific Account
|
||||
$router->get('/view/{id}', [
|
||||
'as' => 'admin.users.view',
|
||||
'uses' => 'Admin\UserController@getView'
|
||||
'uses' => 'Admin\UserController@getView',
|
||||
]);
|
||||
|
||||
// View Specific Account
|
||||
$router->post('/view/{id}', [
|
||||
'uses' => 'Admin\UserController@updateUser'
|
||||
'uses' => 'Admin\UserController@updateUser',
|
||||
]);
|
||||
|
||||
// Delete an Account Matching an ID
|
||||
$router->delete('/view/{id}', [
|
||||
'uses' => 'Admin\UserController@deleteUser'
|
||||
'uses' => 'Admin\UserController@deleteUser',
|
||||
]);
|
||||
|
||||
// Show Create Account Page
|
||||
$router->get('/new', [
|
||||
'as' => 'admin.users.new',
|
||||
'uses' => 'Admin\UserController@getNew'
|
||||
'uses' => 'Admin\UserController@getNew',
|
||||
]);
|
||||
|
||||
// Handle Creating New Account
|
||||
$router->post('/new', [
|
||||
'uses' => 'Admin\UserController@postNew'
|
||||
'uses' => 'Admin\UserController@postNew',
|
||||
]);
|
||||
|
||||
});
|
||||
|
||||
// Server Routes
|
||||
|
|
@ -113,37 +114,37 @@ class AdminRoutes {
|
|||
'middleware' => [
|
||||
'auth',
|
||||
'admin',
|
||||
'csrf'
|
||||
]
|
||||
'csrf',
|
||||
],
|
||||
], function () use ($router) {
|
||||
|
||||
// View All Servers
|
||||
$router->get('/', [
|
||||
'as' => 'admin.servers',
|
||||
'uses' => 'Admin\ServersController@getIndex' ]);
|
||||
'uses' => 'Admin\ServersController@getIndex', ]);
|
||||
|
||||
// View Create Server Page
|
||||
$router->get('/new', [
|
||||
'as' => 'admin.servers.new',
|
||||
'uses' => 'Admin\ServersController@getNew'
|
||||
'uses' => 'Admin\ServersController@getNew',
|
||||
]);
|
||||
|
||||
// Handle POST Request for Creating Server
|
||||
$router->post('/new', [
|
||||
'uses' => 'Admin\ServersController@postNewServer'
|
||||
'uses' => 'Admin\ServersController@postNewServer',
|
||||
]);
|
||||
|
||||
// Assorted Page Helpers
|
||||
$router->post('/new/get-nodes', [
|
||||
'uses' => 'Admin\ServersController@postNewServerGetNodes'
|
||||
'uses' => 'Admin\ServersController@postNewServerGetNodes',
|
||||
]);
|
||||
|
||||
$router->post('/new/get-ips', [
|
||||
'uses' => 'Admin\ServersController@postNewServerGetIps'
|
||||
'uses' => 'Admin\ServersController@postNewServerGetIps',
|
||||
]);
|
||||
|
||||
$router->post('/new/service-options', [
|
||||
'uses' => 'Admin\ServersController@postNewServerServiceOptions'
|
||||
'uses' => 'Admin\ServersController@postNewServerServiceOptions',
|
||||
]);
|
||||
|
||||
$router->post('/new/option-details', [
|
||||
|
|
@ -154,67 +155,66 @@ class AdminRoutes {
|
|||
// View Specific Server
|
||||
$router->get('/view/{id}', [
|
||||
'as' => 'admin.servers.view',
|
||||
'uses' => 'Admin\ServersController@getView'
|
||||
'uses' => 'Admin\ServersController@getView',
|
||||
]);
|
||||
|
||||
// Database Stuffs
|
||||
$router->post('/view/{id}/database', [
|
||||
'as' => 'admin.servers.database',
|
||||
'uses' => 'Admin\ServersController@postDatabase'
|
||||
'uses' => 'Admin\ServersController@postDatabase',
|
||||
]);
|
||||
|
||||
// Change Server Details
|
||||
$router->post('/view/{id}/details', [
|
||||
'uses' => 'Admin\ServersController@postUpdateServerDetails'
|
||||
'uses' => 'Admin\ServersController@postUpdateServerDetails',
|
||||
]);
|
||||
|
||||
// Change Server Details
|
||||
$router->post('/view/{id}/container', [
|
||||
'as' => 'admin.servers.post.container',
|
||||
'uses' => 'Admin\ServersController@postUpdateContainerDetails'
|
||||
'uses' => 'Admin\ServersController@postUpdateContainerDetails',
|
||||
]);
|
||||
|
||||
// Change Server Details
|
||||
$router->post('/view/{id}/startup', [
|
||||
'as' => 'admin.servers.post.startup',
|
||||
'uses' => 'Admin\ServersController@postUpdateServerStartup'
|
||||
'uses' => 'Admin\ServersController@postUpdateServerStartup',
|
||||
]);
|
||||
|
||||
// Rebuild Server
|
||||
$router->post('/view/{id}/rebuild', [
|
||||
'uses' => 'Admin\ServersController@postUpdateServerToggleBuild'
|
||||
'uses' => 'Admin\ServersController@postUpdateServerToggleBuild',
|
||||
]);
|
||||
|
||||
// Change Build Details
|
||||
$router->post('/view/{id}/build', [
|
||||
'uses' => 'Admin\ServersController@postUpdateServerUpdateBuild'
|
||||
'uses' => 'Admin\ServersController@postUpdateServerUpdateBuild',
|
||||
]);
|
||||
|
||||
// Suspend Server
|
||||
$router->post('/view/{id}/suspend', [
|
||||
'uses' => 'Admin\ServersController@postSuspendServer'
|
||||
'uses' => 'Admin\ServersController@postSuspendServer',
|
||||
]);
|
||||
|
||||
// Unsuspend Server
|
||||
$router->post('/view/{id}/unsuspend', [
|
||||
'uses' => 'Admin\ServersController@postUnsuspendServer'
|
||||
'uses' => 'Admin\ServersController@postUnsuspendServer',
|
||||
]);
|
||||
|
||||
// Change Install Status
|
||||
$router->post('/view/{id}/installed', [
|
||||
'uses' => 'Admin\ServersController@postToggleInstall'
|
||||
'uses' => 'Admin\ServersController@postToggleInstall',
|
||||
]);
|
||||
|
||||
// Delete [force delete]
|
||||
$router->delete('/view/{id}/{force?}', [
|
||||
'uses' => 'Admin\ServersController@deleteServer'
|
||||
'uses' => 'Admin\ServersController@deleteServer',
|
||||
]);
|
||||
|
||||
$router->post('/view/{id}/queuedDeletion', [
|
||||
'uses' => 'Admin\ServersController@postQueuedDeletionHandler',
|
||||
'as' => 'admin.servers.post.queuedDeletion'
|
||||
'as' => 'admin.servers.post.queuedDeletion',
|
||||
]);
|
||||
|
||||
});
|
||||
|
||||
// Node Routes
|
||||
|
|
@ -223,70 +223,69 @@ class AdminRoutes {
|
|||
'middleware' => [
|
||||
'auth',
|
||||
'admin',
|
||||
'csrf'
|
||||
]
|
||||
'csrf',
|
||||
],
|
||||
], function () use ($router) {
|
||||
|
||||
// View All Nodes
|
||||
$router->get('/', [
|
||||
'as' => 'admin.nodes',
|
||||
'uses' => 'Admin\NodesController@getIndex'
|
||||
'uses' => 'Admin\NodesController@getIndex',
|
||||
]);
|
||||
|
||||
// Add New Node
|
||||
$router->get('/new', [
|
||||
'as' => 'admin.nodes.new',
|
||||
'uses' => 'Admin\NodesController@getNew'
|
||||
'uses' => 'Admin\NodesController@getNew',
|
||||
]);
|
||||
|
||||
$router->post('/new', [
|
||||
'uses' => 'Admin\NodesController@postNew'
|
||||
'uses' => 'Admin\NodesController@postNew',
|
||||
]);
|
||||
|
||||
// View Node
|
||||
$router->get('/view/{id}', [
|
||||
'as' => 'admin.nodes.view',
|
||||
'uses' => 'Admin\NodesController@getView'
|
||||
'uses' => 'Admin\NodesController@getView',
|
||||
]);
|
||||
|
||||
$router->post('/view/{id}', [
|
||||
'uses' => 'Admin\NodesController@postView'
|
||||
'uses' => 'Admin\NodesController@postView',
|
||||
]);
|
||||
|
||||
$router->delete('/view/{id}/deallocate/single/{allocation}', [
|
||||
'uses' => 'Admin\NodesController@deallocateSingle'
|
||||
'uses' => 'Admin\NodesController@deallocateSingle',
|
||||
]);
|
||||
|
||||
$router->post('/view/{id}/deallocate/block', [
|
||||
'uses' => 'Admin\NodesController@deallocateBlock'
|
||||
'uses' => 'Admin\NodesController@deallocateBlock',
|
||||
]);
|
||||
|
||||
$router->post('/view/{id}/alias', [
|
||||
'as' => 'admin.nodes.alias',
|
||||
'uses' => 'Admin\NodesController@setAlias'
|
||||
'uses' => 'Admin\NodesController@setAlias',
|
||||
]);
|
||||
|
||||
$router->get('/view/{id}/allocations.json', [
|
||||
'as' => 'admin.nodes.view.allocations',
|
||||
'uses' => 'Admin\NodesController@getAllocationsJson'
|
||||
'uses' => 'Admin\NodesController@getAllocationsJson',
|
||||
]);
|
||||
|
||||
$router->post('/view/{id}/allocations', [
|
||||
'as' => 'admin.nodes.post.allocations',
|
||||
'uses' => 'Admin\NodesController@postAllocations'
|
||||
'uses' => 'Admin\NodesController@postAllocations',
|
||||
]);
|
||||
|
||||
// View Deploy
|
||||
$router->get('/view/{id}/deploy', [
|
||||
'as' => 'admin.nodes.deply',
|
||||
'uses' => 'Admin\NodesController@getScript'
|
||||
'uses' => 'Admin\NodesController@getScript',
|
||||
]);
|
||||
|
||||
$router->delete('/view/{id}', [
|
||||
'as' => 'admin.nodes.delete',
|
||||
'uses' => 'Admin\NodesController@deleteNode'
|
||||
'uses' => 'Admin\NodesController@deleteNode',
|
||||
]);
|
||||
|
||||
});
|
||||
|
||||
// Location Routes
|
||||
|
|
@ -295,21 +294,21 @@ class AdminRoutes {
|
|||
'middleware' => [
|
||||
'auth',
|
||||
'admin',
|
||||
'csrf'
|
||||
]
|
||||
'csrf',
|
||||
],
|
||||
], function () use ($router) {
|
||||
$router->get('/', [
|
||||
'as' => 'admin.locations',
|
||||
'uses' => 'Admin\LocationsController@getIndex'
|
||||
'uses' => 'Admin\LocationsController@getIndex',
|
||||
]);
|
||||
$router->delete('/{id}', [
|
||||
'uses' => 'Admin\LocationsController@deleteLocation'
|
||||
'uses' => 'Admin\LocationsController@deleteLocation',
|
||||
]);
|
||||
$router->patch('/{id}', [
|
||||
'uses' => 'Admin\LocationsController@patchLocation'
|
||||
'uses' => 'Admin\LocationsController@patchLocation',
|
||||
]);
|
||||
$router->post('/', [
|
||||
'uses' => 'Admin\LocationsController@postLocation'
|
||||
'uses' => 'Admin\LocationsController@postLocation',
|
||||
]);
|
||||
});
|
||||
|
||||
|
|
@ -319,27 +318,27 @@ class AdminRoutes {
|
|||
'middleware' => [
|
||||
'auth',
|
||||
'admin',
|
||||
'csrf'
|
||||
]
|
||||
'csrf',
|
||||
],
|
||||
], function () use ($router) {
|
||||
$router->get('/', [
|
||||
'as' => 'admin.databases',
|
||||
'uses' => 'Admin\DatabaseController@getIndex'
|
||||
'uses' => 'Admin\DatabaseController@getIndex',
|
||||
]);
|
||||
$router->get('/new', [
|
||||
'as' => 'admin.databases.new',
|
||||
'uses' => 'Admin\DatabaseController@getNew'
|
||||
'uses' => 'Admin\DatabaseController@getNew',
|
||||
]);
|
||||
$router->post('/new', [
|
||||
'uses' => 'Admin\DatabaseController@postNew'
|
||||
'uses' => 'Admin\DatabaseController@postNew',
|
||||
]);
|
||||
$router->delete('/delete/{id}', [
|
||||
'as' => 'admin.databases.delete',
|
||||
'uses' => 'Admin\DatabaseController@deleteDatabase'
|
||||
'uses' => 'Admin\DatabaseController@deleteDatabase',
|
||||
]);
|
||||
$router->delete('/delete-server/{id}', [
|
||||
'as' => 'admin.databases.delete-server',
|
||||
'uses' => 'Admin\DatabaseController@deleteServer'
|
||||
'uses' => 'Admin\DatabaseController@deleteServer',
|
||||
]);
|
||||
});
|
||||
|
||||
|
|
@ -349,34 +348,34 @@ class AdminRoutes {
|
|||
'middleware' => [
|
||||
'auth',
|
||||
'admin',
|
||||
'csrf'
|
||||
]
|
||||
'csrf',
|
||||
],
|
||||
], function () use ($router) {
|
||||
$router->get('/', [
|
||||
'as' => 'admin.services',
|
||||
'uses' => 'Admin\ServiceController@getIndex'
|
||||
'uses' => 'Admin\ServiceController@getIndex',
|
||||
]);
|
||||
|
||||
$router->get('/new', [
|
||||
'as' => 'admin.services.new',
|
||||
'uses' => 'Admin\ServiceController@getNew'
|
||||
'uses' => 'Admin\ServiceController@getNew',
|
||||
]);
|
||||
|
||||
$router->post('/new', [
|
||||
'uses' => 'Admin\ServiceController@postNew'
|
||||
'uses' => 'Admin\ServiceController@postNew',
|
||||
]);
|
||||
|
||||
$router->get('/service/{id}', [
|
||||
'as' => 'admin.services.service',
|
||||
'uses' => 'Admin\ServiceController@getService'
|
||||
'uses' => 'Admin\ServiceController@getService',
|
||||
]);
|
||||
|
||||
$router->post('/service/{id}', [
|
||||
'uses' => 'Admin\ServiceController@postService'
|
||||
'uses' => 'Admin\ServiceController@postService',
|
||||
]);
|
||||
|
||||
$router->delete('/service/{id}', [
|
||||
'uses' => 'Admin\ServiceController@deleteService'
|
||||
'uses' => 'Admin\ServiceController@deleteService',
|
||||
]);
|
||||
|
||||
$router->get('/service/{id}/configuration', [
|
||||
|
|
@ -390,43 +389,43 @@ class AdminRoutes {
|
|||
|
||||
$router->get('/service/{service}/option/new', [
|
||||
'as' => 'admin.services.option.new',
|
||||
'uses' => 'Admin\ServiceController@newOption'
|
||||
'uses' => 'Admin\ServiceController@newOption',
|
||||
]);
|
||||
|
||||
$router->post('/service/{service}/option/new', [
|
||||
'uses' => 'Admin\ServiceController@postNewOption'
|
||||
'uses' => 'Admin\ServiceController@postNewOption',
|
||||
]);
|
||||
|
||||
$router->get('/service/{service}/option/{option}', [
|
||||
'as' => 'admin.services.option',
|
||||
'uses' => 'Admin\ServiceController@getOption'
|
||||
'uses' => 'Admin\ServiceController@getOption',
|
||||
]);
|
||||
|
||||
$router->post('/service/{service}/option/{option}', [
|
||||
'uses' => 'Admin\ServiceController@postOption'
|
||||
'uses' => 'Admin\ServiceController@postOption',
|
||||
]);
|
||||
|
||||
$router->delete('/service/{service}/option/{id}', [
|
||||
'uses' => 'Admin\ServiceController@deleteOption'
|
||||
'uses' => 'Admin\ServiceController@deleteOption',
|
||||
]);
|
||||
|
||||
$router->get('/service/{service}/option/{option}/variable/new', [
|
||||
'as' => 'admin.services.option.variable.new',
|
||||
'uses' => 'Admin\ServiceController@getNewVariable'
|
||||
'uses' => 'Admin\ServiceController@getNewVariable',
|
||||
]);
|
||||
|
||||
$router->post('/service/{service}/option/{option}/variable/new', [
|
||||
'uses' => 'Admin\ServiceController@postNewVariable'
|
||||
'uses' => 'Admin\ServiceController@postNewVariable',
|
||||
]);
|
||||
|
||||
$router->post('/service/{service}/option/{option}/variable/{variable}', [
|
||||
'as' => 'admin.services.option.variable',
|
||||
'uses' => 'Admin\ServiceController@postOptionVariable'
|
||||
'uses' => 'Admin\ServiceController@postOptionVariable',
|
||||
]);
|
||||
|
||||
$router->get('/service/{service}/option/{option}/variable/{variable}/delete', [
|
||||
'as' => 'admin.services.option.variable.delete',
|
||||
'uses' => 'Admin\ServiceController@deleteVariable'
|
||||
'uses' => 'Admin\ServiceController@deleteVariable',
|
||||
]);
|
||||
});
|
||||
|
||||
|
|
@ -477,7 +476,5 @@ class AdminRoutes {
|
|||
'uses' => 'Admin\PackController@export'
|
||||
]);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue