From 2eaf000ce0093581a520ae51ddd25206c8f6e680 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Fri, 9 Jul 2021 11:53:04 +1000
Subject: [PATCH] Fix password reset

---
 .../themes/adminlte/views/auth/login.blade.php     |  6 +++---
 .../adminlte/views/auth/passwords/email.blade.php  |  6 ++++--
 .../adminlte/views/auth/passwords/reset.blade.php  | 14 +++++++++-----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/resources/themes/adminlte/views/auth/login.blade.php b/resources/themes/adminlte/views/auth/login.blade.php
index 2149176..9494c9e 100644
--- a/resources/themes/adminlte/views/auth/login.blade.php
+++ b/resources/themes/adminlte/views/auth/login.blade.php
@@ -45,14 +45,14 @@
 				<p class="login-box-msg">{{ trans('adminlte_lang::message.siginsession') }}</p>
 
 				<form method="post">
-					{{ csrf_field() }}
+					@csrf
 
 					<div class="row">
 						<div class="col-12">
 							<div class="input-group mb-3">
 								<input type="email" name="email" class="form-control" placeholder="Email">
 								<div class="input-group-append">
-									<span class="input-group-text"><i class="fas fa-envelope fa-fw"></i></span>
+									<span class="input-group-text"><i class="fas fa-fw fa-envelope"></i></span>
 								</div>
 							</div>
 						</div>
@@ -61,7 +61,7 @@
 							<div class="input-group mb-3">
 								<input type="password" name="password" class="form-control" placeholder="Password">
 								<div class="input-group-append">
-									<span class="input-group-text"><i class="fas fa-key fa-fw"></i></span>
+									<span class="input-group-text"><i class="fas fa-fw fa-key"></i></span>
 								</div>
 							</div>
 						</div>
diff --git a/resources/themes/adminlte/views/auth/passwords/email.blade.php b/resources/themes/adminlte/views/auth/passwords/email.blade.php
index 75c3876..14de2c3 100644
--- a/resources/themes/adminlte/views/auth/passwords/email.blade.php
+++ b/resources/themes/adminlte/views/auth/passwords/email.blade.php
@@ -35,13 +35,15 @@
 				<p class="login-box-msg">You forgot your password? Here you can easily retrieve a new password.</p>
 
 				<form method="post" action="{{ url('password/email') }}">
-					{{ csrf_field() }}
+					@csrf
+
 					<div class="input-group mb-3">
 						<input type="email" name="email" class="form-control" placeholder="Email" required>
 						<div class="input-group-append">
-							<span class="fas fa-envelope input-group-text"></span>
+							<span class="input-group-text"><i class="fas fa-fw fa-envelope"></i></span>
 						</div>
 					</div>
+
 					<div class="row">
 						<div class="col-12">
 							<button type="submit" class="btn btn-primary btn-block">{{ trans('adminlte_lang::message.sendpassword') }}</button>
diff --git a/resources/themes/adminlte/views/auth/passwords/reset.blade.php b/resources/themes/adminlte/views/auth/passwords/reset.blade.php
index 23079d0..81b244a 100644
--- a/resources/themes/adminlte/views/auth/passwords/reset.blade.php
+++ b/resources/themes/adminlte/views/auth/passwords/reset.blade.php
@@ -27,32 +27,36 @@
 				<p class="login-box-msg">You are only one step a way from your new password, set your new password now.</p>
 
 				<form method="post" action="{{ url('password/reset') }}">
-					{{ csrf_field() }}
+					<input type="hidden" name="token" value="{{ $token }}">
+					@csrf
+
 					<div class="input-group mb-3">
 						<input type="email" name="email" class="form-control" placeholder="Email" required>
 						<div class="input-group-append">
-							<span class="fas fa-envelope fa-fw input-group-text"></span>
+							<span class="input-group-text"><i class="fas fa-fw fa-envelope"></i></span>
 						</div>
 					</div>
+
 					<div class="input-group mb-3">
 						<input type="password" name="password" class="form-control" placeholder="Password" required>
 						<div class="input-group-append">
-							<span class="fas fa-lock input-group-text"></span>
+							<span class="input-group-text"><i class="fas fa-fw fa-lock"></i></span>
 						</div>
 					</div>
+
 					<div class="input-group mb-3">
 						<input type="password" name="password_confirmation" class="form-control" placeholder="Confirm Password" data-match="#password" required>
 						<div class="input-group-append">
-							<span class="fas fa-lock input-group-text"></span>
+							<span class="input-group-text"><i class="fas fa-fw fa-clone"></i></span>
 						</div>
 					</div>
+
 					<div class="row">
 						<div class="col-12">
 							<button type="submit" class="btn btn-primary btn-block">{{ trans('adminlte_lang::message.passwordreset') }}</button>
 						</div>
 						<!-- /.col -->
 					</div>
-					<input type="hidden" name="token" value="{{ $token }}">
 				</form>
 
 				<p class="mt-3 mb-1">