From d5d671bac1b733de083f548fbf4e6f7ca42031ae Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 22 Jun 2023 09:38:44 +0200 Subject: [PATCH] wip --- app/Http/Livewire/Destination/Show.php | 4 +++- database/seeders/ServerSeeder.php | 3 --- .../views/livewire/destination/show.blade.php | 8 ++++---- .../views/livewire/server/form.blade.php | 20 ++++++++++--------- .../livewire/server/private-key.blade.php | 2 +- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/app/Http/Livewire/Destination/Show.php b/app/Http/Livewire/Destination/Show.php index 4bef75862..df27e31df 100644 --- a/app/Http/Livewire/Destination/Show.php +++ b/app/Http/Livewire/Destination/Show.php @@ -13,12 +13,14 @@ class Show extends Component public function scan() { $alreadyAddedNetworks = $this->server->standaloneDockers; - ray($alreadyAddedNetworks); $networks = instant_remote_process(['docker network ls --format "{{json .}}"'], $this->server, false); $this->networks = format_docker_command_output_to_json($networks)->filter(function ($network) { return $network['Name'] !== 'bridge' && $network['Name'] !== 'host' && $network['Name'] !== 'none'; })->filter(function ($network) use ($alreadyAddedNetworks) { return !$alreadyAddedNetworks->contains('network', $network['Name']); }); + if ($this->networks->count() === 0) { + $this->emit('success', 'No new networks found.'); + } } } diff --git a/database/seeders/ServerSeeder.php b/database/seeders/ServerSeeder.php index 886b1e5b7..a557a8187 100644 --- a/database/seeders/ServerSeeder.php +++ b/database/seeders/ServerSeeder.php @@ -13,9 +13,6 @@ use Illuminate\Database\Seeder; class ServerSeeder extends Seeder { - /** - * Run the database seeds. - */ public function run(): void { $root_team = Team::find(0); diff --git a/resources/views/livewire/destination/show.blade.php b/resources/views/livewire/destination/show.blade.php index 8fd860f69..f5b248ad6 100644 --- a/resources/views/livewire/destination/show.blade.php +++ b/resources/views/livewire/destination/show.blade.php @@ -1,6 +1,6 @@
-

Destinations

+

Destinations

Add a new destination @@ -19,14 +19,14 @@
@if (count($networks) > 0) -

Scanned available Destinations

+

Found Destinations

@endif @foreach ($networks as $network) -
+
{{ data_get($network, 'Name') }}
- Add to Coolify + Configure
@endforeach diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php index 403c5f1eb..6ed63ad57 100644 --- a/resources/views/livewire/server/form.blade.php +++ b/resources/views/livewire/server/form.blade.php @@ -40,13 +40,15 @@ Check Server Details - - @if ($server->settings->is_usable) - Reconfigure Docker Engine - @else - Install Docker Engine - @endif - + @if ($server->id !== 0) + + @if ($server->settings->is_usable) + Reconfigure Docker Engine + @else + Install Docker Engine + @endif + + @endif
@else
@@ -59,8 +61,8 @@
@isset($uptime) -

Server Info

-
+

Server Info

+

Uptime: {{ $uptime }}

@isset($dockerVersion)

Docker Engine {{ $dockerVersion }}

diff --git a/resources/views/livewire/server/private-key.blade.php b/resources/views/livewire/server/private-key.blade.php index ad7d1e387..40e87dc99 100644 --- a/resources/views/livewire/server/private-key.blade.php +++ b/resources/views/livewire/server/private-key.blade.php @@ -1,6 +1,6 @@
-

Private Key

+

Private Key

Add a new Private Key