From 8ca77102402cf001234c9bd895382fe10c03b3ee Mon Sep 17 00:00:00 2001
From: Tony Lea <tnylea@gmail.com>
Date: Thu, 16 May 2024 20:42:58 -0400
Subject: [PATCH] Adding more two factor functionality

---
 database/.DS_Store                               | Bin 6148 -> 0 bytes
 .../views/pages/auth/password/reset.blade.php    |   4 ++--
 .../pages/auth/two-factor-challenge.blade.php    |   2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 database/.DS_Store

diff --git a/database/.DS_Store b/database/.DS_Store
deleted file mode 100644
index 6601ebee6262db68d12615f2b2b6956cd19ffa24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%}T>S5T0$TO)WwW3OxqA7OYx|;w9Aj0!H+pQWH{YFwIJn+CwSitS{t~_&m<+
zZp6}h@FHSoVD_7xpDg=r*dG88-AQ-=U;}`KN?594vqC6Nx+EpzAr$HxK4cJqgap#1
zY<B!b259ZJV1%nSgfV<szhIg^1+fe;{uVsNQJS?{@1j($Y;0Dos#Uk{yaze;GC!N7
zU4MK-y-O+Mps@YmDjH1t_Rg71GCxWNV^t7^15CNSj*?JLyK<6*sjBsKz^YlbzTKG3
z+O2leX&-myO=os;*h2fLGoRP2-M#(Oi~eIgO5}?sRN%j-WZPf?uV}2C+p{-LVwnsv
zUep#fjLZNtzznPd17`2D>gzCBo+C5B4E%@z+8-QLLf2rfQEeUA(Djkx6+#lU=`BI%
z7<3Kh8Zm+*bSa`P73PT{bUFGRljj=DHR^H@YGnM58CjSYicq7Y-%;rxT#ei^1I)l8
z17+Q{>HI(c{{6pL#64z!8TeNWh)U1vb#Y4OY+afhowW|?Jt_(1<r+Ur&`?J)=F(Bz
bKvjZ%hYUp5V6G88D0~r6G;qTV{3-(<^0`g~

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()
                     <x-auth::elements.button type="primary" rounded="md" submit="true">Send password reset link</x-auth::elements.button>
                 </form>
             @endif
-            <div class="mt-3 space-x-0.5 text-sm leading-5 text-center text-gray-400 translate-y-3 dark:text-gray-300">
-                <span>Or</span>
+            <div class="mt-3 space-x-0.5 text-sm leading-5 text-center" style="color:{{ config('devdojo.auth.appearance.color.text') }}">
+                <span class="opacity-[47%]">Or</span>
                 <x-auth::elements.text-link href="{{ route('auth.login') }}">return to login</x-auth::elements.text-link>
             </div>
         </x-auth::elements.container>
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('/');