Skip to content

Commit 59bf063

Browse files
committed
fix: layouts fixes
1 parent 0a30eb3 commit 59bf063

File tree

13 files changed

+662
-676
lines changed

13 files changed

+662
-676
lines changed
Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,73 @@
11
<x-laravel-ui-adminlte::adminlte-layout>
2-
<div class="login-box">
3-
<div class="login-logo">
4-
<a href="{{ url('/home') }}"><b>{{ config('app.name') }}</b></a>
5-
</div>
6-
<!-- /.login-logo -->
72

8-
<!-- /.login-box-body -->
9-
<div class="card">
10-
<div class="card-body login-card-body">
11-
<p class="login-box-msg">{{ __('auth.login.title') }}</p>
3+
<body class="hold-transition login-page">
4+
<div class="login-box">
5+
<div class="login-logo">
6+
<a href="{{ url('/home') }}"><b>{{ config('app.name') }}</b></a>
7+
</div>
8+
<!-- /.login-logo -->
129

13-
<form method="post" action="{{ url('/login') }}">
14-
@csrf
10+
<!-- /.login-box-body -->
11+
<div class="card">
12+
<div class="card-body login-card-body">
13+
<p class="login-box-msg">{{ __('auth.login.title') }}</p>
1514

16-
<div class="input-group mb-3">
17-
<input type="email"
18-
name="email"
19-
value="{{ old('email') }}"
20-
placeholder="Email"
21-
class="form-control @error('email') is-invalid @enderror">
22-
<div class="input-group-append">
23-
<div class="input-group-text"><span class="fas fa-envelope"></span></div>
24-
</div>
25-
@error('email')
26-
<span class="error invalid-feedback">{{ $message }}</span>
27-
@enderror
28-
</div>
15+
<form method="post" action="{{ url('/login') }}">
16+
@csrf
2917

30-
<div class="input-group mb-3">
31-
<input type="password"
32-
name="password"
33-
placeholder="Password"
34-
class="form-control @error('password') is-invalid @enderror">
35-
<div class="input-group-append">
36-
<div class="input-group-text">
37-
<span class="fas fa-lock"></span>
18+
<div class="input-group mb-3">
19+
<input type="email" name="email" value="{{ old('email') }}" placeholder="Email"
20+
class="form-control @error('email') is-invalid @enderror">
21+
<div class="input-group-append">
22+
<div class="input-group-text"><span class="fas fa-envelope"></span></div>
23+
</div>
24+
@error('email')
25+
<span class="error invalid-feedback">{{ $message }}</span>
26+
@enderror
3827
</div>
39-
</div>
40-
@error('password')
41-
<span class="error invalid-feedback">{{ $message }}</span>
42-
@enderror
4328

44-
</div>
29+
<div class="input-group mb-3">
30+
<input type="password" name="password" placeholder="Password"
31+
class="form-control @error('password') is-invalid @enderror">
32+
<div class="input-group-append">
33+
<div class="input-group-text">
34+
<span class="fas fa-lock"></span>
35+
</div>
36+
</div>
37+
@error('password')
38+
<span class="error invalid-feedback">{{ $message }}</span>
39+
@enderror
4540

46-
<div class="row">
47-
<div class="col-8">
48-
<div class="icheck-primary">
49-
<input type="checkbox" id="remember">
50-
<label for="remember">{{ __('auth.remember_me') }}</label>
5141
</div>
52-
</div>
5342

54-
<div class="col-4">
55-
<button type="submit" class="btn btn-primary btn-block">{{ __('auth.sign_in') }}</button>
56-
</div>
43+
<div class="row">
44+
<div class="col-8">
45+
<div class="icheck-primary">
46+
<input type="checkbox" id="remember">
47+
<label for="remember">{{ __('auth.remember_me') }}</label>
48+
</div>
49+
</div>
50+
51+
<div class="col-4">
52+
<button type="submit"
53+
class="btn btn-primary btn-block">{{ __('auth.sign_in') }}</button>
54+
</div>
5755

