From 8c005435b5425fcc82dd92f029e0d6999703e941 Mon Sep 17 00:00:00 2001
From: ShadowArcanist <projectshadowmoon@gmail.com>
Date: Sun, 21 Sep 2025 23:59:46 +0530
Subject: [PATCH 1/5] Added confirmation modal for switching proxies

---
 .../components/modal-confirmation.blade.php   |  3 +-
 .../views/livewire/server/proxy.blade.php     | 34 +++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/resources/views/components/modal-confirmation.blade.php b/resources/views/components/modal-confirmation.blade.php
index 0d185782f..1c82614a6 100644
--- a/resources/views/components/modal-confirmation.blade.php
+++ b/resources/views/components/modal-confirmation.blade.php
@@ -11,6 +11,7 @@
     'content' => null,
     'checkboxes' => [],
     'actions' => [],
+    'warningMessage' => null,
     'confirmWithText' => true,
     'confirmationText' => 'Confirm Deletion',
     'confirmationLabel' => 'Please confirm the execution of the actions by entering the Name below',
@@ -228,7 +229,7 @@
                     <div x-show="step === 2">
                         <div class="p-4 mb-4 text-white border-l-4 border-red-500 bg-error" role="alert">
                             <p class="font-bold">Warning</p>
-                            <p>This operation is permanent and cannot be undone. Please think again before proceeding!
+                            <p>{!! $warningMessage ?: 'This operation is permanent and cannot be undone. Please think again before proceeding!' !!}
                             </p>
                         </div>
                         <div class="mb-4">The following actions will be performed:</div>
diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php
index db2fd2827..9100fc2a0 100644
--- a/resources/views/livewire/server/proxy.blade.php
+++ b/resources/views/livewire/server/proxy.blade.php
@@ -4,24 +4,22 @@
         <div x-init="$wire.loadProxyConfiguration">
             @if ($selectedProxy !== 'NONE')
                 <form wire:submit='submit'>
-                    <div class="flex items-center gap-2">
-                        <h2>Configuration</h2>
-                        @if ($server->proxy->status === 'exited' || $server->proxy->status === 'removing')
-                            <x-forms.button canGate="update" :canResource="$server" wire:click.prevent="changeProxy">Switch
-                                Proxy</x-forms.button>
-                        @else
-                            <x-forms.button canGate="update" :canResource="$server" disabled
-                                wire:click.prevent="changeProxy">Switch Proxy</x-forms.button>
-                        @endif
-                        <x-forms.button canGate="update" :canResource="$server" type="submit">Save</x-forms.button>
-                    </div>
-                    <div class="pb-4 "> <svg class="inline-flex w-6 h-6 mr-2 dark:text-warning" viewBox="0 0 256 256"
-                            xmlns="http://www.w3.org/2000/svg">
-                            <path fill="currentColor"
-                                d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16" />
-                        </svg>Before switching proxies, please read <a class="underline dark:text-white"
-                            href="https://coolify.io/docs/knowledge-base/server/proxies#switch-between-proxies">this</a>.
-                    </div>
+                     <div class="flex items-center gap-2">
+                         <h2>Configuration</h2>
+                         @if ($server->proxy->status === 'exited' || $server->proxy->status === 'removing')
+                             @can('update', $server)
+                                 <x-modal-confirmation title="Confirm Proxy Switching?" buttonTitle="Switch Proxy"
+                                     submitAction="changeProxy" :actions="[
+                                         'Custom proxy configurations may be reset to their default settings.'
+                                     ]" warningMessage="This operation may cause issues. Please refer to the guide <a href='https://coolify.io/docs/knowledge-base/server/proxies#switch-between-proxies' target='_blank' class='underline text-white'>switching between proxies</a> before proceeding!" step2ButtonText="Switch Proxy" :confirmWithText="false" :confirmWithPassword="false">
+                                 </x-modal-confirmation>
+                             @endcan
+                         @else
+                             <x-forms.button canGate="update" :canResource="$server"
+                                 wire:click="$dispatch('error', 'Currently running proxy must be stopped before switching proxy')">Switch Proxy</x-forms.button>
+                         @endif
+                         <x-forms.button canGate="update" :canResource="$server" type="submit">Save</x-forms.button>
+                     </div>
                     <h3>Advanced</h3>
                     <div class="pb-4 w-96">
                         <x-forms.checkbox canGate="update" :canResource="$server"

