cupcakearmy/coolify
1
0
Fork 0
mirror of https://github.com/cupcakearmy/coolify.git synced 2024-10-23 00:24:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

updates

Browse Source
This commit is contained in:
Andras Bacsai 2023-06-12 12:21:48 +02:00
parent a97d22b81b
commit 19a83bb2c0
7 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Livewire/Team/InviteLink.php
View File

@ -19,6 +19,7 @@ public function mount()
public function viaEmail() public function viaEmail()
{ {
$this->generate_invite_link(isEmail: true); $this->generate_invite_link(isEmail: true);
$this->emit('message', 'Invitation sent via email successfully.');
} }
private function generate_invite_link(bool $isEmail = false) private function generate_invite_link(bool $isEmail = false)
{ {
@ -61,7 +62,6 @@ private function generate_invite_link(bool $isEmail = false)
$user->first()->notify(new InvitationLinkEmail()); $user->first()->notify(new InvitationLinkEmail());
} }
$this->emit('refreshInvitations'); $this->emit('refreshInvitations');
$this->emit('message', 'Invitation sent successfully.');
} catch (\Throwable $e) { } catch (\Throwable $e) {
$error_message = $e->getMessage(); $error_message = $e->getMessage();
if ($e->getCode() === '23505') { if ($e->getCode() === '23505') {
@ -73,5 +73,6 @@ private function generate_invite_link(bool $isEmail = false)
public function inviteByLink() public function inviteByLink()
{ {
$this->generate_invite_link(); $this->generate_invite_link();
$this->emit('message', 'Invitation link generated.');
} }
} }

2
resources/views/components/settings/navbar.blade.php
View File

@ -7,7 +7,7 @@
<button>Configuration</button> <button>Configuration</button>
</a> </a>
<a class="{{ request()->routeIs('settings.emails') ? 'text-white' : '' }}" href="{{ route('settings.emails') }}"> <a class="{{ request()->routeIs('settings.emails') ? 'text-white' : '' }}" href="{{ route('settings.emails') }}">
<button>Emails</button> <button>SMTP</button>
</a> </a>
<div class="flex-1"></div> <div class="flex-1"></div>
</nav> </nav>

3
resources/views/livewire/project/new/github-private-repository.blade.php
View File

@ -31,8 +31,7 @@
@endif @endif
@endforeach @endforeach
</x-forms.select> </x-forms.select>
<x-forms.button class="h-8 hover:bg-coolgray-400 bg-coolgray-200" <x-forms.button wire:click.prevent="loadBranches"> Check
wire:click.prevent="loadBranches"> Check
repository</x-forms.button> repository</x-forms.button>
</div> </div>
@endif @endif

2
resources/views/livewire/run-command.blade.php
View File

@ -10,7 +10,7 @@
@endif @endif
@endforeach @endforeach
</x-forms.select> </x-forms.select>
<x-forms.button type="submit" class="h-8 hover:bg-coolgray-400 bg-coolgray-200">Execute Command <x-forms.button type="submit">Execute Command
</x-forms.button> </x-forms.button>
</form> </form>
<div class="container w-full pt-10 mx-auto"> <div class="container w-full pt-10 mx-auto">

4
resources/views/livewire/settings/configuration.blade.php
View File

@ -14,10 +14,10 @@
<x-forms.input id="settings.default_redirect_404" label="Default Redirect 404" <x-forms.input id="settings.default_redirect_404" label="Default Redirect 404"
helper="All urls that has no service available will be redirected to this domain.<span class='text-helper'>You can set to your main marketing page or your social media link.</span>" /> helper="All urls that has no service available will be redirected to this domain.<span class='text-helper'>You can set to your main marketing page or your social media link.</span>" />
</div> </div>
<div class="flex gap-2 "> {{-- <div class="flex gap-2 ">
<x-forms.input type="number" id="settings.public_port_min" label="Public Port Min" /> <x-forms.input type="number" id="settings.public_port_min" label="Public Port Min" />
<x-forms.input type="number" id="settings.public_port_max" label="Public Port Max" /> <x-forms.input type="number" id="settings.public_port_max" label="Public Port Max" />
</div> </div> --}}
</div> </div>
</form> </form>

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

@ -6,7 +6,7 @@
Save Save
</x-forms.button> </x-forms.button>
</div> </div>
<div class="pt-2 pb-4 text-sm">SMTP settings for password reset, invitation, etc.</div> <div class="pt-2 pb-4 text-sm">SMTP settings for password resets, invitations, etc.</div>
<div class="flex items-end gap-2"> <div class="flex items-end gap-2">
<x-forms.input id="settings.extra_attributes.smtp_test_recipients" label="Test Recipient(s)" <x-forms.input id="settings.extra_attributes.smtp_test_recipients" label="Test Recipient(s)"
helper="Email list to send a test email to, separated by comma." /> helper="Email list to send a test email to, separated by comma." />

17
resources/views/team/show.blade.php
View File

@ -29,12 +29,17 @@
</div> </div>
@else @else
<div class="py-4"> <div class="py-4">
<h3>Invite a new member</h3> @if (!is_transactional_emails_active())
<div class="pb-4 text-xs text-warning">You need to configure SMTP settings before you can invite a new <h3>Invite a new member</h3>
member <div class="pb-4 text-xs text-warning">You need to configure SMTP settings before you can invite a
via new
email. member
</div> via
email.
</div>
@else
<h3 class="pb-4">Invite a new member</h3>
@endif
<livewire:team.invite-link /> <livewire:team.invite-link />
</div> </div>