From b908951a2dbe243e12a1285af73ee44d0db5748e Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sat, 9 Mar 2024 13:08:23 +0100
Subject: [PATCH] Refactor views

---
 resources/views/auth/login.blade.php              |  7 -------
 resources/views/auth/lost-two-factor.blade.php    |  2 +-
 resources/views/auth/mfa.blade.php                |  2 +-
 resources/views/auth/passwords/email.blade.php    | 10 ++--------
 resources/views/auth/passwords/reset.blade.php    | 15 ++++-----------
 resources/views/auth/register.blade.php           | 13 ++++---------
 resources/views/layout/v2/session.blade.php       | 15 +++++----------
 resources/views/v2/index.blade.php                |  1 -
 .../views/v2/partials/layout/scripts.blade.php    |  4 ----
 9 files changed, 17 insertions(+), 52 deletions(-)

diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 589d2ae31b..efd63039f6 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -80,10 +80,3 @@
     </div>
 
 @endsection
-@section('scripts')
-<script nonce="{{ $JS_NONCE }}">
-    addEventListener("DOMContentLoaded", () => {
-        document.querySelector('#focus').focus();
-    });
-</script>
-@endsection
diff --git a/resources/views/auth/lost-two-factor.blade.php b/resources/views/auth/lost-two-factor.blade.php
index 890db5a96d..3b218bf429 100644
--- a/resources/views/auth/lost-two-factor.blade.php
+++ b/resources/views/auth/lost-two-factor.blade.php
@@ -13,7 +13,7 @@
 </div>
 
 <div class="row">
-    <div class="col-lg-10 col-lg-offset-1 col-md-12 col-sm-12 col-xs-12">
+    <div class="col">
         <p>
             {{ trans('firefly.two_factor_lost_intro') }}
         </p>
diff --git a/resources/views/auth/mfa.blade.php b/resources/views/auth/mfa.blade.php
index caed2124a9..740d4f79d1 100644
--- a/resources/views/auth/mfa.blade.php
+++ b/resources/views/auth/mfa.blade.php
@@ -28,7 +28,7 @@
             <form action="{{ route('two-factor.submit') }}" method="post">
                 <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
                 <div class="input-group mb-3">
-                    <input type="text" name="one_time_password" inputmode="numeric" autocomplete="one-time-code" class="form-control" placeholder="{{ __('firefly.two_factor_code_here') }}" autofocus />
+                    <input type="text" autofocus required name="one_time_password" inputmode="numeric" autocomplete="one-time-code" class="form-control" placeholder="{{ __('firefly.two_factor_code_here') }}" autofocus />
                     <div class="input-group-text"> <em class="fa-solid fa-calculator"></em> </div>
                 </div>
                 <div class="row">
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index a0d04a2771..601b7a3ad8 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -33,7 +33,7 @@
             <form action="{{ route('password.email') }}" method="post">
                 <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
                 <div class="input-group mb-3">
-                    <input type="email" " class="form-control" name="email"
+                    <input type="email" autofocus required class="form-control" name="email"
                            placeholder="{{ trans('form.email') }}"/>
                     <div class="input-group-text"> <em class="fa-solid fa-envelope"></em> </div>
                 </div>
@@ -58,10 +58,4 @@
     </div>
 
 @endsection
-@section('scripts')
-<script nonce="{{ $JS_NONCE }}">
-    addEventListener("DOMContentLoaded", () => {
-        document.querySelector('#focus').focus();
-    });
-</script>
-@endsection
+
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index c584252765..a90693ed6c 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -28,17 +28,17 @@
                 <input type="hidden" name="token" value="{{ $token }}">
 
                 <div class="input-group mb-3">
-                    <input type="email" name="email" " class="form-control" value="{{ old('email') }}"
+                    <input type="email" name="email" required autofocus class="form-control" value="{{ old('email') }}"
                            placeholder="{{ trans('form.email') }}"/>
                     <div class="input-group-text"> <em class="fa-solid fa-envelope"></em> </div>
                 </div>
                 <div class="input-group mb-3">
-                    <input type="password" class="form-control" placeholder="{{ trans('form.password') }}"
+                    <input type="password" class="form-control" required placeholder="{{ trans('form.password') }}"
                            name="password"/>
                     <div class="input-group-text"> <em class="fa-solid fa-lock"></em> </div>
                 </div>
                 <div class="input-group mb-3">
-                    <input type="password" class="form-control" placeholder="{{ trans('form.password_confirmation') }}"
+                    <input type="password" class="form-control" required placeholder="{{ trans('form.password_confirmation') }}"
                            name="password_confirmation"/>
                     <div class="input-group-text"> <em class="fa-solid fa-lock"></em> </div>
                 </div>
