diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index a4be5c5..383903c 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -14,8 +14,8 @@ class Authenticate extends Middleware
*/
protected function redirectTo($request)
{
- if (! $request->expectsJson()) {
- return route('login');
+ if(!$this->auth->check()){
+ return route('/');
}
}
}
diff --git a/resources/views/layouts/navbars/loggedout.blade.php b/resources/views/layouts/navbars/loggedout.blade.php
index 5d67057..a36b975 100644
--- a/resources/views/layouts/navbars/loggedout.blade.php
+++ b/resources/views/layouts/navbars/loggedout.blade.php
@@ -3,7 +3,7 @@
- United Hauling
+ United Hauling
-
diff --git a/routes/web.php b/routes/web.php
index 74747b7..0c8de69 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -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');