From 5d2651afc1ae402a630952508c7edd5a3cc25abe Mon Sep 17 00:00:00 2001 From: Astrid Date: Mon, 24 Jun 2024 17:20:56 +0200 Subject: [PATCH 1/4] Add margin top to button --- resources/views/livewire/settings/backup.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/livewire/settings/backup.blade.php b/resources/views/livewire/settings/backup.blade.php index 4ca132123..50f5f3d28 100644 --- a/resources/views/livewire/settings/backup.blade.php +++ b/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. - Add Database + Add Database @endif
From 7759fe2cdfb3042d5f031af8e413e46594c7b597 Mon Sep 17 00:00:00 2001 From: kubatron 117 Date: Mon, 24 Jun 2024 17:24:08 +0200 Subject: [PATCH 2/4] Add czech localization --- lang/cs.json | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 lang/cs.json diff --git a/lang/cs.json b/lang/cs.json new file mode 100644 index 000000000..48b47b06a --- /dev/null +++ b/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": "Příklady
Pro veřejné repozitáře, použijte https://....
Pro soukromé repozitáře, použijte git@....

https://github.com/coollabsio/coolify-examples main branch bude zvolena
https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify nodejs-fastify branch bude vybrána.
https://gitea.com/sedlav/expressjs.git main branch vybrána.
https://gitlab.com/andrasbacsai/nodejs-example.git main branch bude vybrána." +} From 351c9c1ad3a48a7f3020f1ac70f57f2630683c24 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 24 Jun 2024 18:31:15 +0200 Subject: [PATCH 3/4] chore: Update version to 4.0.0-beta.301 --- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/sentry.php b/config/sentry.php index 00a60c53a..de47cdebd 100644 --- a/config/sentry.php +++ b/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.300', + 'release' => '4.0.0-beta.301', // 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 4e43d9845..850674546 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ Date: Mon, 24 Jun 2024 18:33:01 +0200 Subject: [PATCH 4/4] fix: projects with 0 envs --- resources/views/livewire/dashboard.blade.php | 7 +++++-- resources/views/livewire/project/index.blade.php | 13 ++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php index 2df3b1cdb..c1dd375ff 100644 --- a/resources/views/livewire/dashboard.blade.php +++ b/resources/views/livewire/dashboard.blade.php @@ -23,7 +23,7 @@
@foreach ($projects as $project)
+ onclick="gotoProject('{{ $project->uuid }}','{{ $project->default_environment()?->name }}')">
{{ $project->name }}
@@ -160,7 +160,10 @@ @endif diff --git a/resources/views/livewire/project/index.blade.php b/resources/views/livewire/project/index.blade.php index 0a5cb26bb..76bae7a91 100644 --- a/resources/views/livewire/project/index.blade.php +++ b/resources/views/livewire/project/index.blade.php @@ -12,12 +12,12 @@
@forelse ($projects as $project)
- +
{{ $project->name }}
{{ $project->description }}
- +
@@ -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; + }