@@ -77,11 +77,4 @@
     @include('partials.password-modal')
 
 @endsection
-@section('scripts')
-    <script nonce="{{ $JS_NONCE }}" src="v2-local/bs/js/bootstrap.min.js"></script>
-    <script nonce="{{ $JS_NONCE }}">
-        addEventListener("DOMContentLoaded", () => {
-            document.querySelector('#focus').focus();
-        });
-    </script>
-@endsection
+
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index bae294cf20..e6b6765b0d 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -29,17 +29,17 @@
                 <input type="hidden" name="_token" value="{{ csrf_token() }}">
                 <input type="hidden" name="invite_code" value="{{ $inviteCode ?? '' }}">
                 <div class="input-group mb-3">
-                    <input type="email" name="email" value="{{ $email }}" class="form-control" "
+                    <input type="email" name="email" autofocus required value="{{ $email }}" class="form-control" "
                            placeholder="{{ trans('form.email') }}"/>
                     <div class="input-group-text"> <em class="fa-solid fa-envelope"></em> </div>
                 </div>
                 <div class="input-group mb-3">
-                    <input type="password" autocomplete="new-password" class="form-control"
+                    <input type="password" autocomplete="new-password" required class="form-control"
                            placeholder="{{ trans('form.password') }}" name="password"/>
                     <div class="input-group-text"> <em class="fa-solid fa-lock"></em> </div>
                 </div>
                 <div class="input-group mb-3">
-                    <input type="password" autocomplete="new-password" class="form-control"
+                    <input type="password" autocomplete="new-password" required class="form-control"
                            placeholder="{{ trans('form.password_confirmation') }}" name="password_confirmation"/>
                     <div class="input-group-text"> <em class="fa-solid fa-lock"></em> </div>
                 </div>
@@ -76,10 +76,5 @@
 
 @endsection
 @section('scripts')
-    <script nonce="{{ $JS_NONCE }}" src="v2-local/bs/js/bootstrap.min.js"></script>
-<script nonce="{{ $JS_NONCE }}">
-    addEventListener("DOMContentLoaded", () => {
-        document.querySelector('#focus').focus();
-    });
-</script>
+    @vite(['resources/assets/v2/pages/dashboard/dashboard.js'])
 @endsection
diff --git a/resources/views/layout/v2/session.blade.php b/resources/views/layout/v2/session.blade.php
index 8cfc77d7ba..b9147e675c 100644
--- a/resources/views/layout/v2/session.blade.php
+++ b/resources/views/layout/v2/session.blade.php
@@ -62,13 +62,8 @@
         })()
     </script>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="v2/css/fonts.css" rel="stylesheet">
-    <link rel="stylesheet" href="v2/css/adminlte.css">
-    <!-- session layout includes custom set of icons -->
-    <link href="v2-local/fa/css/fontawesome.min.css" rel="stylesheet" />
-    <link href="v2-local/fa/css/solid.min.css" rel="stylesheet" />
-
-</head> <!--end::Head--> <!--begin::Body-->
+    @vite(['resources/assets/v2/sass/app.scss'])
+</head>
 
 <body class="login-page bg-body-secondary">
 <div class="login-box">
@@ -78,8 +73,8 @@
     @yield('content')
 
 
-</div> <!-- /.login-box --> <!--begin::Third Party Plugin(OverlayScrollbars)-->
-<script src="v2/js/adminlte.js" nonce="{{ $JS_NONCE }}"></script>
+</div>
+
 @yield('scripts')
-</body><!--end::Body-->
+</body>
 </html>
diff --git a/resources/views/v2/index.blade.php b/resources/views/v2/index.blade.php
index 8390c5d60a..7306b8f8f5 100644
--- a/resources/views/v2/index.blade.php
+++ b/resources/views/v2/index.blade.php
@@ -54,6 +54,5 @@
 
 @endsection
 @section('scripts')
-    <!-- hier load -->
     @vite(['resources/assets/v2/pages/dashboard/dashboard.js'])
 @endsection
diff --git a/resources/views/v2/partials/layout/scripts.blade.php b/resources/views/v2/partials/layout/scripts.blade.php
index b499159e01..fee4f58180 100644
--- a/resources/views/v2/partials/layout/scripts.blade.php
+++ b/resources/views/v2/partials/layout/scripts.blade.php
@@ -1,5 +1 @@
-
-<!--
-<script src="v2/js/adminlte.js" nonce="{{ $JS_NONCE }}"></script>
--->
 @yield('scripts')