Merge branch 'next' into fix-ssh-keys

resources/views/livewire/server/delete.blade.php

@@ -8,13 +8,29 @@
         </div>
         @if ($server->definedResources()->count() > 0)
             <div class="pb-2 text-red-500">You need to delete all resources before deleting this server.</div>
-            <x-modal-confirmation disabled isErrorButton buttonTitle="Delete">
-                This server will be deleted. It is not reversible. <br>Please think again.
-            </x-modal-confirmation>
+            <x-modal-confirmation 
+                title="Confirm Server Deletion?"
+                isErrorButton
+                buttonTitle="Delete"
+                submitAction="delete"
+                :actions="['This server will be permanently deleted.']"
+                confirmationText="{{ $server->name }}"
+                confirmationLabel="Please confirm the execution of the actions by entering the Server Name below"
+                shortConfirmationLabel="Server Name"
+                step3ButtonText="Permanently Delete Server"
+            />
         @else
-            <x-modal-confirmation isErrorButton buttonTitle="Delete">
-                This server will be deleted. It is not reversible. <br>Please think again.
-            </x-modal-confirmation>
+            <x-modal-confirmation 
+                title="Confirm Server Deletion?"
+                isErrorButton
+                buttonTitle="Delete"
+                submitAction="delete"
+                :actions="['This server will be permanently deleted.']"
+                confirmationText="{{ $server->name }}"
+                confirmationLabel="Please confirm the execution of the actions by entering the Server Name below"
+                shortConfirmationLabel="Server Name"
+                step2ButtonText="Permanently Delete Server"
+            />
         @endif
     @endif
 </div>

resources/views/livewire/server/form.blade.php

@@ -3,11 +3,15 @@
         <div class="flex gap-2">
             <h2>General</h2>
             @if ($server->id === 0)
-                <x-modal-confirmation buttonTitle="Save" title="Change Localhost" action="submit">
-                    You could lose a lot of functionalities if you change the server details of the server where Coolify
-                    is
-                    running on.<br>Please think again.
-                </x-modal-confirmation>
+                <x-modal-confirmation 
+                    title="Confirm Server Settings Change?"
+                    buttonTitle="Save"
+                    submitAction="submit"
+                    :actions="['You could lose a lot of functionalities if you change the server details of the server where Coolify is running on.']"
+                    :confirmWithText="false"
+                    :confirmWithPassword="false"
+                    step2ButtonText="Save Server Settings"
+                />
             @else
                 <x-forms.button type="submit">Save</x-forms.button>
                 @if ($server->isFunctional())

resources/views/livewire/server/proxy/deploy.blade.php

@@ -24,7 +24,17 @@
                         </a>
                     </button>
                 @endif
-                <x-modal-confirmation @click="$wire.dispatch('restartEvent')">
+                <x-modal-confirmation 
+                    title="Confirm Proxy Restart?"
+                    buttonTitle="Restart Proxy"
+                    submitAction="restart"
+                    :actions="['This proxy will be stopped and started again.', 'All resources hosted on coolify will be unavailable during the restart.']"
+                    :confirmWithText="false"
+                    :confirmWithPassword="false"
+                    step2ButtonText="Restart Proxy"
+                    :dispatchEvent="true"
+                    dispatchEventType="restartEvent"
+                >
                     <x-slot:button-title>
                         <svg class="w-5 h-5 dark:text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                             <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
@@ -35,10 +45,18 @@
                         </svg>
                         Restart Proxy
                     </x-slot:button-title>
-                    This proxy will be stopped and started. It is not reversible. <br>All resources will be unavailable
-                    during the restart. <br>Please think again.
                 </x-modal-confirmation>
-                <x-modal-confirmation @click="$wire.dispatch('stopEvent')">
+                <x-modal-confirmation 
+                    title="Confirm Proxy Stopping?"
+                    buttonTitle="Stop Proxy"
+                    submitAction="stop(true)"
+                    :actions="['The coolify proxy will be stopped.', 'All resources hosted on coolify will be unavailable.']"
+                    :confirmWithText="false"
+                    :confirmWithPassword="false"
+                    step2ButtonText="Stop Proxy"
+                    :dispatchEvent="true"
+                    dispatchEventType="stopEvent"
+                >
                     <x-slot:button-title>
                         <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"
                             stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
@@ -51,8 +69,6 @@
                         </svg>
                         Stop Proxy
                     </x-slot:button-title>
-                    This proxy will be stopped. It is not reversible. <br>All resources will be unavailable.
-                    <br>Please think again.
                 </x-modal-confirmation>
             </div>
         @else