diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index c50a53bef..bd0ea1477 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -6,6 +6,7 @@ use Illuminate\Support\Facades\Http; use Illuminate\Support\ServiceProvider; use Laravel\Sanctum\Sanctum; use App\Models\PersonalAccessToken; +use Illuminate\Support\Facades\Config; class AppServiceProvider extends ServiceProvider { @@ -16,7 +17,6 @@ class AppServiceProvider extends ServiceProvider public function boot(): void { Sanctum::usePersonalAccessTokenModel(PersonalAccessToken::class); - Http::macro('github', function (string $api_url, string|null $github_access_token = null) { if ($github_access_token) { return Http::withHeaders([ @@ -30,5 +30,6 @@ class AppServiceProvider extends ServiceProvider ])->baseUrl($api_url); } }); + view()->share('realtimePort', \App\Models\InstanceSettings::realtimePort() ); } } diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index a1889537e..b7ec65b1c 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -52,8 +52,8 @@ cluster: "{{ env('PUSHER_HOST') }}" || window.location.hostname, key: "{{ env('PUSHER_APP_KEY') }}" || 'coolify', wsHost: "{{ env('PUSHER_HOST') }}" || window.location.hostname, - wsPort: "{{ App\Models\InstanceSettings::realtimePort() }}", - wssPort: "{{ App\Models\InstanceSettings::realtimePort() }}", + wsPort: "{{ $realtimePort }}", + wssPort: "{{ $realtimePort }}", forceTLS: false, encrypted: true, enableStats: false,