From 0cd3a3d8488f416f9ad640bce8fec2232407b202 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 3 Nov 2023 10:57:58 +0100 Subject: [PATCH] fix: increase polling time for services fix: allow domain as ip address --- app/Http/Livewire/Boarding/Index.php | 2 +- app/Http/Livewire/Destination/Form.php | 2 +- app/Http/Livewire/Project/Service/Index.php | 2 +- app/Http/Livewire/Project/Service/Navbar.php | 4 ---- app/Http/Livewire/Server/Form.php | 4 ++-- app/Http/Livewire/Server/New/ByIp.php | 4 ++-- resources/views/livewire/project/service/index.blade.php | 2 +- resources/views/livewire/project/service/navbar.blade.php | 2 +- resources/views/livewire/server/form.blade.php | 2 +- resources/views/livewire/server/new/by-ip.blade.php | 4 ++-- 10 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app/Http/Livewire/Boarding/Index.php b/app/Http/Livewire/Boarding/Index.php index 1b9093be6..1d57f9b0a 100644 --- a/app/Http/Livewire/Boarding/Index.php +++ b/app/Http/Livewire/Boarding/Index.php @@ -164,7 +164,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA== { $this->validate([ 'remoteServerName' => 'required', - 'remoteServerHost' => 'required|ip', + 'remoteServerHost' => 'required', 'remoteServerPort' => 'required|integer', 'remoteServerUser' => 'required', ]); diff --git a/app/Http/Livewire/Destination/Form.php b/app/Http/Livewire/Destination/Form.php index fbce335e7..4f1bbc693 100644 --- a/app/Http/Livewire/Destination/Form.php +++ b/app/Http/Livewire/Destination/Form.php @@ -16,7 +16,7 @@ class Form extends Component protected $validationAttributes = [ 'destination.name' => 'name', 'destination.network' => 'network', - 'destination.server.ip' => 'IP Address', + 'destination.server.ip' => 'IP Address/Domain', ]; public function submit() diff --git a/app/Http/Livewire/Project/Service/Index.php b/app/Http/Livewire/Project/Service/Index.php index fba473250..2cc0d6404 100644 --- a/app/Http/Livewire/Project/Service/Index.php +++ b/app/Http/Livewire/Project/Service/Index.php @@ -13,7 +13,7 @@ class Index extends Component public $databases; public array $parameters; public array $query; - protected $listeners = ["refreshStacks","checkStatus"]; + protected $listeners = ["refreshStacks"]; public function render() { return view('livewire.project.service.index'); diff --git a/app/Http/Livewire/Project/Service/Navbar.php b/app/Http/Livewire/Project/Service/Navbar.php index b8e604ad4..8c17c3307 100644 --- a/app/Http/Livewire/Project/Service/Navbar.php +++ b/app/Http/Livewire/Project/Service/Navbar.php @@ -19,10 +19,6 @@ class Navbar extends Component return view('livewire.project.service.navbar'); } - public function checkStatus() - { - $this->emit('checkStatus'); - } public function deploy() { $this->service->parse(); diff --git a/app/Http/Livewire/Server/Form.php b/app/Http/Livewire/Server/Form.php index 816514aeb..e71db0093 100644 --- a/app/Http/Livewire/Server/Form.php +++ b/app/Http/Livewire/Server/Form.php @@ -32,7 +32,7 @@ class Form extends Component protected $validationAttributes = [ 'server.name' => 'Name', 'server.description' => 'Description', - 'server.ip' => 'IP address', + 'server.ip' => 'IP address/Domain', 'server.user' => 'User', 'server.port' => 'Port', 'server.settings.is_cloudflare_tunnel' => 'Cloudflare Tunnel', @@ -125,7 +125,7 @@ class Form extends Component if(isCloud() && !isDev()) { $this->validate(); $this->validate([ - 'server.ip' => 'required|ip', + 'server.ip' => 'required', ]); } else { $this->validate(); diff --git a/app/Http/Livewire/Server/New/ByIp.php b/app/Http/Livewire/Server/New/ByIp.php index ec4827af7..66750db28 100644 --- a/app/Http/Livewire/Server/New/ByIp.php +++ b/app/Http/Livewire/Server/New/ByIp.php @@ -26,14 +26,14 @@ class ByIp extends Component protected $rules = [ 'name' => 'required|string', 'description' => 'nullable|string', - 'ip' => 'required|ip', + 'ip' => 'required', 'user' => 'required|string', 'port' => 'required|integer', ]; protected $validationAttributes = [ 'name' => 'Name', 'description' => 'Description', - 'ip' => 'IP Address', + 'ip' => 'IP Address/Domain', 'user' => 'User', 'port' => 'Port', ]; diff --git a/resources/views/livewire/project/service/index.blade.php b/resources/views/livewire/project/service/index.blade.php index 933c89ecd..ba2bd8877 100644 --- a/resources/views/livewire/project/service/index.blade.php +++ b/resources/views/livewire/project/service/index.blade.php @@ -1,4 +1,4 @@ -
+
diff --git a/resources/views/livewire/project/service/navbar.blade.php b/resources/views/livewire/project/service/navbar.blade.php index d662f026a..781ff6c7a 100644 --- a/resources/views/livewire/project/service/navbar.blade.php +++ b/resources/views/livewire/project/service/navbar.blade.php @@ -1,4 +1,4 @@ -
+

Configuration

diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php index 462d07857..6f5d0d32b 100644 --- a/resources/views/livewire/server/form.blade.php +++ b/resources/views/livewire/server/form.blade.php @@ -47,7 +47,7 @@ label="Is it part of a Swarm cluster?" /> --}}
- +
diff --git a/resources/views/livewire/server/new/by-ip.blade.php b/resources/views/livewire/server/new/by-ip.blade.php index 0a80b14a4..7dfb3a5b0 100644 --- a/resources/views/livewire/server/new/by-ip.blade.php +++ b/resources/views/livewire/server/new/by-ip.blade.php @@ -10,8 +10,8 @@
- +