feat: multi deployments

resources/views/components/databases/navbar.blade.php

@@ -22,7 +22,7 @@
         </a>
     @endif
     <div class="flex-1"></div>
-    @if ($database->status !== 'exited')
+    @if (!str($database->status)->startsWith('exited'))
         <button wire:click='stop' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
             <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24" stroke-width="2"
                 stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">

resources/views/components/status/index.blade.php

@@ -1,6 +1,6 @@
-@if (Str::of($status)->startsWith('running'))
+@if (str($status)->startsWith('running'))
     <x-status.running :status="$status" />
-@elseif(Str::of($status)->startsWith('restarting') || Str::of($status)->startsWith('starting'))
+@elseif(str($status)->startsWith('restarting') || str($status)->startsWith('starting') || str($status)->startsWith('degraded'))
     <x-status.restarting :status="$status" />
 @else
     <x-status.stopped :status="$status" />

resources/views/components/status/restarting.blade.php

@@ -2,7 +2,12 @@
     'status' => 'Restarting',
 ])
 <x-loading wire:loading.delay.longer />
-<div class="flex items-center gap-2" wire:loading.remove.delay.longer>
+<div class="flex items-center " wire:loading.remove.delay.longer>
     <div class="badge badge-warning badge-xs"></div>
-    <div class="text-xs font-medium tracking-wide text-warning">{{ Str::headline($status) }}</div>
+    <div class="pl-2 pr-1 text-xs font-bold tracking-widerr text-warning">
+        {{ str($status)->before(':')->headline() }}
+    </div>
+    @if (!str($status)->startsWith('Proxy'))
+        <div class="text-xs text-warning">({{ str($status)->after(':') }})</div>
+    @endif
 </div>

resources/views/components/status/running.blade.php

@@ -2,7 +2,12 @@
     'status' => 'Running',
 ])
 <x-loading wire:loading.delay.longer />
-<div class="flex items-center gap-2 " wire:loading.remove.delay.longer>
+<div class="flex items-center" wire:loading.remove.delay.longer>
     <div class="badge badge-success badge-xs"></div>
-    <div class="text-xs font-medium tracking-wide text-success">{{ Str::headline($status) }}</div>
+    <div class="pl-2 pr-1 text-xs font-bold tracking-wider text-success">
+        {{ str($status)->before(':')->headline() }}
+    </div>
+    @if (!str($status)->startsWith('Proxy'))
+        <div class="text-xs text-success">({{ str($status)->after(':') }})</div>
+    @endif
 </div>

resources/views/components/status/stopped.blade.php

@@ -2,7 +2,7 @@
     'status' => 'Stopped',
 ])
 <x-loading wire:loading.delay.longer />
-<div class="flex items-center gap-2 " wire:loading.remove.delay.longer>
+<div class="flex items-center" wire:loading.remove.delay.longer>
     <div class="badge badge-error badge-xs"></div>
-    <div class="text-xs font-medium tracking-wide text-error">{{ Str::headline($status) }}</div>
+    <div class="pl-2 pr-1 text-xs font-bold tracking-wider text-error">{{ str($status)->before(':')->headline() }}</div>
 </div>

resources/views/livewire/project/application/configuration.blade.php

@@ -27,8 +27,8 @@
                 <a :class="activeTab === 'source' && 'text-white'"
                     @click.prevent="activeTab = 'source'; window.location.hash = 'source'" href="#">Source</a>
             @endif
-            <a :class="activeTab === 'server' && 'text-white'"
-                @click.prevent="activeTab = 'server'; window.location.hash = 'server'" href="#">Server
+            <a :class="activeTab === 'servers' && 'text-white'"
+                @click.prevent="activeTab = 'servers'; window.location.hash = 'servers'" href="#">Servers
             </a>
 
             <a :class="activeTab === 'scheduled-tasks' && 'text-white'"
@@ -88,7 +88,7 @@
                     <livewire:project.application.source :application="$application" />
                 </div>
             @endif
