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
feat(server): add dedicated server creation flow
Andras Bacsai7236cb82287f
diff --git a/app/Livewire/GlobalSearch.php b/app/Livewire/GlobalSearch.phpindex 4d9b1af350..bf64ee8e9d 100644--- a/app/Livewire/GlobalSearch.php+++ b/app/Livewire/GlobalSearch.php@@ -1134,6 +1134,12 @@ class GlobalSearch extends Componentpublic function navigateToResource($type){+ if ($type === 'server') {+ $this->dispatch('closeSearchModal');++ return redirectRoute($this, 'server.create');+ }+// Find the item by type - check regular items first, then services$item = collect($this->creatableItems)->firstWhere('type', $type);diff --git a/app/Livewire/Server/Create.php b/app/Livewire/Server/Create.phpindex 5fd2ea4f7d..7edfcaf72b 100644--- a/app/Livewire/Server/Create.php+++ b/app/Livewire/Server/Create.php@@ -11,12 +11,21 @@ class Create extends Component{public $private_keys = [];+ public ?string $selectedType = null;++ public ?string $selectedTokenUuid = null;+public bool $limit_reached = false;public bool $has_hetzner_tokens = false;- public function mount()+ public function mount(?string $selectedType = null, ?string $selectedTokenUuid = null): void{+ $this->selectedType = in_array($selectedType, ['hetzner', 'vultr', 'digital-ocean', 'manual'], true)+ ? $selectedType+ : null;+ $this->selectedTokenUuid = $this->selectedType && $this->selectedType !== 'manual' ? $selectedTokenUuid : null;+$this->private_keys = PrivateKey::ownedByCurrentTeamCached();if (! isCloud()) {$this->limit_reached = false;diff --git a/app/Livewire/Server/CreatePage.php b/app/Livewire/Server/CreatePage.phpnew file mode 100644index 0000000000..158f28351b--- /dev/null+++ b/app/Livewire/Server/CreatePage.php@@ -0,0 +1,55 @@+<?php++namespace App\Livewire\Server;++use App\Models\CloudProviderToken;+use Illuminate\Contracts\View\View;+use Livewire\Component;++class CreatePage extends Component+{+ public ?string $type = null;++ public ?string $token_uuid = null;++ public string $title = 'New Server';++ public ?string $tokenProvider = null;++ public ?string $tokenProviderName = null;++ public bool $hasProviderTokens = false;++ public function mount(?string $type = null, ?string $token_uuid = null): void+ {+ $this->type = $type;+ $this->token_uuid = $token_uuid;+ $this->tokenProvider = match ($type) {+ 'hetzner' => 'hetzner',+ 'vultr' => 'vultr',+ 'digital-ocean' => 'digitalocean',+ default => null,+ };+ $this->tokenProviderName = match ($type) {+ 'hetzner' => 'Hetzner',+ 'vultr' => 'Vultr',+ 'digital-ocean' => 'DigitalOcean',+ default => null,+ };+ $this->hasProviderTokens = $this->tokenProvider+ ? CloudProviderToken::ownedByCurrentTeam()->where('provider', $this->tokenProvider)->exists()+ : false;+ $this->title = match ($type) {+ 'hetzner' => 'Hetzner',+ 'vultr' => 'Vultr',+ 'digital-ocean' => 'DigitalOcean',+ 'manual' => 'Manual',+ default => 'New Server',+ };+ }++ public function render(): View+ {+ return view('livewire.server.create-page');+ }+}diff --git a/app/Livewire/Server/New/ByDigitalOcean.php b/app/Livewire/Server/New/ByDigitalOcean.phpindex 6abb6759ff..c131e096ac 100644--- a/app/Livewire/Server/New/ByDigitalOcean.php+++ b/app/Livewire/Server/New/ByDigitalOcean.php@@ -33,6 +33,8 @@ class ByDigitalOcean extends Componentpublic ?int $selected_token_id = null;+ public ?string $selectedTokenUuid = null;+public array $regions = [];public array $images = [];@@ -74,11 +76,12 @@ class ByDigitalOcean extends Componentpublic bool $from_onboarding = false;- public function mount()+ public function mount(?string $selectedTokenUuid = null){try {$this->authorize('viewAny', CloudProviderToken::class);$this->loadTokens();+ $this->selectTokenFromUrl($selectedTokenUuid);$this->loadSavedCloudInitScripts();$this->server_name = generate_random_name();$this->private_keys = PrivateKey::ownedAndOnlySShKeys()->where('id', '!=', 0)->get();@@ -86,6 +89,11 @@ class ByDigitalOcean extends Componentif ($this->private_keys->count() > 0) {$this->private_key_id = $this->private_keys->first()->id;}++ if ($this->selectedTokenUuid) {+ $this->current_step = 2;+ $this->loading_data = true;+ }} catch (\Throwable $e) {return handleError($e, $this);}@@ -174,9 +182,27 @@ class ByDigitalOcean extends Component];}- public function selectToken(int $tokenId): void+ public function selectToken(int $tokenId): mixed{$this->selected_token_id = $tokenId;++ return $this->nextStep();+ }++ private function selectTokenFromUrl(?string $selectedTokenUuid): void+ {+ if (! $selectedTokenUuid) {+ return;+ }++ $token = $this->available_tokens->firstWhere('uuid', $selectedTokenUuid);++ if (! $token) {+ return;+ }++ $this->selectedTokenUuid = $selectedTokenUuid;+ $this->selected_token_id = $token->id;}private function getDigitalOceanToken(): string@@ -197,26 +223,46 @@ class ByDigitalOcean extends Component]);try {- $digitalOceanToken = $this->getDigitalOceanToken();-- if (! $digitalOceanToken) {- return $this->dispatch('error', 'Please select a valid DigitalOcean token.');+ if (! $this->selectedTokenUuid) {+ $token = $this->available_tokens->firstWhere('id', $this->selected_token_id);++ if ($token) {+ return $this->redirectRoute('server.create.token', [+ 'type' => 'digital-ocean',+ 'token_uuid' => $token->uuid,+ ], navigate: true);+ }}- $this->loadDigitalOceanData($digitalOceanToken);$this->current_step = 2;+ $this->loading_data = true;} catch (\Throwable $e) {return handleError($e, $this);}}- public function previousStep(): void+ public function previousStep(): mixed{+ if ($this->selectedTokenUuid) {+ return $this->redirectRoute('server.create.type', ['type' => 'digital-ocean'], navigate: true);+ }+$this->current_step = 1;++ return null;}- private function loadDigitalOceanData(string $token): void+ public function loadDigitalOceanData(): void{+ $token = $this->getDigitalOceanToken();++ if (! $token) {+ $this->loading_data = false;+ $this->dispatch('error', 'Please select a valid DigitalOcean token.');++ return;+ }+$this->loading_data = true;try {diff --git a/app/Livewire/Server/New/ByHetzner.php b/app/Livewire/Server/New/ByHetzner.phpindex e1191d79ba..31cd89dae8 100644--- a/app/Livewire/Server/New/ByHetzner.php+++ b/app/Livewire/Server/New/ByHetzner.php@@ -37,6 +37,8 @@ class ByHetzner extends Component// Step 1: Token selectionpublic ?int $selected_token_id = null;+ public ?string $selectedTokenUuid = null;+// Step 2: Server configurationpublic array $locations = [];@@ -89,11 +91,12 @@ class ByHetzner extends Componentpublic bool $from_onboarding = false;- public function mount()+ public function mount(?string $selectedTokenUuid = null){try {$this->authorize('viewAny', CloudProviderToken::class);$this->loadTokens();+ $this->selectTokenFromUrl($selectedTokenUuid);$this->loadSavedCloudInitScripts();$this->server_name = generate_random_name();$this->private_keys = PrivateKey::ownedAndOnlySShKeys()->where('id', '!=', 0)->get();@@ -101,6 +104,11 @@ class ByHetzner extends Componentif ($this->private_keys->count() > 0) {$this->private_key_id = $this->private_keys->first()->id;}++ if ($this->selectedTokenUuid) {+ $this->current_step = 2;+ $this->loading_data = true;+ }} catch (\Throwable $e) {return handleError($e, $this);}@@ -207,9 +215,27 @@ class ByHetzner extends Component];}- public function selectToken(int $tokenId)+ public function selectToken(int $tokenId): mixed{$this->selected_token_id = $tokenId;++ return $this->nextStep();+ }++ private function selectTokenFromUrl(?string $selectedTokenUuid): void+ {+ if (! $selectedTokenUuid) {+ return;+ }++ $token = $this->available_tokens->firstWhere('uuid', $selectedTokenUuid);++ if (! $token) {+ return;+ }++ $this->selectedTokenUuid = $selectedTokenUuid;+ $this->selected_token_id = $token->id;}private function validateHetznerToken(string $token): bool@@ -244,17 +270,20 @@ class ByHetzner extends Component]);try {- $hetznerToken = $this->getHetznerToken();-- if (! $hetznerToken) {- return $this->dispatch('error', 'Please select a valid Hetzner token.');+ if (! $this->selectedTokenUuid) {+ $token = $this->available_tokens->firstWhere('id', $this->selected_token_id);++ if ($token) {+ return $this->redirectRoute('server.create.token', [+ 'type' => 'hetzner',+ 'token_uuid' => $token->uuid,+ ], navigate: true);+ }}- // Load Hetzner data- $this->loadHetznerData($hetznerToken);-- // Move to step 2+ // Move to step 2; provider data is loaded after initial render via wire:init.$this->current_step = 2;+ $this->loading_data = true;} catch (\Throwable $e) {return handleError($e, $this);}@@ -262,11 +291,24 @@ class ByHetzner extends Componentpublic function previousStep(){+ if ($this->selectedTokenUuid) {+ return $this->redirectRoute('server.create.type', ['type' => 'hetzner'], navigate: true);+ }+$this->current_step = 1;}- private function loadHetznerData(string $token)+ public function loadHetznerData(): void{+ $token = $this->getHetznerToken();++ if (! $token) {+ $this->loading_data = false;+ $this->dispatch('error', 'Please select a valid Hetzner token.');++ return;+ }+$this->loading_data = true;$this->selectedHetznerSshKeyIds = [];$this->selectedHetznerFirewallIds = [];diff --git a/app/Livewire/Server/New/ByVultr.php b/app/Livewire/Server/New/ByVultr.phpindex bc0b936d1d..1246448453 100644--- a/app/Livewire/Server/New/ByVultr.php+++ b/app/Livewire/Server/New/ByVultr.php@@ -33,6 +33,8 @@ class ByVultr extends Componentpublic ?int $selected_token_id = null;+ public ?string $selectedTokenUuid = null;+public array $regions = [];public array $plans = [];@@ -72,10 +74,11 @@ class ByVultr extends Componentpublic bool $from_onboarding = false;- public function mount(): void+ public function mount(?string $selectedTokenUuid = null): void{$this->authorize('viewAny', CloudProviderToken::class);$this->loadTokens();+ $this->selectTokenFromUrl($selectedTokenUuid);$this->loadSavedCloudInitScripts();$this->server_name = generate_random_name();$this->private_keys = PrivateKey::ownedAndOnlySShKeys()->where('id', '!=', 0)->get();@@ -83,6 +86,11 @@ class ByVultr extends Componentif ($this->private_keys->count() > 0) {$this->private_key_id = $this->private_keys->first()->id;}++ if ($this->selectedTokenUuid) {+ $this->current_step = 2;+ $this->loading_data = true;+ }}public function getListeners(): array@@ -165,9 +173,27 @@ class ByVultr extends Component];}- public function selectToken(int $tokenId): void+ public function selectToken(int $tokenId): mixed{$this->selected_token_id = $tokenId;++ return $this->nextStep();+ }++ private function selectTokenFromUrl(?string $selectedTokenUuid): void+ {+ if (! $selectedTokenUuid) {+ return;+ }++ $token = $this->available_tokens->firstWhere('uuid', $selectedTokenUuid);++ if (! $token) {+ return;+ }++ $this->selectedTokenUuid = $selectedTokenUuid;+ $this->selected_token_id = $token->id;}public function nextStep(): mixed@@ -177,14 +203,19 @@ class ByVultr extends Component]);try {- $vultrToken = $this->getVultrToken();-- if (! $vultrToken) {- return $this->dispatch('error', 'Please select a valid Vultr token.');+ if (! $this->selectedTokenUuid) {+ $token = $this->available_tokens->firstWhere('id', $this->selected_token_id);++ if ($token) {+ return $this->redirectRoute('server.create.token', [+ 'type' => 'vultr',+ 'token_uuid' => $token->uuid,+ ], navigate: true);+ }}- $this->loadVultrData($vultrToken);$this->current_step = 2;+ $this->loading_data = true;} catch (\Throwable $e) {return handleError($e, $this);}@@ -192,9 +223,15 @@ class ByVultr extends Componentreturn null;}- public function previousStep(): void+ public function previousStep(): mixed{+ if ($this->selectedTokenUuid) {+ return $this->redirectRoute('server.create.type', ['type' => 'vultr'], navigate: true);+ }+$this->current_step = 1;++ return null;}public function updatedSelectedRegion(): void@@ -251,6 +288,29 @@ class ByVultr extends Componentreturn '$'.number_format((float) $monthlyCost, 2);}+ public function getAdvancedVultrOptionsSummaryProperty(): array+ {+ $summary = [];++ if (count($this->selectedVultrSshKeyIds) > 0) {+ $summary[] = count($this->selectedVultrSshKeyIds).' extra SSH '.str('key')->plural(count($this->selectedVultrSshKeyIds));+ }++ if (! $this->enable_ipv6) {+ $summary[] = 'IPv6 disabled';+ }++ if ($this->disable_public_ipv4) {+ $summary[] = 'Public IPv4 disabled';+ }++ if (! empty($this->cloud_init_script)) {+ $summary[] = 'cloud-init';+ }++ return $summary;+ }+private function getVultrToken(): string{if ($this->selected_token_id) {@@ -262,8 +322,17 @@ class ByVultr extends Componentreturn '';}- private function loadVultrData(string $token): void+ public function loadVultrData(): void{+ $token = $this->getVultrToken();++ if (! $token) {+ $this->loading_data = false;+ $this->dispatch('error', 'Please select a valid Vultr token.');++ return;+ }+$this->loading_data = true;try {diff --git a/resources/css/app.css b/resources/css/app.cssindex de92bf0c90..c354c6c53f 100644--- a/resources/css/app.css+++ b/resources/css/app.css@@ -97,6 +97,90 @@}}+@keyframes coolbox-border-track {+ 0% {+ background-position: 0 0, 100% 0, 100% 100%, 0 100%;+ background-size: 35% 2px, 0 0, 0 0, 0 0;+ }++ 33% {+ background-position: 100% 0, 100% 0, 100% 100%, 0 100%;+ background-size: 35% 2px, 0 0, 0 0, 0 0;+ }++ 34% {+ background-position: 100% 0, 100% 0, 100% 100%, 0 100%;+ background-size: 0 0, 2px 35%, 0 0, 0 0;+ }++ 50% {+ background-position: 100% 0, 100% 100%, 100% 100%, 0 100%;+ background-size: 0 0, 2px 35%, 0 0, 0 0;+ }++ 51% {+ background-position: 0 0, 100% 0, 100% 100%, 0 100%;+ background-size: 0 0, 0 0, 35% 2px, 0 0;+ }++ 84% {+ background-position: 0 0, 100% 0, 0 100%, 0 100%;+ background-size: 0 0, 0 0, 35% 2px, 0 0;+ }++ 85% {+ background-position: 0 0, 100% 0, 100% 100%, 0 100%;+ background-size: 0 0, 0 0, 0 0, 2px 35%;+ }++ 100% {+ background-position: 0 0, 100% 0, 100% 100%, 0 0;+ background-size: 0 0, 0 0, 0 0, 2px 35%;+ }+}++@layer components {+ .coolbox-loading {+ @apply overflow-hidden border-transparent;+ isolation: isolate;+ }++ .coolbox-loading::before {+ content: "";+ position: absolute;+ inset: 0;+ border-radius: inherit;+ background:+ linear-gradient(var(--color-warning), var(--color-warning)),+ linear-gradient(var(--color-warning), var(--color-warning)),+ linear-gradient(var(--color-warning), var(--color-warning)),+ linear-gradient(var(--color-warning), var(--color-warning));+ background-repeat: no-repeat;+ animation: coolbox-border-track 2400ms linear infinite;+ pointer-events: none;+ z-index: 0;+ }++ .coolbox-loading::after {+ content: "";+ position: absolute;+ inset: 2px;+ border-radius: calc(0.25rem - 2px);+ background: white;+ pointer-events: none;+ z-index: 1;+ }++ .dark .coolbox-loading::after {+ background: var(--color-coolgray-100);+ }++ .coolbox-loading > * {+ position: relative;+ z-index: 2;+ }+}+/** Base styles*/diff --git a/resources/views/components/digital-ocean-icon.blade.php b/resources/views/components/digital-ocean-icon.blade.phpindex f3d15c6e23..5652730d6c 100644--- a/resources/views/components/digital-ocean-icon.blade.php+++ b/resources/views/components/digital-ocean-icon.blade.php@@ -1,4 +1,10 @@-<svg {{ $attributes->merge(['class' => 'w-6 h-6 flex-shrink-0']) }} fill="#0080FF" role="img" viewBox="0 0 24 24"+@php+ $iconAttributes = $attributes->has('class')+ ? $attributes->class('shrink-0')+ : $attributes->merge(['class' => 'size-6 shrink-0']);+@endphp++<svg {{ $iconAttributes }} fill="#0080FF" role="img" viewBox="0 0 24 24"xmlns="http://www.w3.org/2000/svg"><title>DigitalOcean</title><pathdiff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.phpindex 19d8196137..1adac94a48 100644--- a/resources/views/livewire/dashboard.blade.php+++ b/resources/views/livewire/dashboard.blade.php@@ -85,19 +85,14 @@<h3>Servers</h3>@can('create', App\Models\Server::class)@if ($servers->count() > 0 && $privateKeys->count() > 0)- <x-modal-input buttonTitle="Add" title="New Server" :closeOutside="false">- <x-slot:content>- <button- class="flex items-center justify-center size-4 text-black dark:text-white rounded hover:bg-coolgray-400 dark:hover:bg-coolgray-300 cursor-pointer">- <svg class="size-3" xmlns="http://www.w3.org/2000/svg" fill="none"- viewBox="0 0 24 24" stroke-width="2" stroke="currentColor">- <path stroke-linecap="round" stroke-linejoin="round"- d="M12 4.5v15m7.5-7.5h-15" />- </svg>- </button>- </x-slot:content>- <livewire:server.create />- </x-modal-input>+ <a href="{{ route('server.create') }}" {{ wireNavigate() }}+ class="flex items-center justify-center size-4 text-black dark:text-white rounded hover:bg-coolgray-400 dark:hover:bg-coolgray-300 cursor-pointer">+ <svg class="size-3" xmlns="http://www.w3.org/2000/svg" fill="none"+ viewBox="0 0 24 24" stroke-width="2" stroke="currentColor">+ <path stroke-linecap="round" stroke-linejoin="round"+ d="M12 4.5v15m7.5-7.5h-15" />+ </svg>+ </a>@endif@endcan</div>@@ -154,9 +149,9 @@<div class='font-bold dark:text-warning'>No servers found.</div>@can('create', App\Models\Server::class)<div class="flex items-center gap-1">- <x-modal-input buttonTitle="Add" title="New Server" :closeOutside="false">- <livewire:server.create />- </x-modal-input> your first server+ <a href="{{ route('server.create') }}" {{ wireNavigate() }}>+ <x-forms.button>Add</x-forms.button>+ </a> your first serverorgo to the <a class="underline dark:text-white"href="{{ route('onboarding') }}"diff --git a/resources/views/livewire/global-search.blade.php b/resources/views/livewire/global-search.blade.phpindex 3169c7fc9f..7493975977 100644--- a/resources/views/livewire/global-search.blade.php+++ b/resources/views/livewire/global-search.blade.php@@ -245,6 +245,10 @@if (value) {// Close search modal firstthis.closeModal();+ if (value === 'server') {+ window.location.href = '/servers/new';+ return;+ }// Open the specific resource modal after a short delaysetTimeout(() => {this.$dispatch('open-create-modal-' + value);@@ -705,9 +709,9 @@</div>@else<div- class="flex-shrink-0 w-10 h-10 rounded-lg bg-warning-100 dark:bg-warning-900/40 flex items-center justify-center">+ class="flex-shrink-0 w-10 h-10 rounded-full bg-warning/20 flex items-center justify-center"><svg xmlns="http://www.w3.org/2000/svg"- class="h-5 w-5 text-warning-600 dark:text-warning-400" fill="none"+ class="h-6 w-6 text-warning" fill="none"viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"d="M12 4v16m8-8H4" />@@ -821,9 +825,9 @@</template><template x-if="!item.logo"><div- class="flex-shrink-0 w-10 h-10 rounded-lg bg-warning-100 dark:bg-warning-900/40 flex items-center justify-center">+ class="flex-shrink-0 w-10 h-10 rounded-full bg-warning/20 flex items-center justify-center"><svg xmlns="http://www.w3.org/2000/svg"- class="h-5 w-5 text-warning-600 dark:text-warning-400"+ class="h-6 w-6 text-warning"fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round"stroke-width="2" d="M12 4v16m8-8H4" />@@ -937,46 +941,6 @@</template></div>- <div x-data="{ modalOpen: false }" @open-create-modal-server.window="modalOpen = true"- @keydown.window.escape="modalOpen=false" class="relative w-auto h-auto">- <template x-teleport="body">- <div x-show="modalOpen" x-init="$watch('modalOpen', value => {- if (value) {- setTimeout(() => {- const firstInput = $el.querySelector('input, textarea, select');- if (firstInput) firstInput.focus();- }, 200);- }- })" class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">- <div x-show="modalOpen" x-transition:enter="ease-out duration-100" x-transition:enter-start="opacity-0"- x-transition:enter-end="opacity-100" x-transition:leave="ease-in duration-100"- x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0" @click="modalOpen=false"- class="absolute inset-0 w-full h-full bg-black/20 backdrop-blur-xs"></div>- <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen" x-transition:enter="ease-out duration-100"- x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95"- x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"- x-transition:leave="ease-in duration-100"- x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"- x-transition:leave-end="opacity-0 -translate-y-2 sm:scale-95"- class="relative w-full py-6 border rounded-sm drop-shadow-sm min-w-full lg:min-w-[36rem] max-w-fit bg-white border-neutral-200 dark:bg-base px-6 dark:border-coolgray-300">- <div class="flex items-center justify-between pb-3">- <h3 class="text-2xl font-bold">New Server</h3>- <button @click="modalOpen=false"- class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 rounded-full dark:text-white hover:bg-neutral-100 dark:hover:bg-coolgray-300 outline-0 focus-visible:ring-2 focus-visible:ring-coollabs dark:focus-visible:ring-warning">- <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"- stroke-width="1.5" stroke="currentColor">- <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />- </svg>- </button>- </div>- <div class="relative flex items-center justify-center w-auto">- <livewire:server.create key="create-modal-server" />- </div>- </div>- </div>- </template>- </div>-<div x-data="{ modalOpen: false }" @open-create-modal-team.window="modalOpen = true"@keydown.window.escape="modalOpen=false" class="relative w-auto h-auto"><template x-teleport="body">diff --git a/resources/views/livewire/project/new/github-private-repository-deploy-key.blade.php b/resources/views/livewire/project/new/github-private-repository-deploy-key.blade.phpindex bcc78d2dcf..0ea8f8dcfb 100644--- a/resources/views/livewire/project/new/github-private-repository-deploy-key.blade.php+++ b/resources/views/livewire/project/new/github-private-repository-deploy-key.blade.php@@ -8,28 +8,28 @@@forelse ($private_keys as $key)@if ($private_key_id == $key->id)<div class="gap-2 py-4 cursor-pointer group coolbox"- wire:click="setPrivateKey('{{ $key->id }}')" wire:key="{{ $key->id }}">+ wire:click="setPrivateKey('{{ $key->id }}')"+ wire:loading.class="coolbox-loading"+ wire:target="setPrivateKey('{{ $key->id }}')" wire:key="{{ $key->id }}"><div class="flex flex-col mx-6"><div class="box-title">{{ $key->name }}</div><div class="box-description">{{ $key->description }}</div>- <span wire:target="loadRepositories" wire:loading.delay- class="loading loading-xs dark:text-warning loading-spinner"></span></div></div>@else<div class="gap-2 py-4 cursor-pointer group coolbox"- wire:click="setPrivateKey('{{ $key->id }}')" wire:key="{{ $key->id }}">+ wire:click="setPrivateKey('{{ $key->id }}')"+ wire:loading.class="coolbox-loading"+ wire:target="setPrivateKey('{{ $key->id }}')" wire:key="{{ $key->id }}"><div class="flex flex-col mx-6"><div class="box-title">{{ $key->name }}</div><div class="box-description">{{ $key->description }}</div>- <span wire:target="loadRepositories" wire:loading.delay- class="loading loading-xs dark:text-warning loading-spinner"></span></div></div>@endifdiff --git a/resources/views/livewire/project/new/github-private-repository.blade.php b/resources/views/livewire/project/new/github-private-repository.blade.phpindex c57fa1489d..398b6e970b 100644--- a/resources/views/livewire/project/new/github-private-repository.blade.php+++ b/resources/views/livewire/project/new/github-private-repository.blade.php@@ -25,6 +25,8 @@<div class="flex"><div class="w-full gap-2 py-4 group coolbox"wire:click.prevent="loadRepositories({{ $ghapp->id }})"+ wire:loading.class="coolbox-loading"+ wire:target="loadRepositories({{ $ghapp->id }})"wire:key="{{ $ghapp->id }}"><div class="flex mr-4"><div class="flex flex-col mx-6">@@ -36,9 +38,6 @@</div></div></div>- <div class="flex flex-col items-center justify-center">- <x-loading wire:loading wire:target="loadRepositories({{ $ghapp->id }})" />- </div></div>@endforeach</div>diff --git a/resources/views/livewire/project/new/select.blade.php b/resources/views/livewire/project/new/select.blade.phpindex 600433dcd9..2d3750a8a1 100644--- a/resources/views/livewire/project/new/select.blade.php+++ b/resources/views/livewire/project/new/select.blade.php@@ -75,7 +75,9 @@</div></div></div>- <div x-show="loading">Loading...</div>+ <div x-show="loading" class="flex items-center justify-center py-8">+ <x-loading text="Loading resources..." />+ </div><div x-show="!loading" class="flex flex-col gap-4 py-4"><h2 x-show="filteredGitBasedApplications.length > 0">Applications</h2><div x-show="filteredGitBasedApplications.length > 0 || filteredDockerBasedApplications.length > 0"diff --git a/resources/views/livewire/security/cloud-provider-token-form.blade.php b/resources/views/livewire/security/cloud-provider-token-form.blade.phpindex 376cbe2fd2..93f8e21cfa 100644--- a/resources/views/livewire/security/cloud-provider-token-form.blade.php+++ b/resources/views/livewire/security/cloud-provider-token-form.blade.php@@ -24,23 +24,12 @@target='_blank' class='underline dark:text-white'>{{ $provider === 'digitalocean' ? 'DigitalOcean' : ucfirst($provider) }} Console</a>.@if ($provider === 'hetzner')Choose Project → Security → API Tokens.- <br><br>- Don't have a Hetzner account? <a href='https://coolify.io/hetzner' target='_blank'- class='underline dark:text-white'>Sign up here</a>- <br>- <span class="text-xs">(Coolify's affiliate link, only new accounts - supports us (€10)- and gives you €20)</span>@endif@if ($provider === 'digitalocean')Generate New Token.@endif@if ($provider === 'vultr')Open Account → API Access.- <br><br>- Don't have a Vultr account? <a href='https://www.vultr.com/?ref=9911335' target='_blank'- class='underline dark:text-white'>Sign up here</a>- <br>- <span class="text-xs">Coolify's affiliate link, only new accounts - supports us</span>@endif</div>@@ -68,23 +57,12 @@target='_blank' class='underline dark:text-white'>{{ $provider === 'digitalocean' ? 'DigitalOcean' : ucfirst($provider) }} Console</a>.@if ($provider === 'hetzner')Choose Project → Security → API Tokens.- <br><br>- Don't have a Hetzner account? <a href='https://coolify.io/hetzner' target='_blank'- class='underline dark:text-white'>Sign up here</a>- <br>- <span class="text-xs">(Coolify's affiliate link, only new accounts - supports us (€10)- and gives you €20)</span>@endif@if ($provider === 'digitalocean')Generate New Token.@endif@if ($provider === 'vultr')Open Account → API Access.- <br><br>- Don't have a Vultr account? <a href='https://www.vultr.com/?ref=9911335' target='_blank'- class='underline dark:text-white'>Sign up here</a>- <br>- <span class="text-xs">Coolify's affiliate link, only new accounts - supports us</span>@endif</div></div>diff --git a/resources/views/livewire/server/create-page.blade.php b/resources/views/livewire/server/create-page.blade.phpnew file mode 100644index 0000000000..f5a632331b--- /dev/null+++ b/resources/views/livewire/server/create-page.blade.php@@ -0,0 +1,29 @@+<div class="flex flex-col gap-4">+ <x-slot:title>+ {{ $title }} | Coolify+ </x-slot>++ <div>+ <div class="flex items-center gap-2">+ <h1>{{ $title }}</h1>+ @if ($type)+ <a href="{{ $token_uuid ? route('server.create.type', ['type' => $type]) : route('server.create') }}" {{ wireNavigate() }}>+ <x-forms.button>Back</x-forms.button>+ </a>+ @if (! $token_uuid && $hasProviderTokens && $tokenProvider)+ @can('create', App\Models\CloudProviderToken::class)+ <x-modal-input buttonTitle="+ New Token" title="Add {{ $tokenProviderName }} Token" isHighlightedButton>+ <livewire:security.cloud-provider-token-form :modal_mode="true" :provider="$tokenProvider"+ wire:key="new-server-header-token-{{ $tokenProvider }}" />+ </x-modal-input>+ @endcan+ @endif+ @endif+ </div>+ <div class="subtitle">Add a server to deploy your applications and databases.</div>+ </div>++ <div class="w-full">+ <livewire:server.create :selected-type="$type" :selected-token-uuid="$token_uuid" />+ </div>+</div>diff --git a/resources/views/livewire/server/create.blade.php b/resources/views/livewire/server/create.blade.phpindex 0fc9720382..1b81a76faa 100644--- a/resources/views/livewire/server/create.blade.php+++ b/resources/views/livewire/server/create.blade.php@@ -1,78 +1,117 @@<div class="w-full">- <div class="flex flex-col gap-4">- @can('viewAny', App\Models\CloudProviderToken::class)- <div>- <x-modal-input title="Connect a Hetzner Server">- <x-slot:content>- <div class="relative gap-2 cursor-pointer coolbox group">- <div class="flex items-center gap-4 mx-6">- <svg class="w-10 h-10 flex-shrink-0" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">+ @if (!$selectedType)+ <div class="flex flex-col items-center justify-center gap-3 sm:gap-6 sm:min-h-[calc(100vh-12rem)]">+ <div class="mx-auto flex w-full max-w-7xl flex-col gap-3 sm:grid sm:grid-cols-2 sm:gap-6 xl:grid-cols-4">+ @can('viewAny', App\Models\CloudProviderToken::class)+ <a href="{{ route('server.create.type', ['type' => 'hetzner']) }}" aria-label="Choose Hetzner"+ class="box-without-bg flex-col gap-3 sm:gap-6 p-3 sm:p-6 h-full cursor-pointer transition-all duration-200 hover:border-coollabs dark:hover:border-warning focus-visible:border-coollabs dark:focus-visible:border-warning focus-visible:outline-none"+ {{ wireNavigate() }}>+ <div class="flex flex-col gap-2 sm:gap-4 text-left h-full">+ <div class="flex items-center justify-between">+ <svg class="size-9 sm:size-14" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg"><rect width="200" height="200" fill="#D50C2D" rx="8" />- <path d="M40 40 H60 V90 H140 V40 H160 V160 H140 V110 H60 V160 H40 Z" fill="white" />+ <path d="M40 40 H60 V90 H140 V40 H160 V160 H140 V110 H60 V160 H40 Z"+ fill="white" /></svg>- <div class="flex flex-col justify-center flex-1">- <div class="box-title">Connect a Hetzner Server</div>- <div class="box-description">- Deploy servers directly from your Hetzner Cloud account- </div>- </div>+ <span+ class="px-1.5 py-0.5 text-[10px] sm:px-2 sm:py-1 sm:text-xs font-bold uppercase tracking-wide bg-coollabs/10 dark:bg-warning/20 text-coollabs dark:text-warning rounded">+ Provider+ </span>+ </div>+ <div>+ <h3 class="text-sm sm:text-xl font-bold mb-1 sm:mb-2">Hetzner</h3>+ <p class="hidden sm:block text-sm dark:text-neutral-400">+ Deploy servers directly from your Hetzner Cloud account.+ </p></div></div>- </x-slot:content>- <livewire:server.new.by-hetzner :private_keys="$private_keys" :limit_reached="$limit_reached" />- </x-modal-input>- </div>+ </a>- <div>- <x-modal-input title="Connect a Vultr Server">- <x-slot:content>- <div class="relative gap-2 cursor-pointer coolbox group">- <div class="flex items-center gap-4 mx-6">- <svg class="w-10 h-10 flex-shrink-0" viewBox="0 0 200 200"- xmlns="http://www.w3.org/2000/svg">+ <a href="{{ route('server.create.type', ['type' => 'vultr']) }}" aria-label="Choose Vultr"+ class="box-without-bg flex-col gap-3 sm:gap-6 p-3 sm:p-6 h-full cursor-pointer transition-all duration-200 hover:border-coollabs dark:hover:border-warning focus-visible:border-coollabs dark:focus-visible:border-warning focus-visible:outline-none"+ {{ wireNavigate() }}>+ <div class="flex flex-col gap-2 sm:gap-4 text-left h-full">+ <div class="flex items-center justify-between">+ <svg class="size-9 sm:size-14" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg"><rect width="200" height="200" fill="#007BFC" rx="8" /><path d="M42 46 H73 L100 127 L127 46 H158 L114 154 H86 Z" fill="white" /></svg>- <div class="flex flex-col justify-center flex-1">- <div class="box-title">Connect a Vultr Server</div>- <div class="box-description">- Deploy servers directly from your Vultr account- </div>- </div>+ <span+ class="px-1.5 py-0.5 text-[10px] sm:px-2 sm:py-1 sm:text-xs font-bold uppercase tracking-wide bg-coollabs/10 dark:bg-warning/20 text-coollabs dark:text-warning rounded">+ Provider+ </span>+ </div>+ <div>+ <h3 class="text-sm sm:text-xl font-bold mb-1 sm:mb-2">Vultr</h3>+ <p class="hidden sm:block text-sm dark:text-neutral-400">+ Deploy servers directly from your Vultr account.+ </p></div></div>- </x-slot:content>- <livewire:server.new.by-vultr :private_keys="$private_keys" :limit_reached="$limit_reached" />- </x-modal-input>- </div>-- <div class="border-t dark:border-coolgray-300 my-4"></div>+ </a>- <div>- <x-modal-input title="Connect a DigitalOcean Droplet">- <x-slot:content>- <div class="relative gap-2 cursor-pointer coolbox group">- <div class="flex items-center gap-4 mx-6">- <x-digital-ocean-icon class="w-10 h-10 flex-shrink-0" />- <div class="flex flex-col justify-center flex-1">- <div class="box-title">Connect a DigitalOcean Droplet</div>- <div class="box-description">- Deploy servers directly from your DigitalOcean account- </div>- </div>+ <a href="{{ route('server.create.type', ['type' => 'digital-ocean']) }}"+ aria-label="Choose DigitalOcean"+ class="box-without-bg flex-col gap-3 sm:gap-6 p-3 sm:p-6 h-full cursor-pointer transition-all duration-200 hover:border-coollabs dark:hover:border-warning focus-visible:border-coollabs dark:focus-visible:border-warning focus-visible:outline-none"+ {{ wireNavigate() }}>+ <div class="flex flex-col gap-2 sm:gap-4 text-left h-full">+ <div class="flex items-center justify-between">+ <x-digital-ocean-icon class="size-9 sm:size-14" />+ <span+ class="px-1.5 py-0.5 text-[10px] sm:px-2 sm:py-1 sm:text-xs font-bold uppercase tracking-wide bg-coollabs/10 dark:bg-warning/20 text-coollabs dark:text-warning rounded">+ Provider+ </span>+ </div>+ <div>+ <h3 class="text-sm sm:text-xl font-bold mb-1 sm:mb-2">DigitalOcean</h3>+ <p class="hidden sm:block text-sm dark:text-neutral-400">+ Deploy droplets directly from your DigitalOcean account.+ </p></div></div>- </x-slot:content>- <livewire:server.new.by-digital-ocean :private_keys="$private_keys" :limit_reached="$limit_reached" />- </x-modal-input>- </div>-- <div class="border-t dark:border-coolgray-300 my-4"></div>- @endcan+ </a>+ @endcan- <div>- <h3 class="pb-2">Add Server by IP Address</h3>- <livewire:server.new.by-ip :private_keys="$private_keys" :limit_reached="$limit_reached" />+ <a href="{{ route('server.create.type', ['type' => 'manual']) }}" aria-label="Choose Manual"+ class="box-without-bg flex-col gap-3 sm:gap-6 p-3 sm:p-6 h-full cursor-pointer transition-all duration-200 hover:border-coollabs dark:hover:border-warning focus-visible:border-coollabs dark:focus-visible:border-warning focus-visible:outline-none"+ {{ wireNavigate() }}>+ <div class="flex flex-col gap-2 sm:gap-4 text-left h-full">+ <div class="flex items-center justify-between">+ <svg class="size-9 sm:size-14" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"+ stroke-width="1.5" stroke="currentColor">+ <path stroke-linecap="round" stroke-linejoin="round"+ d="M11.42 15.17L17.25 21A2.652 2.652 0 0021 17.25l-5.877-5.877M11.42 15.17l2.496-3.03c.317-.384.74-.626 1.208-.766M11.42 15.17l-4.655 5.653a2.548 2.548 0 11-3.586-3.586l6.837-5.63m5.108-.233c.55-.164 1.163-.188 1.743-.14a4.5 4.5 0 004.486-6.336l-3.276 3.277a3.004 3.004 0 01-2.25-2.25l3.276-3.276a4.5 4.5 0 00-6.336 4.486c.091 1.076-.071 2.264-.904 2.95l-.102.085m-1.745 1.437L5.909 7.5H4.5L2.25 3.75l1.5-1.5L7.5 4.5v1.409l4.26 4.26m-1.745 1.437l1.745-1.437m6.615 8.206L15.75 15.75M4.867 19.125h.008v.008h-.008v-.008z" />+ </svg>+ <span+ class="px-1.5 py-0.5 text-[10px] sm:px-2 sm:py-1 sm:text-xs font-bold uppercase tracking-wide bg-neutral-100 dark:bg-coolgray-300 dark:text-neutral-400 rounded">+ Manual+ </span>+ </div>+ <div>+ <h3 class="text-sm sm:text-xl font-bold mb-1 sm:mb-2">Manual</h3>+ <p class="hidden sm:block text-sm dark:text-neutral-400">+ Add any reachable server by IP address or domain.+ </p>+ </div>+ </div>+ </a>+ </div>+ </div>+ @else+ <div class="flex flex-col gap-4">+ @if ($selectedType === 'hetzner')+ <livewire:server.new.by-hetzner :private_keys="$private_keys" :limit_reached="$limit_reached"+ :selected-token-uuid="$selectedTokenUuid" wire:key="new-server-hetzner-{{ $selectedTokenUuid ?? 'select' }}" />+ @elseif ($selectedType === 'vultr')+ <livewire:server.new.by-vultr :private_keys="$private_keys" :limit_reached="$limit_reached"+ :selected-token-uuid="$selectedTokenUuid" wire:key="new-server-vultr-{{ $selectedTokenUuid ?? 'select' }}" />+ @elseif ($selectedType === 'digital-ocean')+ <livewire:server.new.by-digital-ocean :private_keys="$private_keys" :limit_reached="$limit_reached"+ :selected-token-uuid="$selectedTokenUuid" wire:key="new-server-digital-ocean-{{ $selectedTokenUuid ?? 'select' }}" />+ @else+ <livewire:server.new.by-ip :private_keys="$private_keys" :limit_reached="$limit_reached"+ key="new-server-manual" />+ @endif</div>- </div>+ @endif</div>diff --git a/resources/views/livewire/server/index.blade.php b/resources/views/livewire/server/index.blade.phpindex 815bf43b5a..ced967aa2a 100644--- a/resources/views/livewire/server/index.blade.php+++ b/resources/views/livewire/server/index.blade.php@@ -5,9 +5,9 @@<div class="flex items-center gap-2"><h1>Servers</h1>@can('createAnyResource')- <x-modal-input buttonTitle="+ Add" title="New Server" :closeOutside="false">- <livewire:server.create />- </x-modal-input>+ <a href="{{ route('server.create') }}" {{ wireNavigate() }}>+ <x-forms.button>+ Add</x-forms.button>+ </a>@endcan</div><div class="subtitle">All your servers are here.</div>diff --git a/resources/views/livewire/server/new/by-digital-ocean.blade.php b/resources/views/livewire/server/new/by-digital-ocean.blade.phpindex 4523b1492f..5cce8d70b9 100644--- a/resources/views/livewire/server/new/by-digital-ocean.blade.php+++ b/resources/views/livewire/server/new/by-digital-ocean.blade.php@@ -4,43 +4,61 @@@else@if ($current_step === 1)<div class="flex flex-col w-full gap-4">+ <div class="text-sm text-neutral-500 dark:text-neutral-400">+ Don't have a DigitalOcean account? <a href="https://coolify.io/digitalocean" target="_blank"+ class="underline dark:text-white">Sign up here</a>.+ <span class="text-xs">Coolify's referral link - it supports both of us.</span>+ </div>@if ($available_tokens->count() > 0)- <div class="flex gap-2">- <div class="flex-1">- <x-forms.select label="Select DigitalOcean Token" id="selected_token_id"- wire:change="selectToken($event.target.value)" required>- <option value="">Select a saved token...</option>- @foreach ($available_tokens as $token)- <option value="{{ $token->id }}">+ <div class="grid gap-3 md:grid-cols-2">+ @foreach ($available_tokens as $token)+ <a class="coolbox group text-left" wire:key="digital-ocean-token-{{ $token->id }}"+ href="{{ route('server.create.token', ['type' => 'digital-ocean', 'token_uuid' => $token->uuid]) }}" {{ wireNavigate() }}>+ <div class="flex flex-col justify-center mx-6">+ <div class="box-title">{{ $token->name ?? 'DigitalOcean Token' }}- </option>- @endforeach- </x-forms.select>- </div>- <div class="flex items-end">- <x-forms.button canGate="create" :canResource="App\Models\Server::class" wire:click="nextStep"- :disabled="!$selected_token_id">- Continue- </x-forms.button>- </div>+ </div>+ <div class="box-description">+ Use this token to create a DigitalOcean Droplet.+ </div>+ </div>+ </a>+ @endforeach+ </div>+ @else+ <div class="w-full max-w-2xl">+ <x-modal-input title="Add DigitalOcean Token">+ <x-slot:content>+ <div class="coolbox group cursor-pointer">+ <div class="flex items-center gap-4 mx-6">+ <div+ class="flex size-10 shrink-0 items-center justify-center rounded-full bg-coollabs/10 text-coollabs dark:bg-warning/20 dark:text-warning">+ <svg class="size-6" xmlns="http://www.w3.org/2000/svg" fill="none"+ viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">+ <path stroke-linecap="round" stroke-linejoin="round"+ d="M12 4.5v15m7.5-7.5h-15" />+ </svg>+ </div>+ <div class="flex flex-col justify-center">+ <div class="box-title">Add a new token</div>+ <div class="box-description">+ Add a DigitalOcean API token to create Droplets from your account.+ </div>+ </div>+ </div>+ </div>+ </x-slot:content>+ <livewire:security.cloud-provider-token-form :modal_mode="true" provider="digitalocean"+ wire:key="new-server-empty-token-digitalocean" />+ </x-modal-input></div>-- <div class="text-center text-sm dark:text-neutral-500">OR</div>@endif-- <x-modal-input isFullWidth- buttonTitle="{{ $available_tokens->count() > 0 ? '+ Add New Token' : 'Add DigitalOcean Token' }}"- title="Add DigitalOcean Token">- <livewire:security.cloud-provider-token-form :modal_mode="true" provider="digitalocean" />- </x-modal-input></div>@elseif ($current_step === 2)+ <div wire:init="loadDigitalOceanData">@if ($loading_data)<div class="flex items-center justify-center py-8">- <div class="text-center">- <div class="animate-spin rounded-full h-12 w-12 border-b-2 border-primary mx-auto"></div>- <p class="mt-4 text-sm dark:text-neutral-400">Loading DigitalOcean data...</p>- </div>+ <x-loading text="Loading DigitalOcean data..." /></div>@else<form class="flex flex-col w-full gap-2" wire:submit='submit'>@@ -211,17 +229,13 @@</div></x-dropdown>- <div class="flex gap-2 justify-between">- <x-forms.button type="button" wire:click="previousStep">- Back- </x-forms.button>- <x-forms.button isHighlighted canGate="create" :canResource="App\Models\Server::class" type="submit"- :disabled="!$private_key_id">- Buy & Create Server{{ $this->selectedDropletPrice ? ' (' . $this->selectedDropletPrice . '/mo)' : '' }}- </x-forms.button>- </div>+ <x-forms.button class="w-full" isHighlighted canGate="create" :canResource="App\Models\Server::class"+ type="submit" :disabled="!$private_key_id">+ Buy & Create Server{{ $this->selectedDropletPrice ? ' (' . $this->selectedDropletPrice . '/mo)' : '' }}+ </x-forms.button></form>@endif+ </div>@endif@endif</div>diff --git a/resources/views/livewire/server/new/by-hetzner.blade.php b/resources/views/livewire/server/new/by-hetzner.blade.phpindex 5587c6e39c..86a3bf3f7f 100644--- a/resources/views/livewire/server/new/by-hetzner.blade.php+++ b/resources/views/livewire/server/new/by-hetzner.blade.php@@ -4,43 +4,61 @@@else@if ($current_step === 1)<div class="flex flex-col w-full gap-4">+ <div class="text-sm text-neutral-500 dark:text-neutral-400">+ Don't have a Hetzner account? <a href="https://coolify.io/hetzner" target="_blank"+ class="underline dark:text-white">Sign up here</a>.+ <span class="text-xs">Coolify's affiliate link, only for new accounts - it supports both of us.</span>+ </div>@if ($available_tokens->count() > 0)- <div class="flex gap-2">- <div class="flex-1">- <x-forms.select label="Select Hetzner Token" id="selected_token_id"- wire:change="selectToken($event.target.value)" required>- <option value="">Select a saved token...</option>- @foreach ($available_tokens as $token)- <option value="{{ $token->id }}">+ <div class="grid gap-3 md:grid-cols-2">+ @foreach ($available_tokens as $token)+ <a class="coolbox group text-left" wire:key="hetzner-token-{{ $token->id }}"+ href="{{ route('server.create.token', ['type' => 'hetzner', 'token_uuid' => $token->uuid]) }}" {{ wireNavigate() }}>+ <div class="flex flex-col justify-center mx-6">+ <div class="box-title">{{ $token->name ?? 'Hetzner Token' }}- </option>- @endforeach- </x-forms.select>- </div>- <div class="flex items-end">- <x-forms.button canGate="create" :canResource="App\Models\Server::class" wire:click="nextStep"- :disabled="!$selected_token_id">- Continue- </x-forms.button>- </div>+ </div>+ <div class="box-description">+ Use this token to create a Hetzner server.+ </div>+ </div>+ </a>+ @endforeach+ </div>+ @else+ <div class="w-full max-w-2xl">+ <x-modal-input title="Add Hetzner Token">+ <x-slot:content>+ <div class="coolbox group cursor-pointer">+ <div class="flex items-center gap-4 mx-6">+ <div+ class="flex size-10 shrink-0 items-center justify-center rounded-full bg-coollabs/10 text-coollabs dark:bg-warning/20 dark:text-warning">+ <svg class="size-6" xmlns="http://www.w3.org/2000/svg" fill="none"+ viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">+ <path stroke-linecap="round" stroke-linejoin="round"+ d="M12 4.5v15m7.5-7.5h-15" />+ </svg>+ </div>+ <div class="flex flex-col justify-center">+ <div class="box-title">Add a new token</div>+ <div class="box-description">+ Add a Hetzner API token to create servers from your account.+ </div>+ </div>+ </div>+ </div>+ </x-slot:content>+ <livewire:security.cloud-provider-token-form :modal_mode="true" provider="hetzner"+ wire:key="new-server-empty-token-hetzner" />+ </x-modal-input></div>-- <div class="text-center text-sm dark:text-neutral-500">OR</div>@endif-- <x-modal-input isFullWidth- buttonTitle="{{ $available_tokens->count() > 0 ? '+ Add New Token' : 'Add Hetzner Token' }}"- title="Add Hetzner Token">- <livewire:security.cloud-provider-token-form :modal_mode="true" provider="hetzner" />- </x-modal-input></div>@elseif ($current_step === 2)+ <div wire:init="loadHetznerData">@if ($loading_data)<div class="flex items-center justify-center py-8">- <div class="text-center">- <div class="animate-spin rounded-full h-12 w-12 border-b-2 border-primary mx-auto"></div>- <p class="mt-4 text-sm dark:text-neutral-400">Loading Hetzner data...</p>- </div>+ <x-loading text="Loading Hetzner data..." /></div>@else<form class="flex flex-col w-full gap-2" wire:submit='submit'>@@ -248,17 +266,13 @@</div></x-dropdown>- <div class="flex gap-2 justify-between">- <x-forms.button type="button" wire:click="previousStep">- Back- </x-forms.button><x-forms.button isHighlighted canGate="create" :canResource="App\Models\Server::class" type="submit":disabled="!$private_key_id">Buy & Create Server{{ $this->selectedServerPrice ? ' (' . $this->selectedServerPrice . '/mo)' : '' }}</x-forms.button>- </div></form>@endif+ </div>@endif@endif</div>diff --git a/resources/views/livewire/server/new/by-vultr.blade.php b/resources/views/livewire/server/new/by-vultr.blade.phpindex b1f082e30f..89e459e82b 100644--- a/resources/views/livewire/server/new/by-vultr.blade.php+++ b/resources/views/livewire/server/new/by-vultr.blade.php@@ -4,43 +4,61 @@@else@if ($current_step === 1)<div class="flex flex-col w-full gap-4">+ <div class="text-sm text-neutral-500 dark:text-neutral-400">+ Don't have a Vultr account? <a href="https://coolify.io/vultr" target="_blank"+ class="underline dark:text-white">Sign up here</a>.+ <span class="text-xs">Coolify's affiliate link - it supports both of us.</span>+ </div>@if ($available_tokens->count() > 0)- <div class="flex gap-2">- <div class="flex-1">- <x-forms.select label="Select Vultr Token" id="selected_token_id"- wire:change="selectToken($event.target.value)" required>- <option value="">Select a saved token...</option>- @foreach ($available_tokens as $token)- <option value="{{ $token->id }}">+ <div class="grid gap-3 md:grid-cols-2">+ @foreach ($available_tokens as $token)+ <a class="coolbox group text-left" wire:key="vultr-token-{{ $token->id }}"+ href="{{ route('server.create.token', ['type' => 'vultr', 'token_uuid' => $token->uuid]) }}" {{ wireNavigate() }}>+ <div class="flex flex-col justify-center mx-6">+ <div class="box-title">{{ $token->name ?? 'Vultr Token' }}- </option>- @endforeach- </x-forms.select>- </div>- <div class="flex items-end">- <x-forms.button canGate="create" :canResource="App\Models\Server::class" wire:click="nextStep"- :disabled="!$selected_token_id">- Continue- </x-forms.button>- </div>+ </div>+ <div class="box-description">+ Use this token to create a Vultr server.+ </div>+ </div>+ </a>+ @endforeach+ </div>+ @else+ <div class="w-full max-w-2xl">+ <x-modal-input title="Add Vultr Token">+ <x-slot:content>+ <div class="coolbox group cursor-pointer">+ <div class="flex items-center gap-4 mx-6">+ <div+ class="flex size-10 shrink-0 items-center justify-center rounded-full bg-coollabs/10 text-coollabs dark:bg-warning/20 dark:text-warning">+ <svg class="size-6" xmlns="http://www.w3.org/2000/svg" fill="none"+ viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">+ <path stroke-linecap="round" stroke-linejoin="round"+ d="M12 4.5v15m7.5-7.5h-15" />+ </svg>+ </div>+ <div class="flex flex-col justify-center">+ <div class="box-title">Add a new token</div>+ <div class="box-description">+ Add a Vultr API token to create servers from your account.+ </div>+ </div>+ </div>+ </div>+ </x-slot:content>+ <livewire:security.cloud-provider-token-form :modal_mode="true" provider="vultr"+ wire:key="new-server-empty-token-vultr" />+ </x-modal-input></div>-- <div class="text-center text-sm dark:text-neutral-500">OR</div>@endif-- <x-modal-input isFullWidth- buttonTitle="{{ $available_tokens->count() > 0 ? '+ Add New Token' : 'Add Vultr Token' }}"- title="Add Vultr Token">- <livewire:security.cloud-provider-token-form :modal_mode="true" provider="vultr" />- </x-modal-input></div>@elseif ($current_step === 2)+ <div wire:init="loadVultrData">@if ($loading_data)<div class="flex items-center justify-center py-8">- <div class="text-center">- <div class="animate-spin rounded-full h-12 w-12 border-b-2 border-primary mx-auto"></div>- <p class="mt-4 text-sm dark:text-neutral-400">Loading Vultr data...</p>- </div>+ <x-loading text="Loading Vultr data..." /></div>@else<form class="flex flex-col w-full gap-2" wire:submit='submit'>@@ -125,68 +143,82 @@@endif</div>- <div>- <x-forms.datalist label="Additional SSH Keys (from Vultr)" id="selectedVultrSshKeyIds"- helper="Select existing SSH keys from your Vultr account to add to this server. The Coolify SSH key will be automatically added."- :multiple="true" :disabled="count($vultrSshKeys) === 0" :placeholder="count($vultrSshKeys) > 0 ? 'Search and select SSH keys...' : 'No SSH keys found in Vultr account'">- @foreach ($vultrSshKeys as $sshKey)- <option value="{{ $sshKey['id'] }}">- {{ $sshKey['name'] }} - {{ substr($sshKey['id'], 0, 20) }}- </option>- @endforeach- </x-forms.datalist>- </div>+ <x-dropdown inline panelClass="max-h-[55vh] overflow-y-auto scrollbar">+ <x-slot:title>+ <span class="text-sm font-medium">Advanced Vultr options</span>+ <span class="mt-1 text-xs text-neutral-500 dark:text-neutral-400">SSH keys, network configuration, and cloud-init.</span>+ @if (count($this->advancedVultrOptionsSummary) > 0)+ <span class="mt-1 flex flex-wrap gap-1.5">+ @foreach ($this->advancedVultrOptionsSummary as $summaryItem)+ <span class="rounded bg-neutral-200 px-2 py-0.5 text-xs text-neutral-700 dark:bg-coolgray-100 dark:text-neutral-300">+ {{ $summaryItem }}+ </span>+ @endforeach+ </span>+ @endif+ </x-slot>- <div class="flex flex-col gap-2">- <label class="text-sm font-medium">Network Configuration</label>- <div class="flex gap-4">- <x-forms.checkbox id="enable_ipv6" label="Enable IPv6"- helper="Enable public IPv6 address for this server" />- <x-forms.checkbox id="disable_public_ipv4" label="Disable public IPv4"- helper="Disable the default public IPv4 address" />- </div>- </div>+ <div class="flex w-full flex-col gap-4 p-3">+ <div>+ <x-forms.datalist label="Additional SSH Keys (from Vultr)" id="selectedVultrSshKeyIds"+ helper="Select existing SSH keys from your Vultr account to add to this server. The Coolify SSH key will be automatically added."+ :multiple="true" :disabled="count($vultrSshKeys) === 0" :placeholder="count($vultrSshKeys) > 0 ? 'Search and select SSH keys...' : 'No SSH keys found in Vultr account'">+ @foreach ($vultrSshKeys as $sshKey)+ <option value="{{ $sshKey['id'] }}">+ {{ $sshKey['name'] }} - {{ substr($sshKey['id'], 0, 20) }}+ </option>+ @endforeach+ </x-forms.datalist>+ </div>- <div class="flex flex-col gap-2">- <div class="flex justify-between items-center gap-2">- <label class="text-sm font-medium w-32">Cloud-Init Script</label>- @if ($saved_cloud_init_scripts->count() > 0)- <div class="flex items-center gap-2 flex-1">- <x-forms.select wire:model.live="selected_cloud_init_script_id" label="" helper="">- <option value="">Load saved script...</option>- @foreach ($saved_cloud_init_scripts as $script)- <option value="{{ $script->id }}">{{ $script->name }}</option>- @endforeach- </x-forms.select>- <x-forms.button type="button" wire:click="clearCloudInitScript">- Clear- </x-forms.button>+ <div class="flex flex-col gap-2">+ <label class="text-sm font-medium">Network Configuration</label>+ <div class="grid grid-cols-1 gap-2 md:grid-cols-2">+ <x-forms.checkbox id="enable_ipv6" label="Enable IPv6"+ helper="Enable public IPv6 address for this server" fullWidth />+ <x-forms.checkbox id="disable_public_ipv4" label="Disable public IPv4"+ helper="Disable the default public IPv4 address" fullWidth /></div>- @endif- </div>- <x-forms.textarea id="cloud_init_script" label=""- helper="Add a cloud-init script to run when the server is created. Coolify sends it to Vultr as user data."- rows="8" />+ </div>- <div class="flex items-center gap-2">- <x-forms.checkbox id="save_cloud_init_script" label="Save this script for later use" />- <div class="flex-1">- <x-forms.input id="cloud_init_script_name" label="" placeholder="Script name..." />+ <div class="flex flex-col gap-2">+ <div class="flex justify-between items-center gap-2">+ <label class="text-sm font-medium w-32">Cloud-Init Script</label>+ @if ($saved_cloud_init_scripts->count() > 0)+ <div class="flex items-center gap-2 flex-1">+ <x-forms.select wire:model.live="selected_cloud_init_script_id" label="" helper="">+ <option value="">Load saved script...</option>+ @foreach ($saved_cloud_init_scripts as $script)+ <option value="{{ $script->id }}">{{ $script->name }}</option>+ @endforeach+ </x-forms.select>+ <x-forms.button type="button" wire:click="clearCloudInitScript">+ Clear+ </x-forms.button>+ </div>+ @endif+ </div>+ <x-forms.textarea id="cloud_init_script" label=""+ helper="Add a cloud-init script to run when the server is created. Coolify sends it to Vultr as user data."+ rows="8" />++ <div class="flex items-center gap-2">+ <x-forms.checkbox id="save_cloud_init_script" label="Save this script for later use" />+ <div class="flex-1">+ <x-forms.input id="cloud_init_script_name" label="" placeholder="Script name..." />+ </div>+ </div></div></div>- </div>+ </x-dropdown>- <div class="flex gap-2 justify-between">- <x-forms.button type="button" wire:click="previousStep">- Back- </x-forms.button>- <x-forms.button isHighlighted canGate="create" :canResource="App\Models\Server::class"- type="submit" :disabled="!$private_key_id">- Buy & Create Server{{ $this->selectedServerPrice ? ' (' . $this->selectedServerPrice . '/mo)' : '' }}- </x-forms.button>- </div>+ <x-forms.button class="w-full" isHighlighted canGate="create" :canResource="App\Models\Server::class"+ type="submit" :disabled="!$private_key_id">+ Buy & Create Server{{ $this->selectedServerPrice ? ' (' . $this->selectedServerPrice . '/mo)' : '' }}+ </x-forms.button></form>@endif+ </div>@endif@endif</div>diff --git a/routes/web.php b/routes/web.phpindex f772776999..c31140a133 100644--- a/routes/web.php+++ b/routes/web.php@@ -46,6 +46,7 @@ use App\Livewire\Server\CaCertificate\Show as CaCertificateShow;use App\Livewire\Server\Charts as ServerCharts;use App\Livewire\Server\CloudflareTunnel;use App\Livewire\Server\CloudProviderToken\Show as CloudProviderTokenShow;+use App\Livewire\Server\CreatePage as ServerCreatePage;use App\Livewire\Server\Delete as DeleteServer;use App\Livewire\Server\Destinations as ServerDestinations;use App\Livewire\Server\DockerCleanup;@@ -88,6 +89,7 @@ use App\Livewire\Team\Index as TeamIndex;use App\Livewire\Team\Member\Index as TeamMemberIndex;use App\Livewire\Terminal\Index as TerminalIndex;use App\Models\ScheduledDatabaseBackupExecution;+use App\Models\Server;use App\Models\ServiceDatabase;use App\Providers\RouteServiceProvider;use Illuminate\Support\Facades\Route;@@ -277,7 +279,9 @@ Route::middleware(['auth', 'verified'])->group(function () {});Route::get('/servers', ServerIndex::class)->name('server.index');- // Route::get('/server/new', ServerCreate::class)->name('server.create');+ Route::get('/servers/new', ServerCreatePage::class)->name('server.create')->middleware('can:create,'.Server::class);+ Route::get('/servers/new/{type}/{token_uuid}', ServerCreatePage::class)->name('server.create.token')->middleware('can:create,'.Server::class)->whereIn('type', ['hetzner', 'vultr', 'digital-ocean']);+ Route::get('/servers/new/{type}', ServerCreatePage::class)->name('server.create.type')->middleware('can:create,'.Server::class)->whereIn('type', ['hetzner', 'vultr', 'digital-ocean', 'manual']);Route::prefix('server/{server_uuid}')->group(function () {Route::get('/', ServerShow::class)->name('server.show');diff --git a/tests/Feature/Authorization/DashboardAuthorizationTest.php b/tests/Feature/Authorization/DashboardAuthorizationTest.phpindex 26a39af0aa..52de178a71 100644--- a/tests/Feature/Authorization/DashboardAuthorizationTest.php+++ b/tests/Feature/Authorization/DashboardAuthorizationTest.php@@ -81,7 +81,7 @@ test('admin sees add server button on dashboard', function () {createServerWithKeyForTeam($team);Livewire::test(Dashboard::class)- ->assertSee('New Server');+ ->assertSee(route('server.create'));});test('member does not see add server button on dashboard', function () {@@ -93,5 +93,5 @@ test('member does not see add server button on dashboard', function () {createServerWithKeyForTeam($team);Livewire::test(Dashboard::class)- ->assertDontSee('New Server');+ ->assertDontSee(route('server.create'));});diff --git a/tests/Feature/Authorization/ServerAuthorizationTest.php b/tests/Feature/Authorization/ServerAuthorizationTest.phpindex ffcb4a1c64..c9e7ec10d6 100644--- a/tests/Feature/Authorization/ServerAuthorizationTest.php+++ b/tests/Feature/Authorization/ServerAuthorizationTest.php@@ -1,7 +1,10 @@<?phpuse App\Http\Middleware\PreventRequestsDuringMaintenance;+use App\Livewire\Server\Create as ServerCreate;+use App\Livewire\Server\Index as ServerIndex;use App\Livewire\Server\Navbar as ServerNavbar;+use App\Models\CloudProviderToken;use App\Models\InstanceSettings;use App\Models\Server;use App\Models\Team;@@ -132,6 +135,144 @@ test('member cannot create server', function () {expect(auth()->user()->can('create', Server::class))->toBeFalse();});+test('admin can access new server page', function () {+ $this->actingAs($this->admin);+ session(['currentTeam' => $this->team]);++ $this->get(route('server.create'))+ ->assertSuccessful()+ ->assertSee('New Server')+ ->assertSeeLivewire(ServerCreate::class);+});++test('new server chooser lists providers before rendering a creation form', function () {+ $this->actingAs($this->admin);+ session(['currentTeam' => $this->team]);++ Livewire::test(ServerCreate::class)+ ->assertSee('Hetzner')+ ->assertSee('Vultr')+ ->assertSee('DigitalOcean')+ ->assertSee('Manual')+ ->assertDontSee('>Select<', false)+ ->assertDontSee('Continue')+ ->assertSee(route('server.create.type', ['type' => 'hetzner']))+ ->assertSee(route('server.create.type', ['type' => 'vultr']))+ ->assertSee(route('server.create.type', ['type' => 'digital-ocean']))+ ->assertSee(route('server.create.type', ['type' => 'manual']))+ ->assertDontSee('Add Server by IP Address');+});++test('new server chooser uses compact mobile provider cards', function () {+ $this->actingAs($this->admin);+ session(['currentTeam' => $this->team]);++ Livewire::test(ServerCreate::class)+ ->assertSee('mx-auto flex w-full max-w-7xl flex-col', false)+ ->assertSee('sm:grid', false)+ ->assertSee('sm:grid-cols-2', false)+ ->assertSee('xl:grid-cols-4', false)+ ->assertSee('gap-3 sm:gap-6', false)+ ->assertSee('dark:hover:border-warning', false)+ ->assertSee('focus-visible:border-coollabs', false)+ ->assertSee('aria-label="Choose Hetzner"', false)+ ->assertSee('p-3 sm:p-6', false)+ ->assertDontSee('sm:min-h-80', false)+ ->assertSee('size-9 sm:size-14', false)+ ->assertDontSee('size-9 sm:size-14 w-14 h-14', false)+ ->assertSee('hidden sm:block', false)+ ->assertDontSee('>Select<', false)+ ->assertDontSee('<button', false);+});++test('new server provider pages render the selected creation flow', function (string $type, string $heading) {+ $this->actingAs($this->admin);+ session(['currentTeam' => $this->team]);++ $response = $this->get(route('server.create.type', ['type' => $type]))+ ->assertSuccessful()+ ->assertSee($heading)+ ->assertDontSee('<h1>New Server</h1>', false)+ ->assertDontSee('Choose how to add your server');++ $response->assertSeeInOrder([$heading, 'Back']);+})->with([+ ['hetzner', 'Hetzner'],+ ['vultr', 'Vultr'],+ ['digital-ocean', 'DigitalOcean'],+ ['manual', 'Manual'],+]);++test('new server provider pages do not show the new token action in the header', function (string $type, string $heading) {+ $this->actingAs($this->admin);+ session(['currentTeam' => $this->team]);++ $response = $this->get(route('server.create.type', ['type' => $type]))+ ->assertSuccessful()+ ->assertDontSee('+ New Token')+ ->assertDontSee('+ Add New Token');++ $response->assertSeeInOrder([$heading, 'Back']);+})->with([+ ['hetzner', 'Hetzner'],+ ['vultr', 'Vultr'],+ ['digital-ocean', 'DigitalOcean'],+]);++test('new server provider pages show the new token action in the header when tokens exist', function (string $type, string $provider, string $heading, string $modalTitle) {+ $this->actingAs($this->admin);+ session(['currentTeam' => $this->team]);++ CloudProviderToken::factory()->create([+ 'team_id' => $this->team->id,+ 'provider' => $provider,+ ]);++ $response = $this->get(route('server.create.type', ['type' => $type]))+ ->assertSuccessful()+ ->assertSee($modalTitle);++ $response->assertSeeInOrder([$heading, 'Back', '+ New Token']);+})->with([+ ['hetzner', 'hetzner', 'Hetzner', 'Add Hetzner Token'],+ ['vultr', 'vultr', 'Vultr', 'Add Vultr Token'],+ ['digital-ocean', 'digitalocean', 'DigitalOcean', 'Add DigitalOcean Token'],+]);++test('new server manual page does not show the new token action', function () {+ $this->actingAs($this->admin);+ session(['currentTeam' => $this->team]);++ $this->get(route('server.create.type', ['type' => 'manual']))+ ->assertSuccessful()+ ->assertSee('Manual')+ ->assertDontSee('+ New Token');+});++test('member cannot access new server page', function () {+ $this->actingAs($this->member);+ session(['currentTeam' => $this->team]);++ $this->get(route('server.create'))+ ->assertForbidden();+});++test('server index links admins to new server page', function () {+ $this->actingAs($this->admin);+ session(['currentTeam' => $this->team]);++ Livewire::test(ServerIndex::class)+ ->assertSee(route('server.create'));+});++test('server index does not link members to new server page', function () {+ $this->actingAs($this->member);+ session(['currentTeam' => $this->team]);++ Livewire::test(ServerIndex::class)+ ->assertDontSee(route('server.create'));+});+// --- Cross-team isolation ---test('user from different team cannot view server', function () {diff --git a/tests/Feature/DigitalOceanServerCreationTest.php b/tests/Feature/DigitalOceanServerCreationTest.phpnew file mode 100644index 0000000000..4bc9e7bcf9--- /dev/null+++ b/tests/Feature/DigitalOceanServerCreationTest.php@@ -0,0 +1,36 @@+<?php++use App\Livewire\Server\New\ByDigitalOcean;+use App\Models\InstanceSettings;+use App\Models\Team;+use App\Models\User;+use Illuminate\Foundation\Testing\RefreshDatabase;+use Livewire\Livewire;++uses(RefreshDatabase::class);++beforeEach(function () {+ config([+ 'cache.default' => 'array',+ 'session.driver' => 'array',+ ]);++ InstanceSettings::unguarded(fn () => InstanceSettings::query()->create([+ 'id' => 0,+ ]));++ $this->team = Team::factory()->create();+ $this->user = User::factory()->create();+ $this->team->members()->attach($this->user->id, ['role' => 'owner']);++ $this->actingAs($this->user);+ session(['currentTeam' => $this->team]);+});++it('renders only the full width buy button at the bottom of the DigitalOcean form', function () {+ Livewire::test(ByDigitalOcean::class)+ ->set('current_step', 2)+ ->assertDontSee('wire:click="previousStep"', false)+ ->assertSeeHtml('class="button w-full"')+ ->assertSee('Buy & Create Server', false);+});diff --git a/tests/Feature/GithubPrivateRepositoryTest.php b/tests/Feature/GithubPrivateRepositoryTest.phpindex 781d29b3d1..18026b173d 100644--- a/tests/Feature/GithubPrivateRepositoryTest.php+++ b/tests/Feature/GithubPrivateRepositoryTest.php@@ -82,6 +82,13 @@ function githubPrivateRepositoryTestPrivateKeyForTeam(Team $team): PrivateKey}describe('GitHub Private Repository Component', function () {+ test('github app selection uses coolbox loading border', function () {+ Livewire::test(GithubPrivateRepository::class, ['type' => 'private-gh-app'])+ ->assertSee('wire:loading.class="coolbox-loading"', false)+ ->assertSee('wire:target="loadRepositories('.$this->githubApp->id.')"', false)+ ->assertDontSee('loading-spinner', false);+ });+test('loadRepositories fetches and displays repositories', function () {$repos = [['id' => 1, 'name' => 'alpha-repo', 'owner' => ['login' => 'testuser']],diff --git a/tests/Feature/Server/HetznerServerCreationTest.php b/tests/Feature/Server/HetznerServerCreationTest.phpindex 9576416010..d134a67796 100644--- a/tests/Feature/Server/HetznerServerCreationTest.php+++ b/tests/Feature/Server/HetznerServerCreationTest.php@@ -290,10 +290,9 @@ describe('Hetzner data loading', function () {], 200),]);- $component = Livewire::test(ByHetzner::class)- ->set('selected_token_id', $this->hetznerToken->id)- ->call('nextStep')- ->assertSet('current_step', 2);+ $component = Livewire::test(ByHetzner::class, ['selectedTokenUuid' => $this->hetznerToken->uuid])+ ->assertSet('current_step', 2)+ ->call('loadHetznerData');expect($component->get('hetznerFirewalls'))->toHaveCount(1)->and($component->get('hetznerNetworks'))->toHaveCount(1);diff --git a/tests/Feature/Server/NewServerProviderTokenUrlTest.php b/tests/Feature/Server/NewServerProviderTokenUrlTest.phpnew file mode 100644index 0000000000..b5c23b9299--- /dev/null+++ b/tests/Feature/Server/NewServerProviderTokenUrlTest.php@@ -0,0 +1,170 @@+<?php++use App\Livewire\Server\CreatePage;+use App\Livewire\Server\New\ByDigitalOcean;+use App\Livewire\Server\New\ByHetzner;+use App\Livewire\Server\New\ByVultr;+use App\Models\CloudProviderToken;+use App\Models\InstanceSettings;+use App\Models\Team;+use App\Models\User;+use Illuminate\Foundation\Testing\RefreshDatabase;+use Illuminate\Support\Facades\Http;+use Livewire\Livewire;++uses(RefreshDatabase::class);++beforeEach(function () {+ InstanceSettings::unguarded(fn () => InstanceSettings::updateOrCreate(['id' => 0], ['id' => 0]));++ $this->team = Team::factory()->create();+ $this->admin = User::factory()->create();+ $this->admin->teams()->attach($this->team, ['role' => 'admin']);++ $this->actingAs($this->admin);+ session(['currentTeam' => $this->team]);+});++test('provider token selection redirects to a token specific server creation url', function (string $component, string $provider, string $type) {+ $token = CloudProviderToken::factory()->create([+ 'team_id' => $this->team->id,+ 'provider' => $provider,+ ]);++ Livewire::test($component)+ ->call('selectToken', $token->id)+ ->assertRedirect(route('server.create.token', [+ 'type' => $type,+ 'token_uuid' => $token->uuid,+ ]));+})->with([+ 'hetzner' => [ByHetzner::class, 'hetzner', 'hetzner'],+ 'vultr' => [ByVultr::class, 'vultr', 'vultr'],+ 'digital-ocean' => [ByDigitalOcean::class, 'digitalocean', 'digital-ocean'],+]);++test('provider token selection is rendered as clickable token boxes', function (string $component, string $provider, string $type, string $tokenName) {+ $token = CloudProviderToken::factory()->create([+ 'team_id' => $this->team->id,+ 'provider' => $provider,+ 'name' => $tokenName,+ ]);++ Livewire::test($component)+ ->assertSee($tokenName)+ ->assertSee(route('server.create.token', ['type' => $type, 'token_uuid' => $token->uuid]))+ ->assertDontSee('loadingProviderTokenId', false)+ ->assertDontSee('coolbox-loading', false)+ ->assertSee('coolbox', false)+ ->assertDontSee('wire:click="selectToken(', false)+ ->assertDontSee('loading-spinner', false)+ ->assertDontSee('Loading Hetzner details...')+ ->assertDontSee('Loading Vultr details...')+ ->assertDontSee('Loading DigitalOcean details...')+ ->assertDontSee('Select a saved token')+ ->assertDontSee('You need a saved')+ ->assertDontSee('Continue');+})->with([+ 'hetzner' => [ByHetzner::class, 'hetzner', 'hetzner', 'Production Hetzner'],+ 'vultr' => [ByVultr::class, 'vultr', 'vultr', 'Production Vultr'],+ 'digital-ocean' => [ByDigitalOcean::class, 'digitalocean', 'digital-ocean', 'Production DigitalOcean'],+]);++test('provider token selection shows an add token box when no tokens exist', function (string $component, string $title, string $description) {+ Livewire::test($component)+ ->assertSee($title)+ ->assertSee($description)+ ->assertSee('max-w-2xl', false)+ ->assertSee('coolbox', false)+ ->assertSee('M12 4.5v15m7.5-7.5h-15', false)+ ->assertDontSee('wire:click="selectToken(', false);+})->with([+ 'hetzner' => [ByHetzner::class, 'Add a new token', 'Add a Hetzner API token to create servers from your account.'],+ 'vultr' => [ByVultr::class, 'Add a new token', 'Add a Vultr API token to create servers from your account.'],+ 'digital-ocean' => [ByDigitalOcean::class, 'Add a new token', 'Add a DigitalOcean API token to create Droplets from your account.'],+]);++test('provider token urls pass the token uuid into the server creation page', function () {+ $token = CloudProviderToken::factory()->create([+ 'team_id' => $this->team->id,+ 'provider' => 'hetzner',+ ]);++ expect(route('server.create.token', [+ 'type' => 'hetzner',+ 'token_uuid' => $token->uuid,+ ]))->toEndWith('/servers/new/hetzner/'.$token->uuid);++ Livewire::test(CreatePage::class, [+ 'type' => 'hetzner',+ 'token_uuid' => $token->uuid,+ ])+ ->assertSet('type', 'hetzner')+ ->assertSet('token_uuid', $token->uuid)+ ->assertSet('title', 'Hetzner');+});++test('provider token pages defer provider api data loading until wire init', function (string $component, string $provider, string $type, string $loadingText, string $wireInitCall) {+ $token = CloudProviderToken::factory()->create([+ 'team_id' => $this->team->id,+ 'provider' => $provider,+ ]);++ Http::fake([+ '*' => Http::response([], 200),+ ]);++ Livewire::test($component, ['selectedTokenUuid' => $token->uuid])+ ->assertSet('current_step', 2)+ ->assertSet('loading_data', true)+ ->assertSee($loadingText)+ ->assertSee($wireInitCall, false)+ ->assertSee('text-coollabs dark:text-warning animate-spin', false)+ ->assertDontSee('border-b-2 border-primary', false);++ Http::assertNothingSent();+})->with([+ 'hetzner' => [ByHetzner::class, 'hetzner', 'hetzner', 'Loading Hetzner data...', 'wire:init="loadHetznerData"'],+ 'vultr' => [ByVultr::class, 'vultr', 'vultr', 'Loading Vultr data...', 'wire:init="loadVultrData"'],+ 'digital-ocean' => [ByDigitalOcean::class, 'digitalocean', 'digital-ocean', 'Loading DigitalOcean data...', 'wire:init="loadDigitalOceanData"'],+]);++test('back button on token specific provider creation pages returns to provider token selection', function (string $provider, string $type) {+ $token = CloudProviderToken::factory()->create([+ 'team_id' => $this->team->id,+ 'provider' => $provider,+ ]);++ Livewire::test(CreatePage::class, [+ 'type' => $type,+ 'token_uuid' => $token->uuid,+ ])+ ->assertSee(route('server.create.type', ['type' => $type]), false)+ ->assertDontSee('href="'.route('server.create').'"', false);+})->with([+ 'hetzner' => ['hetzner', 'hetzner'],+ 'vultr' => ['vultr', 'vultr'],+ 'digital-ocean' => ['digitalocean', 'digital-ocean'],+]);++test('new token header button is hidden on token specific provider creation pages', function (string $provider, string $type) {+ $token = CloudProviderToken::factory()->create([+ 'team_id' => $this->team->id,+ 'provider' => $provider,+ ]);++ Livewire::test(CreatePage::class, [+ 'type' => $type,+ ])+ ->assertSee('+ New Token');++ Livewire::test(CreatePage::class, [+ 'type' => $type,+ 'token_uuid' => $token->uuid,+ ])+ ->assertDontSee('+ New Token');+})->with([+ 'hetzner' => ['hetzner', 'hetzner'],+ 'vultr' => ['vultr', 'vultr'],+ 'digital-ocean' => ['digitalocean', 'digital-ocean'],+]);diff --git a/tests/Feature/ServiceTemplatesLastUpdatedHintTest.php b/tests/Feature/ServiceTemplatesLastUpdatedHintTest.phpindex 2ba9b850e2..f839c023cd 100644--- a/tests/Feature/ServiceTemplatesLastUpdatedHintTest.php+++ b/tests/Feature/ServiceTemplatesLastUpdatedHintTest.php@@ -75,6 +75,19 @@ it('caches parsed local service templates by bundle mtime', function () {expect($first->keys()->all())->toBe($second->keys()->all());});+it('renders the shared loading indicator while resource choices load', function () {+ View::share('errors', new ViewErrorBag);++ $view = $this->view('livewire.project.new.select', [+ 'current_step' => 'type',+ 'environments' => collect(),+ ]);++ $view->assertSee('Loading resources...', false);+ $view->assertSee('text-coollabs dark:text-warning animate-spin', false);+ $view->assertDontSee('<div x-show="loading">Loading...</div>', false);+});+it('renders the service templates last updated hint placeholder', function () {View::share('errors', new ViewErrorBag);diff --git a/tests/Feature/VultrServerCreationTest.php b/tests/Feature/VultrServerCreationTest.phpindex 5dee12ca2e..6129863918 100644--- a/tests/Feature/VultrServerCreationTest.php+++ b/tests/Feature/VultrServerCreationTest.php@@ -102,9 +102,7 @@ it('creates a Vultr server through the Livewire flow', function () {], 202),]);- Livewire::test(ByVultr::class)- ->set('selected_token_id', $this->vultrToken->id)- ->call('nextStep')+ Livewire::test(ByVultr::class, ['selectedTokenUuid' => $this->vultrToken->uuid])->assertSet('current_step', 2)->set('server_name', 'test-vultr-server')->set('selected_region', 'ewr')@@ -148,3 +146,22 @@ it('requires IPv6 when public IPv4 is disabled', function () {->call('submit')->assertHasErrors(['enable_ipv6']);});++it('uses the shared dropdown UI for advanced Vultr options', function () {+ Livewire::test(ByVultr::class)+ ->set('current_step', 2)+ ->assertSee('Advanced Vultr options')+ ->assertSeeHtml('dropdownOpen')+ ->assertSeeHtml('x-ref="panel"')+ ->assertSee('Additional SSH Keys (from Vultr)')+ ->assertSee('Network Configuration')+ ->assertSee('Cloud-Init Script');+});++it('renders only the full width buy button at the bottom of the Vultr form', function () {+ Livewire::test(ByVultr::class)+ ->set('current_step', 2)+ ->assertDontSee('wire:click="previousStep"', false)+ ->assertSeeHtml('class="button w-full"')+ ->assertSee('Buy & Create Server', false);+});diff --git a/tests/Unit/CloudProviderTokenFormViewTest.php b/tests/Unit/CloudProviderTokenFormViewTest.phpindex ae6be05c07..64be1328ba 100644--- a/tests/Unit/CloudProviderTokenFormViewTest.php+++ b/tests/Unit/CloudProviderTokenFormViewTest.php@@ -6,11 +6,24 @@ it('allows selecting Vultr in cloud provider token forms', function () {expect($view)->toContain('<x-forms.select required id="provider" label="Provider" wire:model.live="provider">')->and($view)->toContain('<option value="vultr">Vultr</option>')- ->and($view)->toContain('<option disabled value="digitalocean">DigitalOcean</option>')+ ->and($view)->toContain('<option value="digitalocean">DigitalOcean</option>')->and(substr_count($view, 'Open Account → API Access.'))->toBe(2)->and(substr_count($view, 'https://console.vultr.com/user/apiaccess/'))->toBe(2)- ->and($view)->not->toContain('<option value="digitalocean">DigitalOcean</option>')->and($view)->not->toContain('cloudProviderTokens->where(\'provider\', $provider)->isEmpty()')->and($view)->not->toContain('<x-forms.select required id="provider" label="Provider" disabled>')->and($component)->toContain("'provider' => 'required|string|in:hetzner,digitalocean,vultr'");});++it('keeps provider affiliate links on server provider views', function () {+ $tokenFormView = file_get_contents(__DIR__.'/../../resources/views/livewire/security/cloud-provider-token-form.blade.php');+ $hetznerView = file_get_contents(__DIR__.'/../../resources/views/livewire/server/new/by-hetzner.blade.php');+ $vultrView = file_get_contents(__DIR__.'/../../resources/views/livewire/server/new/by-vultr.blade.php');+ $digitalOceanView = file_get_contents(__DIR__.'/../../resources/views/livewire/server/new/by-digital-ocean.blade.php');++ expect($tokenFormView)+ ->not->toContain('https://coolify.io/hetzner')+ ->not->toContain('https://coolify.io/vultr')+ ->and($hetznerView)->toContain('https://coolify.io/hetzner')+ ->and($vultrView)->toContain('https://coolify.io/vultr')+ ->and($digitalOceanView)->toContain('https://coolify.io/digitalocean');+});diff --git a/tests/Unit/GlobalSearchNewImageQuickActionTest.php b/tests/Unit/GlobalSearchNewImageQuickActionTest.phpindex bcddf6f65c..1790086543 100644--- a/tests/Unit/GlobalSearchNewImageQuickActionTest.php+++ b/tests/Unit/GlobalSearchNewImageQuickActionTest.php@@ -33,6 +33,19 @@ it('ensures GlobalSearch uses redirect route helper', function () {->toContain('redirectRoute($this, \'project.resource.create\'');});+it('routes new server quick action to the new server page', function () {+ $globalSearchFile = file_get_contents(__DIR__.'/../../app/Livewire/GlobalSearch.php');+ $bladeFile = file_get_contents(__DIR__.'/../../resources/views/livewire/global-search.blade.php');++ expect($globalSearchFile)+ ->toContain("if (\$type === 'server')")+ ->toContain("redirectRoute(\$this, 'server.create')");++ expect($bladeFile)+ ->toContain("window.location.href = '/servers/new'")+ ->not->toContain('@open-create-modal-server.window');+});+it('ensures docker-image item has quickcommand with new image', function () {$globalSearchFile = file_get_contents(__DIR__.'/../../app/Livewire/GlobalSearch.php');@@ -142,3 +155,13 @@ it('uses cropped image assets instead of inline wide logos for GlobalSearch dataexpect($globalSearchFile)->not->toContain("'logo_html' =>");});++it('uses rounded yellow plus icons for GlobalSearch creatable actions without logos', function () {+ $bladeFile = file_get_contents(__DIR__.'/../../resources/views/livewire/global-search.blade.php');++ expect($bladeFile)+ ->toContain('rounded-full bg-warning/20 flex items-center justify-center')+ ->toContain('class="h-6 w-6 text-warning"')+ ->not->toContain('rounded-lg bg-warning-100 dark:bg-warning-900/40')+ ->not->toContain('text-warning-600 dark:text-warning-400');+});