From 2769431d32209387df361ff67303b9c31a430ffa Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Fri, 27 Sep 2019 17:27:58 -0500 Subject: [PATCH 01/14] changed routing --- routes/web.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/routes/web.php b/routes/web.php index b07a18d..74747b7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -11,13 +11,6 @@ | */ -Route::get('/', function () { - if(Auth::check()) { - return redirect('/dashboard'); - } - return redirect('/display'); -})->name('/'); - Route::group(['middleware' => ['auth']], function(){ /** * Dashboard Controller Display pages @@ -37,6 +30,6 @@ Route::get('/logout', 'Auth\LoginController@logout')->name('logout'); /** * Unsecure Display pages */ -Route::get('/display', 'Hauling\HaulingController@displayForm')->name('display'); -Route::post('/display', 'Hauling\HaulingController@displayFormResults'); +Route::get('/', 'Hauling\HaulingController@displayForm')->name('display'); +Route::post('/', 'Hauling\HaulingController@displayFormResults'); Route::get('/display/quotes', 'Hauling\HaulingController@displayQuotes')->name('quotes'); From 52b10ea9c456d18ecba6f23e9d154fbc351131a4 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Fri, 27 Sep 2019 17:41:24 -0500 Subject: [PATCH 02/14] 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 @@ - United Hauling + United Hauling