diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 7cbc2c3..2631f8f 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -25,4 +25,6 @@ public function index() { return view('home'); } + + } diff --git a/app/Http/Controllers/PostController.php b/app/Http/Controllers/PostController.php index b4a226a..a75ffb5 100644 --- a/app/Http/Controllers/PostController.php +++ b/app/Http/Controllers/PostController.php @@ -57,9 +57,6 @@ public function postSearch(){ return view('search', compact('posts')); } - - public function _construct() - { - $this->middleware('auth'); - } + + } diff --git a/app/Http/Middleware/UserAuth.php b/app/Http/Middleware/UserAuth.php index f96fa43..b644984 100644 --- a/app/Http/Middleware/UserAuth.php +++ b/app/Http/Middleware/UserAuth.php @@ -7,8 +7,8 @@ use Session; use Illuminate\Http\Request; - -class UserAuth +use Illuminate\Auth\Middleware\Authenticate as Middleware; +class UserAuth extends Middleware { /** * Handle an incoming request. @@ -17,13 +17,10 @@ class UserAuth * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse */ - public function handle(Request $request, Closure $next) + protected function redirectTo($request) { - - if (!Auth::guard('user')->check()) - { - return redirect('/login'); + if (! $request->expectsJson()) { + return route('login'); } - return $next($request); } } diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php index f2dbc18..7b55a25 100644 --- a/resources/views/layouts/master.blade.php +++ b/resources/views/layouts/master.blade.php @@ -23,7 +23,7 @@ Home