56+
</div>
57+
</form>
58+
59+
<p class="mb-1">
60+
<a href="{{ route('password.request') }}">{{ __('auth.login.forgot_password') }}</a>
61+
</p>
62+
<p class="mb-0">
63+
<a href="{{ route('register') }}"
64+
class="text-center">{{ __('auth.login.register_membership') }}</a>
65+
</p>
5866
</div>
59-
</form>
67+
<!-- /.login-card-body -->
68+
</div>
6069

61-
<p class="mb-1">
62-
<a href="{{ route('password.request') }}">{{ __('auth.login.forgot_password') }}</a>
63-
</p>
64-
<p class="mb-0">
65-
<a href="{{ route('register') }}" class="text-center">{{ __('auth.login.register_membership') }}</a>
66-
</p>
6770
</div>
68-
<!-- /.login-card-body -->
69-
</div>
70-
71-
</div>
72-
<!-- /.login-box -->
71+
<!-- /.login-box -->
72+
</body>
7373
</x-laravel-ui-adminlte::adminlte-layout>
Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,44 @@
11
<x-laravel-ui-adminlte::adminlte-layout>
2-
<div class="login-box">
3-
<div class="login-logo">
4-
<a href="{{ url('/home') }}"><b>{{ config('app.name') }}</b></a>
5-
</div>
6-
7-
<div class="card">
8-
<div class="card-body login-card-body">
9-
<p class="login-box-msg">{{ __('auth.confirm_passwords.title') }}</p>
10-
11-
<form method="POST" action="{{ route('password.confirm') }}">
12-
@csrf
13-
14-
<div class="input-group mb-3">
15-
<input type="password"
16-
name="password"
17-
class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}"
18-
placeholder="Password"
19-
required autocomplete="current-password">
20-
<div class="input-group-append">
21-
<div class="input-group-text"><span class="fas fa-lock"></span></div>
22-
</div>
23-
@if ($errors->has('password'))
24-
<span class="error invalid-feedback">{{ $errors->first('password') }}</span>
25-
@endif
26-
</div>
27-
282

29-
<div class="row">
30-
<div class="col-12">
31-
<button type="submit" class="btn btn-primary btn-block">{{ __('auth.confirm_password') }}</button>
32-
</div>
33-
<!-- /.col -->
3+
<body class="hold-transition login-page">
4+
<div class="login-box">
5+
<div class="login-logo">
6+
<a href="{{ url('/home') }}"><b>{{ config('app.name') }}</b></a>
7+
</div>
8+
9+
<div class="card">
10+
<div class="card-body login-card-body">
11+
<p class="login-box-msg">{{ __('auth.confirm_passwords.title') }}</p>
12+
13+
<form method="POST" action="{{ route('password.confirm') }}">
14+
@csrf
15+
16+
<div class="input-group mb-3">
17+
<input type="password" name="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" placeholder="Password" required autocomplete="current-password">
18+
<div class="input-group-append">
19+
<div class="input-group-text"><span class="fas fa-lock"></span></div>
20+
</div>
21+
@if ($errors->has('password'))
22+
<span class="error invalid-feedback">{{ $errors->first('password') }}</span>
23+
@endif
24+
</div>
25+
26+
27+
<div class="row">
28+
<div class="col-12">
29+
<button type="submit" class="btn btn-primary btn-block">{{ __('auth.confirm_password') }}</button>
30+
</div>
31+
<!-- /.col -->
32+
</div>
33+
</form>
34+
35+
<p class="mt-3 mb-1">
36+
<a href="{{ route('password.request') }}">{{ __('auth.confirm_passwords.forgot_your_password') }}</a>
37+
</p>
3438
</div>
35-
</form>
39+
<!-- /.login-card-body -->
40+
</div>
3641

