diff --git a/app/Livewire/Project/New/PublicGitRepository.php b/app/Livewire/Project/New/PublicGitRepository.php index 2f2331fc0..45b3b5726 100644 --- a/app/Livewire/Project/New/PublicGitRepository.php +++ b/app/Livewire/Project/New/PublicGitRepository.php @@ -188,11 +188,22 @@ class PublicGitRepository extends Component private function getGitSource() { + $this->git_branch = 'main'; + $this->base_directory = '/'; + $this->repository_url_parsed = Url::fromString($this->repository_url); $this->git_host = $this->repository_url_parsed->getHost(); $this->git_repository = $this->repository_url_parsed->getSegment(1).'/'.$this->repository_url_parsed->getSegment(2); + if ($this->repository_url_parsed->getSegment(3) === 'tree') { - $this->git_branch = str($this->repository_url_parsed->getPath())->after('tree/')->value(); + $path = str($this->repository_url_parsed->getPath())->trim('/'); + $this->git_branch = str($path)->after('tree/')->before('/')->value(); + $this->base_directory = str($path)->after($this->git_branch)->after('/')->value(); + if (filled($this->base_directory)) { + $this->base_directory = '/'.$this->base_directory; + } else { + $this->base_directory = '/'; + } } else { $this->git_branch = 'main'; } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 329482230..717daf2a2 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -28,6 +28,7 @@ class AppServiceProvider extends ServiceProvider $this->configurePasswords(); $this->configureSanctumModel(); $this->configureGitHubHttp(); + } private function configureCommands(): void diff --git a/config/constants.php b/config/constants.php index 739a616ae..981c0e331 100644 --- a/config/constants.php +++ b/config/constants.php @@ -2,7 +2,7 @@ return [ 'coolify' => [ - 'version' => '4.0.0-beta.390', + 'version' => '4.0.0-beta.391', 'helper_version' => '1.0.6', 'realtime_version' => '1.0.5', 'self_hosted' => env('SELF_HOSTED', true), diff --git a/public/coolify-logo-dev-transparent.png b/public/coolify-logo-dev-transparent.png new file mode 100644 index 000000000..9beeb9ba3 Binary files /dev/null and b/public/coolify-logo-dev-transparent.png differ diff --git a/public/coolify-transparent.png b/public/coolify-transparent.png index 22d337a1e..96fc0db36 100644 Binary files a/public/coolify-transparent.png and b/public/coolify-transparent.png differ diff --git a/public/coolify.png b/public/coolify.png deleted file mode 100644 index fa01fec05..000000000 Binary files a/public/coolify.png and /dev/null differ diff --git a/public/favicon-dev.png b/public/favicon-dev.png deleted file mode 100644 index d7c507015..000000000 Binary files a/public/favicon-dev.png and /dev/null differ diff --git a/public/favicon.png b/public/favicon.png deleted file mode 100644 index 2c4482801..000000000 Binary files a/public/favicon.png and /dev/null differ diff --git a/public/svgs/coolify.png b/public/svgs/coolify.png index fa01fec05..96fc0db36 100644 Binary files a/public/svgs/coolify.png and b/public/svgs/coolify.png differ diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index db7aad83e..96bc22b56 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -21,7 +21,7 @@ @endphp {{ $name }}{{ $title ?? 'Coolify' }} @env('local') - + @else @endenv diff --git a/resources/views/livewire/project/new/select.blade.php b/resources/views/livewire/project/new/select.blade.php index d48c3bbec..730ced42a 100644 --- a/resources/views/livewire/project/new/select.blade.php +++ b/resources/views/livewire/project/new/select.blade.php @@ -103,7 +103,7 @@ :src='service.logo' x-on:error.window="$event.target.src = service.logo_github_url" onerror="this.onerror=null; this.src=this.getAttribute('data-fallback');" - x-on:error="$event.target.src = '/svgs/coolify.png'" + x-on:error="$event.target.src = '/svgs/coolify-transparent.png'" :data-fallback='service.logo_github_url' /> diff --git a/templates/compose/next-image-transformation.yaml b/templates/compose/next-image-transformation.yaml index b3b412541..1d3a4b5b0 100644 --- a/templates/compose/next-image-transformation.yaml +++ b/templates/compose/next-image-transformation.yaml @@ -1,7 +1,7 @@ # documentation: https://github.com/coollabsio/next-image-transformation # slogan: Drop-in replacement for Vercel's Nextjs image optimization service. # tags: nextjs,image,transformation,service -# logo: svgs/coolify.png +# logo: svgs/coolify-transparent.png # port: 3000 services: diff --git a/versions.json b/versions.json index 141624819..8b37d727d 100644 --- a/versions.json +++ b/versions.json @@ -1,10 +1,10 @@ { "coolify": { "v4": { - "version": "4.0.0-beta.390" + "version": "4.0.0-beta.391" }, "nightly": { - "version": "4.0.0-beta.391" + "version": "4.0.0-beta.392" }, "helper": { "version": "1.0.6"