From 1768b9374fab6ac87958943ee47474b87f0dad1b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 3 Oct 2023 08:14:49 +0200
Subject: [PATCH 01/11] fix: move /data to ./_data in dev

---
 docker-compose.dev.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index cefdec07f..63cc51da5 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -34,14 +34,14 @@ services:
       POSTGRES_DB: "${DB_DATABASE:-coolify}"
       POSTGRES_HOST_AUTH_METHOD: "trust"
     volumes:
-      - /data/coolify/_volumes/database/:/var/lib/postgresql/data
+      - ./_data/coolify/_volumes/database/:/var/lib/postgresql/data
   redis:
     ports:
       - "${FORWARD_REDIS_PORT:-6379}:6379"
     env_file:
       - .env
     volumes:
-      - /data/coolify/_volumes/redis/:/data
+      - ./_data/coolify/_volumes/redis/:/data
   vite:
     image: node:19
     working_dir: /var/www/html
@@ -56,7 +56,7 @@ services:
     volumes:
       - /:/host
       - /var/run/docker.sock:/var/run/docker.sock
-      - /data/coolify/:/data/coolify
+      - ./_data/coolify/:/data/coolify
   mailpit:
     image: "axllent/mailpit:latest"
     container_name: coolify-mail
@@ -76,6 +76,6 @@ services:
       MINIO_ACCESS_KEY: "${MINIO_ACCESS_KEY:-minioadmin}"
       MINIO_SECRET_KEY: "${MINIO_SECRET_KEY:-minioadmin}"
     volumes:
-      - /data/coolify/_volumes/minio/:/data
+      - ./_data/coolify/_volumes/minio/:/data
     networks:
       - coolify

From e3a6458506aab5ed8bd4c58a58d6bd79797ebfe6 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 3 Oct 2023 08:16:19 +0200
Subject: [PATCH 02/11] version++

---
 config/sentry.php  | 2 +-
 config/version.php | 2 +-
 versions.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/sentry.php b/config/sentry.php
index 5bd48364a..fbddc758e 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.59',
+    'release' => '4.0.0-beta.60',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index 75c583caf..b61b5c9de 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.59';
+return '4.0.0-beta.60';
diff --git a/versions.json b/versions.json
index 25b2d8bb1..d43babfda 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.59"
+            "version": "4.0.0-beta.60"
         }
     }
 }

From 1560ab2a50903ed2f4ba2c07355b3e558745e3cd Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 3 Oct 2023 08:22:03 +0200
Subject: [PATCH 03/11] fix: UI

---
 .../views/livewire/project/service/compose-modal.blade.php      | 1 +
 resources/views/livewire/project/shared/storages/show.blade.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/livewire/project/service/compose-modal.blade.php b/resources/views/livewire/project/service/compose-modal.blade.php
index 465ea2eb0..8b9e0155b 100644
--- a/resources/views/livewire/project/service/compose-modal.blade.php
+++ b/resources/views/livewire/project/service/compose-modal.blade.php
@@ -1,6 +1,7 @@
 <dialog id="composeModal" class="modal" x-data="{ raw: true }">
     <form method="dialog" class="flex flex-col gap-2 rounded max-w-7xl modal-box" wire:submit.prevent='submit'>
         <h1>Docker Compose</h1>
+        <div>Volume names are updated upon save. The service UUID will be added as a prefix to all volumes, to prevent name collision. To see the actual volume names, go to Storage menu.</div>
         <div x-cloak x-show="raw">
             <x-forms.button class="w-64" @click.prevent="raw = !raw">Check Deployable Compose</x-forms.button>
         </div>
diff --git a/resources/views/livewire/project/shared/storages/show.blade.php b/resources/views/livewire/project/shared/storages/show.blade.php
index a7da32f9c..e84ff22ea 100644
--- a/resources/views/livewire/project/shared/storages/show.blade.php
+++ b/resources/views/livewire/project/shared/storages/show.blade.php
@@ -8,7 +8,7 @@
     </x-modal>
     @once ($isReadOnly)
         <span class="text-warning">Please modify storage layout in your <a
