From 379212b8fe08672c46ae7a2166b6a32914616f8d Mon Sep 17 00:00:00 2001
From: = <grahamh220@gmail.com>
Date: Tue, 16 Apr 2024 17:29:09 +0100
Subject: [PATCH 01/12] Making text areas use monospaced font and disabling
 spellcheck by default

---
 app/View/Components/Forms/Textarea.php              | 3 ++-
 resources/views/components/forms/textarea.blade.php | 2 +-
 resources/views/livewire/help.blade.php             | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/View/Components/Forms/Textarea.php b/app/View/Components/Forms/Textarea.php
index 86547cf65..28f4a45ba 100644
--- a/app/View/Components/Forms/Textarea.php
+++ b/app/View/Components/Forms/Textarea.php
@@ -23,10 +23,11 @@ class Textarea extends Component
         public bool    $disabled = false,
         public bool    $readonly = false,
         public bool    $allowTab = false,
+        public bool    $spellcheck = false,
         public ?string $helper = null,
         public bool    $realtimeValidation = false,
         public bool    $allowToPeak = true,
-        public string  $defaultClass = "input scrollbar",
+        public string  $defaultClass = "input scrollbar font-mono",
         public string  $defaultClassInput = "input"
     ) {
         //
diff --git a/resources/views/components/forms/textarea.blade.php b/resources/views/components/forms/textarea.blade.php
index f5bdc3e7d..641e43739 100644
--- a/resources/views/components/forms/textarea.blade.php
+++ b/resources/views/components/forms/textarea.blade.php
@@ -56,7 +56,7 @@
 
         </div>
     @else
-        <textarea {{ $allowTab ? '@keydown.tab=handleKeydown' : '' }} placeholder="{{ $placeholder }}" {{ $attributes->merge(['class' => $defaultClass]) }}
+        <textarea {{ $allowTab ? '@keydown.tab=handleKeydown' : '' }} placeholder="{{ $placeholder }}" spellcheck="{{ $spellcheck ? 'true' : 'false' }}" {{ $attributes->merge(['class' => $defaultClass]) }}
             @if ($realtimeValidation) wire:model.debounce.200ms="{{ $id }}"
         @else
     wire:model={{ $value ?? $id }}
diff --git a/resources/views/livewire/help.blade.php b/resources/views/livewire/help.blade.php
index 556c02b98..a8536a94b 100644
--- a/resources/views/livewire/help.blade.php
+++ b/resources/views/livewire/help.blade.php
@@ -2,7 +2,7 @@
     <div>Your feedback helps us to improve Coolify. Thank you! 💜</div>
     <form wire:submit="submit" class="flex flex-col gap-4 pt-4">
         <x-forms.input id="subject" label="Subject" placeholder="Summary of your problem."></x-forms.input>
-        <x-forms.textarea rows="10" id="description" label="Description"
+        <x-forms.textarea rows="10" id="description" label="Description" class="font-sans"
             placeholder="Please provide as much information as possible."></x-forms.textarea>
         <div></div>
         <x-forms.button class="w-full mt-4" type="submit" @click="modalOpen=false">Send</x-forms.button>

From 4fb4e19e998dacd8acdaa9bdf5c64e7fe5c9d0ac Mon Sep 17 00:00:00 2001
From: = <grahamh220@gmail.com>
Date: Wed, 17 Apr 2024 11:12:15 +0100
Subject: [PATCH 02/12] Using corrrect ternary pattern to generate textarea
 spellcheck attribute

---
 resources/views/components/forms/textarea.blade.php | 2 +-
 resources/views/livewire/help.blade.php             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/components/forms/textarea.blade.php b/resources/views/components/forms/textarea.blade.php
index 641e43739..bbc92c49d 100644
--- a/resources/views/components/forms/textarea.blade.php
+++ b/resources/views/components/forms/textarea.blade.php
@@ -56,7 +56,7 @@
 
         </div>
     @else
-        <textarea {{ $allowTab ? '@keydown.tab=handleKeydown' : '' }} placeholder="{{ $placeholder }}" spellcheck="{{ $spellcheck ? 'true' : 'false' }}" {{ $attributes->merge(['class' => $defaultClass]) }}
+        <textarea {{ $allowTab ? '@keydown.tab=handleKeydown' : '' }}  placeholder="{{ $placeholder }}" {{ !$spellcheck ? 'spellcheck=false' : '' }} {{ $attributes->merge(['class' => $defaultClass]) }}
             @if ($realtimeValidation) wire:model.debounce.200ms="{{ $id }}"
         @else
     wire:model={{ $value ?? $id }}
diff --git a/resources/views/livewire/help.blade.php b/resources/views/livewire/help.blade.php
index a8536a94b..0b79d3bd6 100644
--- a/resources/views/livewire/help.blade.php
+++ b/resources/views/livewire/help.blade.php
@@ -2,7 +2,7 @@
     <div>Your feedback helps us to improve Coolify. Thank you! 💜</div>
     <form wire:submit="submit" class="flex flex-col gap-4 pt-4">
         <x-forms.input id="subject" label="Subject" placeholder="Summary of your problem."></x-forms.input>
-        <x-forms.textarea rows="10" id="description" label="Description" class="font-sans"
+        <x-forms.textarea rows="10" id="description" label="Description" class="font-sans" spellcheck
             placeholder="Please provide as much information as possible."></x-forms.textarea>
         <div></div>
         <x-forms.button class="w-full mt-4" type="submit" @click="modalOpen=false">Send</x-forms.button>

From c75ce9cbbae852615692f33b29b9d506c180fb3d Mon Sep 17 00:00:00 2001
From: = <grahamh220@gmail.com>
Date: Wed, 17 Apr 2024 11:14:29 +0100
Subject: [PATCH 03/12] Removing extra whitespace

---
 resources/views/components/forms/textarea.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/components/forms/textarea.blade.php b/resources/views/components/forms/textarea.blade.php
index bbc92c49d..2c32c585e 100644
--- a/resources/views/components/forms/textarea.blade.php
+++ b/resources/views/components/forms/textarea.blade.php
@@ -56,7 +56,7 @@
 
         </div>
     @else
-        <textarea {{ $allowTab ? '@keydown.tab=handleKeydown' : '' }}  placeholder="{{ $placeholder }}" {{ !$spellcheck ? 'spellcheck=false' : '' }} {{ $attributes->merge(['class' => $defaultClass]) }}
+        <textarea {{ $allowTab ? '@keydown.tab=handleKeydown' : '' }} placeholder="{{ $placeholder }}" {{ !$spellcheck ? 'spellcheck=false' : '' }} {{ $attributes->merge(['class' => $defaultClass]) }}
             @if ($realtimeValidation) wire:model.debounce.200ms="{{ $id }}"
         @else
     wire:model={{ $value ?? $id }}

From 930a611374f956555e70024cc55d43f72446d7fa Mon Sep 17 00:00:00 2001
From: Duarte OC <me@duarteocarmo.com>
Date: Thu, 18 Apr 2024 18:20:51 +0200
Subject: [PATCH 04/12] Fix domains example

---
 .../views/livewire/project/application/general.blade.php      | 4 ++--
 .../views/livewire/project/service/edit-domain.blade.php      | 2 +-
 .../project/service/service-application-view.blade.php        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php
index 558db9c3c..fd24a9ea1 100644
--- a/resources/views/livewire/project/application/general.blade.php
+++ b/resources/views/livewire/project/application/general.blade.php
@@ -49,7 +49,7 @@
                                 @if (!isDatabaseImage(data_get($service, 'image')))
                                     <div class="flex items-end gap-2">
                                         <x-forms.input
-                                            helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "
+                                            helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io,https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "
                                             label="Domains for {{ str($serviceName)->headline() }}"
                                             id="parsedServiceDomains.{{ $serviceName }}.domain"></x-forms.input>
                                         <x-forms.button wire:click="generateDomain('{{ $serviceName }}')">Generate
@@ -64,7 +64,7 @@
             @if ($application->build_pack !== 'dockercompose')
                 <div class="flex items-end gap-2">
                     <x-forms.input placeholder="https://coolify.io" id="application.fqdn" label="Domains"
-                        helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. " />
+                        helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io,https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. " />
                     <x-forms.button wire:click="getWildcardDomain">Generate Domain
                     </x-forms.button>
                 </div>
diff --git a/resources/views/livewire/project/service/edit-domain.blade.php b/resources/views/livewire/project/service/edit-domain.blade.php
index 3237edb06..b80c10136 100644
--- a/resources/views/livewire/project/service/edit-domain.blade.php
+++ b/resources/views/livewire/project/service/edit-domain.blade.php
@@ -1,6 +1,6 @@
 <form wire:submit.prevent='submit' class="flex flex-col w-full gap-2">
     <div class="pb-2">Note: If a service has a defined port, do not delete it. <br>If you want to use your custom domain, you can add it with a port.</div>
     <x-forms.input required placeholder="https://app.coolify.io" label="Domains" id="application.fqdn"
-        helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "></x-forms.input>
+        helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io,https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "></x-forms.input>
     <x-forms.button type="submit">Save</x-forms.button>
 </form>
diff --git a/resources/views/livewire/project/service/service-application-view.blade.php b/resources/views/livewire/project/service/service-application-view.blade.php
index da9eefca8..069f049fd 100644
--- a/resources/views/livewire/project/service/service-application-view.blade.php
+++ b/resources/views/livewire/project/service/service-application-view.blade.php
@@ -25,10 +25,10 @@
                     @if ($application->required_fqdn)
                         <x-forms.input required placeholder="https://app.coolify.io" label="Domains"
                             id="application.fqdn"
-                            helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "></x-forms.input>
+                            helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io,https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "></x-forms.input>
                     @else
                         <x-forms.input placeholder="https://app.coolify.io" label="Domains" id="application.fqdn"
-                            helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "></x-forms.input>
+                            helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io,https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "></x-forms.input>
                     @endif
                 @endif
                 <x-forms.input required

From 6653e379b347442b4bc319629a17012789814737 Mon Sep 17 00:00:00 2001
From: Jere Salonen <hi@jere.co>
Date: Fri, 19 Apr 2024 09:57:46 +0200
Subject: [PATCH 05/12] feat: Update service contribution docs URL

Updated the URL in the service contribution docs to point to the correct
knowledge base page for adding a new service.
---
 CONTRIBUTION.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTION.md b/CONTRIBUTION.md
index c139793ec..02a21573c 100644
--- a/CONTRIBUTION.md
+++ b/CONTRIBUTION.md
@@ -30,5 +30,5 @@ Your horizon (Laravel scheduler): `localhost:8000/horizon` - Only reachable if y
 Mails are caught by Mailpit: `localhost:8025`
 
 ## New Service Contribution
-Check out the docs [here](https://coolify.io/docs/resources/services/add-service).
+Check out the docs [here](https://coolify.io/docs/knowledge-base/add-a-service).
 

From c8b494e9092206dde9db2631fafdde1b3367f55c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Apr 2024 12:05:56 +0200
Subject: [PATCH 06/12] Add Odoo service and template files

---
 public/svgs/odoo.svg             |  1 +
 templates/compose/odoo.yaml      | 34 ++++++++++++++++++++++++++++++++
 templates/service-templates.json | 19 ++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 public/svgs/odoo.svg
 create mode 100644 templates/compose/odoo.yaml

diff --git a/public/svgs/odoo.svg b/public/svgs/odoo.svg
new file mode 100644
index 000000000..073cf91ef
--- /dev/null
+++ b/public/svgs/odoo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 919 495"><path d="M695,346a75,75,0,1,1,75-75A75,75,0,0,1,695,346Zm0-31a44,44,0,1,0-44-44A44,44,0,0,0,695,315ZM538,346a75,75,0,1,1,75-75A75,75,0,0,1,538,346Zm0-31a44,44,0,1,0-44-44A44,44,0,0,0,538,315Zm-82-45c0,41.9-33.6,76-75,76s-75-34-75-75.9S336.5,196,381,196c16.4,0,31.6,3.5,44,12.6V165.1c0-8.3,7.3-15.1,15.5-15.1s15.5,6.8,15.5,15.1Zm-75,45a44,44,0,1,0-44-44A44,44,0,0,0,381,315Z" style="fill:#8f8f8f"/><path d="M224,346a75,75,0,1,1,75-75A75,75,0,0,1,224,346Zm0-31a44,44,0,1,0-44-44A44,44,0,0,0,224,315Z" style="fill:#714b67"/></svg>
\ No newline at end of file
diff --git a/templates/compose/odoo.yaml b/templates/compose/odoo.yaml
new file mode 100644
index 000000000..75f6f6cbc
--- /dev/null
+++ b/templates/compose/odoo.yaml
@@ -0,0 +1,34 @@
+# documentation: https://www.odoo.com/
+# slogan: Odoo is a suite of open-source business apps that cover all your company needs.
+# tags: business, apps, CRM, eCommerce, accounting, inventory, point of sale, project management, open-source
+# logo: svgs/odoo.svg
+# port: 8069
+
+services:
+  odoo:
+    image: odoo:17
+    environment:
+      - SERVICE_FQDN_ODOO_8069
+      - HOST=postgresql
+      - USER=$SERVICE_USER_POSTGRES
+      - PASSWORD=$SERVICE_PASSWORD_POSTGRES
+    volumes:
+      - odoo-web-data:/var/lib/odoo
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8069"]
+      interval: 2s
+      timeout: 10s
+      retries: 30
+  postgresql:
+    image: postgres:16-alpine
+    volumes:
+      - postgresql-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=$SERVICE_USER_POSTGRES
+      - POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
+      - POSTGRES_DB=postgres
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d postgres"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
diff --git a/templates/service-templates.json b/templates/service-templates.json
index 29d0989d4..bdac94e64 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -677,6 +677,25 @@
         "minversion": "0.0.0",
         "port": "8080"
     },
+    "odoo": {
+        "documentation": "https:\/\/www.odoo.com\/",
+        "slogan": "Odoo is a suite of open-source business apps that cover all your company needs.",
+        "compose": "c2VydmljZXM6CiAgb2RvbzoKICAgIGltYWdlOiAnb2RvbzoxNycKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9PRE9PXzgwNjkKICAgICAgLSBIT1NUPXBvc3RncmVzcWwKICAgICAgLSBVU0VSPSRTRVJWSUNFX1VTRVJfUE9TVEdSRVMKICAgICAgLSBQQVNTV09SRD0kU0VSVklDRV9QQVNTV09SRF9QT1NUR1JFUwogICAgdm9sdW1lczoKICAgICAgLSAnb2Rvby13ZWItZGF0YTovdmFyL2xpYi9vZG9vJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjgwNjknCiAgICAgIGludGVydmFsOiAycwogICAgICB0aW1lb3V0OiAxMHMKICAgICAgcmV0cmllczogMzAKICBwb3N0Z3Jlc3FsOgogICAgaW1hZ2U6ICdwb3N0Z3JlczoxNi1hbHBpbmUnCiAgICB2b2x1bWVzOgogICAgICAtICdwb3N0Z3Jlc3FsLWRhdGE6L3Zhci9saWIvcG9zdGdyZXNxbC9kYXRhJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gUE9TVEdSRVNfVVNFUj0kU0VSVklDRV9VU0VSX1BPU1RHUkVTCiAgICAgIC0gUE9TVEdSRVNfUEFTU1dPUkQ9JFNFUlZJQ0VfUEFTU1dPUkRfUE9TVEdSRVMKICAgICAgLSBQT1NUR1JFU19EQj1wb3N0Z3JlcwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQtU0hFTEwKICAgICAgICAtICdwZ19pc3JlYWR5IC1VICQke1BPU1RHUkVTX1VTRVJ9IC1kIHBvc3RncmVzJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCg==",
+        "tags": [
+            "business",
+            "apps",
+            "crm",
+            "ecommerce",
+            "accounting",
+            "inventory",
+            "point of sale",
+            "project management",
+            "open-source"
+        ],
+        "logo": "svgs\/odoo.svg",
+        "minversion": "0.0.0",
+        "port": "8069"
+    },
     "openblocks": {
         "documentation": "https:\/\/openblocks.dev",
         "slogan": "OpenBlocks is a self-hosted, open-source, low-code platform for building internal tools.",

From eb748554c5ff9a160c46fc8aba12d660bdf0aa91 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Apr 2024 12:59:51 +0200
Subject: [PATCH 07/12] Fix environment variable generation in
 ApplicationDeploymentJob.php and Application.php

---
 app/Jobs/ApplicationDeploymentJob.php | 18 ++++++++++--------
 app/Models/Application.php            |  4 ++++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index 3d04be7d3..1717c5d08 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -710,7 +710,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function save_environment_variables()
     {
         $envs = collect([]);
-        $ports = $this->application->settings->is_static ? [80] : $this->application->ports_exposes_array;
+        $ports = $this->application->main_port();
         if ($this->pull_request_id !== 0) {
             $this->env_filename = ".env-pr-$this->pull_request_id";
             foreach ($this->application->environment_variables_preview as $env) {
@@ -727,14 +727,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $envs->push($env->key . '=' . $real_value);
             }
             // Add PORT if not exists, use the first port as default
-            if ($this->application->environment_variables_preview->filter(fn ($env) => Str::of($env)->startsWith('PORT'))->isEmpty()) {
+            if ($this->application->environment_variables_preview->where('key', 'PORT')->isEmpty()) {
                 $envs->push("PORT={$ports[0]}");
             }
             // Add HOST if not exists
-            if ($this->application->environment_variables_preview->filter(fn ($env) => Str::of($env)->startsWith('HOST'))->isEmpty()) {
+            if ($this->application->environment_variables_preview->where('key', 'HOST')->isEmpty()) {
                 $envs->push("HOST=0.0.0.0");
             }
-            if ($this->application->environment_variables_preview->filter(fn ($env) => Str::of($env)->startsWith('SOURCE_COMMIT'))->isEmpty()) {
+            // Add SOURCE_COMMIT if not exists
+            if ($this->application->environment_variables_preview->where('key', 'SOURCE_COMMIT')->isEmpty()) {
                 if (!is_null($this->commit)) {
                     $envs->push("SOURCE_COMMIT={$this->commit}");
                 } else {
@@ -760,14 +761,15 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $envs->push($env->key . '=' . $real_value);
             }
             // Add PORT if not exists, use the first port as default
-            if ($this->application->environment_variables->filter(fn ($env) => Str::of($env)->startsWith('PORT'))->isEmpty()) {
+            if ($this->application->environment_variables->where('key', 'PORT')->isEmpty()) {
                 $envs->push("PORT={$ports[0]}");
             }
             // Add HOST if not exists
-            if ($this->application->environment_variables->filter(fn ($env) => Str::of($env)->startsWith('HOST'))->isEmpty()) {
+            if ($this->application->environment_variables->where('key', 'HOST')->isEmpty()) {
                 $envs->push("HOST=0.0.0.0");
             }
-            if ($this->application->environment_variables->filter(fn ($env) => Str::of($env)->startsWith('SOURCE_COMMIT'))->isEmpty()) {
+            // Add SOURCE_COMMIT if not exists
+            if ($this->application->environment_variables->where('key', 'SOURCE_COMMIT')->isEmpty()) {
                 if (!is_null($this->commit)) {
                     $envs->push("SOURCE_COMMIT={$this->commit}");
                 } else {
@@ -1214,7 +1216,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private function generate_compose_file()
     {
         $this->create_workdir();
-        $ports = $this->application->settings->is_static ? [80] : $this->application->ports_exposes_array;
+        $ports = $this->application->main_port();
         $onlyPort = null;
         if (count($ports) > 0) {
             $onlyPort = $ports[0];
diff --git a/app/Models/Application.php b/app/Models/Application.php
index 971f1e894..f28d389f4 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -346,6 +346,10 @@ class Application extends BaseModel
         }
         return null;
     }
+    public function main_port()
+    {
+        return $this->settings->is_static ? [80] : $this->ports_exposes_array;
+    }
     public function environment_variables(): HasMany
     {
         return $this->hasMany(EnvironmentVariable::class)->where('is_preview', false)->orderBy('key', 'asc');

From bbad029aa11bbeeccf32d8c7b4a61aef4e2967a4 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Apr 2024 12:59:54 +0200
Subject: [PATCH 08/12] Update version to 4.0.0-beta.268

---
 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 416daa809..bfdaf0b4c 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.267',
+    'release' => '4.0.0-beta.268',
     // 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 66b6ee419..b65f24d33 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.267';
+return '4.0.0-beta.268';
diff --git a/versions.json b/versions.json
index ff438882c..be9854b43 100644
--- a/versions.json
+++ b/versions.json
@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.267"
+            "version": "4.0.0-beta.268"
         }
     }
 }

From 9a9be466f776902f8c78620e02f919fd0271612c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Apr 2024 13:49:38 +0200
Subject: [PATCH 09/12] Refactor replaceVariables function in services.php to
 use a more concise syntax

---
 bootstrap/helpers/services.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap/helpers/services.php b/bootstrap/helpers/services.php
index 8e3c0337e..5b71a8b10 100644
--- a/bootstrap/helpers/services.php
+++ b/bootstrap/helpers/services.php
@@ -18,7 +18,7 @@ function collectRegex(string $name)
 }
 function replaceVariables($variable)
 {
-    return $variable->replaceFirst('$', '')->replaceFirst('{', '')->replaceLast('}', '');
+    return $variable->after('${')->before('}');
 }
 
 function getFilesystemVolumesFromServer(ServiceApplication|ServiceDatabase|Application $oneService, bool $isInit = false)

From f952553c7694d34a7954e08ffd975c2ad9c3ecb7 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Apr 2024 14:09:54 +0200
Subject: [PATCH 10/12] fix: move s3 storages to separate view

---
 app/Livewire/{Team => }/Storage/Create.php    |  4 ++--
 app/Livewire/{Team => }/Storage/Form.php      |  4 ++--
 app/Livewire/{Team => }/Storage/Index.php     |  4 ++--
 app/Livewire/Storage/Show.php                 | 22 +++++++++++++++++++
 app/Livewire/Team/Storage/Show.php            |  2 +-
 app/Models/S3Storage.php                      |  2 +-
 resources/views/components/navbar.blade.php   | 14 ++++++++++++
 .../views/components/team/navbar.blade.php    |  6 +----
 .../{team => }/storage/create.blade.php       |  0
 .../{team => }/storage/form.blade.php         |  8 +++----
 .../{team => }/storage/index.blade.php        | 10 ++++-----
 .../views/livewire/storage/show.blade.php     |  3 +++
 .../livewire/team/storage/show.blade.php      |  6 -----
 .../livewire/team/storages/create.blade.php   |  3 ---
 routes/web.php                                | 12 +++++-----
 15 files changed, 61 insertions(+), 39 deletions(-)
 rename app/Livewire/{Team => }/Storage/Create.php (95%)
 rename app/Livewire/{Team => }/Storage/Form.php (94%)
 rename app/Livewire/{Team => }/Storage/Index.php (73%)
 create mode 100644 app/Livewire/Storage/Show.php
 rename resources/views/livewire/{team => }/storage/create.blade.php (100%)
 rename resources/views/livewire/{team => }/storage/form.blade.php (87%)
 rename resources/views/livewire/{team => }/storage/index.blade.php (71%)
 create mode 100644 resources/views/livewire/storage/show.blade.php
 delete mode 100644 resources/views/livewire/team/storage/show.blade.php
 delete mode 100644 resources/views/livewire/team/storages/create.blade.php

diff --git a/app/Livewire/Team/Storage/Create.php b/app/Livewire/Storage/Create.php
similarity index 95%
rename from app/Livewire/Team/Storage/Create.php
rename to app/Livewire/Storage/Create.php
index a25fc9821..d1af807d5 100644
--- a/app/Livewire/Team/Storage/Create.php
+++ b/app/Livewire/Storage/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Team\Storage;
+namespace App\Livewire\Storage;
 
 use App\Models\S3Storage;
 use Livewire\Component;
@@ -65,7 +65,7 @@ class Create extends Component
             $this->storage->team_id = currentTeam()->id;
             $this->storage->testConnection();
             $this->storage->save();
-            return redirect()->route('team.storage.show', $this->storage->uuid);
+            return redirect()->route('storage.show', $this->storage->uuid);
         } catch (\Throwable $e) {
             $this->dispatch('error', 'Failed to create storage.', $e->getMessage());
             // return handleError($e, $this);
diff --git a/app/Livewire/Team/Storage/Form.php b/app/Livewire/Storage/Form.php
similarity index 94%
rename from app/Livewire/Team/Storage/Form.php
rename to app/Livewire/Storage/Form.php
index 1fd0d470b..79c1f0c30 100644
--- a/app/Livewire/Team/Storage/Form.php
+++ b/app/Livewire/Storage/Form.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Team\Storage;
+namespace App\Livewire\Storage;
 
 use App\Models\S3Storage;
 use Livewire\Component;
@@ -43,7 +43,7 @@ class Form extends Component
     {
         try {
             $this->storage->delete();
-            return redirect()->route('team.storage.index');
+            return redirect()->route('storage.index');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }
diff --git a/app/Livewire/Team/Storage/Index.php b/app/Livewire/Storage/Index.php
similarity index 73%
rename from app/Livewire/Team/Storage/Index.php
rename to app/Livewire/Storage/Index.php
index c15834564..f071a0af0 100644
--- a/app/Livewire/Team/Storage/Index.php
+++ b/app/Livewire/Storage/Index.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Team\Storage;
+namespace App\Livewire\Storage;
 
 use App\Models\S3Storage;
 use Livewire\Component;
@@ -13,6 +13,6 @@ class Index extends Component
     }
     public function render()
     {
-        return view('livewire.team.storage.index');
+        return view('livewire.storage.index');
     }
 }
diff --git a/app/Livewire/Storage/Show.php b/app/Livewire/Storage/Show.php
new file mode 100644
index 000000000..988fb30cb
--- /dev/null
+++ b/app/Livewire/Storage/Show.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Livewire\Storage;
+
+use App\Models\S3Storage;
+use Livewire\Component;
+
+class Show extends Component
+{
+    public $storage = null;
+    public function mount()
+    {
+        $this->storage = S3Storage::ownedByCurrentTeam()->whereUuid(request()->storage_uuid)->first();
+        if (!$this->storage) {
+            abort(404);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.storage.show');
+    }
+}
diff --git a/app/Livewire/Team/Storage/Show.php b/app/Livewire/Team/Storage/Show.php
index 6fbb6034f..ab2acbbb9 100644
--- a/app/Livewire/Team/Storage/Show.php
+++ b/app/Livewire/Team/Storage/Show.php
@@ -17,6 +17,6 @@ class Show extends Component
     }
     public function render()
     {
-        return view('livewire.team.storage.show');
+        return view('livewire.storage.show');
     }
 }
diff --git a/app/Models/S3Storage.php b/app/Models/S3Storage.php
index 9d60ce491..dc0b93466 100644
--- a/app/Models/S3Storage.php
+++ b/app/Models/S3Storage.php
@@ -48,7 +48,7 @@ class S3Storage extends BaseModel
             if ($this->unusable_email_sent === false && is_transactional_emails_active()) {
                 $mail = new MailMessage();
                 $mail->subject('Coolify: S3 Storage Connection Error');
-                $mail->view('emails.s3-connection-error', ['name' => $this->name, 'reason' => $e->getMessage(), 'url' => route('team.storage.show', ['storage_uuid' => $this->uuid])]);
+                $mail->view('emails.s3-connection-error', ['name' => $this->name, 'reason' => $e->getMessage(), 'url' => route('storage.show', ['storage_uuid' => $this->uuid])]);
                 $users = collect([]);
                 $members = $this->team->members()->get();
                 foreach ($members as $user) {
diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index 96af53d3f..0eebffd1e 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -156,6 +156,20 @@
                             Destinations
                         </a>
                     </li>
+                    <li>
+                        <a title="S3 Storages"
+                            class="{{ request()->is('storages*') ? 'menu-item-active menu-item' : 'menu-item' }}"
+                            href="{{ route('storage.index') }}">
+                            <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24">
+                                <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
+                                    <path d="M4 6a8 3 0 1 0 16 0A8 3 0 1 0 4 6"/>
+                                    <path d="M4 6v6a8 3 0 0 0 16 0V6"/>
+                                    <path d="M4 12v6a8 3 0 0 0 16 0v-6"/>
+                                </g>
+                            </svg>
+                            S3 Storages
+                        </a>
+                    </li>
                     <li>
                         <a title="Notifications"
                             class="{{ request()->is('notifications*') ? 'menu-item-active menu-item' : 'menu-item' }}"
diff --git a/resources/views/components/team/navbar.blade.php b/resources/views/components/team/navbar.blade.php
index 9c857478e..0c6c44901 100644
--- a/resources/views/components/team/navbar.blade.php
+++ b/resources/views/components/team/navbar.blade.php
@@ -5,7 +5,7 @@
             <livewire:team.create/>
         </x-modal-input>
     </div>
-    <div class="subtitle">Team settings & shared environment variables.</div>
+    <div class="subtitle">Team wide configurations.</div>
     <nav class="navbar-main">
         <a class="{{ request()->routeIs('team.index') ? 'dark:text-white' : '' }}" href="{{ route('team.index') }}">
             <button>General</button>
@@ -14,10 +14,6 @@
             href="{{ route('team.member.index') }}">
             <button>Members</button>
         </a>
-        <a class="{{ request()->routeIs('team.storage.index') ? 'dark:text-white' : '' }}"
-            href="{{ route('team.storage.index') }}">
-            <button>S3 Storages</button>
-        </a>
         <a class="{{ request()->routeIs('team.shared-variables.index') ? 'dark:text-white' : '' }}"
             href="{{ route('team.shared-variables.index') }}">
             <button>Shared Variables</button>
diff --git a/resources/views/livewire/team/storage/create.blade.php b/resources/views/livewire/storage/create.blade.php
similarity index 100%
rename from resources/views/livewire/team/storage/create.blade.php
rename to resources/views/livewire/storage/create.blade.php
diff --git a/resources/views/livewire/team/storage/form.blade.php b/resources/views/livewire/storage/form.blade.php
similarity index 87%
rename from resources/views/livewire/team/storage/form.blade.php
rename to resources/views/livewire/storage/form.blade.php
index 245a58f2d..1a2c99696 100644
--- a/resources/views/livewire/team/storage/form.blade.php
+++ b/resources/views/livewire/storage/form.blade.php
@@ -2,12 +2,12 @@
     <form class="flex flex-col gap-2 pb-6" wire:submit='submit'>
         <div class="flex items-start gap-2">
             <div class="pb-4">
-                <h2>Storage Details</h2>
-                <div>{{ $storage->name }}</div>
+                <h1>Storage Details</h1>
+                <div class="subtitle">{{ $storage->name }}</div>
                 @if ($storage->is_usable)
-                    <div> Usable </div>
+                    <div>Usable</div>
                 @else
-                    <div class="text-red-500"> Not Usable </div>
+                    <div class="text-red-500">Not Usable</div>
                 @endif
             </div>
             <x-forms.button type="submit">
diff --git a/resources/views/livewire/team/storage/index.blade.php b/resources/views/livewire/storage/index.blade.php
similarity index 71%
rename from resources/views/livewire/team/storage/index.blade.php
rename to resources/views/livewire/storage/index.blade.php
index c2676e11f..02b6973f2 100644
--- a/resources/views/livewire/team/storage/index.blade.php
+++ b/resources/views/livewire/storage/index.blade.php
@@ -1,13 +1,11 @@
 <div>
-    <x-team.navbar :team="auth()->user()->currentTeam()" />
     <div class="flex items-start gap-2">
-        <h2 class="pb-4">S3 Storages</h2>
+        <h1>S3 Storages</h1>
         <x-modal-input buttonTitle="+ Add" title="New S3 Storage">
-            <livewire:team.storage.create />
+            <livewire:storage.create />
         </x-modal-input>
-        {{-- <a class="dark:text-white hover:no-underline" href="/team/storages/new"> <x-forms.button>+ Add
-            </x-forms.button></a> --}}
     </div>
+    <div class="subtitle">S3 storages for backups.</div>
     <div class="grid gap-2 lg:grid-cols-2">
         @forelse ($s3 as $storage)
             <div x-data x-on:click="goto('{{ $storage->uuid }}')" @class(['gap-2 border cursor-pointer box group border-transparent'])>
@@ -27,7 +25,7 @@
     </div>
     <script>
         function goto(uuid) {
-            window.location.href = '/team/storages/' + uuid;
+            window.location.href = '/storages/' + uuid;
         }
     </script>
 </div>
diff --git a/resources/views/livewire/storage/show.blade.php b/resources/views/livewire/storage/show.blade.php
new file mode 100644
index 000000000..137f7bdff
--- /dev/null
+++ b/resources/views/livewire/storage/show.blade.php
@@ -0,0 +1,3 @@
+<div>
+    <livewire:storage.form :storage="$storage" />
+</div>
diff --git a/resources/views/livewire/team/storage/show.blade.php b/resources/views/livewire/team/storage/show.blade.php
deleted file mode 100644
index 83fa95a08..000000000
--- a/resources/views/livewire/team/storage/show.blade.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-    <x-team.navbar :team="auth()
-        ->user()
-        ->currentTeam()" />
-    <livewire:team.storage.form :storage="$storage" />
-</div>
diff --git a/resources/views/livewire/team/storages/create.blade.php b/resources/views/livewire/team/storages/create.blade.php
deleted file mode 100644
index 379e555e9..000000000
--- a/resources/views/livewire/team/storages/create.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-    {{-- If you look to others for fulfillment, you will never truly be fulfilled. --}}
-</div>
diff --git a/routes/web.php b/routes/web.php
index ce2c4f418..623de722a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -27,11 +27,11 @@ use App\Livewire\Notifications\Telegram as NotificationTelegram;
 use App\Livewire\Notifications\Discord as NotificationDiscord;
 
 use App\Livewire\Team\Index as TeamIndex;
-
-use App\Livewire\Team\Storage\Index as TeamStorageIndex;
-use App\Livewire\Team\Storage\Show as TeamStorageShow;
 use App\Livewire\Team\Member\Index as TeamMemberIndex;
 
+use App\Livewire\Storage\Index as StorageIndex;
+use App\Livewire\Storage\Show as StorageShow;
+
 use App\Livewire\CommandCenter\Index as CommandCenterIndex;
 use App\Livewire\ForcePasswordReset;
 use App\Livewire\Project\Index as ProjectIndex;
@@ -135,14 +135,12 @@ Route::middleware(['auth', 'verified'])->group(function () {
         Route::get('/telegram', NotificationTelegram::class)->name('notifications.telegram');
         Route::get('/discord', NotificationDiscord::class)->name('notifications.discord');
     });
+    Route::get('/storages', StorageIndex::class)->name('storage.index');
+    Route::get('/storages/{storage_uuid}', StorageShow::class)->name('storage.show');
     Route::prefix('team')->group(function () {
         Route::get('/', TeamIndex::class)->name('team.index');
-        // Route::get('/new', TeamCreate::class)->name('team.create');
         Route::get('/members', TeamMemberIndex::class)->name('team.member.index');
         Route::get('/shared-variables', TeamSharedVariablesIndex::class)->name('team.shared-variables.index');
-        Route::get('/storages', TeamStorageIndex::class)->name('team.storage.index');
-        // Route::get('/storages/new', TeamStorageCreate::class)->name('team.storage.create');
-        Route::get('/storages/{storage_uuid}', TeamStorageShow::class)->name('team.storage.show');
     });
 
     Route::get('/command-center', CommandCenterIndex::class)->name('command-center');

From 50c5d533b0bd10cc7a5460981e8c4a44dcd71ad6 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Apr 2024 14:13:32 +0200
Subject: [PATCH 11/12] Fix condition for displaying environment variable in
 show.blade.php

---
 .../livewire/project/shared/environment-variable/show.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/livewire/project/shared/environment-variable/show.blade.php b/resources/views/livewire/project/shared/environment-variable/show.blade.php
index 9e5588791..e07766fcb 100644
--- a/resources/views/livewire/project/shared/environment-variable/show.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/show.blade.php
@@ -1,7 +1,7 @@
 <div>
     <form wire:submit='submit'
         class="flex flex-col items-center gap-4 p-4 bg-white border lg:items-start dark:bg-base dark:border-coolgray-300">
-        @if (!$env->isFoundInCompose)
+        @if (!$env->isFoundInCompose && !$isSharedVariable)
             <div class="flex items-center justify-center gap-2 dark:text-warning text-coollabs"> <svg
                     class="hidden w-4 h-4 dark:text-warning lg:block" viewBox="0 0 256 256"
                     xmlns="http://www.w3.org/2000/svg">

From 8a4c2bf20869ccae261e77550ba231a58559cfef Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 26 Apr 2024 14:59:03 +0200
Subject: [PATCH 12/12] shared variables are more visible now on the ui

---
 app/Livewire/Project/Edit.php                 | 22 ---------
 app/Livewire/Project/EnvironmentEdit.php      | 23 ---------
 .../SharedVariables/Environment/Index.php     | 19 ++++++++
 .../SharedVariables/Environment/Show.php      | 47 +++++++++++++++++++
 app/Livewire/SharedVariables/Index.php        | 13 +++++
 .../SharedVariables/Project/Index.php         | 19 ++++++++
 app/Livewire/SharedVariables/Project/Show.php | 47 +++++++++++++++++++
 .../Team/Index.php}                           |  6 +--
 resources/views/components/navbar.blade.php   | 13 +++++
 .../views/components/team/navbar.blade.php    |  6 +--
 .../views/livewire/project/edit.blade.php     | 20 --------
 .../project/environment-edit.blade.php        | 17 -------
 .../environment/index.blade.php               | 28 +++++++++++
 .../environment/show.blade.php                | 20 ++++++++
 .../livewire/shared-variables/index.blade.php | 28 +++++++++++
 .../shared-variables/project/index.blade.php  | 22 +++++++++
 .../shared-variables/project/show.blade.php   | 22 +++++++++
 .../team/index.blade.php}                     |  5 +-
 routes/web.php                                | 27 +++++++++--
 19 files changed, 307 insertions(+), 97 deletions(-)
 create mode 100644 app/Livewire/SharedVariables/Environment/Index.php
 create mode 100644 app/Livewire/SharedVariables/Environment/Show.php
 create mode 100644 app/Livewire/SharedVariables/Index.php
 create mode 100644 app/Livewire/SharedVariables/Project/Index.php
 create mode 100644 app/Livewire/SharedVariables/Project/Show.php
 rename app/Livewire/{TeamSharedVariablesIndex.php => SharedVariables/Team/Index.php} (88%)
 create mode 100644 resources/views/livewire/shared-variables/environment/index.blade.php
 create mode 100644 resources/views/livewire/shared-variables/environment/show.blade.php
 create mode 100644 resources/views/livewire/shared-variables/index.blade.php
 create mode 100644 resources/views/livewire/shared-variables/project/index.blade.php
 create mode 100644 resources/views/livewire/shared-variables/project/show.blade.php
 rename resources/views/livewire/{team-shared-variables-index.blade.php => shared-variables/team/index.blade.php} (85%)

diff --git a/app/Livewire/Project/Edit.php b/app/Livewire/Project/Edit.php
index d222917a6..8a35eff7f 100644
--- a/app/Livewire/Project/Edit.php
+++ b/app/Livewire/Project/Edit.php
@@ -12,28 +12,6 @@ class Edit extends Component
         'project.name' => 'required|min:3|max:255',
         'project.description' => 'nullable|string|max:255',
     ];
-    protected $listeners = ['refreshEnvs' => '$refresh', 'saveKey' => 'saveKey'];
-
-    public function saveKey($data)
-    {
-        try {
-            $found = $this->project->environment_variables()->where('key', $data['key'])->first();
-            if ($found) {
-                throw new \Exception('Variable already exists.');
-            }
-            $this->project->environment_variables()->create([
-                'key' => $data['key'],
-                'value' => $data['value'],
-                'is_multiline' => $data['is_multiline'],
-                'is_literal' => $data['is_literal'],
-                'type' => 'project',
-                'team_id' => currentTeam()->id,
-            ]);
-            $this->project->refresh();
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
     public function mount()
     {
         $projectUuid = request()->route('project_uuid');
diff --git a/app/Livewire/Project/EnvironmentEdit.php b/app/Livewire/Project/EnvironmentEdit.php
index 173d946f3..cd952a961 100644
--- a/app/Livewire/Project/EnvironmentEdit.php
+++ b/app/Livewire/Project/EnvironmentEdit.php
@@ -16,29 +16,6 @@ class EnvironmentEdit extends Component
         'environment.name' => 'required|min:3|max:255',
         'environment.description' => 'nullable|min:3|max:255',
     ];
-    protected $listeners = ['refreshEnvs' => '$refresh', 'saveKey' => 'saveKey'];
-
-    public function saveKey($data)
-    {
-        try {
-            $found = $this->environment->environment_variables()->where('key', $data['key'])->first();
-            if ($found) {
-                throw new \Exception('Variable already exists.');
-            }
-            $this->environment->environment_variables()->create([
-                'key' => $data['key'],
-                'value' => $data['value'],
-                'is_multiline' => $data['is_multiline'],
-                'is_literal' => $data['is_literal'],
-                'type' => 'environment',
-                'team_id' => currentTeam()->id,
-            ]);
-            $this->environment->refresh();
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
     public function mount()
     {
         $this->parameters = get_route_parameters();
diff --git a/app/Livewire/SharedVariables/Environment/Index.php b/app/Livewire/SharedVariables/Environment/Index.php
new file mode 100644
index 000000000..34f33ef5d
--- /dev/null
+++ b/app/Livewire/SharedVariables/Environment/Index.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Livewire\SharedVariables\Environment;
+
+use App\Models\Project;
+use Illuminate\Support\Collection;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public Collection $projects;
+    public function mount() {
+        $this->projects = Project::ownedByCurrentTeam()->get();
+    }
+    public function render()
+    {
+        return view('livewire.shared-variables.environment.index');
+    }
+}
diff --git a/app/Livewire/SharedVariables/Environment/Show.php b/app/Livewire/SharedVariables/Environment/Show.php
new file mode 100644
index 000000000..29fd91153
--- /dev/null
+++ b/app/Livewire/SharedVariables/Environment/Show.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Livewire\SharedVariables\Environment;
+
+use App\Models\Application;
+use App\Models\Project;
+use Livewire\Component;
+
+class Show extends Component
+{
+    public Project $project;
+    public Application $application;
+    public $environment;
+    public array $parameters;
+    protected $listeners = ['refreshEnvs' => '$refresh', 'saveKey' => 'saveKey'];
+
+    public function saveKey($data)
+    {
+        try {
+            $found = $this->environment->environment_variables()->where('key', $data['key'])->first();
+            if ($found) {
+                throw new \Exception('Variable already exists.');
+            }
+            $this->environment->environment_variables()->create([
+                'key' => $data['key'],
+                'value' => $data['value'],
+                'is_multiline' => $data['is_multiline'],
+                'is_literal' => $data['is_literal'],
+                'type' => 'environment',
+                'team_id' => currentTeam()->id,
+            ]);
+            $this->environment->refresh();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        $this->project = Project::ownedByCurrentTeam()->where('uuid', request()->route('project_uuid'))->first();
+        $this->environment = $this->project->environments()->where('name', request()->route('environment_name'))->first();
+    }
+    public function render()
+    {
+        return view('livewire.shared-variables.environment.show');
+    }
+}
diff --git a/app/Livewire/SharedVariables/Index.php b/app/Livewire/SharedVariables/Index.php
new file mode 100644
index 000000000..61c31e9f8
--- /dev/null
+++ b/app/Livewire/SharedVariables/Index.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Livewire\SharedVariables;
+
+use Livewire\Component;
+
+class Index extends Component
+{
+    public function render()
+    {
+        return view('livewire.shared-variables.index');
+    }
+}
diff --git a/app/Livewire/SharedVariables/Project/Index.php b/app/Livewire/SharedVariables/Project/Index.php
new file mode 100644
index 000000000..39de974e8
--- /dev/null
+++ b/app/Livewire/SharedVariables/Project/Index.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Livewire\SharedVariables\Project;
+
+use App\Models\Project;
+use Illuminate\Support\Collection;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public Collection $projects;
+    public function mount() {
+        $this->projects = Project::ownedByCurrentTeam()->get();
+    }
+    public function render()
+    {
+        return view('livewire.shared-variables.project.index');
+    }
+}
diff --git a/app/Livewire/SharedVariables/Project/Show.php b/app/Livewire/SharedVariables/Project/Show.php
new file mode 100644
index 000000000..a172c52f0
--- /dev/null
+++ b/app/Livewire/SharedVariables/Project/Show.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Livewire\SharedVariables\Project;
+
+use App\Models\Project;
+use Livewire\Component;
+
+class Show extends Component
+{
+    public Project $project;
+    protected $listeners = ['refreshEnvs' => '$refresh', 'saveKey' => 'saveKey'];
+
+    public function saveKey($data)
+    {
+        try {
+            $found = $this->project->environment_variables()->where('key', $data['key'])->first();
+            if ($found) {
+                throw new \Exception('Variable already exists.');
+            }
+            $this->project->environment_variables()->create([
+                'key' => $data['key'],
+                'value' => $data['value'],
+                'is_multiline' => $data['is_multiline'],
+                'is_literal' => $data['is_literal'],
+                'type' => 'project',
+                'team_id' => currentTeam()->id,
+            ]);
+            $this->project->refresh();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function mount()
+    {
+        $projectUuid = request()->route('project_uuid');
+        $teamId = currentTeam()->id;
+        $project = Project::where('team_id', $teamId)->where('uuid', $projectUuid)->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $this->project = $project;
+    }
+    public function render()
+    {
+        return view('livewire.shared-variables.project.show');
+    }
+}
diff --git a/app/Livewire/TeamSharedVariablesIndex.php b/app/Livewire/SharedVariables/Team/Index.php
similarity index 88%
rename from app/Livewire/TeamSharedVariablesIndex.php
rename to app/Livewire/SharedVariables/Team/Index.php
index eeee30ab9..ef5c7472c 100644
--- a/app/Livewire/TeamSharedVariablesIndex.php
+++ b/app/Livewire/SharedVariables/Team/Index.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Livewire;
+namespace App\Livewire\SharedVariables\Team;
 
 use App\Models\Team;
 use Livewire\Component;
 
-class TeamSharedVariablesIndex extends Component
+class Index extends Component
 {
     public Team $team;
     protected $listeners = ['refreshEnvs' => '$refresh', 'saveKey' => 'saveKey'];
@@ -37,6 +37,6 @@ class TeamSharedVariablesIndex extends Component
     }
     public function render()
     {
-        return view('livewire.team-shared-variables-index');
+        return view('livewire.shared-variables.team.index');
     }
 }
diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index 0eebffd1e..aab4b6a7a 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -170,6 +170,19 @@
                             S3 Storages
                         </a>
                     </li>
+                    <li>
+                        <a title="Shared variables"
+                            class="{{ request()->is('shared-variables*') ? 'menu-item-active menu-item' : 'menu-item' }}"
+                            href="{{ route('shared-variables.index') }}">
+                            <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24">
+                                <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
+                                    <path d="M5 4C2.5 9 2.5 14 5 20M19 4c2.5 5 2.5 10 0 16M9 9h1c1 0 1 1 2.016 3.527C13 15 13 16 14 16h1"/>
+                                    <path d="M8 16c1.5 0 3-2 4-3.5S14.5 9 16 9"/>
+                                </g>
+                            </svg>
+                            Shared Variables
+                        </a>
+                    </li>
                     <li>
                         <a title="Notifications"
                             class="{{ request()->is('notifications*') ? 'menu-item-active menu-item' : 'menu-item' }}"
diff --git a/resources/views/components/team/navbar.blade.php b/resources/views/components/team/navbar.blade.php
index 0c6c44901..2c38d9695 100644
--- a/resources/views/components/team/navbar.blade.php
+++ b/resources/views/components/team/navbar.blade.php
@@ -2,7 +2,7 @@
     <div class="flex items-end gap-2">
         <h1>Team</h1>
         <x-modal-input buttonTitle="+ Add" title="New Team">
-            <livewire:team.create/>
+            <livewire:team.create />
         </x-modal-input>
     </div>
     <div class="subtitle">Team wide configurations.</div>
@@ -14,10 +14,6 @@
             href="{{ route('team.member.index') }}">
             <button>Members</button>
         </a>
-        <a class="{{ request()->routeIs('team.shared-variables.index') ? 'dark:text-white' : '' }}"
-            href="{{ route('team.shared-variables.index') }}">
-            <button>Shared Variables</button>
-        </a>
         <div class="flex-1"></div>
     </nav>
 </div>
diff --git a/resources/views/livewire/project/edit.blade.php b/resources/views/livewire/project/edit.blade.php
index 9fd47a70a..816873aab 100644
--- a/resources/views/livewire/project/edit.blade.php
+++ b/resources/views/livewire/project/edit.blade.php
@@ -14,24 +14,4 @@
             <x-forms.input label="Description" id="project.description" />
         </div>
     </form>
-    <div class="flex gap-2">
-        <h2>Shared Variables</h2>
-        <x-modal-input buttonTitle="+ Add" title="New Shared Variable">
-            <livewire:project.shared.environment-variable.add :shared="true"  />
-        </x-modal-input>
-    </div>
-    <div class="pb-4 lg:flex lg:gap-1">
-        <div>You can use these variables anywhere with</div>
-        <div class=" dark:text-warning text-coollabs">@{{ project.VARIABLENAME }} </div>
-        <x-helper
-            helper="More info <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
-    </div>
-    <div class="flex flex-col gap-2">
-        @forelse ($project->environment_variables->sort()->sortBy('key') as $env)
-            <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
-                :env="$env" type="project" />
-        @empty
-            <div>No environment variables found.</div>
-        @endforelse
-    </div>
 </div>
diff --git a/resources/views/livewire/project/environment-edit.blade.php b/resources/views/livewire/project/environment-edit.blade.php
index 23bb8748b..6439a128d 100644
--- a/resources/views/livewire/project/environment-edit.blade.php
+++ b/resources/views/livewire/project/environment-edit.blade.php
@@ -42,21 +42,4 @@
             <x-forms.input label="Description" id="environment.description" />
         </div>
     </form>
-    <div class="flex gap-2 pt-10">
-        <h2>Shared Variables</h2>
-        <x-modal-input buttonTitle="+ Add" title="New Shared Variable">
-            <livewire:project.shared.environment-variable.add :shared="true"  />
-        </x-modal-input>
-    </div>
-    <div class="flex items-center gap-2 pb-4">You can use these variables anywhere with <span class="dark:text-warning text-coollabs">@{{environment.VARIABLENAME}}</span><x-helper
-            helper="More info <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
-    </div>
-    <div class="flex flex-col gap-2">
-        @forelse ($environment->environment_variables->sort()->sortBy('key') as $env)
-            <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
-                :env="$env" type="environment" />
-        @empty
-            <div>No environment variables found.</div>
-        @endforelse
-    </div>
 </div>
diff --git a/resources/views/livewire/shared-variables/environment/index.blade.php b/resources/views/livewire/shared-variables/environment/index.blade.php
new file mode 100644
index 000000000..bcb6afde6
--- /dev/null
+++ b/resources/views/livewire/shared-variables/environment/index.blade.php
@@ -0,0 +1,28 @@
+<div>
+    <div class="flex gap-2">
+        <h1>Environments</h1>
+    </div>
+    <div class="subtitle">List of your environments by projects.</div>
+    <div class="flex flex-col gap-2">
+        @forelse ($projects as $project)
+            <h2>{{ data_get($project, 'name') }}</h2>
+            <div class="pt-0 pb-3">{{ data_get($project, 'description') }}</div>
+            @forelse ($project->environments as $environment)
+                <a class="box group"
+                    href="{{ route('shared-variables.environment.show', ['project_uuid' => $project->uuid, 'environment_name' => $environment->name]) }}">
+                    <div class="flex flex-col justify-center flex-1 mx-6 ">
+                        <div class="box-title"> {{ $environment->name }}</div>
+                        <div class="box-description">
+                            {{ $environment->description }}</div>
+                    </div>
+                </a>
+            @empty
+                <p>No environments found.</p>
+            @endforelse
+        @empty
+            <div>
+                <div>No project found.</div>
+            </div>
+        @endforelse
+    </div>
+</div>
diff --git a/resources/views/livewire/shared-variables/environment/show.blade.php b/resources/views/livewire/shared-variables/environment/show.blade.php
new file mode 100644
index 000000000..ed91cad02
--- /dev/null
+++ b/resources/views/livewire/shared-variables/environment/show.blade.php
@@ -0,0 +1,20 @@
+<div>
+    <div class="flex gap-2">
+        <h1>Shared Variables for {{ $project->name }}/{{ $environment->name }}</h1>
+        <x-modal-input buttonTitle="+ Add" title="New Shared Variable">
+            <livewire:project.shared.environment-variable.add :shared="true" />
+        </x-modal-input>
+    </div>
+    <div class="flex items-center gap-1 subtitle">You can use these variables anywhere with <span
+            class="dark:text-warning text-coollabs">@{{ environment.VARIABLENAME }}</span><x-helper
+            helper="More info <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
+    </div>
+    <div class="flex flex-col gap-2">
+        @forelse ($environment->environment_variables->sort()->sortBy('key') as $env)
+            <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
+                :env="$env" type="environment" />
+        @empty
+            <div>No environment variables found.</div>
+        @endforelse
+    </div>
+</div>
diff --git a/resources/views/livewire/shared-variables/index.blade.php b/resources/views/livewire/shared-variables/index.blade.php
new file mode 100644
index 000000000..91975347f
--- /dev/null
+++ b/resources/views/livewire/shared-variables/index.blade.php
@@ -0,0 +1,28 @@
+<div>
+    <div class="flex items-start gap-2">
+        <h1>Shared Variables</h1>
+    </div>
+    <div class="subtitle">Set Team / Project / Environment wide variables.</div>
+
+    <div class="flex flex-col gap-2">
+        <a class="box group" href="{{ route('shared-variables.team.index') }}">
+            <div class="flex flex-col justify-center mx-6">
+                <div class="box-title">Team wide</div>
+                <div class="box-description">Usable for all resources in a team.</div>
+            </div>
+        </a>
+        <a class="box group" href="{{ route('shared-variables.project.index') }}">
+            <div class="flex flex-col justify-center mx-6">
+                <div class="box-title">Project wide</div>
+                <div class="box-description">Usable for all resources in a project.</div>
+            </div>
+        </a>
+        <a class="box group" href="{{ route('shared-variables.environment.index') }}">
+            <div class="flex flex-col justify-center mx-6">
+                <div class="box-title">Environment wide</div>
+                <div class="box-description">Usable for all resources in an environment.</div>
+            </div>
+        </a>
+
+    </div>
+</div>
diff --git a/resources/views/livewire/shared-variables/project/index.blade.php b/resources/views/livewire/shared-variables/project/index.blade.php
new file mode 100644
index 000000000..e9f7c0838
--- /dev/null
+++ b/resources/views/livewire/shared-variables/project/index.blade.php
@@ -0,0 +1,22 @@
+<div>
+    <div class="flex gap-2">
+        <h1>Projects</h1>
+    </div>
+    <div class="subtitle">List of your projects.</div>
+    <div class="flex flex-col gap-2">
+        @forelse ($projects as $project)
+            <a class="box group"
+                href="{{ route('shared-variables.project.show', ['project_uuid' => data_get($project, 'uuid')]) }}">
+                <div class="flex flex-col justify-center mx-6 ">
+                    <div class="box-title">{{ $project->name }}</div>
+                    <div class="box-description ">
+                        {{ $project->description }}</div>
+                </div>
+            </a>
+        @empty
+            <div>
+                <div>No project found.</div>
+            </div>
+        @endforelse
+    </div>
+</div>
diff --git a/resources/views/livewire/shared-variables/project/show.blade.php b/resources/views/livewire/shared-variables/project/show.blade.php
new file mode 100644
index 000000000..1f8a9ddc1
--- /dev/null
+++ b/resources/views/livewire/shared-variables/project/show.blade.php
@@ -0,0 +1,22 @@
+<div>
+    <div class="flex gap-2">
+        <h1>Shared Variables for {{data_get($project,'name')}}</h1>
+        <x-modal-input buttonTitle="+ Add" title="New Shared Variable">
+            <livewire:project.shared.environment-variable.add :shared="true" />
+        </x-modal-input>
+    </div>
+    <div class="flex flex-wrap gap-1 subtitle">
+        <div>You can use these variables anywhere with</div>
+        <div class="dark:text-warning text-coollabs">@{{ project.VARIABLENAME }} </div>
+        <x-helper
+            helper="More info <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
+    </div>
+    <div class="flex flex-col gap-2">
+        @forelse ($project->environment_variables->sort()->sortBy('key') as $env)
+            <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
+                :env="$env" type="project" />
+        @empty
+            <div>No environment variables found.</div>
+        @endforelse
+    </div>
+</div>
diff --git a/resources/views/livewire/team-shared-variables-index.blade.php b/resources/views/livewire/shared-variables/team/index.blade.php
similarity index 85%
rename from resources/views/livewire/team-shared-variables-index.blade.php
rename to resources/views/livewire/shared-variables/team/index.blade.php
index 4d36dc950..ec72c8e94 100644
--- a/resources/views/livewire/team-shared-variables-index.blade.php
+++ b/resources/views/livewire/shared-variables/team/index.blade.php
@@ -1,12 +1,11 @@
 <div>
-    <x-team.navbar />
     <div class="flex gap-2">
-        <h2>Shared Variables</h2>
+        <h1>Team Shared Variables</h1>
         <x-modal-input buttonTitle="+ Add" title="New Shared Variable">
             <livewire:project.shared.environment-variable.add :shared="true" />
         </x-modal-input>
     </div>
-    <div class="flex items-center gap-2 pb-4">You can use these variables anywhere with <span
+    <div class="flex items-center gap-1 subtitle">You can use these variables anywhere with <span
             class="dark:text-warning text-coollabs">@{{ team.VARIABLENAME }}</span> <x-helper
             helper="More info <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
     </div>
diff --git a/routes/web.php b/routes/web.php
index 623de722a..bd85ecdd1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -32,6 +32,13 @@ use App\Livewire\Team\Member\Index as TeamMemberIndex;
 use App\Livewire\Storage\Index as StorageIndex;
 use App\Livewire\Storage\Show as StorageShow;
 
+use App\Livewire\SharedVariables\Index as SharedVariablesIndex;
+use App\Livewire\SharedVariables\Team\Index as TeamSharedVariablesIndex;
+use App\Livewire\SharedVariables\Project\Index as ProjectSharedVariablesIndex;
+use App\Livewire\SharedVariables\Project\Show as ProjectSharedVariablesShow;
+use App\Livewire\SharedVariables\Environment\Index as EnvironmentSharedVariablesIndex;
+use App\Livewire\SharedVariables\Environment\Show as EnvironmentSharedVariablesShow;
+
 use App\Livewire\CommandCenter\Index as CommandCenterIndex;
 use App\Livewire\ForcePasswordReset;
 use App\Livewire\Project\Index as ProjectIndex;
@@ -76,7 +83,6 @@ use App\Livewire\Subscription\Show as SubscriptionShow;
 use App\Livewire\Tags\Index as TagsIndex;
 use App\Livewire\Tags\Show as TagsShow;
 
-use App\Livewire\TeamSharedVariablesIndex;
 use App\Livewire\Waitlist\Index as WaitlistIndex;
 use App\Models\ScheduledDatabaseBackupExecution;
 use Illuminate\Support\Facades\Storage;
@@ -126,21 +132,34 @@ Route::middleware(['auth', 'verified'])->group(function () {
     Route::get('/settings/license', SettingsLicense::class)->name('settings.license');
 
     Route::get('/profile', ProfileIndex::class)->name('profile');
+
     Route::prefix('tags')->group(function () {
         Route::get('/', TagsIndex::class)->name('tags.index');
         Route::get('/{tag_name}', TagsShow::class)->name('tags.show');
     });
+
     Route::prefix('notifications')->group(function () {
         Route::get('/email', NotificationEmail::class)->name('notifications.email');
         Route::get('/telegram', NotificationTelegram::class)->name('notifications.telegram');
         Route::get('/discord', NotificationDiscord::class)->name('notifications.discord');
     });
-    Route::get('/storages', StorageIndex::class)->name('storage.index');
-    Route::get('/storages/{storage_uuid}', StorageShow::class)->name('storage.show');
+
+    Route::prefix('storages')->group(function () {
+        Route::get('/', StorageIndex::class)->name('storage.index');
+        Route::get('/{storage_uuid}', StorageShow::class)->name('storage.show');
+    });
+    Route::prefix('shared-variables')->group(function () {
+        Route::get('/', SharedVariablesIndex::class)->name('shared-variables.index');
+        Route::get('/team', TeamSharedVariablesIndex::class)->name('shared-variables.team.index');
+        Route::get('/projects', ProjectSharedVariablesIndex::class)->name('shared-variables.project.index');
+        Route::get('/project/{project_uuid}', ProjectSharedVariablesShow::class)->name('shared-variables.project.show');
+        Route::get('/environments', EnvironmentSharedVariablesIndex::class)->name('shared-variables.environment.index');
+        Route::get('/environment/{project_uuid}/{environment_name}', EnvironmentSharedVariablesShow::class)->name('shared-variables.environment.show');
+    });
+
     Route::prefix('team')->group(function () {
         Route::get('/', TeamIndex::class)->name('team.index');
         Route::get('/members', TeamMemberIndex::class)->name('team.member.index');
-        Route::get('/shared-variables', TeamSharedVariablesIndex::class)->name('team.shared-variables.index');
     });
 
     Route::get('/command-center', CommandCenterIndex::class)->name('command-center');