From 9da54bc94f112c228307eef6b7da26fbfd8ee731 Mon Sep 17 00:00:00 2001
From: ShadowArcanist <projectshadowmoon@gmail.com>
Date: Mon, 22 Sep 2025 00:05:26 +0530
Subject: [PATCH 2/5] Added description text on Proxy configuration title

---
 resources/views/livewire/server/proxy.blade.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php
index 9100fc2a0..e61acbec4 100644
--- a/resources/views/livewire/server/proxy.blade.php
+++ b/resources/views/livewire/server/proxy.blade.php
@@ -20,7 +20,8 @@
                          @endif
                          <x-forms.button canGate="update" :canResource="$server" type="submit">Save</x-forms.button>
                      </div>
-                    <h3>Advanced</h3>
+                     <div class="subtitle">Configure your proxy settings and advanced options.</div>
+                     <h3>Advanced</h3>
                     <div class="pb-4 w-96">
                         <x-forms.checkbox canGate="update" :canResource="$server"
                             helper="If set, all resources will only have docker container labels for {{ str($server->proxyType())->title() }}.<br>For applications, labels needs to be regenerated manually. <br>Resources needs to be restarted."

From 11878bcf5db02ac7db4b8d4e090a20034598be6c Mon Sep 17 00:00:00 2001
From: ShadowArcanist <projectshadowmoon@gmail.com>
Date: Mon, 22 Sep 2025 00:09:49 +0530
Subject: [PATCH 3/5] Added (Coolify Proxy) to the proxy name on Configuration
 page

New users can easily understand Traefik or Caddy is being used as the Coolify proxy
---
 resources/views/livewire/server/proxy.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php
index e61acbec4..652322d32 100644
--- a/resources/views/livewire/server/proxy.blade.php
+++ b/resources/views/livewire/server/proxy.blade.php
@@ -36,9 +36,9 @@
                         @endif
                     </div>
                     @if ($server->proxyType() === ProxyTypes::TRAEFIK->value)
-                        <h3>Traefik</h3>
+                        <h3>Traefik (Coolify Proxy)</h3>
                     @elseif ($server->proxyType() === 'CADDY')
-                        <h3>Caddy</h3>
+                        <h3>Caddy (Coolify Proxy)</h3>
                     @endif
                     @if (
                         $server->proxy->last_applied_settings &&

From 24fdac624d57ba7c8d1cab2d8e40e3855a60040b Mon Sep 17 00:00:00 2001
From: ShadowArcanist <projectshadowmoon@gmail.com>
Date: Mon, 22 Sep 2025 00:15:02 +0530
Subject: [PATCH 4/5] Improved spacing between titles on proxy configuration
 page

---
 resources/views/livewire/server/proxy.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php
index 652322d32..4c330725d 100644
--- a/resources/views/livewire/server/proxy.blade.php
+++ b/resources/views/livewire/server/proxy.blade.php
@@ -22,7 +22,7 @@
                      </div>
                      <div class="subtitle">Configure your proxy settings and advanced options.</div>
                      <h3>Advanced</h3>
-                    <div class="pb-4 w-96">
+                    <div class="pb-6 w-96">
                         <x-forms.checkbox canGate="update" :canResource="$server"
                             helper="If set, all resources will only have docker container labels for {{ str($server->proxyType())->title() }}.<br>For applications, labels needs to be regenerated manually. <br>Resources needs to be restarted."
                             id="server.settings.generate_exact_labels"
@@ -52,7 +52,7 @@
                     </div>
                     <div wire:loading.remove wire:target="loadProxyConfiguration">
                         @if ($proxySettings)
-                            <div class="flex flex-col gap-2 pt-4">
+                            <div class="flex flex-col gap-2 pt-2">
                                 <x-forms.textarea canGate="update" :canResource="$server" useMonacoEditor
                                     monacoEditorLanguage="yaml"
                                     label="Configuration file ({{ $this->configurationFilePath }})" name="proxySettings"

From 4ea4846124632f6bdbbfaa51c248f7337f3f5336 Mon Sep 17 00:00:00 2001
From: ShadowArcanist <projectshadowmoon@gmail.com>
Date: Mon, 22 Sep 2025 00:26:08 +0530
Subject: [PATCH 5/5] Moved Proxy config reset button from bottom of the editor
 to next to the proxy name

---
 .../views/livewire/server/proxy.blade.php     | 58 ++++++++++---------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php
index 4c330725d..aa6b9b7cd 100644
--- a/resources/views/livewire/server/proxy.blade.php
+++ b/resources/views/livewire/server/proxy.blade.php
@@ -8,7 +8,8 @@
                          <h2>Configuration</h2>
                          @if ($server->proxy->status === 'exited' || $server->proxy->status === 'removing')
                              @can('update', $server)
-                                 <x-modal-confirmation title="Confirm Proxy Switching?" buttonTitle="Switch Proxy"
+                                 <x-modal-confirmation title="Confirm Proxy Switching?" 
+                                     buttonTitle="Switch Proxy"
                                      submitAction="changeProxy" :actions="[
                                          'Custom proxy configurations may be reset to their default settings.'
                                      ]" warningMessage="This operation may cause issues. Please refer to the guide <a href='https://coolify.io/docs/knowledge-base/server/proxies#switch-between-proxies' target='_blank' class='underline text-white'>switching between proxies</a> before proceeding!" step2ButtonText="Switch Proxy" :confirmWithText="false" :confirmWithPassword="false">
