From b6f856223141c46ce2b0b88a007666db20411610 Mon Sep 17 00:00:00 2001 From: Johnny Kessler <68814636+jhKessler@users.noreply.github.com> Date: Thu, 7 Nov 2024 18:09:47 +0100 Subject: [PATCH 01/10] chore: edit www helper --- resources/views/livewire/project/application/general.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php index 6c93d25b7..3db633e6a 100644 --- a/resources/views/livewire/project/application/general.blade.php +++ b/resources/views/livewire/project/application/general.blade.php @@ -70,7 +70,7 @@
+ helper="You must need to add www and non-www as an A DNS record. Make sure the www domain is added under Domains."> From 44d1c407dd4332cf224676bcb7760578adb24a6a Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 8 Nov 2024 15:03:11 +0100 Subject: [PATCH 02/10] version++ --- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/sentry.php b/config/sentry.php index 8ff3c354a..97488c6dd 100644 --- a/config/sentry.php +++ b/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.363', + 'release' => '4.0.0-beta.364', // When left empty or `null` the Laravel environment will be used 'environment' => config('app.env'), diff --git a/config/version.php b/config/version.php index abee59dbc..79f788c51 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ Date: Fri, 8 Nov 2024 15:03:21 +0100 Subject: [PATCH 03/10] fix: github app name is too long --- app/Livewire/Source/Github/Create.php | 2 +- .../new/github-private-repository.blade.php | 2 +- .../shared/scheduled-task/all.blade.php | 6 ++--- resources/views/source/all.blade.php | 2 +- resources/views/source/github/new.blade.php | 4 ---- resources/views/source/new.blade.php | 22 ------------------- 6 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 resources/views/source/github/new.blade.php delete mode 100644 resources/views/source/new.blade.php diff --git a/app/Livewire/Source/Github/Create.php b/app/Livewire/Source/Github/Create.php index 103c5c9fb..136d3525e 100644 --- a/app/Livewire/Source/Github/Create.php +++ b/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() diff --git a/resources/views/livewire/project/new/github-private-repository.blade.php b/resources/views/livewire/project/new/github-private-repository.blade.php index b4ef1bdb1..b390189fc 100644 --- a/resources/views/livewire/project/new/github-private-repository.blade.php +++ b/resources/views/livewire/project/new/github-private-repository.blade.php @@ -1,7 +1,7 @@

Create a new Application

- + @if ($repositories->count() > 0) diff --git a/resources/views/livewire/project/shared/scheduled-task/all.blade.php b/resources/views/livewire/project/shared/scheduled-task/all.blade.php index 1d34447f6..42bbacb6d 100644 --- a/resources/views/livewire/project/shared/scheduled-task/all.blade.php +++ b/resources/views/livewire/project/shared/scheduled-task/all.blade.php @@ -1,11 +1,11 @@

Scheduled Tasks

- + @if ($resource->type() == 'application') - + @elseif ($resource->type() == 'service') - + @endif
diff --git a/resources/views/source/all.blade.php b/resources/views/source/all.blade.php index 989edf186..4d8002424 100644 --- a/resources/views/source/all.blade.php +++ b/resources/views/source/all.blade.php @@ -4,7 +4,7 @@

Sources

- +
diff --git a/resources/views/source/github/new.blade.php b/resources/views/source/github/new.blade.php deleted file mode 100644 index cb516e591..000000000 --- a/resources/views/source/github/new.blade.php +++ /dev/null @@ -1,4 +0,0 @@ - -

New GitHub Source

- - diff --git a/resources/views/source/new.blade.php b/resources/views/source/new.blade.php deleted file mode 100644 index 29359c5d7..000000000 --- a/resources/views/source/new.blade.php +++ /dev/null @@ -1,22 +0,0 @@ - -

New Source

-
Add source providers for your applications.
-
- {{--
- GitHub - - GitLab - -
--}} -
- -
- {{--
- WIP -
--}} -
- From 2676f9a8db0f45468bef90c7d7af4ec1cc52c4bb Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Fri, 8 Nov 2024 15:09:54 +0100 Subject: [PATCH 04/10] fix disable 2 stp confirmation UI --- .../views/livewire/settings/index.blade.php | 56 +++++++++++-------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/resources/views/livewire/settings/index.blade.php b/resources/views/livewire/settings/index.blade.php index 193156bf0..7ab92d9c1 100644 --- a/resources/views/livewire/settings/index.blade.php +++ b/resources/views/livewire/settings/index.blade.php @@ -130,29 +130,39 @@