37-
<p class="mt-3 mb-1">
38-
<a href="{{ route('password.request') }}">{{ __('auth.confirm_passwords.forgot_your_password') }}</a>
39-
</p>
4042
</div>
41-
<!-- /.login-card-body -->
42-
</div>
43-
44-
</div>
45-
43+
</body>
4644
</x-laravel-ui-adminlte::adminlte-layout>
Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
<x-laravel-ui-adminlte::adminlte-layout>
2-
<div class="login-box">
3-
<div class="login-logo">
4-
<a href="{{ url('/home') }}"><b>{{ config('app.name') }}</b></a>
5-
</div>
62

7-
<!-- /.login-logo -->
8-
<div class="card">
9-
<div class="card-body login-card-body">
10-
<p class="login-box-msg">{{ __('auth.forgot_password.title') }}</p>
3+
<body class="hold-transition login-page">
4+
<div class="login-box">
5+
<div class="login-logo">
6+
<a href="{{ url('/home') }}"><b>{{ config('app.name') }}</b></a>
7+
</div>
118

12-
@if (session('status'))
13-
<div class="alert alert-success">
14-
{{ session('status') }}
15-
</div>
16-
@endif
17-
18-
<form action="{{ route('password.email') }}" method="post">
19-
@csrf
9+
<!-- /.login-logo -->
10+
<div class="card">
11+
<div class="card-body login-card-body">
12+
<p class="login-box-msg">{{ __('auth.forgot_password.title') }}</p>
2013

21-
<div class="input-group mb-3">
22-
<input type="email"
23-
name="email"
24-
class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}"
25-
placeholder="Email">
26-
<div class="input-group-append">
27-
<div class="input-group-text"><span class="fas fa-envelope"></span></div>
14+
@if (session('status'))
15+
<div class="alert alert-success">
16+
{{ session('status') }}
2817
</div>
29-
@if ($errors->has('email'))
30-
<span class="error invalid-feedback">{{ $errors->first('email') }}</span>
3118
@endif
32-
</div>
3319

34-
<div class="row">
35-
<div class="col-12">
36-
<button type="submit" class="btn btn-primary btn-block">{{ __('auth.forgot_password.send_pwd_reset') }}</button>
37-
</div>
38-
<!-- /.col -->
39-
</div>
40-
</form>
20+
<form action="{{ route('password.email') }}" method="post">
21+
@csrf
22+
23+
<div class="input-group mb-3">
24+
<input type="email" name="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" placeholder="Email">
25+
<div class="input-group-append">
26+
<div class="input-group-text"><span class="fas fa-envelope"></span></div>
27+
</div>
28+
@if ($errors->has('email'))
29+
<span class="error invalid-feedback">{{ $errors->first('email') }}</span>
30+
@endif
31+
</div>
4132

42-
<p class="mt-3 mb-1">
43-
<a href="{{ route("login") }}">{{ __('auth.sign_in') }}</a>
44-
</p>
45-
<p class="mb-0">
46-
<a href="{{ route("register") }}" class="text-center">{{ __('auth.registration.title') }}</a>
47-
</p>
33+
<div class="row">
34+
<div class="col-12">
35+
<button type="submit" class="btn btn-primary btn-block">{{ __('auth.forgot_password.send_pwd_reset') }}</button>
36+
</div>
37+
<!-- /.col -->
38+
</div>
39+
</form>
40+
41+
<p class="mt-3 mb-1">
42+
<a href="{{ route("login") }}">{{ __('auth.sign_in') }}</a>
43+
</p>
44+
<p class="mb-0">
45+
<a href="{{ route("register") }}" class="text-center">{{ __('auth.registration.title') }}</a>
46+
</p>
47+
</div>
48+
<!-- /.login-card-body -->
49+
</div>
4850
</div>
49-
<!-- /.login-card-body -->
50-
</div>
51-
</div>
52-
<!-- /.login-box -->
51+
<!-- /.login-box -->
52+
</body>
5353
</x-laravel-ui-adminlte::adminlte-layout>

0 commit comments

Comments
 (0)