-            <div x-cloak x-show="activeTab === 'server'">
+            <div x-cloak x-show="activeTab === 'servers'">
                 <livewire:project.shared.destination :resource="$application" :servers="$servers" />
             </div>
             <div x-cloak x-show="activeTab === 'storages'">

resources/views/livewire/project/application/general.blade.php

@@ -97,7 +97,7 @@
                             <x-forms.input id="application.docker_registry_image_tag" label="Docker Image Tag" />
                         @endif
                     @else
-                        @if ($application->destination->server->isSwarm())
+                        @if ($application->destination->server->isSwarm() || $application->additional_servers->count() > 0)
                             <x-forms.input id="application.docker_registry_image_name" required label="Docker Image" />
                             <x-forms.input id="application.docker_registry_image_tag"
                                 helper="If set, it will tag the built image with this tag too. <br><br>Example: If you set it to 'latest', it will push the image with the commit sha tag + with the latest tag."

resources/views/livewire/project/application/heading.blade.php

@@ -27,7 +27,7 @@
             @if (!$application->destination->server->isSwarm())
                 <x-applications.advanced :application="$application" />
             @endif
-            @if ($application->status !== 'exited')
+            @if (!str($application->status)->startsWith('exited'))
                 @if (!$application->destination->server->isSwarm())
                     <button title="With rolling update if possible" wire:click='deploy'
                         class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">

resources/views/livewire/project/database/configuration.blade.php

@@ -21,10 +21,10 @@
                 @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
                 href="#">Environment
                 Variables</a>
-            <a :class="activeTab === 'server' && 'text-white'"
-                @click.prevent="activeTab = 'server';
-                window.location.hash = 'server'"
-                href="#">Server
+            <a :class="activeTab === 'servers' && 'text-white'"
+                @click.prevent="activeTab = 'servers';
+                window.location.hash = 'servers'"
+                href="#">Servers
             </a>
             <a :class="activeTab === 'storages' && 'text-white'"
                 @click.prevent="activeTab = 'storages';
@@ -74,7 +74,7 @@
             <div x-cloak x-show="activeTab === 'environment-variables'">
                 <livewire:project.shared.environment-variable.all :resource="$database" />
             </div>
-            <div x-cloak x-show="activeTab === 'server'">
+            <div x-cloak x-show="activeTab === 'servers'">
                 <livewire:project.shared.destination :resource="$database" />
             </div>
             <div x-cloak x-show="activeTab === 'storages'">

resources/views/livewire/project/resource/index.blade.php

@@ -61,7 +61,10 @@
                             <template x-if="item.status.startsWith('exited')">
                                 <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
                             </template>
-                            <template x-if="item.status.startsWith('restarting')">
+                            <template x-if="item.status.startsWith('restarting')" >
+                                <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('degraded')">
                                 <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
                             </template>
                         </a>

resources/views/livewire/project/shared/destination.blade.php

@@ -1,48 +1,66 @@
 <div>
-    <h2>Server</h2>
+    <h2>Servers</h2>
     <div class="">Server related configurations.</div>