-                class="underline" href="{{ Str::of(url()->current())->beforeLast('/') }}#compose">Docker Compose</a> file.</span>
+                class="underline" href="{{ Str::of(url()->current())->beforeLast('/') }}">Docker Compose</a> file.</span>
     @endonce
     <form wire:submit.prevent='submit' class="flex flex-col gap-2 pt-4 xl:items-end xl:flex-row">
         @if ($isReadOnly)

From 68c976ab70564e4be5915f537448476cb39b220f Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 3 Oct 2023 08:48:07 +0200
Subject: [PATCH 04/11] fix: show all storages in one place for services

---
 .../Livewire/Project/Shared/Storages/All.php  |  1 +
 .../Livewire/Project/Shared/Storages/Show.php |  1 +
 .../livewire/project/service/index.blade.php  | 44 ++++++++++++++++++-
 .../livewire/project/service/show.blade.php   |  4 +-
 .../project/shared/storages/all.blade.php     | 37 +++++++++-------
 .../project/shared/storages/show.blade.php    | 31 ++++++++-----
 6 files changed, 88 insertions(+), 30 deletions(-)

diff --git a/app/Http/Livewire/Project/Shared/Storages/All.php b/app/Http/Livewire/Project/Shared/Storages/All.php
index 30fa9e9e9..8ac22d881 100644
--- a/app/Http/Livewire/Project/Shared/Storages/All.php
+++ b/app/Http/Livewire/Project/Shared/Storages/All.php
@@ -7,6 +7,7 @@ use Livewire\Component;
 
 class All extends Component
 {
+    public bool $isHeaderVisible = true;
     public $resource;
     protected $listeners = ['refreshStorages', 'submit'];
 
diff --git a/app/Http/Livewire/Project/Shared/Storages/Show.php b/app/Http/Livewire/Project/Shared/Storages/Show.php
index 84593aef3..15d16095c 100644
--- a/app/Http/Livewire/Project/Shared/Storages/Show.php
+++ b/app/Http/Livewire/Project/Shared/Storages/Show.php
@@ -11,6 +11,7 @@ class Show extends Component
     public LocalPersistentVolume $storage;
     public bool $isReadOnly = false;
     public ?string $modalId = null;
+    public bool $isFirst = true;
 
     protected $rules = [
         'storage.name' => 'required|string',
diff --git a/resources/views/livewire/project/service/index.blade.php b/resources/views/livewire/project/service/index.blade.php
index 75aa9166e..28a2deb63 100644
--- a/resources/views/livewire/project/service/index.blade.php
+++ b/resources/views/livewire/project/service/index.blade.php
@@ -7,6 +7,8 @@
             <a :class="activeTab === 'service-stack' && 'text-white'"
                 @click.prevent="activeTab = 'service-stack'; window.location.hash = 'service-stack'"
                 href="#">Service Stack</a>
+            <a :class="activeTab === 'storages' && 'text-white'"
+                @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Storages</a>
             <a :class="activeTab === 'environment-variables' && 'text-white'"
                 @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
                 href="#">Environment
@@ -34,7 +36,7 @@
                     </div>
                 </form>
                 <div class="grid grid-cols-1 gap-2 pt-4 xl:grid-cols-3">
-                    @foreach ($service->applications as $application)
+                    @foreach ($applications as $application)
                         <div @class([
                             'border-l border-dashed border-red-500' => Str::of(
                                 $application->status)->contains(['exited']),
@@ -98,6 +100,46 @@
                     @endforeach
                 </div>
 
+            </div>
+            <div x-cloak x-show="activeTab === 'storages'">
+                @foreach ($applications as $application)
+                    @if ($loop->first)
+                        <livewire:project.shared.storages.all :resource="$application" />
+                    @else
+                        <livewire:project.shared.storages.all :resource="$application" :isHeaderVisible="false" />
+                    @endif
+                    @if ($application->fileStorages()->get()->count() > 0)
+                        <h5 class="py-4">Mounted Files/Dirs (binds)</h5>
+                        <div class="flex flex-col gap-4">
+                            @foreach ($application->fileStorages()->get()->sort() as $fileStorage)
+                                <livewire:project.service.file-storage :fileStorage="$fileStorage"
+                                    wire:key="{{ $loop->index }}" />
+                            @endforeach
+                        </div>
+                    @endif
+                @endforeach
+                @foreach ($databases as $database)
+                    @if ($loop->first)
+                        <h3 class="pt-4">{{ Str::headline($database->name) }}</h3>
+                        @if ($applications->count() > 0)
+                            <livewire:project.shared.storages.all :resource="$database" :isHeaderVisible="false" />
+                        @else
+                            <livewire:project.shared.storages.all :resource="$database" />
+                        @endif
+                        @if ($database->fileStorages()->get()->count() > 0)
+                            <h5 class="py-4">Mounted Files/Dirs (binds)</h5>
+                            <div class="flex flex-col gap-4">
+                                @foreach ($database->fileStorages()->get()->sort() as $fileStorage)
+                                    <livewire:project.service.file-storage :fileStorage="$fileStorage"
+                                        wire:key="{{ $loop->index }}" />
+                                @endforeach
+                            </div>
+                        @endif
+                    @else
+                        <livewire:project.shared.storages.all :resource="$database" :isHeaderVisible="false" />
+                    @endif
+                @endforeach
+
             </div>
             <div x-cloak x-show="activeTab === 'environment-variables'">
                 <div x-cloak x-show="activeTab === 'environment-variables'">
diff --git a/resources/views/livewire/project/service/show.blade.php b/resources/views/livewire/project/service/show.blade.php
index 8fcfc008a..b789e6550 100644
--- a/resources/views/livewire/project/service/show.blade.php
+++ b/resources/views/livewire/project/service/show.blade.php
@@ -26,7 +26,7 @@
                 <div x-cloak x-show="activeTab === 'storages'">
                     <livewire:project.shared.storages.all :resource="$serviceApplication" />
                     @if ($serviceApplication->fileStorages()->get()->count() > 0)
-                        <h3 class="py-4">Mounted Files (binds)</h3>
+                        <h5 class="py-4">Mounted Files/Dirs (binds)</h5>
                         <div class="flex flex-col gap-4">
                             @foreach ($serviceApplication->fileStorages()->get()->sort() as $fileStorage)
                                 <livewire:project.service.file-storage :fileStorage="$fileStorage" wire:key="{{ $loop->index }}" />
@@ -42,7 +42,7 @@
                 <div x-cloak x-show="activeTab === 'storages'">
                     <livewire:project.shared.storages.all :resource="$serviceDatabase" />
                     @if ($serviceDatabase->fileStorages()->get()->count() > 0)
-                        <h3 class="py-4">Mounted Files (binds)</h3>
+                        <h5 class="py-4">Mounted Files/Dirs (binds)</h5>
                         <div class="flex flex-col gap-4">
                             @foreach ($serviceDatabase->fileStorages()->get()->sort() as $fileStorage)
                                 <livewire:project.service.file-storage :fileStorage="$fileStorage" wire:key="{{ $loop->index }}" />
diff --git a/resources/views/livewire/project/shared/storages/all.blade.php b/resources/views/livewire/project/shared/storages/all.blade.php
index 21f7a89ae..fbf8cd593 100644
--- a/resources/views/livewire/project/shared/storages/all.blade.php
+++ b/resources/views/livewire/project/shared/storages/all.blade.php
@@ -1,28 +1,33 @@
 <div>
-    <div>
-        <div class="flex items-center gap-2">
-            <h2>Storages</h2>
-            @if ($resource->type() !== 'service')
-                <x-helper
-                    helper="For Preview Deployments, storage has a <span class='text-helper'>-pr-#PRNumber</span> in their
+    @if ($isHeaderVisible)
+        <div>
+            <div class="flex items-center gap-2">
+                <h2>Storages</h2>
+                @if ($resource->type() !== 'service')
+                    <x-helper
+                        helper="For Preview Deployments, storage has a <span class='text-helper'>-pr-#PRNumber</span> in their
             volume
             name, example: <span class='text-helper'>-pr-1</span>" />
-                <x-forms.button class="btn" onclick="newStorage.showModal()">+ Add</x-forms.button>
-                <livewire:project.shared.storages.add :uuid="$resource->uuid" />
+                    <x-forms.button class="btn" onclick="newStorage.showModal()">+ Add</x-forms.button>
+                    <livewire:project.shared.storages.add :uuid="$resource->uuid" />
+                @endif
+            </div>
+            <div class="pb-4">Persistent storage to preserve data between deployments.</div>
+            @if ($resource->type() === 'service')
+                <span class="text-warning">Please modify storage layout in your <a class="underline"
+                        href="{{ Str::of(url()->current())->beforeLast('/') }}">Docker Compose</a> file.</span>
+                <h2 class="pt-4">{{ Str::headline($resource->name) }} </h2>
             @endif
         </div>
-        <div>Persistent storage to preserve data between deployments.</div>
-    </div>
-    <div class="flex flex-col gap-2 py-4">
-        @forelse ($resource->persistentStorages as $storage)
+    @endif
+    <div class="flex flex-col gap-4">
+        @foreach ($resource->persistentStorages as $storage)
             @if ($resource->type() === 'service')
-                <livewire:project.shared.storages.show wire:key="storage-{{ $storage->id }}" :storage="$storage"
+                <livewire:project.shared.storages.show wire:key="storage-{{ $storage->id }}" :storage="$storage" :isFirst="$loop->first"
                     isReadOnly='true' />
             @else
                 <livewire:project.shared.storages.show wire:key="storage-{{ $storage->id }}" :storage="$storage" />
             @endif
-        @empty
-            <div class="text-neutral-500">No volume storages found.</div>
-        @endforelse
+        @endforeach
     </div>
 </div>
diff --git a/resources/views/livewire/project/shared/storages/show.blade.php b/resources/views/livewire/project/shared/storages/show.blade.php
index e84ff22ea..401b03069 100644
--- a/resources/views/livewire/project/shared/storages/show.blade.php
+++ b/resources/views/livewire/project/shared/storages/show.blade.php
@@ -6,19 +6,28 @@
                 reversible. <br>Please think again.</p>
         </x-slot:modalBody>
     </x-modal>
-    @once ($isReadOnly)
-        <span class="text-warning">Please modify storage layout in your <a
-                class="underline" href="{{ Str::of(url()->current())->beforeLast('/') }}">Docker Compose</a> file.</span>
-    @endonce
-    <form wire:submit.prevent='submit' class="flex flex-col gap-2 pt-4 xl:items-end xl:flex-row">
+
+    <form wire:submit.prevent='submit' class="flex flex-col gap-2 xl:items-end xl:flex-row">
         @if ($isReadOnly)
-            <x-forms.input id="storage.name" label="Volume Name" required readonly />
-            <x-forms.input id="storage.host_path" label="Source Path" readonly />
-            <x-forms.input id="storage.mount_path" label="Destination Path" required readonly />
+            @if ($isFirst)
+                <x-forms.input id="storage.name" label="Volume Name" required readonly />
+                <x-forms.input id="storage.host_path" label="Source Path (on host)" readonly />
+                <x-forms.input id="storage.mount_path" label="Destination Path (in container)" required readonly />
+            @else
+                <x-forms.input id="storage.name" required readonly />
+                <x-forms.input id="storage.host_path" readonly />
+                <x-forms.input id="storage.mount_path" required readonly />
+            @endif
         @else
-            <x-forms.input id="storage.name" label="Name" required />
-            <x-forms.input id="storage.host_path" label="Source Path" />
-            <x-forms.input id="storage.mount_path" label="Destination Path" required />
+            @if ($isFirst)
+                <x-forms.input id="storage.name" label="Volume Name" required />
+                <x-forms.input id="storage.host_path" label="Source Path (on host)" />
+                <x-forms.input id="storage.mount_path" label="Destination Path (in container)" required />
+            @else
+                <x-forms.input id="storage.name" required />
+                <x-forms.input id="storage.host_path" />
+                <x-forms.input id="storage.mount_path" required />
+            @endif
             <div class="flex gap-2">
                 <x-forms.button type="submit">
                     Update

From cf6caa279dbb2bb50bd23cb275fbe14705552726 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 3 Oct 2023 09:02:36 +0200
Subject: [PATCH 05/11] fix: ui

---
 resources/views/projects.blade.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/resources/views/projects.blade.php b/resources/views/projects.blade.php
index 563230edf..a76607b9d 100644
--- a/resources/views/projects.blade.php
+++ b/resources/views/projects.blade.php
@@ -17,17 +17,16 @@
             @forelse ($projects as $project)
                 <div class="gap-2 border border-transparent cursor-pointer box group" x-data
                     x-on:click="goto('{{ $project->uuid }}')">
-                    <div class="flex flex-col mx-6">
+                    <div class="flex flex-col flex-1 mx-6">
                         <a class=" group-hover:text-white hover:no-underline"
                             href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}">{{ $project->name }}</a>
                         <div class="text-xs group-hover:text-white hover:no-underline"
                             href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}">
                             {{ $project->description }}</div>
                     </div>
-                    <div class="flex-1"></div>
-                    <a class="mx-4 rounded hover:text-white"
+                    <a class="mx-4 rounded group-hover:text-white"
                         href="{{ route('project.edit', ['project_uuid' => data_get($project, 'uuid')]) }}">
-                        <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24" stroke-width="1.5"
+                        <svg xmlns="http://www.w3.org/2000/svg" class="icon hover:text-warning" viewBox="0 0 24 24" stroke-width="1.5"
                             stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
                             <path stroke="none" d="M0 0h24v24H0z" fill="none" />
                             <path

From 09fc950ae8d98cf35d683ff0a67ba1c5973df9af Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 3 Oct 2023 11:00:52 +0200
Subject: [PATCH 06/11] fix: add _data to vite ignore

---
 vite.config.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vite.config.js b/vite.config.js
index 6fbf344f3..11868eb91 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -4,6 +4,9 @@ import vue from "@vitejs/plugin-vue";
 
 export default defineConfig({
     server: {
+        watch: {
+            ignored: ['**/_data/**'],
+          },
         host: "0.0.0.0",
         hmr: process.env.GITPOD_WORKSPACE_URL
             ? {

From 734e9fd68ddae8dc1ef940d5e97eabd49d1d7ec9 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 3 Oct 2023 11:01:01 +0200
Subject: [PATCH 07/11] more explanation

---
 .../views/livewire/project/service/compose-modal.blade.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/views/livewire/project/service/compose-modal.blade.php b/resources/views/livewire/project/service/compose-modal.blade.php
index 8b9e0155b..d3c16dfd4 100644
--- a/resources/views/livewire/project/service/compose-modal.blade.php
+++ b/resources/views/livewire/project/service/compose-modal.blade.php
@@ -1,14 +1,17 @@
 <dialog id="composeModal" class="modal" x-data="{ raw: true }">
     <form method="dialog" class="flex flex-col gap-2 rounded max-w-7xl modal-box" wire:submit.prevent='submit'>
+        <div class="flex items-end gap-2">
         <h1>Docker Compose</h1>
-        <div>Volume names are updated upon save. The service UUID will be added as a prefix to all volumes, to prevent name collision. To see the actual volume names, go to Storage menu.</div>
         <div x-cloak x-show="raw">
-            <x-forms.button class="w-64" @click.prevent="raw = !raw">Check Deployable Compose</x-forms.button>
+            <x-forms.button class="w-64" @click.prevent="raw = !raw">Show Deployable Compose</x-forms.button>
         </div>
         <div x-cloak x-show="raw === false">
             <x-forms.button class="w-64" @click.prevent="raw = !raw">Show Source
                 Compose</x-forms.button>
         </div>
+    </div>
+        <div>Volume names are updated upon save. The service UUID will be added as a prefix to all volumes, to prevent name collision. <br>To see the actual volume names, check the Deployable Compose file, or go to Storage menu.</div>
+
         <div x-cloak x-show="raw">
             <x-forms.textarea rows="20" id="raw">
             </x-forms.textarea>

From 51e601a3034d1daab45dfd2fad03c1b90f408018 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 3 Oct 2023 11:22:35 +0200
Subject: [PATCH 08/11] fix: only use _ in volume names for services

---
 app/Models/Service.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/Models/Service.php b/app/Models/Service.php
index c23ff075a..7ad297229 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -318,11 +318,7 @@ class Service extends BaseModel
                             );
                         } else if ($type->value() === 'volume') {
                             $slug = Str::slug($source, '-');
-                            if ($isNew) {
-                                $name = "{$savedService->service->uuid}-{$slug}";
-                            } else {
-                                $name = "{$savedService->service->uuid}_{$slug}";
-                            }
+                            $name = "{$savedService->service->uuid}_{$slug}";
                             if (is_string($volume)) {
                                 $source = Str::of($volume)->before(':');
                                 $target = Str::of($volume)->after(':')->beforeLast(':');

From 5580a4e704dc04309d769f1912affaa9b4aeb3a2 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 3 Oct 2023 11:56:56 +0200
Subject: [PATCH 09/11] feat: delete resource command

---
 app/Console/Commands/DeleteResource.php | 86 +++++++++++++++++++++++++
 app/Models/Application.php              | 10 ++-
 app/Models/Service.php                  |  3 +-
 app/Models/StandalonePostgresql.php     | 11 ++++
 4 files changed, 107 insertions(+), 3 deletions(-)
 create mode 100644 app/Console/Commands/DeleteResource.php

diff --git a/app/Console/Commands/DeleteResource.php b/app/Console/Commands/DeleteResource.php
new file mode 100644
index 000000000..0712448ec
--- /dev/null
+++ b/app/Console/Commands/DeleteResource.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Application;
+use App\Models\Service;
+use App\Models\StandalonePostgresql;
+use Illuminate\Console\Command;
+
+use function Laravel\Prompts\confirm;
+use function Laravel\Prompts\select;
+
+class DeleteResource extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:delete-resource';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Delete a resource from the database';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $resource = select(
+            'What resource do you want to delete?',
+            ['Application', 'Database', 'Service'],
+        );
+        if ($resource === 'Application') {
+            $this->deleteApplication();
+        } elseif ($resource === 'Database') {
+            $this->deleteDatabase();
+        } elseif ($resource === 'Service') {
+            $this->deleteService();
+        }
+    }
+    private function deleteApplication() {
+        $applications = Application::all();
+        $application = select(
+            'What application do you want to delete?',
+            $applications->pluck('name')->toArray(),
+        );
+        $application = $applications->where('name', $application)->first();
+        $confirmed = confirm("Are you sure you want to delete {$application->name}?");
+        if (!$confirmed) {
+            return;
+        }
+        $application->delete();
+    }
+    private function deleteDatabase() {
+        $databases = StandalonePostgresql::all();
+        $database = select(
+            'What database do you want to delete?',
+            $databases->pluck('name')->toArray(),
+        );
+        $database = $databases->where('name', $database)->first();
+        $confirmed = confirm("Are you sure you want to delete {$database->name}?");
+        if (!$confirmed) {
+            return;
+        }
+        $database->delete();
+    }
+    private function deleteService() {
+        $services = Service::all();
+        $service = select(
+            'What service do you want to delete?',
+            $services->pluck('name')->toArray(),
+        );
+        $service = $services->where('name', $service)->first();
+        $confirmed = confirm("Are you sure you want to delete {$service->name}?");
+        if (!$confirmed) {
+            return;
+        }
+        $service->delete();
+    }
+
+}
diff --git a/app/Models/Application.php b/app/Models/Application.php
index 224b332cc..fc437769a 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -18,10 +18,16 @@ class Application extends BaseModel
             ]);
         });
         static::deleting(function ($application) {
+            // Stop Container
+            instant_remote_process(
+                ["docker rm -f {$application->uuid}"],
+                $application->destination->server,
+                false
+            );
             $application->settings()->delete();
             $storages =  $application->persistentStorages()->get();
             foreach ($storages as $storage) {
-                instant_remote_process(["docker volume rm -f $storage->name"], $application->destination->server);
+                instant_remote_process(["docker volume rm -f $storage->name"], $application->destination->server, false);
             }
             $application->persistentStorages()->delete();
             $application->environment_variables()->delete();
@@ -233,7 +239,7 @@ class Application extends BaseModel
     }
     public function isHealthcheckDisabled(): bool
     {
-        if (data_get($this, 'dockerfile') || data_get($this, 'build_pack') === 'dockerfile' || data_get($this,'health_check_enabled') === false) {
+        if (data_get($this, 'dockerfile') || data_get($this, 'build_pack') === 'dockerfile' || data_get($this, 'health_check_enabled') === false) {
             ray('dockerfile');
             return true;
         }
diff --git a/app/Models/Service.php b/app/Models/Service.php
index 7ad297229..49d8b9f33 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -8,7 +8,6 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
 use Symfony\Component\Yaml\Yaml;
 use Illuminate\Support\Str;
-use Spatie\Url\Url;
 
 class Service extends BaseModel
 {
@@ -20,6 +19,7 @@ class Service extends BaseModel
         static::deleted(function ($service) {
             $storagesToDelete = collect([]);
             foreach ($service->applications()->get() as $application) {
+                instant_remote_process(["docker rm -f {$application->name}-{$service->uuid}"], $service->server, false);
                 $storages = $application->persistentStorages()->get();
                 foreach ($storages as $storage) {
                     $storagesToDelete->push($storage);
@@ -27,6 +27,7 @@ class Service extends BaseModel
                 $application->persistentStorages()->delete();
             }
             foreach ($service->databases()->get() as $database) {
+                instant_remote_process(["docker rm -f {$database->name}-{$service->uuid}"], $service->server, false);
                 $storages = $database->persistentStorages()->get();
                 foreach ($storages as $storage) {
                     $storagesToDelete->push($storage);
diff --git a/app/Models/StandalonePostgresql.php b/app/Models/StandalonePostgresql.php
index 21ec17e40..17b5b8056 100644
--- a/app/Models/StandalonePostgresql.php
+++ b/app/Models/StandalonePostgresql.php
@@ -29,9 +29,20 @@ class StandalonePostgresql extends BaseModel
             ]);
         });
         static::deleted(function ($database) {
+            // Stop Container
+            instant_remote_process(
+                ["docker rm -f {$database->uuid}"],
+                $database->destination->server,
+                false
+            );
+            // Stop TCP Proxy
+            if ($database->is_public) {
+                instant_remote_process(["docker rm -f {$database->uuid}-proxy"], $database->destination->server, false);
+            }
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();
             $database->environment_variables()->delete();
+            // Remove Volume
             instant_remote_process(['docker volume rm postgres-data-' . $database->uuid], $database->destination->server, false);
         });
     }

From 75862ca8de19871e45870966dd87fc7958bd72ed Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 3 Oct 2023 11:59:30 +0200
Subject: [PATCH 10/11] rename resource delete

---
 .../{DeleteResource.php => ResourceDelete.php}     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
 rename app/Console/Commands/{DeleteResource.php => ResourceDelete.php} (91%)

diff --git a/app/Console/Commands/DeleteResource.php b/app/Console/Commands/ResourceDelete.php
similarity index 91%
rename from app/Console/Commands/DeleteResource.php
rename to app/Console/Commands/ResourceDelete.php
index 0712448ec..d0c18f5cc 100644
--- a/app/Console/Commands/DeleteResource.php
+++ b/app/Console/Commands/ResourceDelete.php
@@ -10,14 +10,14 @@ use Illuminate\Console\Command;
 use function Laravel\Prompts\confirm;
 use function Laravel\Prompts\select;
 
-class DeleteResource extends Command
+class ResourceDelete extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'app:delete-resource';
+    protected $signature = 'resource:delete';
 
     /**
      * The console command description.
@@ -43,7 +43,8 @@ class DeleteResource extends Command
             $this->deleteService();
         }
     }
-    private function deleteApplication() {
+    private function deleteApplication()
+    {
         $applications = Application::all();
         $application = select(
             'What application do you want to delete?',
@@ -56,7 +57,8 @@ class DeleteResource extends Command
         }
         $application->delete();
     }
-    private function deleteDatabase() {
+    private function deleteDatabase()
+    {
         $databases = StandalonePostgresql::all();
         $database = select(
             'What database do you want to delete?',
@@ -69,7 +71,8 @@ class DeleteResource extends Command
         }
         $database->delete();
     }
-    private function deleteService() {
+    private function deleteService()
+    {
         $services = Service::all();
         $service = select(
             'What service do you want to delete?',
@@ -82,5 +85,4 @@ class DeleteResource extends Command
         }
         $service->delete();
     }
-
 }

From 194675c838f5baf5ab5ba4d2281fe56084ac5cb4 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 3 Oct 2023 12:08:57 +0200
Subject: [PATCH 11/11] update commands

---
 .../{ResourceDelete.php => ResourcesDelete.php}  | 16 ++++++++++++++--
 ...{ResetRootPassword.php => UsersResetRoot.php} |  4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)
 rename app/Console/Commands/{ResourceDelete.php => ResourcesDelete.php} (83%)
 rename app/Console/Commands/{ResetRootPassword.php => UsersResetRoot.php} (92%)

diff --git a/app/Console/Commands/ResourceDelete.php b/app/Console/Commands/ResourcesDelete.php
similarity index 83%
rename from app/Console/Commands/ResourceDelete.php
rename to app/Console/Commands/ResourcesDelete.php
index d0c18f5cc..d230aa927 100644
--- a/app/Console/Commands/ResourceDelete.php
+++ b/app/Console/Commands/ResourcesDelete.php
@@ -10,14 +10,14 @@ use Illuminate\Console\Command;
 use function Laravel\Prompts\confirm;
 use function Laravel\Prompts\select;
 
-class ResourceDelete extends Command
+class ResourcesDelete extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'resource:delete';
+    protected $signature = 'resources:delete';
 
     /**
      * The console command description.
@@ -46,6 +46,10 @@ class ResourceDelete extends Command
     private function deleteApplication()
     {
         $applications = Application::all();
+        if ($applications->count() === 0) {
+            $this->error('There are no applications to delete.');
+            return;
+        }
         $application = select(
             'What application do you want to delete?',
             $applications->pluck('name')->toArray(),
@@ -60,6 +64,10 @@ class ResourceDelete extends Command
     private function deleteDatabase()
     {
         $databases = StandalonePostgresql::all();
+        if ($databases->count() === 0) {
+            $this->error('There are no databases to delete.');
+            return;
+        }
         $database = select(
             'What database do you want to delete?',
             $databases->pluck('name')->toArray(),
@@ -74,6 +82,10 @@ class ResourceDelete extends Command
     private function deleteService()
     {
         $services = Service::all();
+        if ($services->count() === 0) {
+            $this->error('There are no services to delete.');
+            return;
+        }
         $service = select(
             'What service do you want to delete?',
             $services->pluck('name')->toArray(),
diff --git a/app/Console/Commands/ResetRootPassword.php b/app/Console/Commands/UsersResetRoot.php
similarity index 92%
rename from app/Console/Commands/ResetRootPassword.php
rename to app/Console/Commands/UsersResetRoot.php
index 61e0eb309..d72ef07d9 100644
--- a/app/Console/Commands/ResetRootPassword.php
+++ b/app/Console/Commands/UsersResetRoot.php
@@ -8,14 +8,14 @@ use Illuminate\Support\Facades\Hash;
 
 use function Laravel\Prompts\password;
 
-class ResetRootPassword extends Command
+class UsersResetRoot extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'app:reset-root-password';
+    protected $signature = 'users:reset-root';
 
     /**
      * The console command description.