From b57b4f9bd3924befd9e2cc9204a1a7715e4ab3a0 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 28 Jul 2023 21:36:19 +0200 Subject: [PATCH] fixes --- app/Http/Livewire/Server/Proxy/Deploy.php | 13 ++----------- app/Http/Livewire/Server/Proxy/Status.php | 18 +++++------------- .../views/components/server/navbar.blade.php | 11 ++++++----- .../components/status/restarting.blade.php | 7 +++++-- .../views/components/status/running.blade.php | 5 ++++- .../views/components/status/stopped.blade.php | 5 ++++- .../views/livewire/server/proxy.blade.php | 1 - .../livewire/server/proxy/status.blade.php | 8 ++++---- routes/web.php | 4 ++-- 9 files changed, 32 insertions(+), 40 deletions(-) diff --git a/app/Http/Livewire/Server/Proxy/Deploy.php b/app/Http/Livewire/Server/Proxy/Deploy.php index 74e75a071..6ca4bca4b 100644 --- a/app/Http/Livewire/Server/Proxy/Deploy.php +++ b/app/Http/Livewire/Server/Proxy/Deploy.php @@ -11,18 +11,13 @@ class Deploy extends Component { public Server $server; public $proxy_settings = null; - protected $listeners = ['proxyStatusUpdated']; - public function proxyStatusUpdated() - { - $this->server->refresh(); - } public function start_proxy() { if ( $this->server->proxy->last_applied_settings && $this->server->proxy->last_saved_settings !== $this->server->proxy->last_applied_settings ) { - $this->saveConfiguration($this->server); + $this->emit('saveConfiguration', $server); } $activity = resolve(StartProxy::class)($this->server); $this->emit('newMonitorActivity', $activity->id); @@ -36,8 +31,4 @@ class Deploy extends Component $this->server->save(); $this->emit('proxyStatusUpdated'); } - private function saveConfiguration(Server $server) - { - $this->emit('saveConfiguration', $server); - } -} +} \ No newline at end of file diff --git a/app/Http/Livewire/Server/Proxy/Status.php b/app/Http/Livewire/Server/Proxy/Status.php index 068402b9e..8791e9cc4 100644 --- a/app/Http/Livewire/Server/Proxy/Status.php +++ b/app/Http/Livewire/Server/Proxy/Status.php @@ -9,20 +9,12 @@ use Livewire\Component; class Status extends Component { public Server $server; - protected $listeners = ['proxyStatusUpdated']; - public function proxyStatusUpdated() - { - $this->server->refresh(); - } public function get_status() { - try { - dispatch_sync(new ProxyContainerStatusJob( - server: $this->server - )); - $this->emit('proxyStatusUpdated'); - } catch (\Exception $e) { - ray($e->getMessage()); - } + dispatch_sync(new ProxyContainerStatusJob( + server: $this->server + )); + $this->server->refresh(); + $this->emit('proxyStatusUpdated'); } } \ No newline at end of file diff --git a/resources/views/components/server/navbar.blade.php b/resources/views/components/server/navbar.blade.php index f96d3905e..499568b1a 100644 --- a/resources/views/components/server/navbar.blade.php +++ b/resources/views/components/server/navbar.blade.php @@ -1,5 +1,8 @@
-

Server

+
+

Server

+ +
{{ data_get($server, 'name') }}
diff --git a/resources/views/components/status/restarting.blade.php b/resources/views/components/status/restarting.blade.php index 08a98c064..b108baab2 100644 --- a/resources/views/components/status/restarting.blade.php +++ b/resources/views/components/status/restarting.blade.php @@ -1,5 +1,8 @@ +@props([ + 'text' => 'Stopped', +]) -
+
-
Stopped
+
{{ $text }}
diff --git a/resources/views/components/status/running.blade.php b/resources/views/components/status/running.blade.php index 952817201..f3c059e01 100644 --- a/resources/views/components/status/running.blade.php +++ b/resources/views/components/status/running.blade.php @@ -1,5 +1,8 @@ +@props([ + 'text' => 'Running', +])
-
Running
+
{{ $text }}
diff --git a/resources/views/components/status/stopped.blade.php b/resources/views/components/status/stopped.blade.php index 23d797271..9867e22a1 100644 --- a/resources/views/components/status/stopped.blade.php +++ b/resources/views/components/status/stopped.blade.php @@ -1,5 +1,8 @@ +@props([ + 'text' => 'Stopped', +])
-
Stopped
+
{{ $text }}
diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php index 11b277663..3ed9cdca6 100644 --- a/resources/views/livewire/server/proxy.blade.php +++ b/resources/views/livewire/server/proxy.blade.php @@ -10,7 +10,6 @@ @if ($server->proxy->status === 'exited') Switch Proxy @endif -
Traefik v2
@if ( diff --git a/resources/views/livewire/server/proxy/status.blade.php b/resources/views/livewire/server/proxy/status.blade.php index 032c534c6..41fef8efc 100644 --- a/resources/views/livewire/server/proxy/status.blade.php +++ b/resources/views/livewire/server/proxy/status.blade.php @@ -1,9 +1,9 @@ -
+
@if ($server->proxy->status === 'running') - + @elseif ($server->proxy->status === 'restarting') - + @else - + @endif
diff --git a/routes/web.php b/routes/web.php index 7620c58ee..18d57474b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -67,7 +67,7 @@ Route::middleware(['auth'])->group(function () { 'private_keys' => PrivateKey::ownedByCurrentTeam()->get(), ]))->name('server.create'); Route::get('/server/{server_uuid}', fn () => view('server.show', [ - 'server' => Server::ownedByCurrentTeam(['name', 'description', 'ip', 'port', 'user'])->whereUuid(request()->server_uuid)->firstOrFail(), + 'server' => Server::ownedByCurrentTeam(['name', 'description', 'ip', 'port', 'user', 'proxy'])->whereUuid(request()->server_uuid)->firstOrFail(), ]))->name('server.show'); Route::get('/server/{server_uuid}/proxy', fn () => view('server.proxy', [ 'server' => Server::ownedByCurrentTeam(['name', 'proxy'])->whereUuid(request()->server_uuid)->firstOrFail(), @@ -77,7 +77,7 @@ Route::middleware(['auth'])->group(function () { 'privateKeys' => PrivateKey::ownedByCurrentTeam()->get(), ]))->name('server.private-key'); Route::get('/server/{server_uuid}/destinations', fn () => view('server.destinations', [ - 'server' => Server::ownedByCurrentTeam(['name'])->whereUuid(request()->server_uuid)->firstOrFail() + 'server' => Server::ownedByCurrentTeam(['name', 'proxy'])->whereUuid(request()->server_uuid)->firstOrFail() ]))->name('server.destinations'); });