diff --git a/app/Console/Commands/User/DeleteUserCommand.php b/app/Console/Commands/User/DeleteUserCommand.php index 0145d3b89..87a78329a 100644 --- a/app/Console/Commands/User/DeleteUserCommand.php +++ b/app/Console/Commands/User/DeleteUserCommand.php @@ -35,7 +35,7 @@ class DeleteUserCommand extends Command if ($this->input->isInteractive()) { $tableValues = []; 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); diff --git a/app/Models/User.php b/app/Models/User.php index 910ad2d1a..2a115bdcc 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -63,7 +63,6 @@ use Spatie\Permission\Traits\HasRoles; * @property Carbon|null $updated_at * @property \Illuminate\Database\Eloquent\Collection|ApiKey[] $apiKeys * @property int|null $api_keys_count - * @property string $name * @property DatabaseNotificationCollection|DatabaseNotification[] $notifications * @property int|null $notifications_count * @property \Illuminate\Database\Eloquent\Collection|Server[] $servers diff --git a/app/Notifications/AccountCreated.php b/app/Notifications/AccountCreated.php index 9da414b5f..2365113a3 100644 --- a/app/Notifications/AccountCreated.php +++ b/app/Notifications/AccountCreated.php @@ -24,7 +24,7 @@ class AccountCreated extends Notification implements ShouldQueue public function toMail(User $notifiable): 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('Username: ' . $notifiable->username) ->line('Email: ' . $notifiable->email); diff --git a/app/Notifications/MailTested.php b/app/Notifications/MailTested.php index a24298a7e..b2ccba861 100644 --- a/app/Notifications/MailTested.php +++ b/app/Notifications/MailTested.php @@ -22,7 +22,7 @@ class MailTested extends Notification { return (new MailMessage()) ->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!'); } } diff --git a/resources/views/vendor/notifications/email-plain.blade.php b/resources/views/vendor/notifications/email-plain.blade.php deleted file mode 100644 index acefa6523..000000000 --- a/resources/views/vendor/notifications/email-plain.blade.php +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - '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;', -]; -?> - - - - - - - - -
- - - - - - - - - - - - - - - -
- - {{ config('app.name') }} - -
- - - - -
- -

- @if (! empty($greeting)) - {{ $greeting }} - @else - @if ($level == 'error') - Whoops! - @else - Hello! - @endif - @endif -

- - - @foreach ($introLines as $line) -

- {{ $line }} -

- @endforeach - - - @if (isset($actionText)) - - - - -
- - - - {{ $actionText }} - -
- @endif - - - @foreach ($outroLines as $line) -

- {{ $line }} -

- @endforeach - - -

- Regards,
{{ config('app.name') }} -

- - - @if (isset($actionText)) - - - - -
-

- If you’re having trouble clicking the "{{ $actionText }}" button, - copy and paste the URL below into your web browser: -

- -

- - {{ $actionUrl }} - -

-
- @endif -
-
- - - - -
-

- © {{ date('Y') }} - {{ config('app.name') }}. - All rights reserved. -

-
-
-
- -