Merge pull request #2675 from coollabsio/next

v4.0.0-beta.304

app/Livewire/Project/Service/StackForm.php

@@ -81,7 +81,6 @@ class StackForm extends Component
             return handleError($e, $this);
         } finally {
             if (is_null($this->service->config_hash)) {
-                ray('asdf');
                 $this->service->isConfigurationChanged(true);
             } else {
                 $this->dispatch('configurationChanged');

app/Models/Project.php

@@ -116,10 +116,14 @@ class Project extends BaseModel
     public function default_environment()
     {
         $default = $this->environments()->where('name', 'production')->first();
-        if (! $default) {
-            $default = $this->environments()->get()->sortBy('created_at')->first();
+        if ($default) {
+            return $default->name;
+        }
+        $default = $this->environments()->get();
+        if ($default->count() > 0) {
+            return $default->sortBy('created_at')->first()->name;
         }
 
-        return $default;
+        return null;
     }
 }

app/Models/Service.php

@@ -840,22 +840,26 @@ class Service extends BaseModel
 
         $json = Yaml::parse($this->docker_compose);
         $envs_from_coolify = $this->environment_variables()->get();
-        foreach ($json['services'] as $service => $config) {
-            $envs = collect($config['environment']);
-            $envs->push("COOLIFY_CONTAINER_NAME=$service-{$this->uuid}");
-            foreach ($envs_from_coolify as $env) {
-                $envs = $envs->map(function ($value) use ($env) {
-                    if (str($value)->startsWith($env->key)) {
-                        return "{$env->key}={$env->real_value}";
-                    }
-
-                    return $value;
-                });
-            }
-            $envs = $envs->unique();
-            data_set($json, "services.$service.environment", $envs->toArray());
-        }
+        // foreach ($json['services'] as $service => $config) {
+        //     if (data_get($config, 'environment') === null) {
+        //         data_set($json, "services.$service.environment", []);
+        //         $envs = collect([]);
+        //     } else {
+        //         $envs = collect($config['environment']);
+        //     }
+        //     // $envs->put('COOLIFY_CONTAINER_NAME', "$service-{$this->uuid}");
+        //     foreach ($envs_from_coolify as $env) {
+        //         $envs = $envs->map(function ($value) use ($env) {
+        //             if (str($value)->startsWith($env->key)) {
+        //                 return "{$env->key}={$env->real_value}";
+        //             }
 
+        //             return $value;
+        //         });
+        //     }
+        //     $envs = $envs->unique();
+        //     data_set($json, "services.$service.environment", $envs->toArray());
+        // }
         $this->docker_compose = Yaml::dump($json, 10, 2, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK);
         $docker_compose_base64 = base64_encode($this->docker_compose);
 

config/sentry.php

@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.300',
+    'release' => '4.0.0-beta.304',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.300';
+return '4.0.0-beta.304';

lang/cs.json

@@ -0,0 +1,30 @@
+{
+    "auth.login": "Přihlásit se",
+    "auth.login.azure": "Přihlásit se pomocí Microsoftu",
+    "auth.login.bitbucket": "Přihlásit se pomocí Bitbucketu",
+    "auth.login.github": "Přihlásit se pomocí GitHubu",
+    "auth.login.gitlab": "Přihlásit se pomocí Gitlabu",
+    "auth.login.google": "Přihlásit se pomocí Google",
+    "auth.already_registered": "Již jste registrováni?",
+    "auth.confirm_password": "Potvrďte heslo",
+    "auth.forgot_password": "Zapomněli jste heslo",
+    "auth.forgot_password_send_email": "Poslat e-mail pro resetování hesla",
+    "auth.register_now": "Registrovat se",
+    "auth.logout": "Odhlásit se",
+    "auth.register": "Registrovat se",
+    "auth.registration_disabled": "Registrace je zakázána. Kontaktujte prosím administrátora.",
+    "auth.reset_password": "Obnovit heslo",
+    "auth.failed": "Tyto údaje neodpovídají našim záznamům.",
+    "auth.failed.callback": "Nepodařilo se zpracovat zpětné volání od poskytovatele přihlášení.",
+    "auth.failed.password": "Zadané heslo je nesprávné.",
+    "auth.failed.email": "Nemůžeme najít uživatele s touto e-mailovou adresou.",
+    "auth.throttle": "Příliš mnoho pokusů o přihlášení. Zkuste to prosím znovu za :seconds sekund.",
+    "input.name": "Jméno",
+    "input.email": "E-mail",
+    "input.password": "Heslo",
+    "input.password.again": "Heslo znovu",
+    "input.code": "Jednorázový kód",
+    "input.recovery_code": "Obnovovací kód",
+    "button.save": "Uložit",
+    "repository.url": "<span class='text-helper'>Příklady</span><br>Pro veřejné repozitáře, použijte <span class='text-helper'>https://...</span>.<br>Pro soukromé repozitáře, použijte <span class='text-helper'>git@...</span>.<br><br>https://github.com/coollabsio/coolify-examples <span class='text-helper'>main</span> branch bude zvolena<br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify <span class='text-helper'>nodejs-fastify</span> branch bude vybrána.<br>https://gitea.com/sedlav/expressjs.git <span class='text-helper'>main</span> branch vybrána.<br>https://gitlab.com/andrasbacsai/nodejs-example.git <span class='text-helper'>main</span> branch bude vybrána."
+}

resources/views/livewire/dashboard.blade.php

@@ -23,7 +23,7 @@
         <div class="grid grid-cols-1 gap-2 xl:grid-cols-2">
             @foreach ($projects as $project)
                 <div class="gap-2 border border-transparent cursor-pointer box group"
-                    onclick="window.location.href = '{{ route('project.resource.index', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => $project->default_environment()->name]) }}'">
+                    onclick="gotoProject('{{ $project->uuid }}','{{ $project->default_environment() }}')">
                     <div class="flex flex-1 mx-6">
                         <div class="flex flex-col justify-center flex-1">
                             <div class="box-title">{{ $project->name }}</div>
@@ -160,7 +160,10 @@
     @endif
 
     <script>
-        function gotoProject(uuid, environment = 'production') {
+        function gotoProject(uuid, environment) {
+            if (!environment) {
+                window.location.href = '/project/' + uuid;
+            }
             window.location.href = '/project/' + uuid + '/' + environment;
         }
     </script>

resources/views/livewire/project/index.blade.php

@@ -12,12 +12,12 @@
     <div class="grid gap-2 lg:grid-cols-2">
         @forelse ($projects as $project)
             <div class="box group" x-data x-on:click="goto('{{ $project->uuid }}')">
-                <a class="flex flex-col justify-center flex-1 mx-6"
-                    href="{{ route('project.resource.index', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => $project->default_environment()->name]) }}">
+                <div class="flex flex-col justify-center flex-1 mx-6"
+                    onclick="gotoProject('{{ $project->uuid }}','{{ $project->default_environment() }}')">
                     <div class="box-title">{{ $project->name }}</div>
                     <div class="box-description ">
                         {{ $project->description }}</div>
-                </a>
+                </div>
                 <div class="flex items-center justify-center gap-2 pt-4 pb-2 mr-4 text-xs lg:py-0 lg:justify-normal">
                     <a class="mx-4 font-bold hover:underline"
                         href="{{ route('project.edit', ['project_uuid' => data_get($project, 'uuid')]) }}">
@@ -36,5 +36,12 @@
         function goto(uuid) {
             window.location.href = '/project/' + uuid;
         }
+
+        function gotoProject(uuid, environment) {
+            if (!environment) {
+                window.location.href = '/project/' + uuid;
+            }
+            window.location.href = '/project/' + uuid + '/' + environment;
+        }
     </script>
 </div>

resources/views/livewire/settings/backup.blade.php

@@ -26,7 +26,7 @@
             @else
                 To configure automatic backup for your Coolify instance, you first need to add as a database resource
                 into Coolify.
-                <x-forms.button wire:click="add_coolify_database">Add Database</x-forms.button>
+                <x-forms.button class="mt-2" wire:click="add_coolify_database">Add Database</x-forms.button>
             @endif
         </div>
         <div class="py-4">

versions.json

@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.300"
+            "version": "4.0.0-beta.304"
         }
     }
 }