Merge branch 'next' into IARayan-bitbucket-preview-deployment-fix-pullrequest-update

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';
         }

app/Providers/AppServiceProvider.php

@@ -28,6 +28,7 @@ class AppServiceProvider extends ServiceProvider
         $this->configurePasswords();
         $this->configureSanctumModel();
         $this->configureGitHubHttp();
+
     }
 
     private function configureCommands(): void

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),

resources/views/layouts/base.blade.php

@@ -21,7 +21,7 @@
     @endphp
     <title>{{ $name }}{{ $title ?? 'Coolify' }}</title>
     @env('local')
-    <link rel="icon" href="{{ asset('favicon-dev.png') }}" type="image/x-icon" />
+    <link rel="icon" href="{{ asset('coolify-logo-dev-transparent.png') }}" type="image/x-icon" />
 @else
     <link rel="icon" href="{{ asset('coolify-transparent.png') }}" type="image/x-icon" />
     @endenv

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' />
                                         </template>
                                     </x-slot:logo>

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:

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"