mirror of
https://github.com/tiennm99/coolify.git
synced 2026-10-14 16:17:10 +00:00
Merge remote-tracking branch 'origin/next' into v5-parallel-inertia-react
This commit is contained in:
commit
df854feee8
21 files changed
+1073
-116
No files matched your search
@@ -15,7 +15,10 @@
|
||||
<div class="flex flex-col gap-1.5">
|
||||
<div class="flex flex-wrap items-center gap-2">
|
||||
<h1>Server</h1>
|
||||
@if ($server->proxySet() || $server->isSentinelEnabled())
|
||||
@php
|
||||
$showSentinelStatus = $server->isFunctional() && $server->isSentinelEnabled();
|
||||
@endphp
|
||||
@if ($server->proxySet() || $showSentinelStatus)
|
||||
<div data-testid="server-status-summary" class="flex flex-wrap items-center gap-2">
|
||||
@if ($server->proxySet())
|
||||
<div class="flex items-center gap-1">
|
||||
@@ -38,7 +41,7 @@
|
||||
type="warning" />
|
||||
</div>
|
||||
@endif
|
||||
@if ($server->isSentinelEnabled())
|
||||
@if ($showSentinelStatus)
|
||||
@if ($server->isSentinelLive())
|
||||
<x-status-badge label="Sentinel" status="In sync" type="success" />
|
||||
@else
|
||||
|
||||
@@ -120,6 +120,19 @@
|
||||
@else
|
||||
You can't use this server until it is validated.
|
||||
@endif
|
||||
@if ($this->limaStartCommand)
|
||||
<div
|
||||
class="mt-4 rounded border border-coolgray-200 bg-coolgray-100 p-3 text-sm dark:border-coolgray-300 dark:bg-coolgray-100">
|
||||
<div class="font-semibold">Start this Lima VM locally</div>
|
||||
<div class="mt-1 dark:text-neutral-400">
|
||||
Run this from the Coolify repository root before validating this server:
|
||||
</div>
|
||||
<code
|
||||
class="mt-2 block overflow-x-auto rounded bg-black px-3 py-2 font-mono text-xs text-white">
|
||||
{{ $this->limaStartCommand }}
|
||||
</code>
|
||||
</div>
|
||||
@endif
|
||||
@if ($isValidating)
|
||||
<div x-data="{ slideOverOpen: true }">
|
||||
<x-slide-over closeWithX fullScreen>
|
||||
|
||||
Reference in new issue
Block a user