Refactor views

This commit is contained in:
James Cole
2024-03-09 13:08:23 +01:00
parent 8b87deea58
commit b908951a2d
9 changed files with 17 additions and 52 deletions

View File

@@ -80,10 +80,3 @@
</div> </div>
@endsection @endsection
@section('scripts')
<script nonce="{{ $JS_NONCE }}">
addEventListener("DOMContentLoaded", () => {
document.querySelector('#focus').focus();
});
</script>
@endsection

View File

@@ -13,7 +13,7 @@
</div> </div>
<div class="row"> <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> <p>
{{ trans('firefly.two_factor_lost_intro') }} {{ trans('firefly.two_factor_lost_intro') }}
</p> </p>

View File

@@ -28,7 +28,7 @@
<form action="{{ route('two-factor.submit') }}" method="post"> <form action="{{ route('two-factor.submit') }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/> <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<div class="input-group mb-3"> <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 class="input-group-text"> <em class="fa-solid fa-calculator"></em> </div>
</div> </div>
<div class="row"> <div class="row">

View File

@@ -33,7 +33,7 @@
<form action="{{ route('password.email') }}" method="post"> <form action="{{ route('password.email') }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/> <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<div class="input-group mb-3"> <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') }}"/> placeholder="{{ trans('form.email') }}"/>
<div class="input-group-text"> <em class="fa-solid fa-envelope"></em> </div> <div class="input-group-text"> <em class="fa-solid fa-envelope"></em> </div>
</div> </div>
@@ -58,10 +58,4 @@
</div> </div>
@endsection @endsection
@section('scripts')
<script nonce="{{ $JS_NONCE }}">
addEventListener("DOMContentLoaded", () => {
document.querySelector('#focus').focus();
});
</script>
@endsection

View File

@@ -28,17 +28,17 @@
<input type="hidden" name="token" value="{{ $token }}"> <input type="hidden" name="token" value="{{ $token }}">
<div class="input-group mb-3"> <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') }}"/> placeholder="{{ trans('form.email') }}"/>
<div class="input-group-text"> <em class="fa-solid fa-envelope"></em> </div> <div class="input-group-text"> <em class="fa-solid fa-envelope"></em> </div>
</div> </div>
<div class="input-group mb-3"> <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"/> name="password"/>
<div class="input-group-text"> <em class="fa-solid fa-lock"></em> </div> <div class="input-group-text"> <em class="fa-solid fa-lock"></em> </div>
</div> </div>
<div class="input-group mb-3"> <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"/> name="password_confirmation"/>
<div class="input-group-text"> <em class="fa-solid fa-lock"></em> </div> <div class="input-group-text"> <em class="fa-solid fa-lock"></em> </div>
</div> </div>
@@ -77,11 +77,4 @@
@include('partials.password-modal') @include('partials.password-modal')
@endsection @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

View File

@@ -29,17 +29,17 @@
<input type="hidden" name="_token" value="{{ csrf_token() }}"> <input type="hidden" name="_token" value="{{ csrf_token() }}">
<input type="hidden" name="invite_code" value="{{ $inviteCode ?? '' }}"> <input type="hidden" name="invite_code" value="{{ $inviteCode ?? '' }}">
<div class="input-group mb-3"> <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') }}"/> placeholder="{{ trans('form.email') }}"/>
<div class="input-group-text"> <em class="fa-solid fa-envelope"></em> </div> <div class="input-group-text"> <em class="fa-solid fa-envelope"></em> </div>
</div> </div>
<div class="input-group mb-3"> <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"/> placeholder="{{ trans('form.password') }}" name="password"/>
<div class="input-group-text"> <em class="fa-solid fa-lock"></em> </div> <div class="input-group-text"> <em class="fa-solid fa-lock"></em> </div>
</div> </div>
<div class="input-group mb-3"> <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"/> placeholder="{{ trans('form.password_confirmation') }}" name="password_confirmation"/>
<div class="input-group-text"> <em class="fa-solid fa-lock"></em> </div> <div class="input-group-text"> <em class="fa-solid fa-lock"></em> </div>
</div> </div>
@@ -76,10 +76,5 @@
@endsection @endsection
@section('scripts') @section('scripts')
<script nonce="{{ $JS_NONCE }}" src="v2-local/bs/js/bootstrap.min.js"></script> @vite(['resources/assets/v2/pages/dashboard/dashboard.js'])
<script nonce="{{ $JS_NONCE }}">
addEventListener("DOMContentLoaded", () => {
document.querySelector('#focus').focus();
});
</script>
@endsection @endsection

View File

@@ -62,13 +62,8 @@
})() })()
</script> </script>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="v2/css/fonts.css" rel="stylesheet"> @vite(['resources/assets/v2/sass/app.scss'])
<link rel="stylesheet" href="v2/css/adminlte.css"> </head>
<!-- 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-->
<body class="login-page bg-body-secondary"> <body class="login-page bg-body-secondary">
<div class="login-box"> <div class="login-box">
@@ -78,8 +73,8 @@
@yield('content') @yield('content')
</div> <!-- /.login-box --> <!--begin::Third Party Plugin(OverlayScrollbars)--> </div>
<script src="v2/js/adminlte.js" nonce="{{ $JS_NONCE }}"></script>
@yield('scripts') @yield('scripts')
</body><!--end::Body--> </body>
</html> </html>

View File

@@ -54,6 +54,5 @@
@endsection @endsection
@section('scripts') @section('scripts')
<!-- hier load -->
@vite(['resources/assets/v2/pages/dashboard/dashboard.js']) @vite(['resources/assets/v2/pages/dashboard/dashboard.js'])
@endsection @endsection

View File

@@ -1,5 +1 @@
<!--
<script src="v2/js/adminlte.js" nonce="{{ $JS_NONCE }}"></script>
-->
@yield('scripts') @yield('scripts')