@@ -35,11 +36,30 @@
                                 id="redirectUrl" label="Redirect to (optional)" />
                         @endif
                     </div>
-                    @if ($server->proxyType() === ProxyTypes::TRAEFIK->value)
-                        <h3>Traefik (Coolify Proxy)</h3>
-                    @elseif ($server->proxyType() === 'CADDY')
-                        <h3>Caddy (Coolify Proxy)</h3>
-                    @endif
+                     @php
+                         $proxyTitle = $server->proxyType() === ProxyTypes::TRAEFIK->value ? 'Traefik (Coolify Proxy)' : 'Caddy (Coolify Proxy)';
+                     @endphp
+                     @if ($server->proxyType() === ProxyTypes::TRAEFIK->value || $server->proxyType() === 'CADDY')
+                         <div class="flex items-center gap-2">
+                             <h3>{{ $proxyTitle }}</h3>
+                             @if($proxySettings)
+                                 @can('update', $server)
+                                     <x-modal-confirmation title="Reset Proxy Configuration?"
+                                         buttonTitle="Reset Configuration"
+                                         submitAction="resetProxyConfiguration" :actions="[
+                                             'Reset proxy configuration to default settings',
+                                             'All custom configurations will be lost',
+                                             'Custom ports and entrypoints will be removed',
+                                         ]"
+                                         confirmationText="{{ $server->name }}"
+                                         confirmationLabel="Please confirm by entering the server name below"
+                                         shortConfirmationLabel="Server Name" step2ButtonText="Reset Configuration"
+                                         :confirmWithPassword="false" :confirmWithText="true">
+                                     </x-modal-confirmation>
+                                 @endcan
+                             @endif
+                         </div>
+                     @endif
                     @if (
                         $server->proxy->last_applied_settings &&
                             $server->proxy->last_saved_settings !== $server->proxy->last_applied_settings)
@@ -52,26 +72,12 @@
                     </div>
                     <div wire:loading.remove wire:target="loadProxyConfiguration">
                         @if ($proxySettings)
-                            <div class="flex flex-col gap-2 pt-2">
-                                <x-forms.textarea canGate="update" :canResource="$server" useMonacoEditor
-                                    monacoEditorLanguage="yaml"
-                                    label="Configuration file ({{ $this->configurationFilePath }})" name="proxySettings"
-                                    id="proxySettings" rows="30" />
-                                @can('update', $server)
-                                    <x-modal-confirmation title="Reset Proxy Configuration?"
-                                        buttonTitle="Reset configuration to default" isErrorButton
-                                        submitAction="resetProxyConfiguration" :actions="[
-                                            'Reset proxy configuration to default settings',
-                                            'All custom configurations will be lost',
-                                            'Custom ports and entrypoints will be removed',
-                                        ]"
-                                        confirmationText="{{ $server->name }}"
-                                        confirmationLabel="Please confirm by entering the server name below"
-                                        shortConfirmationLabel="Server Name" step2ButtonText="Reset Configuration"
-                                        :confirmWithPassword="false" :confirmWithText="true">
-                                    </x-modal-confirmation>
-                                @endcan
-                            </div>
+                             <div class="flex flex-col gap-2 pt-2">
+                                  <x-forms.textarea canGate="update" :canResource="$server" useMonacoEditor
+                                      monacoEditorLanguage="yaml"
+                                      label="Configuration file ({{ $this->configurationFilePath }})" name="proxySettings"
+                                      id="proxySettings" rows="30" />
+                             </div>
                         @endif
                     </div>
                 </form>