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

fix

Browse Source
This commit is contained in:
Andras Bacsai
2023-05-25 14:05:44 +02:00
parent ea2a13dff2
commit d2b0823cd0
40 changed files with 284 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
resources/views/livewire/server/form.blade.php
View File

@@ -3,44 +3,44 @@
<form wire:submit.prevent='submit' class="flex flex-col">
<div class="flex gap-2">
<h2>General</h2>
<x-inputs.button type="submit">Save</x-inputs.button>
<x-forms.button type="submit">Save</x-forms.button>
@if ($server_id !== 0)
<x-inputs.button x-on:click.prevent="deleteServer = true">
<x-forms.button x-on:click.prevent="deleteServer = true">
Delete
</x-inputs.button>
</x-forms.button>
@endif
</div>
<div class="flex flex-col gap-2 xl:flex-row">
<div class="flex flex-col w-96">
<x-inputs.input id="server.name" label="Name" required />
<x-inputs.input id="server.description" label="Description" />
{{-- <x-inputs.checkbox disabled type="checkbox" id="server.settings.is_part_of_swarm"
<x-forms.input id="server.name" label="Name" required />
<x-forms.input id="server.description" label="Description" />
{{-- <x-forms.checkbox disabled type="checkbox" id="server.settings.is_part_of_swarm"
label="Is it part of a Swarm cluster?" /> --}}
</div>
<div class="flex flex-col">
@if ($server->id === 0)
<x-inputs.input id="server.ip" label="IP Address" readonly />
<x-inputs.input id="server.user" label="User" readonly />
<x-inputs.input type="number" id="server.port" label="Port" readonly />
<x-forms.input id="server.ip" label="IP Address" readonly />
<x-forms.input id="server.user" label="User" readonly />
<x-forms.input type="number" id="server.port" label="Port" readonly />
@else
<x-inputs.input id="server.ip" label="IP Address" required readonly />
<x-forms.input id="server.ip" label="IP Address" required readonly />
<div class="flex gap-2">
<x-inputs.input id="server.user" label="User" required />
<x-inputs.input type="number" id="server.port" label="Port" required />
<x-forms.input id="server.user" label="User" required />
<x-forms.input type="number" id="server.port" label="Port" required />
</div>
@endif
</div>
</div>
<h3>Quick Actions</h3>
<div class="flex items-center gap-2">
<x-inputs.button wire:click.prevent='validateServer'>
<x-forms.button wire:click.prevent='validateServer'>
@if ($server->settings->is_validated)
Check Connection
@else
Validate Server
@endif
</x-inputs.button>
{{-- <x-inputs.button wire:click.prevent='installDocker'>Install Docker</x-inputs.button> --}}
</x-forms.button>
{{-- <x-forms.button wire:click.prevent='installDocker'>Install Docker</x-forms.button> --}}
</div>
<div class="pt-3 text-sm">
@isset($uptime)
@@ -57,7 +57,7 @@
<div class="flex items-center gap-2 py-4">
<h3>Private Key</h3>
<a href="{{ route('server.private-key', ['server_uuid' => $server->uuid]) }}">
<x-inputs.button>Change</x-inputs.button>
<x-forms.button>Change</x-forms.button>
</a>
</div>
<a href="{{ route('private-key.show', ['private_key_uuid' => data_get($server, 'privateKey.uuid')]) }}">
@@ -66,7 +66,7 @@
<div class="flex items-center gap-2 py-4">
<h3>Destinations</h3>
<a href="{{ route('destination.new', ['server_id' => $server->id]) }}">
<x-inputs.button>Add</x-inputs.button>
<x-forms.button>Add</x-forms.button>
</a>
</div>
<div>

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

@@ -2,18 +2,18 @@
<form class="flex flex-col gap-1" wire:submit.prevent='submit'>
<div class="flex items-center gap-2">
<h1>New Server</h1>
<x-inputs.button type="submit">
<x-forms.button type="submit">
Save
</x-inputs.button>
</x-forms.button>
</div>
<x-inputs.input id="name" label="Name" required />
<x-inputs.input id="description" label="Description" />
<x-inputs.input id="ip" label="IP Address" required
<x-forms.input id="name" label="Name" required />
<x-forms.input id="description" label="Description" />
<x-forms.input id="ip" label="IP Address" required
helper="Could be IP Address (127.0.0.1) or Domain Name (duckduckgo.com)." />
<x-inputs.input id="user" label="User" required />
<x-inputs.input type="number" id="port" label="Port" required />
<x-forms.input id="user" label="User" required />
<x-forms.input type="number" id="port" label="Port" required />
<label>Private Key</label>
<x-inputs.select wire:model.defer="private_key_id">
<x-forms.select wire:model.defer="private_key_id">
<option disabled>Select a private key</option>
@foreach ($private_keys as $key)
@if ($loop->first)
@@ -22,8 +22,8 @@
<option value="{{ $key->id }}">{{ $key->name }}</option>
@endif
@endforeach
</x-inputs.select>
<x-inputs.checkbox instantSave noDirty id="is_part_of_swarm" label="Is it part of a Swarm cluster?" />
</x-forms.select>
<x-forms.checkbox instantSave noDirty id="is_part_of_swarm" label="Is it part of a Swarm cluster?" />
</form>
</div>

18
resources/views/livewire/server/proxy.blade.php
View File

@@ -5,11 +5,11 @@
<div class="flex items-center gap-2 mb-2">
<h2 class="pb-0">Proxy</h2>
@if ($server->extra_attributes->proxy_type)
<x-inputs.button isHighlighted wire:click.prevent="installProxy">
<x-forms.button isHighlighted wire:click.prevent="installProxy">
Start/Reconfigure Proxy
</x-inputs.button>
<x-inputs.button x-on:click.prevent="stopProxy = true">Stop
</x-inputs.button>
</x-forms.button>
<x-forms.button x-on:click.prevent="stopProxy = true">Stop
</x-forms.button>
<div wire:poll.5000ms="proxyStatus">
@if (
$server->extra_attributes->last_applied_proxy_settings &&
@@ -46,13 +46,13 @@
<form wire:submit.prevent='saveConfiguration'>
<div class="flex items-center gap-2">
<h3>Configuration</h3>
<x-inputs.button type="submit">Save</x-inputs.button>
<x-inputs.button wire:click.prevent="resetProxy">
<x-forms.button type="submit">Save</x-forms.button>
<x-forms.button wire:click.prevent="resetProxy">
Reset Configuration
</x-inputs.button>
</x-forms.button>
</div>
<h4>traefik.conf</h4>
<x-inputs.textarea class="text-xs" noDirty name="proxy_settings"
<x-forms.textarea class="text-xs" noDirty name="proxy_settings"
wire:model.defer="proxy_settings" rows="30" />
</form>
@endif
@@ -64,7 +64,7 @@
{{ \App\Enums\ProxyTypes::TRAEFIK_V2 }}
</option>
</select>
<x-inputs.button wire:click="setProxy">Set Proxy</x-inputs.button>
<x-forms.button wire:click="setProxy">Set Proxy</x-forms.button>
@endif
@else
<p>Server is not validated. Validate first.</p>