Skip to content
Merged

#653 #655

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,7 @@ VITE_APP_NAME="${APP_NAME}"
BASE_VERSION_URL=https://raw.githubusercontent.com/CyanFox/Base/v4/version.json
DISABLE_DB_SETTINGS=false
FORCE_HTTPS=false

SENTRY_LARAVEL_DSN=
SENTRY_SEND_DEFAULT_PII=true
SENTRY_TRACES_SAMPLE_RATE=1.0
10 changes: 0 additions & 10 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@

use App\Services\SpotlightService;
use App\Services\ViewIntegrationService;
use Filament\Notifications\Livewire\Notifications;
use Filament\Notifications\Notification;
use Filament\Support\Enums\Alignment;
use Filament\Support\Enums\VerticalAlignment;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\URL;
use Illuminate\Support\ServiceProvider;
Expand Down Expand Up @@ -51,12 +47,6 @@ public function boot(): void
}
}

Notifications::alignment(Alignment::tryFrom(settings('internal.app.notifications.alignment', 'center')));
Notifications::verticalAlignment(VerticalAlignment::tryFrom(settings('internal.app.notifications.vertical_alignment', 'end')));
Notification::configureUsing(function (Notification $notification): void {
$notification->view('components.cf.notification');
});

if (Str::startsWith(config('app.url') ?? '', 'https://') || settings('internal.app.force_https')) {
URL::forceScheme('https');
}
Expand Down
7 changes: 2 additions & 5 deletions app/Traits/WithCustomLivewireException.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
namespace App\Traits;

use Exception;
use Filament\Notifications\Notification;
use Illuminate\Validation\ValidationException;
use Masmerise\Toaster\Toaster;
use Symfony\Component\HttpKernel\Exception\HttpException;

use function Sentry\captureException;
Expand All @@ -26,10 +26,7 @@ public function exception($e, $stopPropagation)
}

if (! $e instanceof ValidationException) {
Notification::make()
->title(__('messages.notifications.something_went_wrong'))
->danger()
->send();
Toaster::error(__('messages.notifications.something_went_wrong'));
}

$stopPropagation();
Expand Down
1 change: 1 addition & 0 deletions bootstrap/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
return Application::configure(basePath: dirname(__DIR__))
->withRouting(
commands: __DIR__.'/../routes/console.php',
channels: __DIR__.'/../routes/channels.php',
health: '/internal/health',
)
->withMiddleware(function (Middleware $middleware) {
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
"license": "MIT",
"require": {
"php": "^8.2",
"filament/notifications": "^4.0",
"laravel/framework": "^12.0",
"laravel/reverb": "^1.0",
"laravel/tinker": "^2.9",
"livewire/livewire": "^3.5",
"lorisleiva/laravel-actions": "^2.9",
"masmerise/livewire-toaster": "^2.8",
"mhmiton/laravel-modules-livewire": "^5.0",
"nunomaduro/essentials": "^0.1",
"nwidart/laravel-modules": "^12.0",
Expand Down Expand Up @@ -58,8 +58,7 @@
"scripts": {
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover --ansi",
"@php artisan filament:upgrade"
"@php artisan package:discover --ansi"
],
"post-update-cmd": [
"@php artisan vendor:publish --tag=laravel-assets --ansi --force"
Expand Down
Loading