diff --git a/app/Http/Livewire/Destination/New/StandaloneDocker.php b/app/Http/Livewire/Destination/New/StandaloneDocker.php index 40bdbe937..498caa8c0 100644 --- a/app/Http/Livewire/Destination/New/StandaloneDocker.php +++ b/app/Http/Livewire/Destination/New/StandaloneDocker.php @@ -24,16 +24,18 @@ class StandaloneDocker extends Component ]; public function mount() { - if (!$this->server_id) { - if (request()->query('server_id')) { - $this->server_id = request()->query('server_id'); - } else { - if ($this->servers->count() > 0) { - $this->server_id = $this->servers->first()->id; - } + if (request()->query('server_id')) { + $this->server_id = request()->query('server_id'); + } else { + if ($this->servers->count() > 0) { + $this->server_id = $this->servers->first()->id; } } - $this->network = new Cuid2(7); + if (request()->query('network_name')) { + $this->network = request()->query('network_name'); + } else { + $this->network = new Cuid2(7); + } $this->name = generate_random_name(); } private function createNetworkAndAttachToProxy() diff --git a/app/Http/Livewire/Destination/Show.php b/app/Http/Livewire/Destination/Show.php new file mode 100644 index 000000000..4bef75862 --- /dev/null +++ b/app/Http/Livewire/Destination/Show.php @@ -0,0 +1,24 @@ +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']); + }); + } +} diff --git a/resources/views/livewire/destination/show.blade.php b/resources/views/livewire/destination/show.blade.php new file mode 100644 index 000000000..e632ac707 --- /dev/null +++ b/resources/views/livewire/destination/show.blade.php @@ -0,0 +1,34 @@ +
+
+

Destinations

+ + Add a new destination + + Scan destinations on the server +
+
Destinations are used to segregate resources by network.
+
+ Docker Networks added to the server: + @forelse ($server->standaloneDockers as $docker) + + + + @empty +
No destinations added
+ @endforelse +
+
+ @if (count($networks) > 0) +

Scanned available destinations

+ @endif + @foreach ($networks as $network) +
+
{{ data_get($network, 'Name') }}
+ + Add to Coolify + +
+ @endforeach +
+
diff --git a/resources/views/livewire/private-key/change.blade.php b/resources/views/livewire/private-key/change.blade.php index 151892296..4ad5f408c 100644 --- a/resources/views/livewire/private-key/change.blade.php +++ b/resources/views/livewire/private-key/change.blade.php @@ -1,6 +1,16 @@
+
+

Private Key

+ + Save + + + Delete + +
+
Private Key used for SSH connection
@@ -23,13 +33,6 @@
-
- - Save - - - Delete - -
+ diff --git a/resources/views/livewire/server/private-key.blade.php b/resources/views/livewire/server/private-key.blade.php index a482d2437..6c7cfb48d 100644 --- a/resources/views/livewire/server/private-key.blade.php +++ b/resources/views/livewire/server/private-key.blade.php @@ -5,7 +5,7 @@ Add a new Private Key -
Selected Private Key for SSH connection
+
Selected Private Key for SSH connection
@if (data_get($server, 'privateKey.uuid')) Currently attached Private Key: diff --git a/resources/views/private-key/show.blade.php b/resources/views/private-key/show.blade.php index a10b25fb4..f27b68105 100644 --- a/resources/views/private-key/show.blade.php +++ b/resources/views/private-key/show.blade.php @@ -1,5 +1,4 @@ -

Private Key

-
Sssh, it is private
+
diff --git a/resources/views/server/destinations.blade.php b/resources/views/server/destinations.blade.php index 338531ae7..c31ac46f1 100644 --- a/resources/views/server/destinations.blade.php +++ b/resources/views/server/destinations.blade.php @@ -1,20 +1,4 @@ -
-

Destinations

- - Add a new destination - -
-
Destinations are used to segregate resources by network.
-
- Docker Networks available on the server: - @forelse ($server->standaloneDockers as $docker) - - - - @empty -
No destinations added
- @endforelse -
+