Confirmation Settings

- @if ($disable_two_step_confirmation) -
- +
+ + +
+ @if ($disable_two_step_confirmation) +
+ +
+ @else +
+ +
+
+

Warning!

+

Disabling two step confirmation reduces security (as anyone can easily delete anything) and increases + the risk of accidental actions. This is not recommended for production servers.

+
+ @endif
- @else -
- -
-
-

Warning!

-

Disabling two step confirmation reduces security (as anyone can easily delete anything) and increases - the - risk of accidental actions. This is not recommended for production servers.

-
- @endif +
From 78a96b4efee78fb43e8a375f20e2297855fcf906 Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Fri, 8 Nov 2024 15:10:08 +0100 Subject: [PATCH 05/10] fix validate import is missing --- app/Livewire/Project/Application/Preview/Form.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Livewire/Project/Application/Preview/Form.php b/app/Livewire/Project/Application/Preview/Form.php index c7b2e8184..edcab44c8 100644 --- a/app/Livewire/Project/Application/Preview/Form.php +++ b/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; From b7451802a6f96ddf5801a945ac2e6210930f1d74 Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Fri, 8 Nov 2024 15:14:13 +0100 Subject: [PATCH 06/10] css fix --- resources/views/livewire/settings/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/livewire/settings/index.blade.php b/resources/views/livewire/settings/index.blade.php index 7ab92d9c1..47e6e2a2e 100644 --- a/resources/views/livewire/settings/index.blade.php +++ b/resources/views/livewire/settings/index.blade.php @@ -156,7 +156,7 @@ confirmationLabel="Please type the confirmation text to disable two step confirmation." shortConfirmationLabel="Confirmation text" step3ButtonText="Disable Two Step Confirmation" />
-
+

Warning!

Disabling two step confirmation reduces security (as anyone can easily delete anything) and increases the risk of accidental actions. This is not recommended for production servers.

From 959966ad310992c300f52090e03cc5be932d1d36 Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Fri, 8 Nov 2024 16:43:40 +0100 Subject: [PATCH 07/10] fix from name and from address can not be saved --- app/Livewire/SettingsEmail.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Livewire/SettingsEmail.php b/app/Livewire/SettingsEmail.php index 0ab5754f2..61f720b3a 100644 --- a/app/Livewire/SettingsEmail.php +++ b/app/Livewire/SettingsEmail.php @@ -63,6 +63,8 @@ class SettingsEmail extends Component $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; From 0bc646e7a753262c1a313462f6d75314982c297e Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Fri, 8 Nov 2024 17:04:37 +0100 Subject: [PATCH 08/10] fix instance backup page --- app/Livewire/SettingsBackup.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/Livewire/SettingsBackup.php b/app/Livewire/SettingsBackup.php index 6dc5d6ab3..1b0599ffe 100644 --- a/app/Livewire/SettingsBackup.php +++ b/app/Livewire/SettingsBackup.php @@ -99,6 +99,14 @@ class SettingsBackup extends Component $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); } From 754053acc10fa86f7300bf4ebe4669089329a2eb Mon Sep 17 00:00:00 2001 From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com> Date: Fri, 8 Nov 2024 17:44:12 +0100 Subject: [PATCH 09/10] fix ghost --- bootstrap/helpers/docker.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php index 2e583b94d..40eacf5c8 100644 --- a/bootstrap/helpers/docker.php +++ b/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"; From 15c00bcdd72fbc9de85a505e5b74b096382ef9e3 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 8 Nov 2024 18:07:40 +0100 Subject: [PATCH 10/10] fix: serverTimezone update --- resources/views/livewire/server/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/livewire/server/show.blade.php b/resources/views/livewire/server/show.blade.php index be351cd66..818412f57 100644 --- a/resources/views/livewire/server/show.blade.php +++ b/resources/views/livewire/server/show.blade.php @@ -124,7 +124,7 @@