From 15af5e5b37dc37c74cc3e27fc0d1727d7f641839 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 May 2023 10:20:09 +0200
Subject: [PATCH] fix

---
 app/Http/Livewire/Settings/Form.php           |  2 +-
 .../components/applications/navbar.blade.php  | 25 ++++++++++---------
 .../project/application/deploy.blade.php      |  8 +++---
 .../project/application/source.blade.php      | 11 +++-----
 4 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/app/Http/Livewire/Settings/Form.php b/app/Http/Livewire/Settings/Form.php
index 5f5e48df2..920ba257d 100644
--- a/app/Http/Livewire/Settings/Form.php
+++ b/app/Http/Livewire/Settings/Form.php
@@ -67,7 +67,7 @@ class Form extends Component
             ];
             if ($schema === 'https') {
                 $entryPoints[] = 'https';
-                $middlewares[] = 'redirect-to-https';
+                $middlewares[] = 'redirect-to-https@docker';
             }
 
             $traefik_dynamic_conf = [
diff --git a/resources/views/components/applications/navbar.blade.php b/resources/views/components/applications/navbar.blade.php
index 735792080..60e5e4084 100644
--- a/resources/views/components/applications/navbar.blade.php
+++ b/resources/views/components/applications/navbar.blade.php
@@ -20,31 +20,32 @@
     <div class="dropdown dropdown-bottom">
         <button tabindex="0"
             class="flex items-center justify-center h-full text-white normal-case bg-transparent border-none rounded btn btn-xs no-animation">
-            Links
+            Open
             <x-chevron-down />
         </button>
         <ul tabindex="0"
             class="text-xs text-white normal-case rounded min-w-max dropdown-content menu bg-coolgray-200">
-            <li>
-                <a class="text-xs" target="_blank" href="{{ $application->gitBranchLocation }}">
-                    Open on Git
-                    <x-external-link />
-                </a>
-            </li>
+            @if (data_get($application, 'fqdn'))
+                <li>
+                    <a class="text-xs hover:no-underline hover:bg-coollabs" target="_blank"
+                        href="{{ $application->fqdn }}">
+                        {{ $application->fqdn }}
+                    </a>
+                </li>
+            @endif
             @if (data_get($application, 'ports_mappings_array'))
                 @foreach ($application->ports_mappings_array as $port)
                     @if (config('app.env') === 'local')
                         <li>
-                            <a class="text-xs " target="_blank"
-                                href="http://localhost:{{ explode(':', $port)[0] }}">Open
+                            <a class="text-xs hover:no-underline hover:bg-coollabs" target="_blank"
+                                href="http://localhost:{{ explode(':', $port)[0] }}">Port
                                 {{ explode(':', $port)[0] }}
-                                <x-external-link />
                             </a>
                         </li>
                     @else
                         <li>
-                            <a class="text-xs" target="_blank"
-                                href="http://{{ $application->destination->server->ip }}:{{ explode(':', $port)[0] }}">Open
+                            <a class="text-xs hover:no-underline hover:bg-coollabs" target="_blank"
+                                href="http://{{ $application->destination->server->ip }}:{{ explode(':', $port)[0] }}">Port
                                 {{ $port }}</a>
                         </li>
                     @endif
diff --git a/resources/views/livewire/project/application/deploy.blade.php b/resources/views/livewire/project/application/deploy.blade.php
index e2e465812..a2bec62aa 100644
--- a/resources/views/livewire/project/application/deploy.blade.php
+++ b/resources/views/livewire/project/application/deploy.blade.php
@@ -9,10 +9,10 @@
             <ul tabindex="0"
                 class="text-xs text-white normal-case rounded min-w-max dropdown-content menu bg-coolgray-200">
                 <li>
-                    <div wire:click='deploy'>Restart</div>
+                    <div class="hover:bg-coollabs" wire:click='deploy'>Restart</div>
                 </li>
                 <li>
-                    <div wire:click='deploy(true)'>Force deploy without cache</div>
+                    <div class="hover:bg-coollabs" wire:click='deploy(true)'>Force deploy without cache</div>
                 </li>
                 <li>
                     <div class="hover:bg-red-500" wire:click='stop'>Stop</div>
@@ -29,10 +29,10 @@
             <ul tabindex="0"
                 class="text-xs text-white normal-case rounded min-w-max dropdown-content menu bg-coolgray-200">
                 <li>
-                    <div wire:click='deploy'>Deploy</div>
+                    <div class="hover:bg-coollabs" wire:click='deploy'>Deploy</div>
                 </li>
                 <li>
-                    <div wire:click='deploy(true)'>Deploy without cache</div>
+                    <div class="hover:bg-coollabs" wire:click='deploy(true)'>Deploy without cache</div>
                 </li>
             </ul>
         </div>
diff --git a/resources/views/livewire/project/application/source.blade.php b/resources/views/livewire/project/application/source.blade.php
index d15046324..bff8ef355 100644
--- a/resources/views/livewire/project/application/source.blade.php
+++ b/resources/views/livewire/project/application/source.blade.php
@@ -7,16 +7,13 @@
                 Commits
                 <x-external-link />
             </a>
+            <a target="_blank" href="{{ $application->gitBranchLocation }}">
+                Open Repository
+                <x-external-link />
+            </a>
         </div>
-        {{-- <div>{{ data_get($application, 'source.name') }}
-            @if (data_get($application, 'source.is_public'))
-                <span class="text-xs">public</span>
-            @endif
-        </div> --}}
         <x-forms.input placeholder="coollabsio/coolify-example" id="application.git_repository" label="Repository" />
         <x-forms.input placeholder="main" id="application.git_branch" label=" Branch" />
         <x-forms.input placeholder="HEAD" id="application.git_commit_sha" placeholder="HEAD" label="Commit SHA" />
-
     </form>
-
 </div>