Merge pull request #4193 from coollabsio/next

v4.0.0-beta.364

Author: andrasbacsai

app/Livewire/Project/Application/Preview/Form.php

@@ -3,6 +3,7 @@
 namespace App\Livewire\Project\Application\Preview;
 
 use App\Models\Application;
+use Livewire\Attributes\Validate;
 use Livewire\Component;
 use Spatie\Url\Url;
 

app/Livewire/SettingsBackup.php

@@ -99,6 +99,14 @@ public function addCoolifyDatabase()
             $this->database->refresh();
             $this->backup->refresh();
             $this->s3s = S3Storage::whereTeamId(0)->get();
+
+            $this->uuid = $this->database->uuid;
+            $this->name = $this->database->name;
+            $this->description = $this->database->description;
+            $this->postgres_user = $this->database->postgres_user;
+            $this->postgres_password = $this->database->postgres_password;
+            $this->executions = $this->backup->executions;
+
         } catch (\Exception $e) {
             return handleError($e, $this);
         }

app/Livewire/SettingsEmail.php

@@ -63,6 +63,8 @@ public function syncData(bool $toModel = false)
             $this->settings->smtp_username = $this->smtpUsername;
             $this->settings->smtp_password = $this->smtpPassword;
             $this->settings->smtp_timeout = $this->smtpTimeout;
+            $this->settings->smtp_from_address = $this->smtpFromAddress;
+            $this->settings->smtp_from_name = $this->smtpFromName;
 
             $this->settings->resend_enabled = $this->resendEnabled;
             $this->settings->resend_api_key = $this->resendApiKey;

app/Livewire/Source/Github/Create.php

@@ -23,7 +23,7 @@ class Create extends Component
 
     public function mount()
     {
-        $this->name = substr(generate_random_name(), 0, 34); // GitHub Apps names can only be 34 characters long
+        $this->name = substr(generate_random_name(), 0, 30);
     }
 
     public function createGitHubApp()

bootstrap/helpers/docker.php

@@ -359,8 +359,11 @@ function fqdnLabelsForTraefik(string $uuid, Collection $domains, bool $is_force_
                 $https_label = "https-{$loop}-{$uuid}-{$service_name}";
             }
             if (str($image)->contains('ghost')) {
-                $labels->push("traefik.http.middlewares.redir-ghost.redirectregex.regex=^{$path}/(.*)");
-                $labels->push('traefik.http.middlewares.redir-ghost.redirectregex.replacement=/$1');
+                $labels->push("traefik.http.middlewares.redir-ghost-{$uuid}.redirectregex.regex=^{$path}/(.*)");
+                $labels->push("traefik.http.middlewares.redir-ghost-{$uuid}.redirectregex.replacement=/$1");
+                $labels->push("caddy_{$loop}.handle_path.{$loop}_redir-ghost-{$uuid}.handler=rewrite");
+                $labels->push("caddy_{$loop}.handle_path.{$loop}_redir-ghost-{$uuid}.rewrite.regexp=^{$path}/(.*)");
+                $labels->push("caddy_{$loop}.handle_path.{$loop}_redir-ghost-{$uuid}.rewrite.replacement=/$1");
             }
 
             $to_www_name = "{$loop}-{$uuid}-to-www";

config/sentry.php

@@ -7,7 +7,7 @@
 
     // 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.363',
+    'release' => '4.0.0-beta.364',
 
     // 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.363';
+return '4.0.0-beta.364';

resources/views/livewire/project/application/general.blade.php

@@ -70,7 +70,7 @@
                 </div>
                 <div class="flex items-end gap-2">
                     <x-forms.select label="Direction" id="application.redirect" required
-                        helper="You need to add both the www and non-www A DNS records pointing to your server.">
+                        helper="You must need to add www and non-www as an A DNS record. Make sure the www domain is added under Domains.">
                         <option value="both">Allow www & non-www.</option>
                         <option value="www">Redirect to www.</option>
                         <option value="non-www">Redirect to non-www.</option>

resources/views/livewire/project/new/github-private-repository.blade.php

@@ -1,7 +1,7 @@
 <div>
     <div class="flex items-end gap-2">
         <h1>Create a new Application</h1>
-        <x-modal-input buttonTitle="+ Add GitHub App" title="New GitHub App">
+        <x-modal-input buttonTitle="+ Add GitHub App" title="New GitHub App" closeOutside="false">
             <livewire:source.github.create />
         </x-modal-input>
         @if ($repositories->count() > 0)

resources/views/livewire/project/shared/scheduled-task/all.blade.php

@@ -1,11 +1,11 @@
 <div>
     <div class="flex gap-2">
         <h2>Scheduled Tasks</h2>
-        <x-modal-input buttonTitle="+ Add" title="New Scheduled Task" :closeOutside=false>
+        <x-modal-input buttonTitle="+ Add" title="New Scheduled Task" :closeOutside="false">
             @if ($resource->type() == 'application')
-                <livewire:project.shared.scheduled-task.add :type="$resource->type()" :containerNames="$containerNames"/>
+                <livewire:project.shared.scheduled-task.add :type="$resource->type()" :containerNames="$containerNames" />
             @elseif ($resource->type() == 'service')
-                <livewire:project.shared.scheduled-task.add :type="$resource->type()" :containerNames="$containerNames"/>
+                <livewire:project.shared.scheduled-task.add :type="$resource->type()" :containerNames="$containerNames" />
             @endif
         </x-modal-input>
     </div>