diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 4b777e44c..11f68fb98 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -25,6 +25,7 @@ class AuthController extends Controller protected $loginPath = '/login'; protected $redirectPath = '/'; + protected $redirectAfterLogout = '/login'; /** diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index b09e9cd32..c3ddb9a0d 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -38,7 +38,7 @@ class Authenticate if ($request->ajax()) { return response('Unauthorized.', 401); } else { - return redirect()->guest('auth/login'); + return redirect()->guest('/login'); } } diff --git a/app/Http/routes.php b/app/Http/routes.php index 28b81b295..7053c71b9 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -63,6 +63,7 @@ Route::group(['middleware' => 'auth'], function() { }); + Route::get('/login', 'Auth\AuthController@getLogin'); Route::post('/login', 'Auth\AuthController@postLogin'); Route::get('/logout', 'Auth\AuthController@getLogout'); diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php index 667a855a5..8d5cdb158 100644 --- a/resources/views/pages/form.blade.php +++ b/resources/views/pages/form.blade.php @@ -27,7 +27,10 @@ tinymce.init({ selector: '.edit-area textarea', - content_css: '/css/app.css', + content_css: [ + '/css/app.css', + '//fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic,300italic,100,300' + ], body_class: 'page-content', relative_urls: false, statusbar: false,