Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix

Browse Source
This commit is contained in:
Andras Bacsai 2023-06-21 10:53:24 +02:00
parent d0af38fb14
commit 1763e0341d
5 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Livewire/Settings/Email.php
View File

@ -47,9 +47,9 @@ public function instantSave()
$this->validate(); $this->validate();
} }
} }
public function test_email() public function testNotification()
{ {
Notification::send($this->settings, new TestEmail); $this->settings->notify(new TestEmail);
$this->emit('success', 'Test email sent.'); $this->emit('success', 'Test email sent.');
} }
private function decrypt() private function decrypt()

3
app/Notifications/TransactionalEmails/TestEmail.php
View File

@ -3,7 +3,6 @@
namespace App\Notifications\TransactionalEmails; namespace App\Notifications\TransactionalEmails;
use App\Notifications\Channels\EmailChannel; use App\Notifications\Channels\EmailChannel;
use App\Notifications\Channels\TransactionalEmailChannel;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Messages\MailMessage;
@ -19,7 +18,7 @@ public function via(): array
public function toMail(): MailMessage public function toMail(): MailMessage
{ {
$mail = new MailMessage(); $mail = new MailMessage();
$mail->subject('Coolify Test Notification'); $mail->subject('Test Notification');
$mail->view('emails.test'); $mail->view('emails.test');
return $mail; return $mail;
} }

2
resources/views/emails/test.blade.php
View File

@ -1,3 +1 @@
Hello,<br><br>
If you are seeing this, it means that your SMTP settings are correct. If you are seeing this, it means that your SMTP settings are correct.

18
resources/views/livewire/notifications/email-settings.blade.php
View File

@ -35,17 +35,15 @@
<x-forms.input helper="If SMTP through SSL, set it to 'tls'." placeholder="tls" id="model.smtp.encryption" <x-forms.input helper="If SMTP through SSL, set it to 'tls'." placeholder="tls" id="model.smtp.encryption"
label="Encryption" /> label="Encryption" />
</div> </div>
<div class="flex flex-col"> <div class="flex flex-col gap-2 xl:flex-row">
<div class="flex flex-col gap-2 xl:flex-row"> <x-forms.input id="model.smtp.username" helper="SMTP Username" label="SMTP Username" />
<x-forms.input id="model.smtp.username" helper="SMTP Username" label="Username" /> <x-forms.input type="password" helper="SMTP Password" id="model.smtp.password" label="SMTP Password" />
<x-forms.input type="password" helper="SMTP Password" id="model.smtp.password" label="Password" />
</div>
<x-forms.input id="model.smtp.timeout" helper="Timeout value for sending emails." label="Timeout" /> <x-forms.input id="model.smtp.timeout" helper="Timeout value for sending emails." label="Timeout" />
<div class="flex flex-col gap-2 xl:flex-row"> </div>
<x-forms.input required id="model.smtp.from_name" helper="Name used in emails." label="From Name" /> <div class="flex flex-col gap-2 xl:flex-row">
<x-forms.input required id="model.smtp.from_address" helper="Email address used in emails." <x-forms.input required id="model.smtp.from_name" helper="Name used in emails." label="From Name" />
label="From Address" /> <x-forms.input required id="model.smtp.from_address" helper="Email address used in emails."
</div> label="From Address" />
</div> </div>
</form> </form>
@if (data_get($model, 'smtp.enabled')) @if (data_get($model, 'smtp.enabled'))

46
resources/views/livewire/settings/email.blade.php
View File

@ -5,6 +5,11 @@
<x-forms.button type="submit"> <x-forms.button type="submit">
Save Save
</x-forms.button> </x-forms.button>
@if ($settings->smtp->enabled)
<x-forms.button isHighlighted wire:click='testNotification'>
Send Test Email
</x-forms.button>
@endif
</div> </div>
<div class="pt-2 pb-4 ">SMTP settings for password resets, invitations, etc.</div> <div class="pt-2 pb-4 ">SMTP settings for password resets, invitations, etc.</div>
<div class="w-32"> <div class="w-32">
@ -13,31 +18,24 @@
<div class="flex items-end gap-2"> <div class="flex items-end gap-2">
<x-forms.input id="settings.smtp.test_recipients" label="Test Recipients" <x-forms.input id="settings.smtp.test_recipients" label="Test Recipients"
helper="Email list to send a test email to, separated by comma." /> helper="Email list to send a test email to, separated by comma." />
@if ($settings->smtp->enabled)
<x-forms.button wire:click='test_email'>
Send Test Email
</x-forms.button>
@endif
</div> </div>
<div class="flex flex-col gap-2 xl:flex-row"> <div class="flex flex-col w-full gap-2 xl:flex-row">
<div class="flex flex-col w-full"> <x-forms.input required id="settings.smtp.host" helper="SMTP Hostname" placeholder="smtp.mailgun.org"
<x-forms.input required id="settings.smtp.host" helper="SMTP Hostname" placeholder="smtp.mailgun.org" label="Host" />
label="Host" /> <x-forms.input required id="settings.smtp.port" helper="SMTP Port" placeholder="587" label="Port" />
<x-forms.input required id="settings.smtp.port" helper="SMTP Port" placeholder="587" label="Port" /> <x-forms.input id="settings.smtp.encryption" helper="If SMTP through SSL, set it to 'tls'."
<x-forms.input id="settings.smtp.encryption" helper="If SMTP through SSL, set it to 'tls'." placeholder="tls" label="Encryption" />
placeholder="tls" label="Encryption" /> </div>
</div> <div class="flex flex-col w-full gap-2 xl:flex-row">
<div class="flex flex-col w-full"> <x-forms.input id="settings.smtp.username" helper="SMTP Username" label="SMTP Username" />
<x-forms.input id="settings.smtp.username" helper="SMTP Username" label="SMTP Username" /> <x-forms.input id="settings.smtp.password" type="password" helper="SMTP Password" label="SMTP Password" />
<x-forms.input id="settings.smtp.password" type="password" helper="SMTP Password" <x-forms.input id="settings.smtp.timeout" helper="Timeout value for sending emails." label="Timeout" />
label="SMTP Password" /> </div>
<x-forms.input id="settings.smtp.timeout" helper="Timeout value for sending emails." label="Timeout" /> <div class="flex flex-col w-full gap-2 xl:flex-row">
</div> <x-forms.input required id="settings.smtp.from_name" helper="Name used in emails." label="From Name" />
<div class="flex flex-col w-full"> <x-forms.input required id="settings.smtp.from_address" helper="Email address used in emails."
<x-forms.input required id="settings.smtp.from_name" helper="Name used in emails." label="From Name" /> label="From Address" />
<x-forms.input required id="settings.smtp.from_address" helper="Email address used in emails."
label="From Address" />
</div>
</div> </div>
</form> </form>
</div> </div>