From f33fdb3bfd6ace708c941178b38dfac72fdf60dd Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 3 Apr 2024 14:32:23 +0200
Subject: [PATCH] Refactor code and comment out unused imports and code blocks

---
 resources/js/app.js                           | 10 +--
 .../views/auth/two-factor-challenge.blade.php | 74 +++++++++----------
 resources/views/layouts/simple.blade.php      |  1 +
 .../views/livewire/profile/index.blade.php    |  4 +-
 4 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/resources/js/app.js b/resources/js/app.js
index 47313863b..befec919e 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -1,6 +1,6 @@
-import { createApp } from "vue";
-import MagicBar from "./components/MagicBar.vue";
+// import { createApp } from "vue";
+// import MagicBar from "./components/MagicBar.vue";
 
-const app = createApp({});
-app.component("magic-bar", MagicBar);
-app.mount("#vue");
+// const app = createApp({});
+// app.component("magic-bar", MagicBar);
+// app.mount("#vue");
diff --git a/resources/views/auth/two-factor-challenge.blade.php b/resources/views/auth/two-factor-challenge.blade.php
index 33094920c..b5fc28e51 100644
--- a/resources/views/auth/two-factor-challenge.blade.php
+++ b/resources/views/auth/two-factor-challenge.blade.php
@@ -1,42 +1,40 @@
 <x-layout-simple>
-    <div class="flex items-center justify-center h-screen">
-        <div>
-            <div class="flex flex-col items-center pb-8">
-                <div class="text-5xl font-bold tracking-tight text-center dark:text-white">Coolify</div>
-                {{-- <x-version /> --}}
-            </div>
-            <div class="w-96">
-                <form action="/two-factor-challenge" method="POST" class="flex flex-col gap-2">
-                    @csrf
-                    <div>
-                        <x-forms.input autofocus type="number" name="code" label="{{ __('input.code') }}" autofocus />
-                        {{-- <div class="pt-2 text-xs cursor-pointer hover:underline hover:dark:text-white"
-                            x-on:click="showRecovery = !showRecovery">Use
-                            Recovery Code
-                        </div> --}}
-                    </div>
-                    <div>
-                        <x-forms.input name="recovery_code" label="{{ __('input.recovery_code') }}" />
-                        {{-- <div class="pt-2 text-xs cursor-pointer hover:underline hover:dark:text-white"
-                            x-on:click="showRecovery = !showRecovery">Use
-                            One-Time Code
-                        </div> --}}
-                    </div>
-                    <x-forms.button type="submit">{{ __('auth.login') }}</x-forms.button>
-                </form>
-                @if ($errors->any())
-                    <div class="text-xs text-center text-error">
-                        @foreach ($errors->all() as $error)
-                            <p>{{ $error }}</p>
-                        @endforeach
-                    </div>
-                @endif
-                @if (session('status'))
-                    <div class="mb-4 font-medium text-green-600">
-                        {{ session('status') }}
-                    </div>
-                @endif
+    <section class="bg-gray-50 dark:bg-base" x-data="{ showRecovery: false }">
+        <div class="flex flex-col items-center justify-center px-6 py-8 mx-auto md:h-screen lg:py-0">
+            <a class="flex items-center mb-6 text-5xl font-extrabold tracking-tight text-gray-900 dark:text-white">
+                Coolify
+            </a>
+            <div class="w-full bg-white shadow md:mt-0 sm:max-w-md xl:p-0 dark:bg-base ">
+                <div class="p-6 space-y-4 md:space-y-6 sm:p-8">
+                    <form action="/two-factor-challenge" method="POST" class="flex flex-col gap-2">
+                        @csrf
+                        <div>
+                            <x-forms.input type="number" name="code" label="{{ __('input.code') }}" autofocus />
+                            <div x-show="!showRecovery"
+                                class="pt-2 text-xs cursor-pointer hover:underline hover:dark:text-white"
+                                x-on:click="showRecovery = !showRecovery">Enter
+                                Recovery Code
+                            </div>
+                        </div>
+                        <div x-show="showRecovery" x-cloak>
+                            <x-forms.input name="recovery_code" label="{{ __('input.recovery_code') }}" />
+                        </div>
+                        <x-forms.button type="submit">{{ __('auth.login') }}</x-forms.button>
+                    </form>
+                    @if ($errors->any())
+                        <div class="text-xs text-center text-error">
+                            @foreach ($errors->all() as $error)
+                                <p>{{ $error }}</p>
+                            @endforeach
+                        </div>
+                    @endif
+                    @if (session('status'))
+                        <div class="mb-4 font-medium text-green-600">
+                            {{ session('status') }}
+                        </div>
+                    @endif
+                </div>
             </div>
         </div>
-    </div>
+    </section>
 </x-layout-simple>
diff --git a/resources/views/layouts/simple.blade.php b/resources/views/layouts/simple.blade.php
index 4a897ff2f..27248f4ec 100644
--- a/resources/views/layouts/simple.blade.php
+++ b/resources/views/layouts/simple.blade.php
@@ -1,5 +1,6 @@
 @extends('layouts.base')
 @section('body')
+    @livewireScripts
     <main class="h-full bg-gray-50 dark:bg-base">
         {{ $slot }}
     </main>
diff --git a/resources/views/livewire/profile/index.blade.php b/resources/views/livewire/profile/index.blade.php
index 2c47a9b17..dbe41f093 100644
--- a/resources/views/livewire/profile/index.blade.php
+++ b/resources/views/livewire/profile/index.blade.php
@@ -19,8 +19,8 @@
         <div class="flex flex-col gap-2">
             <x-forms.input id="current_password" label="Current Password" required type="password" />
             <div class="flex gap-2">
-            <x-forms.input id="new_password" label="New Password" required type="password" />
-            <x-forms.input id="new_password_confirmation" label="New Password Again" required type="password" />
+                <x-forms.input id="new_password" label="New Password" required type="password" />
+                <x-forms.input id="new_password_confirmation" label="New Password Again" required type="password" />
             </div>
         </div>
     </form>