mirror of
https://github.com/pelican-dev/panel.git
synced 2025-10-29 23:26:52 +01:00
Remove "custom" email views (#1763)
This commit is contained in:
Boy132
GitHub
parent
df75dbe2ad
commit
246997754e
@ -35,7 +35,7 @@ class DeleteUserCommand extends Command
|
|||||||
if ($this->input->isInteractive()) {
|
if ($this->input->isInteractive()) {
|
||||||
$tableValues = [];
|
$tableValues = [];
|
||||||
foreach ($results as $user) {
|
foreach ($results as $user) {
|
||||||
$tableValues[] = [$user->id, $user->email, $user->name];
|
$tableValues[] = [$user->id, $user->email, $user->username];
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->table(['User ID', 'Email', 'Name'], $tableValues);
|
$this->table(['User ID', 'Email', 'Name'], $tableValues);
|
||||||
|
|||||||
@ -63,7 +63,6 @@ use Spatie\Permission\Traits\HasRoles;
|
|||||||
* @property Carbon|null $updated_at
|
* @property Carbon|null $updated_at
|
||||||
* @property \Illuminate\Database\Eloquent\Collection|ApiKey[] $apiKeys
|
* @property \Illuminate\Database\Eloquent\Collection|ApiKey[] $apiKeys
|
||||||
* @property int|null $api_keys_count
|
* @property int|null $api_keys_count
|
||||||
* @property string $name
|
|
||||||
* @property DatabaseNotificationCollection|DatabaseNotification[] $notifications
|
* @property DatabaseNotificationCollection|DatabaseNotification[] $notifications
|
||||||
* @property int|null $notifications_count
|
* @property int|null $notifications_count
|
||||||
* @property \Illuminate\Database\Eloquent\Collection|Server[] $servers
|
* @property \Illuminate\Database\Eloquent\Collection|Server[] $servers
|
||||||
|
|||||||
@ -24,7 +24,7 @@ class AccountCreated extends Notification implements ShouldQueue
|
|||||||
public function toMail(User $notifiable): MailMessage
|
public function toMail(User $notifiable): MailMessage
|
||||||
{
|
{
|
||||||
$message = (new MailMessage())
|
$message = (new MailMessage())
|
||||||
->greeting('Hello ' . $notifiable->name . '!')
|
->greeting('Hello ' . $notifiable->username . '!')
|
||||||
->line('You are receiving this email because an account has been created for you on ' . config('app.name') . '.')
|
->line('You are receiving this email because an account has been created for you on ' . config('app.name') . '.')
|
||||||
->line('Username: ' . $notifiable->username)
|
->line('Username: ' . $notifiable->username)
|
||||||
->line('Email: ' . $notifiable->email);
|
->line('Email: ' . $notifiable->email);
|
||||||
|
|||||||
@ -22,7 +22,7 @@ class MailTested extends Notification
|
|||||||
{
|
{
|
||||||
return (new MailMessage())
|
return (new MailMessage())
|
||||||
->subject('Panel Test Message')
|
->subject('Panel Test Message')
|
||||||
->greeting('Hello ' . $this->user->name . '!')
|
->greeting('Hello ' . $this->user->username . '!')
|
||||||
->line('This is a test of the Panel mail system. You\'re good to go!');
|
->line('This is a test of the Panel mail system. You\'re good to go!');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,22 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
if (! empty($greeting)) {
|
|
||||||
echo $greeting, "\n\n";
|
|
||||||
} else {
|
|
||||||
echo $level == 'error' ? 'Whoops!' : 'Hello!', "\n\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! empty($introLines)) {
|
|
||||||
echo implode("\n", $introLines), "\n\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($actionText)) {
|
|
||||||
echo "{$actionText}: {$actionUrl}", "\n\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! empty($outroLines)) {
|
|
||||||
echo implode("\n", $outroLines), "\n\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
echo 'Regards,', "\n";
|
|
||||||
echo config('app.name'), "\n";
|
|
||||||
192
resources/views/vendor/notifications/email.blade.php
vendored
192
resources/views/vendor/notifications/email.blade.php
vendored
@ -1,192 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
|
||||||
|
|
||||||
<style type="text/css" rel="stylesheet" media="all">
|
|
||||||
/* Media Queries */
|
|
||||||
@media only screen and (max-width: 500px) {
|
|
||||||
.button {
|
|
||||||
width: 100% !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<?php
|
|
||||||
|
|
||||||
$style = [
|
|
||||||
/* Layout ------------------------------ */
|
|
||||||
|
|
||||||
'body' => 'margin: 0; padding: 0; width: 100%; background-color: #F2F4F6;',
|
|
||||||
'email-wrapper' => 'width: 100%; margin: 0; padding: 0; background-color: #F2F4F6;',
|
|
||||||
|
|
||||||
/* Masthead ----------------------- */
|
|
||||||
|
|
||||||
'email-masthead' => 'padding: 25px 0; text-align: center;',
|
|
||||||
'email-masthead_name' => 'font-size: 16px; font-weight: bold; color: #2F3133; text-decoration: none; text-shadow: 0 1px 0 white;',
|
|
||||||
|
|
||||||
'email-body' => 'width: 100%; margin: 0; padding: 0; border-top: 1px solid #EDEFF2; border-bottom: 1px solid #EDEFF2; background-color: #FFF;',
|
|
||||||
'email-body_inner' => 'width: auto; max-width: 570px; margin: 0 auto; padding: 0;',
|
|
||||||
'email-body_cell' => 'padding: 35px;',
|
|
||||||
|
|
||||||
'email-footer' => 'width: auto; max-width: 570px; margin: 0 auto; padding: 0; text-align: center;',
|
|
||||||
'email-footer_cell' => 'color: #AEAEAE; padding: 35px; text-align: center;',
|
|
||||||
|
|
||||||
/* Body ------------------------------ */
|
|
||||||
|
|
||||||
'body_action' => 'width: 100%; margin: 30px auto; padding: 0; text-align: center;',
|
|
||||||
'body_sub' => 'margin-top: 25px; padding-top: 25px; border-top: 1px solid #EDEFF2;',
|
|
||||||
|
|
||||||
/* Type ------------------------------ */
|
|
||||||
|
|
||||||
'anchor' => 'color: #3869D4;',
|
|
||||||
'header-1' => 'margin-top: 0; color: #2F3133; font-size: 19px; font-weight: bold; text-align: left;',
|
|
||||||
'paragraph' => 'margin-top: 0; color: #74787E; font-size: 16px; line-height: 1.5em;',
|
|
||||||
'paragraph-sub' => 'margin-top: 0; color: #74787E; font-size: 12px; line-height: 1.5em;',
|
|
||||||
'paragraph-center' => 'text-align: center;',
|
|
||||||
|
|
||||||
/* Buttons ------------------------------ */
|
|
||||||
|
|
||||||
'button' => 'display: block; display: inline-block; width: 200px; min-height: 20px; padding: 10px;
|
|
||||||
background-color: #3869D4; border-radius: 3px; color: #ffffff; font-size: 15px; line-height: 25px;
|
|
||||||
text-align: center; text-decoration: none; -webkit-text-size-adjust: none;',
|
|
||||||
|
|
||||||
'button--green' => 'background-color: #22BC66;',
|
|
||||||
'button--red' => 'background-color: #dc4d2f;',
|
|
||||||
'button--blue' => 'background-color: #3869D4;',
|
|
||||||
];
|
|
||||||
?>
|
|
||||||
|
|
||||||
<?php $fontFamily = 'font-family: Arial, \'Helvetica Neue\', Helvetica, sans-serif;'; ?>
|
|
||||||
|
|
||||||
<body style="{{ $style['body'] }}">
|
|
||||||
<table width="100%" cellpadding="0" cellspacing="0">
|
|
||||||
<tr>
|
|
||||||
<td style="{{ $style['email-wrapper'] }}" align="center">
|
|
||||||
<table width="100%" cellpadding="0" cellspacing="0">
|
|
||||||
<!-- Logo -->
|
|
||||||
<tr>
|
|
||||||
<td style="{{ $style['email-masthead'] }}">
|
|
||||||
<a style="{{ $fontFamily }} {{ $style['email-masthead_name'] }}" href="{{ url('/') }}" target="_blank">
|
|
||||||
{{ config('app.name') }}
|
|
||||||
</a>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
<!-- Email Body -->
|
|
||||||
<tr>
|
|
||||||
<td style="{{ $style['email-body'] }}" width="100%">
|
|
||||||
<table style="{{ $style['email-body_inner'] }}" align="center" width="570" cellpadding="0" cellspacing="0">
|
|
||||||
<tr>
|
|
||||||
<td style="{{ $fontFamily }} {{ $style['email-body_cell'] }}">
|
|
||||||
<!-- Greeting -->
|
|
||||||
<h1 style="{{ $style['header-1'] }}">
|
|
||||||
@if (! empty($greeting))
|
|
||||||
{{ $greeting }}
|
|
||||||
@else
|
|
||||||
@if ($level == 'error')
|
|
||||||
Whoops!
|
|
||||||
@else
|
|
||||||
Hello!
|
|
||||||
@endif
|
|
||||||
@endif
|
|
||||||
</h1>
|
|
||||||
|
|
||||||
<!-- Intro -->
|
|
||||||
@foreach ($introLines as $line)
|
|
||||||
<p style="{{ $style['paragraph'] }}">
|
|
||||||
{{ $line }}
|
|
||||||
</p>
|
|
||||||
@endforeach
|
|
||||||
|
|
||||||
<!-- Action Button -->
|
|
||||||
@if (isset($actionText))
|
|
||||||
<table style="{{ $style['body_action'] }}" align="center" width="100%" cellpadding="0" cellspacing="0">
|
|
||||||
<tr>
|
|
||||||
<td align="center">
|
|
||||||
<?php
|
|
||||||
switch ($level) {
|
|
||||||
case 'success':
|
|
||||||
$actionColor = 'button--green';
|
|
||||||
break;
|
|
||||||
case 'error':
|
|
||||||
$actionColor = 'button--red';
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
$actionColor = 'button--blue';
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
|
|
||||||
<a href="{{ $actionUrl }}"
|
|
||||||
style="{{ $fontFamily }} {{ $style['button'] }} {{ $style[$actionColor] }}"
|
|
||||||
class="button"
|
|
||||||
target="_blank">
|
|
||||||
{{ $actionText }}
|
|
||||||
</a>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
@endif
|
|
||||||
|
|
||||||
<!-- Outro -->
|
|
||||||
@foreach ($outroLines as $line)
|
|
||||||
<p style="{{ $style['paragraph'] }}">
|
|
||||||
{{ $line }}
|
|
||||||
</p>
|
|
||||||
@endforeach
|
|
||||||
|
|
||||||
<!-- Salutation -->
|
|
||||||
<p style="{{ $style['paragraph'] }}">
|
|
||||||
Regards,<br>{{ config('app.name') }}
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<!-- Sub Copy -->
|
|
||||||
@if (isset($actionText))
|
|
||||||
<table style="{{ $style['body_sub'] }}">
|
|
||||||
<tr>
|
|
||||||
<td style="{{ $fontFamily }}">
|
|
||||||
<p style="{{ $style['paragraph-sub'] }}">
|
|
||||||
If you’re having trouble clicking the "{{ $actionText }}" button,
|
|
||||||
copy and paste the URL below into your web browser:
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p style="{{ $style['paragraph-sub'] }}">
|
|
||||||
<a style="{{ $style['anchor'] }}" href="{{ $actionUrl }}" target="_blank">
|
|
||||||
{{ $actionUrl }}
|
|
||||||
</a>
|
|
||||||
</p>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
@endif
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
<!-- Footer -->
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<table style="{{ $style['email-footer'] }}" align="center" width="570" cellpadding="0" cellspacing="0">
|
|
||||||
<tr>
|
|
||||||
<td style="{{ $fontFamily }} {{ $style['email-footer_cell'] }}">
|
|
||||||
<p style="{{ $style['paragraph-sub'] }}">
|
|
||||||
© {{ date('Y') }}
|
|
||||||
<a style="{{ $style['anchor'] }}" href="{{ url('/') }}" target="_blank">{{ config('app.name') }}</a>.
|
|
||||||
All rights reserved.
|
|
||||||
</p>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
Loading…
x
Reference in New Issue
Block a user