StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/service-changes

Browse source
This commit is contained in:
Dane Everitt 2017-01-12 13:15:37 -05:00
commit 6bd9663f59
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
136 changed files with 2470 additions and 1737 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Routes/AdminRoutes.php
View file

@ -286,6 +286,11 @@ class AdminRoutes
'as' => 'admin.nodes.delete',
'uses' => 'Admin\NodesController@deleteNode',
]);
$router->get('/{id}/configurationtoken', [
'as' => 'admin.nodes.configuration-token',
'uses' => 'Admin\NodesController@getConfigurationToken',
]);
});
// Location Routes

5
app/Http/Routes/RemoteRoutes.php
View file

@ -46,6 +46,11 @@ class RemoteRoutes
'as' => 'remote.event',
'uses' => 'Remote\RemoteController@event',
]);
$router->get('configuration/{token}', [
'as' => 'remote.configuration',
'uses' => 'Remote\RemoteController@getConfiguration',
]);
});
}
}

9
app/Http/Routes/ServerRoutes.php
View file

@ -166,15 +166,6 @@ class ServerRoutes
'uses' => 'Server\AjaxController@postResetDatabasePassword',
]);
});
// Assorted AJAX Routes
$router->group(['prefix' => 'js'], function ($server) use ($router) {
// Returns Server Status
$router->get('{folder}/{file}', [
'as' => 'server.js',
'uses' => 'Server\ServerController@getJavascript',
])->where('file', '.*');
});
});
}
}