Merge pull request #456 from jesusantguerrero/feat/coolify

Feat/coolify
jesusantguerrero · Sep 12, 2024 · 386b01b · 386b01b
2 parents 16967ad + 6e9dc72
commit 386b01b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/Caddyfile b/Caddyfile
@@ -6,7 +6,7 @@
 }
 
 # The domain name of your server
-localhost {
+{$SERVER_NAME:localhost} {
 	root * public/
 	encode zstd gzip
 	php_server {

diff --git a/Caddyfile.dev b/Caddyfile.dev
@@ -6,7 +6,7 @@
 }
 
 # The domain name of your server
-localhost {
+{$SERVER_NAME:localhost} {
 	# Set the webroot to the public/ dir
 	root * public/
 	# Enable compression (optional)

diff --git a/docker-compose.coolify.yml b/docker-compose.coolify.yml
@@ -1,4 +1,3 @@
-version: "3.7"
 services:
   web:
     build:
@@ -16,6 +15,7 @@ services:
     networks:
       - loger
     environment:
+        server_name: ${SERVER_NAME:-test.apps.neatlancer.com}, php:80
         DEBUG: "debug"
         # Change the following value if you know how it works.
         # MERCURE_TRANSPORT_URL: "bolt://mercure.db"
@@ -26,7 +26,7 @@ services:
             cors_origins "*"
             anonymous
     ports:
-      - "80:3000"
+      - "3000:80"
 networks:
   loger:
-    external: true
+    driver: bridge
diff --git a/resources/js/Components/board/ItemModal.vue b/resources/js/Components/board/ItemModal.vue
@@ -402,13 +402,13 @@ h1 {
 .form-cell {
     .item-group-cell {
         @apply border-2 border-gray-200 px-0;
+        height: 37px;
 
         span {
             height: 100%;
             display: flex;
             align-items: center;
         }
-        height: 37px;
 
     }
 }

diff --git a/resources/js/Pages/Finance/Account.vue b/resources/js/Pages/Finance/Account.vue
@@ -169,7 +169,6 @@ const setPaymentBill = (transaction: ITransaction) => {
   openModal(
         { data:{
             documents: [transaction],
-            transaction: transaction,
             resourceId: transaction.id,
             title: `Payment of ${transaction.name}`,
             defaultConcept: `Payment of ${transaction.name}`,