stuff
This commit is contained in:
@@ -14,8 +14,8 @@ class Authenticate extends Middleware
|
||||
*/
|
||||
protected function redirectTo($request)
|
||||
{
|
||||
if (! $request->expectsJson()) {
|
||||
return route('login');
|
||||
if(!$this->auth->check()){
|
||||
return route('/');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="/dashboard">United Hauling</a>
|
||||
<a class="navbar-brand" href="/">United Hauling</a>
|
||||
<ul class="navbar-nav mr-auto">
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdoownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Hauling</a>
|
||||
|
||||
@@ -11,6 +11,13 @@
|
||||
|
|
||||
*/
|
||||
|
||||
/**
|
||||
* Unsecure Display pages
|
||||
*/
|
||||
Route::get('/', 'Hauling\HaulingController@displayForm')->name('/');
|
||||
Route::post('/', 'Hauling\HaulingController@displayFormResults');
|
||||
Route::get('/display/quotes', 'Hauling\HaulingController@displayQuotes')->name('quotes');
|
||||
|
||||
Route::group(['middleware' => ['auth']], function(){
|
||||
/**
|
||||
* Dashboard Controller Display pages
|
||||
@@ -26,10 +33,3 @@ Route::group(['middleware' => ['auth']], function(){
|
||||
Route::get('/login', 'Auth\LoginController@redirectToProvider')->name('login');
|
||||
Route::get('/callback', 'Auth\LoginController@handleProviderCallback')->name('callback');
|
||||
Route::get('/logout', 'Auth\LoginController@logout')->name('logout');
|
||||
|
||||
/**
|
||||
* Unsecure Display pages
|
||||
*/
|
||||
Route::get('/', 'Hauling\HaulingController@displayForm')->name('display');
|
||||
Route::post('/', 'Hauling\HaulingController@displayFormResults');
|
||||
Route::get('/display/quotes', 'Hauling\HaulingController@displayQuotes')->name('quotes');
|
||||
|
||||
Reference in New Issue
Block a user