From 3b70060d097aba53d0010b83fc0068f5ea9dd983 Mon Sep 17 00:00:00 2001 From: Joseph Cohen Date: Mon, 5 Jan 2015 13:46:08 -0600 Subject: [PATCH] Format routes --- app/routes/api.php | 6 ++- app/routes/app.php | 15 +++++-- app/routes/auth.php | 27 +++++++++--- app/routes/dashboard.php | 91 ++++++++++++++++++++++++++++++++-------- 4 files changed, 112 insertions(+), 27 deletions(-) diff --git a/app/routes/api.php b/app/routes/api.php index 0c28a59fd..7d2749d61 100644 --- a/app/routes/api.php +++ b/app/routes/api.php @@ -1,6 +1,10 @@ 'allowed_domains', 'namespace' => 'CachetHQ\Cachet\Http\Controllers\Api', 'version' => 'v1'], function () { +Route::api([ + 'after' => 'allowed_domains', + 'namespace' => 'CachetHQ\Cachet\Http\Controllers\Api', + 'version' => 'v1', + ], function () { Route::get('components', 'ComponentController@getComponents'); Route::get('components/{id}', 'ComponentController@getComponent'); Route::get('components/{id}/incidents', 'ComponentController@getComponentIncidents'); diff --git a/app/routes/app.php b/app/routes/app.php index 8843f12e9..ff5404e99 100644 --- a/app/routes/app.php +++ b/app/routes/app.php @@ -1,13 +1,22 @@ 'has_setting:app_name', 'namespace' => 'CachetHQ\Cachet\Http\Controllers'], function () { - Route::get('/', ['as' => 'status-page', 'uses' => 'HomeController@showIndex']); +Route::group([ + 'before' => 'has_setting:app_name', + 'namespace' => 'CachetHQ\Cachet\Http\Controllers', + ], function () { + Route::get('/', [ + 'as' => 'status-page', + 'uses' => 'HomeController@showIndex', + ]); Route::get('/incident/{incident}', 'HomeController@showIncident'); }); // Setup route. -Route::group(['before' => 'is_setup', 'namespace' => 'CachetHQ\Cachet\Http\Controllers'], function () { +Route::group([ + 'before' => 'is_setup', + 'namespace' => 'CachetHQ\Cachet\Http\Controllers', + ], function () { Route::controller('/setup', 'SetupController'); }); diff --git a/app/routes/auth.php b/app/routes/auth.php index 768af1670..d6a63d074 100644 --- a/app/routes/auth.php +++ b/app/routes/auth.php @@ -1,10 +1,27 @@ 'has_setting:app_name', 'namespace' => 'CachetHQ\Cachet\Http\Controllers'], function () { - Route::get('/auth/login', ['before' => 'guest', 'as' => 'login', 'uses' => 'AuthController@showLogin']); - Route::post('/auth/login', ['before' => 'guest|csrf|login_throttling', 'as' => 'logout', 'uses' => 'AuthController@postLogin']); +Route::group([ + 'before' => 'has_setting:app_name', + 'namespace' => 'CachetHQ\Cachet\Http\Controllers', + ], function () { + Route::get('/auth/login', [ + 'before' => 'guest', + 'as' => 'login', + 'uses' => 'AuthController@showLogin', + ]); + Route::post('/auth/login', [ + 'before' => 'guest|csrf|login_throttling', + 'as' => 'logout', + 'uses' => 'AuthController@postLogin', + ]); }); -Route::group(['before' => 'auth', 'namespace' => 'CachetHQ\Cachet\Http\Controllers'], function () { - Route::get('/auth/logout', ['as' => 'logout', 'uses' => 'AuthController@logoutAction']); +Route::group([ + 'before' => 'auth', + 'namespace' => 'CachetHQ\Cachet\Http\Controllers', + ], function () { + Route::get('/auth/logout', [ + 'as' => 'logout', + 'uses' => 'AuthController@logoutAction', + ]); }); diff --git a/app/routes/dashboard.php b/app/routes/dashboard.php index 9a9a9e4f9..8b95f532c 100644 --- a/app/routes/dashboard.php +++ b/app/routes/dashboard.php @@ -1,52 +1,107 @@ 'auth', 'prefix' => 'dashboard', 'namespace' => 'CachetHQ\Cachet\Http\Controllers'], function () { +Route::group([ + 'before' => 'auth', + 'prefix' => 'dashboard', + 'namespace' => 'CachetHQ\Cachet\Http\Controllers', + ], function () { // Dashboard - Route::get('/', ['as' => 'dashboard', 'uses' => 'DashboardController@showDashboard']); + Route::get('/', [ + 'as' => 'dashboard', + 'uses' => 'DashboardController@showDashboard', + ]); // Components - Route::get('components', ['as' => 'dashboard.components', 'uses' => 'DashComponentController@showComponents']); - Route::get('components/add', ['as' => 'dashboard.components.add', 'uses' => 'DashComponentController@showAddComponent']); + Route::get('components', [ + 'as' => 'dashboard.components', + 'uses' => 'DashComponentController@showComponents', + ]); + Route::get('components/add', [ + 'as' => 'dashboard.components.add', + 'uses' => 'DashComponentController@showAddComponent', + ]); Route::post('components/add', 'DashComponentController@createComponentAction'); - Route::get('components/groups', ['as' => 'dashboard.components.groups', 'uses' => 'DashComponentController@showComponentGroups']); - Route::get('components/groups/add', ['as' => 'dashboard.components.groups.add', 'uses' => 'DashComponentController@showAddComponentGroup']); + Route::get('components/groups', [ + 'as' => 'dashboard.components.groups', + 'uses' => 'DashComponentController@showComponentGroups', + ]); + Route::get('components/groups/add', [ + 'as' => 'dashboard.components.groups.add', + 'uses' => 'DashComponentController@showAddComponentGroup', + ]); Route::post('components/groups/add', 'DashComponentController@postAddComponentGroup'); Route::get('components/{component}/delete', 'DashComponentController@deleteComponentAction'); Route::get('components/{component}/edit', 'DashComponentController@showEditComponent'); Route::post('components/{component}/edit', 'DashComponentController@updateComponentAction'); // Incidents - Route::get('incidents', ['as' => 'dashboard.incidents', 'uses' => 'DashIncidentController@showIncidents']); - Route::get('incidents/add', ['as' => 'dashboard.incidents.add', 'uses' => 'DashIncidentController@showAddIncident']); + Route::get('incidents', [ + 'as' => 'dashboard.incidents', + 'uses' => 'DashIncidentController@showIncidents', + ]); + Route::get('incidents/add', [ + 'as' => 'dashboard.incidents.add', + 'uses' => 'DashIncidentController@showAddIncident', + ]); Route::post('incidents/add', 'DashIncidentController@createIncidentAction'); Route::get('incidents/{incident}/delete', 'DashIncidentController@deleteIncidentAction'); Route::get('incidents/{incident}/edit', 'DashIncidentController@showEditIncidentAction'); Route::post('incidents/{incident}/edit', 'DashIncidentController@editIncidentAction'); - Route::get('incidents/template', ['as' => 'dashboard.incidents.template', 'uses' => 'DashIncidentController@showAddIncidentTemplate']); + Route::get('incidents/template', [ + 'as' => 'dashboard.incidents.template', + 'uses' => 'DashIncidentController@showAddIncidentTemplate', + ]); Route::post('incidents/template', 'DashIncidentController@createIncidentTemplateAction'); // Metrics - Route::get('metrics', ['as' => 'dashboard.metrics', 'uses' => 'DashboardController@showMetrics']); + Route::get('metrics', [ + 'as' => 'dashboard.metrics', + 'uses' => 'DashboardController@showMetrics', + ]); // Notifications - Route::get('notifications', ['as' => 'dashboard.notifications', 'uses' => 'DashboardController@showNotifications']); + Route::get('notifications', [ + 'as' => 'dashboard.notifications', + 'uses' => 'DashboardController@showNotifications', + ]); // Team Members - Route::get('team', ['as' => 'dashboard.team', 'uses' => 'DashboardController@showTeamView']); - Route::get('team/add', ['as' => 'dashboard.team.add', 'uses' => 'DashboardController@showAddTeamMemberView']); + Route::get('team', [ + 'as' => 'dashboard.team', + 'uses' => 'DashboardController@showTeamView', + ]); + Route::get('team/add', [ + 'as' => 'dashboard.team.add', + 'uses' => 'DashboardController@showAddTeamMemberView' + ]); Route::get('team/{user}', 'DashboardController@showTeamMemberView'); Route::post('team/add', 'DashboardController@postAddUser'); Route::post('team/{user}', 'DashboardController@postUpdateUser'); // Settings - Route::get('settings/setup', ['as' => 'dashboard.settings.setup', 'uses' => 'DashSettingsController@showSetupView']); - Route::get('settings/security', ['as' => 'dashboard.settings.security', 'uses' => 'DashSettingsController@showSecurityView']); - Route::get('settings/theme', ['as' => 'dashboard.settings.theme', 'uses' => 'DashSettingsController@showThemeView']); - Route::get('settings/stylesheet', ['as' => 'dashboard.settings.stylesheet', 'uses' => 'DashSettingsController@showStylesheetView']); + Route::get('settings/setup', [ + 'as' => 'dashboard.settings.setup', + 'uses' => 'DashSettingsController@showSetupView', + ]); + Route::get('settings/security', [ + 'as' => 'dashboard.settings.security', + 'uses' => 'DashSettingsController@showSecurityView', + ]); + Route::get('settings/theme', [ + 'as' => 'dashboard.settings.theme', + 'uses' => 'DashSettingsController@showThemeView', + ]); + Route::get('settings/stylesheet', [ + 'as' => 'dashboard.settings.stylesheet', + 'uses' => 'DashSettingsController@showStylesheetView', + ]); Route::post('settings', 'DashSettingsController@postSettings'); // User Settings - Route::get('user', ['as' => 'dashboard.user', 'uses' => 'DashUserController@showUser']); + Route::get('user', [ + 'as' => 'dashboard.user', + 'uses' => 'DashUserController@showUser', + ]); Route::get('user/{user}/api/regen', 'DashUserController@regenerateApiKey'); Route::post('user', 'DashUserController@postUser');