From e443fc394a48c8955864edfd912113f63df14a84 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 6 Oct 2023 13:52:15 +0200
Subject: [PATCH] fix: select branch on other git

---
 app/Http/Livewire/Project/New/PublicGitRepository.php    | 1 +
 lang/en.json                                             | 4 ++--
 .../livewire/project/new/public-git-repository.blade.php | 9 +++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/Http/Livewire/Project/New/PublicGitRepository.php b/app/Http/Livewire/Project/New/PublicGitRepository.php
index b725e231d..7a206fae4 100644
--- a/app/Http/Livewire/Project/New/PublicGitRepository.php
+++ b/app/Http/Livewire/Project/New/PublicGitRepository.php
@@ -103,6 +103,7 @@ class PublicGitRepository extends Component
 
         if ($this->git_host == 'github.com') {
             $this->git_source = GithubApp::where('name', 'Public GitHub')->first();
+            return;
         }
         $this->git_repository = $this->repository_url;
         $this->git_source = 'other';
diff --git a/lang/en.json b/lang/en.json
index 6908255fd..a0a62155f 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -20,5 +20,5 @@
     "input.code": "One-time code",
     "input.recovery_code": "Recovery code",
     "button.save": "Save",
-    "repository.url": "<span class='text-helper'>Examples</span><br>https://github.com/coollabsio/coolify-examples  <span class='text-helper'>main</span> branch will be selected<br><br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify <span class='text-helper'>nodejs-fastify</span> branch will be selected"
-}
\ No newline at end of file
+    "repository.url": "<span class='text-helper'>Examples</span><br>https://github.com/coollabsio/coolify-examples  <span class='text-helper'>main</span> branch will be selected<br><br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify <span class='text-helper'>nodejs-fastify</span> branch will be selected.<br><br>https://gitea.com/sedlav/expressjs.git <span class='text-helper'>main</span> branch will be selected.<br><br>https://gitlab.com/andrasbacsai/nodejs-example.git <span class='text-helper'>main</span> branch will be selected."
+}
diff --git a/resources/views/livewire/project/new/public-git-repository.blade.php b/resources/views/livewire/project/new/public-git-repository.blade.php
index 2b9ee568c..78f7742c9 100644
--- a/resources/views/livewire/project/new/public-git-repository.blade.php
+++ b/resources/views/livewire/project/new/public-git-repository.blade.php
@@ -22,8 +22,13 @@
                     <h3 class="pt-8 pb-2">Details</h3>
                     <div class="flex flex-col gap-2 pb-6">
                         <div class="flex gap-2">
-                            <x-forms.input disabled id="git_branch" label="Selected branch"
-                                helper="You can select other branches after configuration is done." />
+                            @if ($git_source === 'other')
+                                <x-forms.input id="git_branch" label="Selected branch"
+                                    helper="You can select other branches after configuration is done." />
+                            @else
+                                <x-forms.input disabled id="git_branch" label="Selected branch"
+                                    helper="You can select other branches after configuration is done." />
+                            @endif
                             @if ($is_static)
                                 <x-forms.input id="publish_directory" label="Publish Directory"
                                     helper="If there is a build process involved (like Svelte, React, Next, etc..), please specify the output directory for the build assets." />