Merge branch 'v4-next' into patricio-deploy-proxy

This commit is contained in:
Andras Bacsai
2023-05-03 20:53:51 +02:00
45 changed files with 431 additions and 248 deletions

View File

@@ -2,30 +2,27 @@
<form wire:submit.prevent='submit' class="flex flex-col">
<div class="flex flex-col gap-2 xl:flex-row">
<div class="flex flex-col w-96">
<x-form-input id="server.name" label="Name" required />
<x-form-input id="server.description" label="Description" />
<x-inputs.input id="server.name" label="Name" required />
<x-inputs.input id="server.description" label="Description" />
</div>
<div class="flex flex-col w-96">
@if ($server->id === 0)
<x-form-input id="server.ip" label="IP Address" readonly />
<x-form-input id="server.user" label="User" readonly />
<x-form-input type="number" id="server.port" label="Port" readonly />
<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 />
@else
<x-form-input id="server.ip" label="IP Address" required readonly />
<x-form-input id="server.user" label="User" required />
<x-form-input type="number" id="server.port" label="Port" required />
<x-inputs.input id="server.ip" label="IP Address" required readonly />
<x-inputs.input id="server.user" label="User" required />
<x-inputs.input type="number" id="server.port" label="Port" required />
@endif
</div>
</div>
<div>
<button class="w-16 mt-4" type="submit">
Submit
</button>
<button wire:click.prevent='checkServer'>Check Server</button>
<button class="bg-red-500" @confirm.window="$wire.delete()"
x-on:click="toggleConfirmModal('Are you sure you would like to delete this application?')">
Delete</button>
{{-- <button wire:click.prevent='installDocker'>Install Docker</button> --}}
<x-inputs.button type="submit">Submit</x-inputs.button>
<x-inputs.button wire:click.prevent='checkServer'>Check Server</x-inputs.button>
<x-inputs.button class="bg-red-500" confirm="Are you sure you would like to delete this application?"
confirmAction="delete">Delete
</x-inputs.button>
</div>
</form>
@isset($uptime)

View File

@@ -1,33 +1,31 @@
<div>
<form class="flex flex-col" wire:submit.prevent='submit'>
<x-form-input id="name" label="Name" required />
<x-form-input id="description" label="Description" />
<x-form-input id="ip" label="IP Address" required />
<x-form-input id="user" label="User" />
<x-form-input type="number" id="port" label="Port" />
<x-form-input id="private_key_id" label="Private Key" required hidden />
<button class="mt-4" type="submit">
<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-inputs.input id="user" label="User" />
<x-inputs.input type="number" id="port" label="Port" />
<x-inputs.input id="private_key_id" label="Private Key" required hidden />
<x-inputs.button class="mt-4" type="submit">
Submit
</button>
</x-inputs.button>
</form>
<div class="flex gap-4">
<div>
<h1>Select a private key</h1>
@foreach ($private_keys as $key)
<button @if ($private_key_id == $key->id) class="bg-green-500" @endif
wire:click.defer="setPrivateKey('{{ $key->id }}')">{{ $key->name }}</button>
@if ($private_key_id == $key->id)
<x-inputs.button class="bg-blue-500" wire:click.defer="setPrivateKey('{{ $key->id }}')">
{{ $key->name }}</x-inputs.button>
@else
<x-inputs.button wire:click.defer="setPrivateKey('{{ $key->id }}')">{{ $key->name }}
</x-inputs.button>
@endif
@endforeach
</div>
<div>
<h2>Add a new One</h2>
<form class="flex flex-col gap-2" wire:submit.prevent='addPrivateKey'>
<x-form-input id="new_private_key_name" label="Name" required />
<x-form-input id="new_private_key_description" label="Longer Description" />
<x-form-input type="textarea" id="new_private_key_value" label="Private Key" required />
<button type="submit">
Submit
</button>
</form>
<livewire:private-key.create />
</div>
</div>
</div>

View File

@@ -0,0 +1,7 @@
<div>
@forelse ($private_keys as $private_key)
<x-inputs.button wire:click='setPrivateKey({{ $private_key->id }})'>{{ $private_key->name }}</x-inputs.button>
@empty
<p>No private keys found</p>
@endforelse
</div>