From 52b10ea9c456d18ecba6f23e9d154fbc351131a4 Mon Sep 17 00:00:00 2001
From: drkthunder02 <mancuso.christopher@gmail.com>
Date: Fri, 27 Sep 2019 17:41:24 -0500
Subject: [PATCH] stuff

---
 app/Http/Middleware/Authenticate.php               |  4 ++--
 .../views/layouts/navbars/loggedout.blade.php      |  2 +-
 routes/web.php                                     | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

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 @@
             <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>
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');