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

updates

Browse Source
This commit is contained in:
Andras Bacsai 2023-06-12 20:54:29 +02:00
parent 0496a32e1d
commit 169dc3c2d1
6 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Exceptions/Handler.php
View File

@ -47,7 +47,7 @@ class Handler extends ExceptionHandler
{ {
$this->reportable(function (Throwable $e) { $this->reportable(function (Throwable $e) {
$this->settings = InstanceSettings::get(); $this->settings = InstanceSettings::get();
if ($this->settings->do_not_track) { if ($this->settings->do_not_track || config('app.env') === 'local') {
return; return;
} }
Integration::captureUnhandledException($e); Integration::captureUnhandledException($e);

1
app/Http/Controllers/Controller.php
View File

@ -61,7 +61,6 @@ class Controller extends BaseController
$invitations = TeamInvitation::whereTeamId(auth()->user()->currentTeam()->id)->get(); $invitations = TeamInvitation::whereTeamId(auth()->user()->currentTeam()->id)->get();
} }
return view('team.show', [ return view('team.show', [
'transactional_emails_active' => is_transactional_emails_active(),
'invitations' => $invitations, 'invitations' => $invitations,
]); ]);
} }

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

@ -72,7 +72,7 @@ class InviteLink extends Component
return general_error_handler(err: $e, that: $this, customErrorMessage: $error_message); return general_error_handler(err: $e, that: $this, customErrorMessage: $error_message);
} }
} }
public function inviteByLink() public function viaLink()
{ {
$this->generate_invite_link(); $this->generate_invite_link();
} }

2
config/sentry.php
View File

@ -7,7 +7,7 @@ return [
// The release version of your application // The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
'release' => config('app.env') === 'local' ? trim(exec('jq -r .coolify.v4.version ../versions.json')) : trim(exec('jq -r .coolify.v4.version versions.json')), 'release' => trim(exec('jq -r .coolify.v4.version versions.json')) ?? 'unknown',
// When left empty or `null` the Laravel environment will be used // When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'), 'environment' => config('app.env'),

2
resources/views/livewire/team/invite-link.blade.php
View File

@ -1,5 +1,5 @@
<div> <div>
<form wire:submit.prevent='inviteByLink' class="flex items-center gap-2"> <form wire:submit.prevent='viaLink' class="flex items-center gap-2">
<x-forms.input id="email" type="email" name="email" placeholder="Email" /> <x-forms.input id="email" type="email" name="email" placeholder="Email" />
<x-forms.select id="role" name="role"> <x-forms.select id="role" name="role">
<option value="admin">Admin</option> <option value="admin">Admin</option>

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

@ -19,32 +19,22 @@
</table> </table>
</div> </div>
@if (auth()->user()->isAdmin()) @if (auth()->user()->isAdmin())
@if (!$transactional_emails_active) <div class="py-4">
<div class="py-4"> @if (is_transactional_emails_active())
<h3 class="pb-4">Invite a new member</h3> <h3 class="pb-4">Invite a new member</h3>
<form class="flex items-center gap-2"> @else
<x-forms.input type="email" name="email" placeholder="Email" /> <h3>Invite a new member</h3>
<x-forms.button>Invite</x-forms.button> <div class="pb-4 text-xs text-warning">You need to configure SMTP settings before you can invite a
</form> new
</div> member
@else via
<div class="py-4"> email.
@if (!is_transactional_emails_active()) </div>
<h3>Invite a new member</h3> @endif
<div class="pb-4 text-xs text-warning">You need to configure SMTP settings before you can invite a <livewire:team.invite-link />
new </div>
member
via
email.
</div>
@else
<h3 class="pb-4">Invite a new member</h3>
@endif
<livewire:team.invite-link />
</div>
<livewire:team.invitations :invitations="$invitations" /> <livewire:team.invitations :invitations="$invitations" />
@endif
@endif @endif
</x-layout> </x-layout>