An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
Merge remote-tracking branch 'origin/next' into feature/vultr-cloud-provider
Andras Bacsaid74206f4a9f6
diff --cc resources/views/components/server/sidebar.blade.phpindex 3c53914290,b89ba66c5d..34738c8399--- a/resources/views/components/server/sidebar.blade.php+++ b/resources/views/components/server/sidebar.blade.php@@@ -1,46 -1,201 +1,201 @@@- <div class="sub-menu-wrapper">- <a class="sub-menu-item {{ $activeMenu === 'general' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.show', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">General</span></a>- @if ($server->isFunctional())- <a class="sub-menu-item {{ $activeMenu === 'advanced' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.advanced', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Advanced</span>- </a>- @endif- <a class="sub-menu-item {{ $activeMenu === 'private-key' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.private-key', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Private Key</span>- </a>- @if ($server->hetzner_server_id || $server->vultr_instance_id)- <a class="sub-menu-item {{ $activeMenu === 'cloud-provider-token' ? 'menu-item-active' : '' }}"- {{ wireNavigate() }}- href="{{ route('server.cloud-provider-token', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Cloud Token</span>- </a>- @endif- <a class="sub-menu-item {{ $activeMenu === 'ca-certificate' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.ca-certificate', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">CA Certificate</span>- </a>- @if (!$server->isLocalhost())- <a class="sub-menu-item {{ $activeMenu === 'cloudflare-tunnel' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.cloudflare-tunnel', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Cloudflare Tunnel</span></a>- @endif- @if ($server->isFunctional())- <a class="sub-menu-item {{ $activeMenu === 'docker-cleanup' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.docker-cleanup', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Docker Cleanup</span>- </a>- <a class="sub-menu-item {{ $activeMenu === 'destinations' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.destinations', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Destinations</span>- </a>- <a class="sub-menu-item {{ $activeMenu === 'log-drains' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.log-drains', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Log Drains</span></a>- <a class="sub-menu-item {{ $activeMenu === 'metrics' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.metrics', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Metrics</span></a>- @endif- @if (!$server->isBuildServer() && !$server->settings->is_cloudflare_tunnel)- <a class="sub-menu-item {{ $activeMenu === 'swarm' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.swarm', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Swarm</span>- </a>- @endif- @if (!$server->isLocalhost())- <a class="sub-menu-item {{ $activeMenu === 'danger' ? 'menu-item-active' : '' }}" {{ wireNavigate() }}- href="{{ route('server.delete', ['server_uuid' => $server->uuid]) }}"><span class="menu-item-label">Danger</span></a>- @endif+ @php+ $serverRouteParameters = ['server_uuid' => $server->uuid];+ $serverPageItems = [+ [+ 'label' => 'Configuration',+ 'route' => 'server.show',+ 'active' => request()->routeIs('server.show', 'server.advanced', 'server.private-key', 'server.cloud-provider-token', 'server.ca-certificate', 'server.cloudflare-tunnel', 'server.docker-cleanup', 'server.destinations', 'server.log-drains', 'server.metrics', 'server.swarm', 'server.delete'),+ ],+ [+ 'label' => 'Proxy',+ 'route' => 'server.proxy',+ 'active' => request()->routeIs('server.proxy', 'server.proxy.*'),+ 'visible' => ! $server->isSwarmWorker() && ! $server->settings->is_build_server,+ ],+ [+ 'label' => 'Sentinel',+ 'route' => 'server.sentinel',+ 'active' => request()->routeIs('server.sentinel', 'server.sentinel.*'),+ 'visible' => $server->isFunctional() && ! $server->isSwarm() && ! $server->settings->is_build_server && auth()->user()?->can('viewSentinel', $server),+ ],+ [+ 'label' => 'Resources',+ 'route' => 'server.resources',+ 'active' => request()->routeIs('server.resources'),+ ],+ [+ 'label' => 'Terminal',+ 'route' => 'server.command',+ 'active' => request()->routeIs('server.command'),+ 'navigate' => false,+ 'visible' => auth()->user()?->can('canAccessTerminal'),+ ],+ [+ 'label' => 'Security',+ 'route' => 'server.security.patches',+ 'active' => request()->routeIs('server.security.patches'),+ 'visible' => auth()->user()?->can('update', $server),+ ],+ ];+ $serverMenuItems = [+ [+ 'label' => 'General',+ 'route' => 'server.show',+ 'active' => $activeMenu === 'general',+ ],+ [+ 'label' => 'Advanced',+ 'route' => 'server.advanced',+ 'active' => $activeMenu === 'advanced',+ 'visible' => $server->isFunctional(),+ ],+ [+ 'label' => 'Private Key',+ 'route' => 'server.private-key',+ 'active' => $activeMenu === 'private-key',+ ],+ [- 'label' => 'Hetzner Token',++ 'label' => 'Cloud Token',+ 'route' => 'server.cloud-provider-token',+ 'active' => $activeMenu === 'cloud-provider-token',- 'visible' => (bool) $server->hetzner_server_id,++ 'visible' => (bool) ($server->hetzner_server_id || $server->vultr_instance_id),+ ],+ [+ 'label' => 'CA Certificate',+ 'route' => 'server.ca-certificate',+ 'active' => $activeMenu === 'ca-certificate',+ ],+ [+ 'label' => 'Cloudflare Tunnel',+ 'route' => 'server.cloudflare-tunnel',+ 'active' => $activeMenu === 'cloudflare-tunnel',+ 'visible' => ! $server->isLocalhost(),+ ],+ [+ 'label' => 'Docker Cleanup',+ 'route' => 'server.docker-cleanup',+ 'active' => $activeMenu === 'docker-cleanup',+ 'visible' => $server->isFunctional(),+ ],+ [+ 'label' => 'Destinations',+ 'route' => 'server.destinations',+ 'active' => $activeMenu === 'destinations',+ 'visible' => $server->isFunctional(),+ ],+ [+ 'label' => 'Log Drains',+ 'route' => 'server.log-drains',+ 'active' => $activeMenu === 'log-drains',+ 'visible' => $server->isFunctional(),+ ],+ [+ 'label' => 'Metrics',+ 'route' => 'server.metrics',+ 'active' => $activeMenu === 'metrics',+ 'visible' => $server->isFunctional(),+ ],+ [+ 'label' => 'Swarm',+ 'route' => 'server.swarm',+ 'active' => $activeMenu === 'swarm',+ 'visible' => ! $server->isBuildServer() && ! $server->settings->is_cloudflare_tunnel,+ ],+ [+ 'label' => 'Danger',+ 'route' => 'server.delete',+ 'active' => $activeMenu === 'danger',+ 'visible' => ! $server->isLocalhost(),+ ],+ ];++ $serverPageItems = array_values(array_filter(+ $serverPageItems,+ fn (array $item): bool => $item['visible'] ?? true,+ ));+ $serverMenuItems = array_values(array_filter(+ $serverMenuItems,+ fn (array $item): bool => $item['visible'] ?? true,+ ));+ $activeServerMenuItem = collect($serverMenuItems)->firstWhere('active', true);+ $activeServerPageItem = collect($serverPageItems)->firstWhere('active', true);+ $activeServerMobileItem = $activeServerMenuItem ?? $activeServerPageItem ?? $serverMenuItems[0];+ $activeServerMobileGroup = $activeServerMenuItem ? 'configuration' : 'server';+ $activeServerMobileNavigation = ($activeServerMobileItem['navigate'] ?? true) ? 'navigate' : 'location';+ $activeServerMenuValue = $activeServerMobileNavigation.'|'.$activeServerMobileGroup.'|'.route($activeServerMobileItem['route'], $serverRouteParameters);+ @endphp++ <div class="w-full md:w-auto">+ <div class="mb-4 w-full border-b-2 border-solid border-neutral-200 pb-6 md:hidden dark:border-coolgray-200">+ <label id="server-mobile-section-label" for="server-mobile-section" class="mb-1 block text-xs font-semibold uppercase tracking-wide text-neutral-500 dark:text-neutral-400">Section</label>+ <select id="server-mobile-section" class="select w-full" aria-label="Server menu"+ data-current-value="{{ $activeServerMenuValue }}"+ x-data="{+ init() {+ this.syncFromLocation();+ window.Livewire?.hook?.('morphed', ({ el }) => {+ if (el.contains(this.$el)) {+ queueMicrotask(() => this.syncFromLocation());+ }+ });+ },+ selected: $el.dataset.currentValue,+ current: $el.dataset.currentValue,+ syncFromLocation() {+ const currentUrl = new URL(window.location.href);+ const selectedOption = Array.from(this.$el.options).find((option) => {+ if (!option.value.startsWith('navigate|') && !option.value.startsWith('location|')) {+ return false;+ }++ const optionUrl = new URL(option.value.split('|').slice(2).join('|'), window.location.origin);++ return optionUrl.pathname === currentUrl.pathname;+ });++ if (selectedOption) {+ this.current = selectedOption.value;+ this.selected = selectedOption.value;+ }+ },+ }"+ x-on:livewire:navigated.window="syncFromLocation()"+ x-model="selected"+ x-on:change="+ const value = $event.target.value;++ if (value.startsWith('navigate|')) {+ const url = value.split('|').slice(2).join('|');+ window.Livewire?.navigate ? window.Livewire.navigate(url) : window.location.href = url;+ return;+ }++ if (value.startsWith('location|')) {+ const url = value.split('|').slice(2).join('|');+ window.location.href = url;+ }+ ">+ <optgroup label="Server">+ @foreach ($serverPageItems as $menuItem)+ <option value="{{ ($menuItem['navigate'] ?? true) ? 'navigate' : 'location' }}|server|{{ route($menuItem['route'], $serverRouteParameters) }}">+ {{ $menuItem['label'] }}+ </option>+ @endforeach+ </optgroup>+ <optgroup label="Configuration">+ @foreach ($serverMenuItems as $menuItem)+ <option value="navigate|configuration|{{ route($menuItem['route'], $serverRouteParameters) }}">+ {{ $menuItem['label'] }}+ </option>+ @endforeach+ </optgroup>+ </select>+ </div>++ <div class="sub-menu-wrapper hidden md:flex">+ @foreach ($serverMenuItems as $menuItem)+ <a class="sub-menu-item {{ $menuItem['active'] ? 'menu-item-active' : '' }}" {{ wireNavigate() }}+ href="{{ route($menuItem['route'], $serverRouteParameters) }}"><span class="menu-item-label">{{ $menuItem['label'] }}</span></a>+ @endforeach+ </div></div>diff --cc resources/views/livewire/server/cloud-provider-token/show.blade.phpindex 30edd145ea,23d7cfe4c0..afb589c94f--- a/resources/views/livewire/server/cloud-provider-token/show.blade.php+++ b/resources/views/livewire/server/cloud-provider-token/show.blade.php@@@ -1,17 -1,17 +1,17 @@@<div><x-slot:title>- {{ data_get_str($server, 'name')->limit(10) }} > Hetzner Token | Coolify+ {{ data_get_str($server, 'name')->limit(10) }} > Cloud Token | Coolify</x-slot><livewire:server.navbar :server="$server" />- <div class="flex flex-col h-full gap-8 sm:flex-row">+ <div class="flex flex-col h-full gap-2 md:gap-8 md:flex-row"><x-server.sidebar :server="$server" activeMenu="cloud-provider-token" /><div class="w-full">- @if ($server->hetzner_server_id)+ @if ($server->hetzner_server_id || $server->vultr_instance_id)<div class="flex items-end gap-2">- <h2>Hetzner Token</h2>+ <h2>{{ $providerName }} Token</h2>@can('create', App\Models\CloudProviderToken::class)- <x-modal-input buttonTitle="+ Add" title="Add Hetzner Token">- <livewire:security.cloud-provider-token-form :modal_mode="true" provider="hetzner" />+ <x-modal-input buttonTitle="+ Add" title="Add {{ $providerName }} Token">+ <livewire:security.cloud-provider-token-form :modal_mode="true" :provider="$provider" /></x-modal-input>@endcan<x-forms.button canGate="update" :canResource="$server" isHighlighted