-    <div class="grid grid-cols-2 gap-4 py-4">
-        {{-- <a class="box"
-            href="{{ route('server.show', ['server_uuid' => data_get($resource, 'destination.server.uuid')]) }}">On
-            server <span class="px-1 text-warning">{{ data_get($resource, 'destination.server.name') }}</span>
-            in <span class="px-1 text-warning"> {{ data_get($resource, 'destination.network') }} </span> network</a>
-        @if (count($additional_destinations) > 0)
-            @foreach ($additional_destinations as $destination)
-                <a class="box"
-                    href="{{ route('server.show', ['server_uuid' => data_get($destination, 'server.uuid')]) }}">On server
-                    <span class="px-1 text-warning">{{ data_get($destination, 'server.name') }}</span> in <span
-                        class="px-1 text-warning"> {{ data_get($destination, 'network') }} </span> network</a>
-            @endforeach
-        @endif --}}
-        <div class="box"
-            wire:click="removeServer('{{ data_get($resource, 'destination.id') }}','{{ data_get($resource, 'destination.server.id') }}')">
-            On
-            server <span class="px-1 text-warning">{{ data_get($resource, 'destination.server.name') }}</span>
-            in <span class="px-1 text-warning"> {{ data_get($resource, 'destination.network') }} </span> network</div>
-        @if (count($resource->additional_networks) > 0)
+    <div class="grid grid-cols-1 gap-4 py-4">
+        <div class="flex gap-2">
+            <div class="relative box w-96">
+                @if (str($resource->realStatus())->startsWith('running'))
+                    <div title="{{ $resource->realStatus() }}" class="absolute bg-success -top-1 -left-1 badge badge-xs">
+                    </div>
+                @elseif (str($resource->realStatus())->startsWith('exited'))
+                    <div title="{{ $resource->realStatus() }}" class="absolute bg-error -top-1 -left-1 badge badge-xs">
+                    </div>
+                @endif
+                <div>
+                    {{ data_get($resource, 'destination.server.name') }}/{{ data_get($resource, 'destination.network') }}
+                </div>
+            </div>
+            @if ($resource?->additional_networks?->count() > 0)
+                <x-forms.button
+                    wire:click="redeploy('{{ data_get($resource, 'destination.id') }}','{{ data_get($resource, 'destination.server.id') }}')">Redeploy</x-forms.button>
+            @endif
+        </div>
+        @if ($resource?->additional_networks?->count() > 0)
             @foreach ($resource->additional_networks as $destination)
-                <div class="box"
-                    wire:click="removeServer('{{ data_get($destination, 'id') }}','{{ data_get($destination, 'server.id') }}')">
-                    On
-                    server
-                    <span class="px-1 text-warning">{{ data_get($destination, 'server.name') }}</span> in <span
-                        class="px-1 text-warning"> {{ data_get($destination, 'network') }} </span> network
+                <div class="flex gap-2">
+                    <div class="relative box w-96">
+                        @if (str(data_get($destination, 'pivot.status'))->startsWith('running'))
+                            <div title="{{ data_get($destination, 'pivot.status') }}"
+                                class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                        @elseif (str(data_get($destination, 'pivot.status'))->startsWith('exited'))
+                            <div title="{{ data_get($destination, 'pivot.status') }}"
+                                class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                        @endif
+                        <div>
+                            {{ data_get($destination, 'server.name') }}/{{ data_get($destination, 'network') }}
+                        </div>
+                    </div>
+                    <x-forms.button
+                        wire:click="redeploy('{{ data_get($destination, 'id') }}','{{ data_get($destination, 'server.id') }}')">Redeploy</x-forms.button>
+                    <x-new-modal
+                        action="removeServer({{ data_get($destination, 'id') }},{{ data_get($destination, 'server.id') }})"
+                        isErrorButton buttonTitle="Remove Server">
+                        This will stop the running application in this server and remove it as a deployment
+                        destination.<br><br>Please think again.
+                    </x-new-modal>
                 </div>
             @endforeach
         @endif
     </div>
-    <h4>Attach to a Server</h4>
-    @if (count($networks) > 0)
-        <div class="grid grid-cols-2 gap-4">
-            @foreach ($networks as $network)
-                <div wire:click="addServer('{{ $network->id }}','{{ data_get($network, 'server.id') }}')"
-                    class="box">
-                    {{ data_get($network, 'server.name') }}
-                    {{ $network->name }}
-                </div>
-            @endforeach
-        </div>
-    @else
-        <div class="text-neutral-500">No additional servers available to attach.</div>
+    @if ($resource->getMorphClass() === 'App\Models\Application')
+        @if (count($networks) > 0)
+            <h4 class="pb-4">Choose another server</h4>
+            <div class="grid grid-cols-1 gap-4 ">
+                @foreach ($networks as $network)
+                    <div wire:click="addServer('{{ $network->id }}','{{ data_get($network, 'server.id') }}')"
+                        class="box w-96">
+                        {{ data_get($network, 'server.name') }}
+                        {{ $network->name }}
+                    </div>
+                @endforeach
+            </div>
+        @else
+            <div class="text-neutral-500">No additional servers available to attach.</div>
+        @endif
     @endif
 </div>