dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Refactor Docker-related code and add conditional rendering

Browse Source
This commit is contained in:
Andras Bacsai
2024-03-25 13:10:05 +01:00
parent 3de4f2805a
commit bcbdee1dcc
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Livewire/Destination/New/Docker.php
View File

@@ -49,7 +49,9 @@ class Docker extends Component
} else { } else {
$this->network = new Cuid2(7); $this->network = new Cuid2(7);
} }
$this->name = str("{$this->servers->first()->name}-{$this->network}")->kebab(); if ($this->servers->count() > 0) {
$this->name = str("{$this->servers->first()->name}-{$this->network}")->kebab();
}
} }
public function generate_name() public function generate_name()

16
resources/views/destination/all.blade.php
View File

@@ -1,11 +1,13 @@
<x-layout> <x-layout>
<div class="flex items-start gap-2"> <div class="flex items-start gap-2">
<h1>Destinations</h1> <h1>Destinations</h1>
<x-modal-input buttonTitle="+ Add" title="New Destination"> @if ($servers->count() > 0)
<livewire:destination.new.docker :server_id="$server_id" /> <x-modal-input buttonTitle="+ Add" title="New Destination">
</x-modal-input> <livewire:destination.new.docker :server_id="$server_id" />
</x-modal-input>
@endif
</div> </div>
<div class="subtitle">Endpoints to deploy your resources.</div> <div class="subtitle">Network endpoints to deploy your resources.</div>
<div class="grid gap-2 lg:grid-cols-2"> <div class="grid gap-2 lg:grid-cols-2">
@forelse ($destinations as $destination) @forelse ($destinations as $destination)
@if ($destination->getMorphClass() === 'App\Models\StandaloneDocker') @if ($destination->getMorphClass() === 'App\Models\StandaloneDocker')
@@ -27,7 +29,11 @@
@endif @endif
@empty @empty
<div> <div>
<div>No destinations found.</div> @if ($servers->count() === 0)
<div> No servers found. Please add one first.</div>
@else
<div>No destinations found.</div>
@endif
</div> </div>
@endforelse @endforelse
</div> </div>

2
resources/views/livewire/server/create.blade.php
View File

@@ -1,3 +1,3 @@
<div> <div class="w-full">
<livewire:server.new.by-ip :private_keys="$private_keys" :limit_reached="$limit_reached" /> <livewire:server.new.by-ip :private_keys="$private_keys" :limit_reached="$limit_reached" />
</div> </div>

12
resources/views/livewire/server/new/by-ip.blade.php
View File

@@ -1,10 +1,10 @@
<div> <div class="w-full">
@if ($limit_reached) @if ($limit_reached)
<x-limit-reached name="servers" /> <x-limit-reached name="servers" />
@else @else
<form class="flex flex-col gap-2" wire:submit='submit'> <form class="flex flex-col w-full gap-2" wire:submit='submit'>
<div class="flex gap-2"> <div class="flex w-full gap-2">
<x-forms.input id="name" label="Name" required /> <x-forms.input autofocus id="name" label="Name" required />
<x-forms.input id="description" label="Description" /> <x-forms.input id="description" label="Description" />
</div> </div>
<div class="flex gap-2"> <div class="flex gap-2">
@@ -23,10 +23,10 @@
@endif @endif
@endforeach @endforeach
</x-forms.select> </x-forms.select>
<div class="w-96"> <div class="">
<x-forms.checkbox instantSave type="checkbox" id="is_build_server" label="Use it as a build server?" /> <x-forms.checkbox instantSave type="checkbox" id="is_build_server" label="Use it as a build server?" />
</div> </div>
<div class="w-96"> <div class="">
<h3 class="pt-6">Swarm <span class="text-xs text-neutral-500">(experimental)</span></h3> <h3 class="pt-6">Swarm <span class="text-xs text-neutral-500">(experimental)</span></h3>
<div class="pb-4">Read the docs <a class='dark:text-white' <div class="pb-4">Read the docs <a class='dark:text-white'
href='https://coolify.io/docs/docker/swarm#deploy-with-persistent-storage' href='https://coolify.io/docs/docker/swarm#deploy-with-persistent-storage'