From 8a80dbd5d88b97f59f6022f913af629b11847620 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 11 Dec 2023 19:36:44 +0100 Subject: [PATCH] fix --- app/Models/InstanceSettings.php | 2 +- app/Providers/AppServiceProvider.php | 2 +- resources/views/layouts/base.blade.php | 4 ++-- resources/views/livewire/dashboard.blade.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Models/InstanceSettings.php b/app/Models/InstanceSettings.php index fcc4c7e25..d725b7e73 100644 --- a/app/Models/InstanceSettings.php +++ b/app/Models/InstanceSettings.php @@ -42,7 +42,7 @@ class InstanceSettings extends Model implements SendsEmail ray($url); $port = $url->getPort(); if ($port) { - return 6001; + return '6001'; } else { return null; } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index bd0ea1477..430d45085 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -30,6 +30,6 @@ class AppServiceProvider extends ServiceProvider ])->baseUrl($api_url); } }); - view()->share('realtimePort', \App\Models\InstanceSettings::realtimePort() ); + Config::set('realtime.port', \App\Models\InstanceSettings::realtimePort()); } } diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index b7ec65b1c..30b1603a5 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: "{{ $realtimePort }}", - wssPort: "{{ $realtimePort }}", + wsPort: "{{ config('realtime.port') }}", + wssPort: "{{ config('realtime.port') }}", forceTLS: false, encrypted: true, enableStats: false, diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php index 8e1a48294..f1f639952 100644 --- a/resources/views/livewire/dashboard.blade.php +++ b/resources/views/livewire/dashboard.blade.php @@ -3,7 +3,7 @@ @endif

Dashboard

- Realtime Port: {{ $realtimePort ?? 'Not set' }} + Realtime Port: {{ config('realtime.port') ?? 'Not set' }}
Your self-hosted environment
@if (request()->query->get('success'))