fix: increase polling time for services
fix: allow domain as ip address
This commit is contained in:
parent
a0031efce0
commit
0cd3a3d848
@ -164,7 +164,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
|
|||||||
{
|
{
|
||||||
$this->validate([
|
$this->validate([
|
||||||
'remoteServerName' => 'required',
|
'remoteServerName' => 'required',
|
||||||
'remoteServerHost' => 'required|ip',
|
'remoteServerHost' => 'required',
|
||||||
'remoteServerPort' => 'required|integer',
|
'remoteServerPort' => 'required|integer',
|
||||||
'remoteServerUser' => 'required',
|
'remoteServerUser' => 'required',
|
||||||
]);
|
]);
|
||||||
|
@ -16,7 +16,7 @@ class Form extends Component
|
|||||||
protected $validationAttributes = [
|
protected $validationAttributes = [
|
||||||
'destination.name' => 'name',
|
'destination.name' => 'name',
|
||||||
'destination.network' => 'network',
|
'destination.network' => 'network',
|
||||||
'destination.server.ip' => 'IP Address',
|
'destination.server.ip' => 'IP Address/Domain',
|
||||||
];
|
];
|
||||||
|
|
||||||
public function submit()
|
public function submit()
|
||||||
|
@ -13,7 +13,7 @@ class Index extends Component
|
|||||||
public $databases;
|
public $databases;
|
||||||
public array $parameters;
|
public array $parameters;
|
||||||
public array $query;
|
public array $query;
|
||||||
protected $listeners = ["refreshStacks","checkStatus"];
|
protected $listeners = ["refreshStacks"];
|
||||||
public function render()
|
public function render()
|
||||||
{
|
{
|
||||||
return view('livewire.project.service.index');
|
return view('livewire.project.service.index');
|
||||||
|
@ -19,10 +19,6 @@ class Navbar extends Component
|
|||||||
return view('livewire.project.service.navbar');
|
return view('livewire.project.service.navbar');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function checkStatus()
|
|
||||||
{
|
|
||||||
$this->emit('checkStatus');
|
|
||||||
}
|
|
||||||
public function deploy()
|
public function deploy()
|
||||||
{
|
{
|
||||||
$this->service->parse();
|
$this->service->parse();
|
||||||
|
@ -32,7 +32,7 @@ class Form extends Component
|
|||||||
protected $validationAttributes = [
|
protected $validationAttributes = [
|
||||||
'server.name' => 'Name',
|
'server.name' => 'Name',
|
||||||
'server.description' => 'Description',
|
'server.description' => 'Description',
|
||||||
'server.ip' => 'IP address',
|
'server.ip' => 'IP address/Domain',
|
||||||
'server.user' => 'User',
|
'server.user' => 'User',
|
||||||
'server.port' => 'Port',
|
'server.port' => 'Port',
|
||||||
'server.settings.is_cloudflare_tunnel' => 'Cloudflare Tunnel',
|
'server.settings.is_cloudflare_tunnel' => 'Cloudflare Tunnel',
|
||||||
@ -125,7 +125,7 @@ class Form extends Component
|
|||||||
if(isCloud() && !isDev()) {
|
if(isCloud() && !isDev()) {
|
||||||
$this->validate();
|
$this->validate();
|
||||||
$this->validate([
|
$this->validate([
|
||||||
'server.ip' => 'required|ip',
|
'server.ip' => 'required',
|
||||||
]);
|
]);
|
||||||
} else {
|
} else {
|
||||||
$this->validate();
|
$this->validate();
|
||||||
|
@ -26,14 +26,14 @@ class ByIp extends Component
|
|||||||
protected $rules = [
|
protected $rules = [
|
||||||
'name' => 'required|string',
|
'name' => 'required|string',
|
||||||
'description' => 'nullable|string',
|
'description' => 'nullable|string',
|
||||||
'ip' => 'required|ip',
|
'ip' => 'required',
|
||||||
'user' => 'required|string',
|
'user' => 'required|string',
|
||||||
'port' => 'required|integer',
|
'port' => 'required|integer',
|
||||||
];
|
];
|
||||||
protected $validationAttributes = [
|
protected $validationAttributes = [
|
||||||
'name' => 'Name',
|
'name' => 'Name',
|
||||||
'description' => 'Description',
|
'description' => 'Description',
|
||||||
'ip' => 'IP Address',
|
'ip' => 'IP Address/Domain',
|
||||||
'user' => 'User',
|
'user' => 'User',
|
||||||
'port' => 'Port',
|
'port' => 'Port',
|
||||||
];
|
];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
<div x-data="{ raw: true, activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" wire:poll.15000ms="checkStatus">
|
<div x-data="{ raw: true, activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" x-init="$wire.checkStatus" wire:poll.10000ms="checkStatus">
|
||||||
<livewire:project.service.navbar :service="$service" :parameters="$parameters" :query="$query" />
|
<livewire:project.service.navbar :service="$service" :parameters="$parameters" :query="$query" />
|
||||||
<livewire:project.service.compose-modal :raw="$service->docker_compose_raw" :actual="$service->docker_compose" />
|
<livewire:project.service.compose-modal :raw="$service->docker_compose_raw" :actual="$service->docker_compose" />
|
||||||
<div class="flex h-full pt-6">
|
<div class="flex h-full pt-6">
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
<div x-init="$wire.checkStatus" wire:poll.2500ms='checkStatus'>
|
<div>
|
||||||
<livewire:project.service.modal />
|
<livewire:project.service.modal />
|
||||||
<h1>Configuration</h1>
|
<h1>Configuration</h1>
|
||||||
<x-resources.breadcrumbs :resource="$service" :parameters="$parameters" />
|
<x-resources.breadcrumbs :resource="$service" :parameters="$parameters" />
|
||||||
|
@ -47,7 +47,7 @@
|
|||||||
label="Is it part of a Swarm cluster?" /> --}}
|
label="Is it part of a Swarm cluster?" /> --}}
|
||||||
</div>
|
</div>
|
||||||
<div class="flex flex-col w-full gap-2 lg:flex-row">
|
<div class="flex flex-col w-full gap-2 lg:flex-row">
|
||||||
<x-forms.input id="server.ip" label="IP Address" required />
|
<x-forms.input id="server.ip" label="IP Address/Domain" helper="An IP Address (127.0.0.1) or domain (example.com)." required />
|
||||||
<div class="flex gap-2">
|
<div class="flex gap-2">
|
||||||
<x-forms.input id="server.user" label="User" required />
|
<x-forms.input id="server.user" label="User" required />
|
||||||
<x-forms.input type="number" id="server.port" label="Port" required />
|
<x-forms.input type="number" id="server.port" label="Port" required />
|
||||||
|
@ -10,8 +10,8 @@
|
|||||||
<x-forms.input id="description" label="Description" />
|
<x-forms.input id="description" label="Description" />
|
||||||
</div>
|
</div>
|
||||||
<div class="flex gap-2">
|
<div class="flex gap-2">
|
||||||
<x-forms.input id="ip" label="IP Address" required
|
<x-forms.input id="ip" label="IP Address/Domain" required
|
||||||
helper="An IP Address (127.0.0.1). No domain names." />
|
helper="An IP Address (127.0.0.1) or domain (example.com)." />
|
||||||
<x-forms.input id="user" label ="User" required />
|
<x-forms.input id="user" label ="User" required />
|
||||||
<x-forms.input type="number" id="port" label="Port" required />
|
<x-forms.input type="number" id="port" label="Port" required />
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user