mirror of
https://github.com/BookStackApp/BookStack.git
synced 2025-04-23 04:10:22 +00:00
Minor fixes to editor and auth
This commit is contained in:
parent
71e2e057cb
commit
588364a202
4 changed files with 7 additions and 2 deletions
app/Http
resources/views/pages
|
@ -25,6 +25,7 @@ class AuthController extends Controller
|
||||||
|
|
||||||
protected $loginPath = '/login';
|
protected $loginPath = '/login';
|
||||||
protected $redirectPath = '/';
|
protected $redirectPath = '/';
|
||||||
|
protected $redirectAfterLogout = '/login';
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -38,7 +38,7 @@ class Authenticate
|
||||||
if ($request->ajax()) {
|
if ($request->ajax()) {
|
||||||
return response('Unauthorized.', 401);
|
return response('Unauthorized.', 401);
|
||||||
} else {
|
} else {
|
||||||
return redirect()->guest('auth/login');
|
return redirect()->guest('/login');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -63,6 +63,7 @@ Route::group(['middleware' => 'auth'], function() {
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::get('/login', 'Auth\AuthController@getLogin');
|
Route::get('/login', 'Auth\AuthController@getLogin');
|
||||||
Route::post('/login', 'Auth\AuthController@postLogin');
|
Route::post('/login', 'Auth\AuthController@postLogin');
|
||||||
Route::get('/logout', 'Auth\AuthController@getLogout');
|
Route::get('/logout', 'Auth\AuthController@getLogout');
|
||||||
|
|
|
@ -27,7 +27,10 @@
|
||||||
|
|
||||||
tinymce.init({
|
tinymce.init({
|
||||||
selector: '.edit-area textarea',
|
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',
|
body_class: 'page-content',
|
||||||
relative_urls: false,
|
relative_urls: false,
|
||||||
statusbar: false,
|
statusbar: false,
|
||||||
|
|
Loading…
Add table
Reference in a new issue