wip

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.5';
+return '4.0.0-beta.6';

database/seeders/GithubAppSeeder.php

@@ -16,8 +16,7 @@ class GithubAppSeeder extends Seeder
     public function run(): void
     {
         $root_team = Team::find(0);
-        $private_key_1 = PrivateKey::find(1);
+        $private_key_2 = PrivateKey::find(1);
-        $private_key_2 = PrivateKey::find(2);
         GithubApp::create([
             'name' => 'Public GitHub',
             'api_url' => 'https://api.github.com',

database/seeders/GitlabAppSeeder.php

@@ -16,7 +16,7 @@ class GitlabAppSeeder extends Seeder
     public function run(): void
     {
         $root_team = Team::find(0);
-        $private_key_3 = PrivateKey::find(3);
+        $private_key_2 = PrivateKey::find(2);
         GitlabApp::create([
             'id' => 1,
             'name' => 'Public GitLab',
@@ -36,7 +36,7 @@ public function run(): void
             'deploy_key_id' => '1234',
             'public_key' => 'dfjasiourj',
             'webhook_token' => '4u3928u4y392',
-            'private_key_id' => $private_key_3->id,
+            'private_key_id' => $private_key_2->id,
             'team_id' => $root_team->id,
         ]);
     }

database/seeders/PrivateKeySeeder.php

@@ -17,6 +17,7 @@ public function run(): void
     {
         $team_1 = Team::find(0);
         PrivateKey::create([
+            "id" => 0,
             "team_id" => $team_1->id,
             "name" => "Testing-host",
             "description" => "This is a test docker container",

database/seeders/ServerSeeder.php

@@ -16,7 +16,7 @@ class ServerSeeder extends Seeder
     public function run(): void
     {
         $root_team = Team::find(0);
-        $private_key_1 = PrivateKey::find(1);
+        $private_key_1 = PrivateKey::find(0);
 
         Server::create([
             'id' => 0,

resources/views/livewire/server/form.blade.php

@@ -1,20 +1,21 @@
-<div x-data="{ deleteServer: false }">
+<div x-data="{ deleteServer: false, changeLocalhost: false }">
     <x-naked-modal show="deleteServer" title="Delete Server"
         message='This server will be deleted. It is not reversible. <br>Please think again.' />
+    <x-naked-modal show="changeLocalhost" action="submit" title="Change localhost"
+        message='You could lost a lot of functionalities if you change the server details of the server where Coolify is running on.<br>Please think again.' />
     <form wire:submit.prevent='submit' class="flex flex-col">
         <div class="flex gap-2">
             <h2>General</h2>
-            <x-forms.button type="submit">Save</x-forms.button>
+            @if ($server->id === 0)
+                <x-forms.button x-on:click.prevent="changeLocalhost = true">Save</x-forms.button>
+            @else
+                <x-forms.button type="submit">Save</x-forms.button>
+            @endif
         </div>
         <div class="flex flex-col gap-2 ">
             <div class="flex flex-col w-full gap-2 lg:flex-row">
-                @if ($server->id === 0)
+                <x-forms.input id="server.name" label="Name" required />
-                    <x-forms.input id="server.name" label="Name" readonly required />
+                <x-forms.input id="server.description" label="Description" />
-                    <x-forms.input id="server.description" label="Description" readonly />
-                @else
-                    <x-forms.input id="server.name" label="Name" required />
-                    <x-forms.input id="server.description" label="Description" />
-                @endif
                 <x-forms.input id="wildcard_domain" label="Wildcard Domain"
                     helper="Wildcard domain for your applications. If you set this, you will get a random generated domain for your new applications.<br><span class='font-bold text-white'>Example</span>In case you set:<span class='text-helper'>https://example.com</span>your applications will get: <span class='text-helper'>https://randomId.example.com</span>" />
 
@@ -23,16 +24,14 @@
             </div>
             <div class="flex flex-col w-full gap-2 lg:flex-row">
                 @if ($server->id === 0)
-                    <x-forms.input id="server.ip" label="IP Address" readonly required />
+                    <x-forms.input id="server.ip" label="IP Address" required />
-                    <x-forms.input id="server.user" label="User" readonly required />
-                    <x-forms.input type="number" id="server.port" label="Port" readonly required />
                 @else
                     <x-forms.input id="server.ip" label="IP Address" readonly required />
-                    <div class="flex gap-2">
-                        <x-forms.input id="server.user" label="User" required />
-                        <x-forms.input type="number" id="server.port" label="Port" required />
-                    </div>
                 @endif
+                <div class="flex gap-2">
+                    <x-forms.input id="server.user" label="User" required />
+                    <x-forms.input type="number" id="server.port" label="Port" required />
+                </div>
             </div>
         </div>
         <h3 class="py-4">Actions</h3>

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.32"
         },
         "v4": {
-            "version": "4.0.0-beta.5"
+            "version": "4.0.0-beta.6"
         }
     }
-}
+}