From 4d89c4ebee68a1fdab59b205853272fee140ae10 Mon Sep 17 00:00:00 2001
From: Tony Lea <tnylea@gmail.com>
Date: Fri, 17 May 2024 21:08:05 -0400
Subject: [PATCH] Adding a few more updates and fixing the todos

---
 public/img/favicon.ico                           | Bin 0 -> 4286 bytes
 .../views/components/layouts/setup.blade.php     |  15 ++++++++-------
 .../pages/auth/two-factor-challenge.blade.php    |   4 +++-
 3 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 public/img/favicon.ico

diff --git a/public/img/favicon.ico b/public/img/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..b275d4a755fbaeb3727ab303f925b421cdd30931
GIT binary patch
literal 4286
zcmchZU5Hgx7>4)Ju|27EMo}3dnw1x6kUAk66f^?{MIe!p^n+AH7X|(x26dxHDZ&UU
z67ReaybvPsuFPmgu`bF?z0r$mJ`qz0^Au8}PVSyp&IgM<d(9btrgwN|ef#@c`<%Vj
z+9%6u{DqL|f3~M9%jRTRwg7Nt{UHB!5xY&Q(PtU#Zy{U0|3kBwWFrhg(ZU$t0>vgu
zQ)v7Y9E1_@xqXyRG36-tc4{8YwnGzqzSO83<=zLksty`F1IHmXU&?=snw6j)H=|C9
zHo>2enxmaxwGEgCHzM7$cFX&45!%g@ieIL7H_V3d?hoayffX<b9)~Yr7*g|;{r{4C
z6kdiq;lY-ze(lst!f$W@>aFCv8DD?_80$W?2Y!O}&<&F2`~=RzVrZwWB<S;Kp65%+
zdM3}oKDYqo&#mYE5j+O>fY#7bI0wqz0%K_^!LPyl4r0%QveZ{+UIV^^i*OCR?r-d0
zVE~Rqe)ZNIDd{^q3Et-l_N%GnmcP#UFsucwwIAU;Xzh6)AJyBR3+5>G;28qX*Qn1o
z2gakxB<cHl0G7i`ptbNWd=6TZ0a6MC4C48<rrrRTdcO%z!XnUf)|^_S9pKVh=>@H!
zPeGskX9$o|AYc&BFI&%WE=U@`hpX^A`~t^eFX&z*t&g4X7wG=IpJ4|`DG)I5d>^%+
zH-PIk49)Lxjav7<zxCZ{FT`=#1_4qE1Psb`x;_E-f~5ECA@ID@*b70@`quvRSUej3
z04W6m262ts+F$R0>qU%VQ2af2GCmEL!0Y1C@CQgK5HN^qV*3=ac_3+heFH-<AEdkB
zONeV?+lU27DG)G-Ys&T(;;v^g^t;Ek3gaIr*Z8#&3y@MEVBq;xqt3MjAm!li)*09X
zP*vkTBOV~7K)}HBQ{y&rY7lER7gc9o+{4HTkWwIE5Z6@MXUNgn<I?;6Td2y7eMU}z
zlmY>RxF%(POrG!e*RjjzK~<f42S_OpFsQ06`_7TK1oUqBVVpHaUVxMW0fX{fsp}o&
z>Ri<Mn97O$MqYrF0s(`#W-Pl&?)e+YSMLBR>HTpSw7&Ek><`cxr?YRY`>2YkMz!jp
zUh1jd{*J;NCA~it*BN&|JOod`I`|CKr`^3MN4cs|t$L`Jda8H)j^=XQnnI@DF&{wH
zcP`(Dpna*_iIVo*qwp1I-HHA12>5=)oN(!P$gUQ$Z%V~*Pf;}MMKL(JC>phbhr4+s
z%lcS2JuL2evr(%zEvwtxS#F!5&vNUXo?BOEZr#w?mD}{*+&V&Tcf69@r2gD$gV4w=
P6WJ)P&!ss>`ilPm{-y*S

literal 0
HcmV?d00001

diff --git a/resources/views/components/layouts/setup.blade.php b/resources/views/components/layouts/setup.blade.php
index 94b563d..664d338 100644
--- a/resources/views/components/layouts/setup.blade.php
+++ b/resources/views/components/layouts/setup.blade.php
@@ -131,7 +131,6 @@ class="flex absolute top-0 left-0 px-3 z-[99] ease-in-out  flex-col w-screen h-s
             
             <div class="flex flex-col w-full h-full bg-white rounded-t-md">
                 <div class="flex relative z-50 flex-shrink-0 justify-center items-center w-full h-10 bg-white rounded-t-md border-b border-zinc-200">
-                    <!-- TODO - When we click the contents of the iframe it does not close this menu. When this is open, need to add a transparent layer over the iframe so this will trigger -->
                     <div class="relative" x-on:click.outside="previewMenuDropdown=false">
                         <button x-on:click="previewMenuDropdown=!previewMenuDropdown" class="flex justify-between items-center px-3 w-64 h-7 text-xs rounded-md border cursor-pointer bg-zinc-100 hover:bg-zinc-200/70">
                             <img src="{{ url(config('devdojo.auth.appearance.favicon.light')) }}" class="w-4 h-4 -translate-x-1.5" />
@@ -139,12 +138,13 @@ class="flex absolute top-0 left-0 px-3 z-[99] ease-in-out  flex-col w-screen h-s
                             <x-phosphor-caret-down-fill class="ml-2 w-3 h-3" />
                         </button>
                         <div x-show="previewMenuDropdown" x-transition.scale.origin.top.opacity class="[&>button]:px-3 [&>button]:block [&>button]:rounded-md space-y-1 [&>button:hover]:bg-zinc-100 group [&>button]:text-left [&>button]:w-full [&>button]:text-sm [&>button]:py-1.5 absolute left-0 bg-white shadow-xl p-2 w-64 rounded-md top-0 mt-[33px] z-[99]">
-                            <button @click="previewURL='/auth/login'">Login</button>
-                            <button @click="previewURL='/auth/register'">Register</button>
-                            <button @click="previewURL='/auth/verify'">Verify Account</button>
-                            <button @click="previewURL='/auth/password/confirm'">Password Confirmation</button>
-                            <button @click="previewURL='/auth/password/reset'">Password Reset Request</button>
-                            <button @click="previewURL='/auth/password/SomeReallyLongToken'">Password Reset</button>
+                            <button @click="previewURL='/auth/login'; previewMenuDropdown=false;">Login</button>
+                            <button @click="previewURL='/auth/register'; previewMenuDropdown=false;">Register</button>
+                            <button @click="previewURL='/auth/verify'; previewMenuDropdown=false;">Verify Account</button>
+                            <button @click="previewURL='/auth/password/confirm'; previewMenuDropdown=false;">Password Confirmation</button>
+                            <button @click="previewURL='/auth/password/reset'; previewMenuDropdown=false;">Password Reset Request</button>
+                            <button @click="previewURL='/auth/password/SomeReallyLongToken'; previewMenuDropdown=false;">Password Reset</button>
+                            <button @click="previewURL='/auth/two-factor-challenge'; previewMenuDropdown=false;">Two Factor Challenge</button>
                         </div>
                     </div>
                     <div class="flex absolute right-0 items-center h-full">
@@ -168,6 +168,7 @@ class="flex absolute top-0 left-0 px-3 z-[99] ease-in-out  flex-col w-screen h-s
                         <svg class="w-5 h-5 animate-spin text-zinc-600" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"><circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle><path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path></svg>
                     </div>
                 </div>
+                <div x-show="previewMenuDropdown" class="absolute inset-0 z-40 w-full h-full bg-transparent"></div>
                 <iframe id="preview" :src="previewURL + '?preview=true'" class="hidden overflow-hidden relative z-30 w-full h-full opacity-0 duration-300 ease-out"></iframe>
             </div>
         </div>
diff --git a/resources/views/pages/auth/two-factor-challenge.blade.php b/resources/views/pages/auth/two-factor-challenge.blade.php
index bf98a47..62bace5 100644
--- a/resources/views/pages/auth/two-factor-challenge.blade.php
+++ b/resources/views/pages/auth/two-factor-challenge.blade.php
@@ -12,7 +12,9 @@
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Auth;
 
-middleware(['two-factor-challenged', 'throttle:5,1']);
+if(!isset($_GET['preview']) || (isset($_GET['preview']) && $_GET['preview'] != true) || !app()->isLocal()){
+    middleware(['two-factor-challenged', 'throttle:5,1']);
+}
 name('auth.two-factor-challenge');
 
 new class extends Component