Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

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

Browse Source
This commit is contained in:
Joao Patricio 2023-05-03 09:33:01 +01:00
commit cc51b1d394
6 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Livewire/Server/Form.php
View File

@ -54,6 +54,11 @@ class Form extends Component
} catch (\Exception $e) { } catch (\Exception $e) {
} }
} }
public function delete()
{
$this->server->delete();
redirect()->route('dashboard');
}
public function submit() public function submit()
{ {
$this->validate(); $this->validate();

4
app/Http/Livewire/Server/New/ByIp.php
View File

@ -45,6 +45,10 @@ class ByIp extends Component
} }
public function submit() public function submit()
{ {
if (!$this->private_key_id) {
$this->addError('private_key_id', 'The private key field is required.');
return;
}
$server = Server::create([ $server = Server::create([
'name' => $this->name, 'name' => $this->name,
'description' => $this->description, 'description' => $this->description,

6
app/Providers/AppServiceProvider.php
View File

@ -16,9 +16,9 @@ class AppServiceProvider extends ServiceProvider
*/ */
public function register(): void public function register(): void
{ {
if (config('app.env') === 'production' && Str::contains(config('coolify.version'), ['nightly'])) { // if (config('app.env') === 'production' && Str::contains(config('coolify.version'), ['nightly'])) {
Process::run('php artisan migrate:fresh --force --seed --seeder=ProductionSeeder'); // Process::run('php artisan migrate:fresh --force --seed --seeder=ProductionSeeder');
} // }
} }
/** /**

1
app/View/Components/FormInput.php
View File

@ -19,6 +19,7 @@ class FormInput extends Component
public string|null $type = 'text', public string|null $type = 'text',
public bool $instantSave = false, public bool $instantSave = false,
public bool $disabled = false, public bool $disabled = false,
public bool $hidden = false
) { ) {
} }

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

@ -11,7 +11,7 @@
<x-form-input id="server.user" label="User" readonly /> <x-form-input id="server.user" label="User" readonly />
<x-form-input type="number" id="server.port" label="Port" readonly /> <x-form-input type="number" id="server.port" label="Port" readonly />
@else @else
<x-form-input id="server.ip" label="IP Address" required /> <x-form-input id="server.ip" label="IP Address" required readonly />
<x-form-input id="server.user" label="User" required /> <x-form-input id="server.user" label="User" required />
<x-form-input type="number" id="server.port" label="Port" required /> <x-form-input type="number" id="server.port" label="Port" required />
@endif @endif
@ -22,6 +22,9 @@
Submit Submit
</button> </button>
<button wire:click.prevent='checkServer'>Check Server</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> --}} {{-- <button wire:click.prevent='installDocker'>Install Docker</button> --}}
</div> </div>
</form> </form>

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

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