Clean up all route files, alias routes etc.

This commit is contained in:
James Brooks
2015-08-07 14:52:44 +01:00
parent 5858d8063b
commit cefabcef2d
14 changed files with 183 additions and 110 deletions

View File

@@ -29,7 +29,7 @@ class ComponentController extends Controller
$this->subMenu = [
'components' => [
'title' => trans('dashboard.components.components'),
'url' => route('dashboard.components'),
'url' => route('dashboard.components.index'),
'icon' => 'ion-outlet',
'active' => false,
],

View File

@@ -44,13 +44,13 @@ class IncidentController extends Controller
$this->subMenu = [
'incidents' => [
'title' => trans('dashboard.incidents.incidents'),
'url' => route('dashboard.incidents'),
'url' => route('dashboard.incidents.index'),
'icon' => 'ion-android-checkmark-circle',
'active' => true,
],
'schedule' => [
'title' => trans('dashboard.schedule.schedule'),
'url' => route('dashboard.schedule'),
'url' => route('dashboard.schedule.index'),
'icon' => 'ion-android-calendar',
'active' => false,
],

View File

@@ -50,7 +50,7 @@ class AuthController extends Controller
// Temporarily store the user.
Session::put('2fa_id', Auth::user()->id);
return Redirect::route('two-factor');
return Redirect::route('auth.two-factor');
}
// We probably want to add support for "Remember me" here.
@@ -98,11 +98,11 @@ class AuthController extends Controller
// Failed login, log back out.
Auth::logout();
return Redirect::route('login')->withError(trans('forms.login.invalid-token'));
return Redirect::route('auth.login')->withError(trans('forms.login.invalid-token'));
}
}
return Redirect::route('login')->withError(trans('forms.login.invalid-token'));
return Redirect::route('auth.login')->withError(trans('forms.login.invalid-token'));
}
/**