diff --git a/app/Mail/BaseNotification.php b/app/Mail/BaseNotification.php index cb6786bf..4d45e5d4 100644 --- a/app/Mail/BaseNotification.php +++ b/app/Mail/BaseNotification.php @@ -20,6 +20,7 @@ namespace Poniverse\Ponyfm\Mail; +use Carbon\Carbon; use Illuminate\Bus\Queueable; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; @@ -126,11 +127,13 @@ abstract class BaseNotification extends Mailable { ->view("emails.html.notifications.{$templateName}") ->text("emails.plaintext.notifications.{$templateName}") ->with(array_merge($extraVariables, [ - 'notificationUrl' => $this->generateNotificationUrl(), - 'unsubscribeUrl' => $this->generateUnsubscribeUrl(), - 'thumbnailUrl' => $this->activityRecord->thumbnail_url, - 'recipientName' => $this->emailRecord->getUser()->display_name, - 'accountSettingsUrl' => $this->emailRecord->getUser()->getSettingsUrl(), + 'notificationUrl' => $this->generateNotificationUrl(), + 'unsubscribeUrl' => $this->generateUnsubscribeUrl(), + 'thumbnailUrl' => $this->activityRecord->thumbnail_url, + 'recipientName' => $this->emailRecord->getUser()->display_name, + 'accountSettingsUrl' => $this->emailRecord->getUser()->getSettingsUrl(), + 'replyEmailAddress' => config('mail.from.address'), + 'currentYear' => Carbon::now()->year, ])); } } diff --git a/resources/emails/src/assets/img/email-header.jpg b/resources/emails/src/assets/img/email-header.jpg new file mode 100644 index 00000000..bf67d7de Binary files /dev/null and b/resources/emails/src/assets/img/email-header.jpg differ diff --git a/resources/emails/src/layouts/notification.hbs b/resources/emails/src/layouts/notification.hbs index 9e854e0b..fef36ce6 100644 --- a/resources/emails/src/layouts/notification.hbs +++ b/resources/emails/src/layouts/notification.hbs @@ -16,28 +16,33 @@ -

Pony.fm

+

Pony.fm - Unlimited Pony Music

{{!-- Pages you create in the src/pages/ folder are inserted here when the flattened emails are created. --}} {{> body}} + - -
What's this?
-

Pony.fm can now send you notifications via email! You can control what you get email notifications for in your account settings.

-

Unsubscribe from this kind of email

+ +

Why did I get this email?

+

Pony.fm can now email your notifications to you! Change what + you get email notifications for in your account settings. + You can also unsubscribe from this kind of email.

- +
-

- Sent with ♥ to \{{ $recipientName }}
-
- Poniverse
- 248-1641 Lonsdale Avenue
- North Vancouver
- BC V7M 2J5
- Canada -

+

+ Any questions? Reply to this email + or hit us up at \{{ $replyEmailAddress }}! + +

+

Sent with ♥ to \{{ $recipientName }}

+
+
+ + +

Pony.fm, a Poniverse project
+ 248-1641 Lonsdale Avenue, North Vancouver, BC V7M 2J5, Canada

diff --git a/resources/emails/src/pages/notifications/new-follower.blade.php.hbs b/resources/emails/src/pages/notifications/new-follower.blade.php.hbs index 3e9ae74d..9810c106 100644 --- a/resources/emails/src/pages/notifications/new-follower.blade.php.hbs +++ b/resources/emails/src/pages/notifications/new-follower.blade.php.hbs @@ -11,7 +11,7 @@ layout: notification - +