From df3f7e31be213aac396a4e5055504295d3ae1241 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Sat, 3 Aug 2024 10:47:08 +1000
Subject: [PATCH] Update password reset email

---
 app/Models/User.php                                    |  3 ++-
 app/Notifications/ResetPassword.php                    |  2 +-
 .../reset.blade.php}                                   | 10 ++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)
 rename resources/views/mail/{user/passwordreset.blade.php => password/reset.blade.php} (65%)

diff --git a/app/Models/User.php b/app/Models/User.php
index bd6fae5..bb7a256 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -72,7 +72,8 @@ class User extends Authenticatable implements IDs
 	 */
 	public function sendPasswordResetNotification($token)
 	{
-		$this->notify((new ResetPasswordNotification($token))->onQueue('high'));
+		$this->notify((new ResetPasswordNotification($token))
+			->onQueue('user'));
 	}
 
 	/* INTERFACES */
diff --git a/app/Notifications/ResetPassword.php b/app/Notifications/ResetPassword.php
index ef297bc..c89a8e0 100644
--- a/app/Notifications/ResetPassword.php
+++ b/app/Notifications/ResetPassword.php
@@ -25,7 +25,7 @@ class ResetPassword extends ResetPasswordNotification implements ShouldQueue
 		}
 
 		return (new MailMessage)
-			->markdown('email.user.passwordreset',[
+			->markdown('mail.password.reset',[
 				'site'=>$notifiable->site,
 				'user'=>$notifiable,
 				'reset_link'=>route('password.reset',$this->token,true),
diff --git a/resources/views/mail/user/passwordreset.blade.php b/resources/views/mail/password/reset.blade.php
similarity index 65%
rename from resources/views/mail/user/passwordreset.blade.php
rename to resources/views/mail/password/reset.blade.php
index 8a943b8..aadbd4e 100644
--- a/resources/views/mail/user/passwordreset.blade.php
+++ b/resources/views/mail/password/reset.blade.php
@@ -1,9 +1,7 @@
 @component('mail::message',['site'=>$site,'heading'=>'Password Reset'])
 Hi {{ isset($user) ? $user->name_full.',' : '' }}
 
-You are receiving this email because we received a password reset request for your account.
-
-If you did not request a password reset, no further action is required.
+You are receiving this email because we received a password reset request for your account. If you did not request a password reset, no further action is required.
 
 To reset your password, please follow this link, or click on the URL below:
 @component('mail::button',['url'=>$reset_link])
@@ -11,7 +9,11 @@ Reset Password
 @endcomponent
 
 @component('mail::subcontent')
-Reset password: {{ $reset_link }}
+If the button above doesnt work, you can copy and paste this link into your browser, and take it from there:
+
+```
+{{ $reset_link }}
+```
 @endcomponent
 
 Thanks,<br>