fix: two factor

andrasbacsai · andrasbacsai · commit 37333f7fbec9 · 2024-03-25T14:23:32.000+01:00
diff --git a/composer.json b/composer.json
@@ -41,7 +41,6 @@
         "stripe/stripe-php": "^12.0",
         "symfony/yaml": "^6.2",
         "visus/cuid2": "^2.0.0",
-        "wire-elements/modal": "^2.0",
         "yosymfony/toml": "^1.0"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
diff --git a/config/wire-elements-modal.php b/config/wire-elements-modal.php
diff --git a/resources/js/app.js b/resources/js/app.js
@@ -1,6 +1,5 @@
 import { createApp } from "vue";
 import MagicBar from "./components/MagicBar.vue";
-import "../../vendor/wire-elements/modal/resources/js/modal";
 
 const app = createApp({});
 app.component("magic-bar", MagicBar);
diff --git a/resources/views/auth/two-factor-challenge.blade.php b/resources/views/auth/two-factor-challenge.blade.php
@@ -3,31 +3,25 @@
         <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 />
+                {{-- <x-version /> --}}
             </div>
-            <div class="w-96" x-data="{ showRecovery: false }">
+            <div class="w-96">
                 <form action="/two-factor-challenge" method="POST" class="flex flex-col gap-2">
                     @csrf
-                    <template x-if="!showRecovery">
-                        <div>
-                            <x-forms.input required 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>
-                    </template>
-                    <template x-if="showRecovery">
-                        <div>
-                            <x-forms.input required type="text" 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.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>
-                    </template>
+                    </div>
                     <x-forms.button type="submit">{{ __('auth.login') }}</x-forms.button>
                 </form>
                 @if ($errors->any())
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
@@ -38,7 +38,6 @@
 @section('body')
 
     <body>
-        {{-- @livewire('wire-elements-modal') --}}
         <x-toast />
         <script data-navigate-once>
             if (localStorage.theme === 'dark' || (!('theme' in localStorage) && window.matchMedia(
diff --git a/resources/views/layouts/simple.blade.php b/resources/views/layouts/simple.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.base')
 @section('body')
-    @parent
-    <main>
+    <main class="h-full bg-gray-50 dark:bg-base">
         {{ $slot }}
     </main>
+    @parent
 @endsection
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -15,7 +15,6 @@ const colors = {
 module.exports = {
     darkMode: "selector",
     content: [
-        './vendor/wire-elements/modal/resources/views/*.blade.php',
         './storage/framework/views/*.php',
         "./resources/**/*.blade.php",
         "./app/**/*.php",
