diff --git a/database/.DS_Store b/database/.DS_Store deleted file mode 100644 index 6601ebe..0000000 Binary files a/database/.DS_Store and /dev/null differ diff --git a/resources/views/pages/auth/password/reset.blade.php b/resources/views/pages/auth/password/reset.blade.php index 96b5139..dcb1101 100644 --- a/resources/views/pages/auth/password/reset.blade.php +++ b/resources/views/pages/auth/password/reset.blade.php @@ -62,8 +62,8 @@ public function sendResetPasswordLink() Send password reset link @endif -
- Or +
+ Or return to login
diff --git a/resources/views/pages/auth/two-factor-challenge.blade.php b/resources/views/pages/auth/two-factor-challenge.blade.php index 44a87ce..bf98a47 100644 --- a/resources/views/pages/auth/two-factor-challenge.blade.php +++ b/resources/views/pages/auth/two-factor-challenge.blade.php @@ -69,7 +69,7 @@ public function submitCode($code) Auth::login($user); // clear out the session that is used to determine if the user can visit the 2fa challenge page. - $this->session()->forget('login.id'); + session()->forget('login.id'); event(new Login(auth()->guard('web'), $user, true)); return redirect()->intended('/');