From 188ac4225871cda344de7156fb1915e939895971 Mon Sep 17 00:00:00 2001 From: phecho Date: Sat, 12 Dec 2015 17:45:10 +0800 Subject: [PATCH 1/2] Fixed typos --- app/Http/Controllers/AuthController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index a157958..2a57737 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -47,7 +47,7 @@ public function postLogin() // We probably want to add support for "Remember me" here. Auth::attempt($loginData); - return Redirect::intended('dashboard.index') + return Redirect::intended('/') ->withSuccess(trans('gitamin.signin.success')); } From ae949dce0e116c566646acdf20ecde4ce06cb679 Mon Sep 17 00:00:00 2001 From: phecho Date: Sat, 12 Dec 2015 18:04:12 +0800 Subject: [PATCH 2/2] Added home route --- app/Http/Controllers/AuthController.php | 3 ++- app/Http/Middleware/RedirectIfAuthenticated.php | 2 +- app/Http/Routes/DefaultRoutes.php | 3 +-- resources/views/default/dashboard/partials/header.blade.php | 2 +- resources/views/default/dashboard/partials/sidebar.blade.php | 2 +- resources/views/default/dashboard/user/index.blade.php | 2 +- resources/views/default/install.blade.php | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 2a57737..e48f963 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -47,7 +47,8 @@ public function postLogin() // We probably want to add support for "Remember me" here. Auth::attempt($loginData); - return Redirect::intended('/') + //return Redirect::intended('/') + return Redirect::home() ->withSuccess(trans('gitamin.signin.success')); } diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index f921997..2303d34 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -47,7 +47,7 @@ public function __construct(Guard $auth) public function handle($request, Closure $next) { if ($this->auth->check()) { - return new RedirectResponse(route('dashboard.index')); + return new RedirectResponse(route('home')); } return $next($request); diff --git a/app/Http/Routes/DefaultRoutes.php b/app/Http/Routes/DefaultRoutes.php index 9137723..b41265c 100644 --- a/app/Http/Routes/DefaultRoutes.php +++ b/app/Http/Routes/DefaultRoutes.php @@ -29,10 +29,9 @@ public function map(Registrar $router) $router->group([ 'middleware' => ['app.hasSetting', 'auth'], 'setting' => 'app_name', - 'as' => 'dashboard.', ], function ($router) { $router->get('/', [ - 'as' => 'index', + 'as' => 'home', 'uses' => 'DashboardController@indexAction', ]); }); diff --git a/resources/views/default/dashboard/partials/header.blade.php b/resources/views/default/dashboard/partials/header.blade.php index 4cd4866..629b72e 100644 --- a/resources/views/default/dashboard/partials/header.blade.php +++ b/resources/views/default/dashboard/partials/header.blade.php @@ -1,5 +1,5 @@