diff --git a/docker-compose.yaml b/docker-compose.yaml index 3875449..cdbdf47 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -24,9 +24,10 @@ services: labels: - "traefik.enable=true" - "traefik.http.routers.directus.rule=Host(`net1.jumpstartscaling.com`)" - - "traefik.http.routers.directus.entrypoints=websecure" + - "traefik.http.routers.directus.entrypoints=https" - "traefik.http.routers.directus.tls.certresolver=letsencrypt" - "traefik.http.services.directus.loadbalancer.server.port=8055" + - "traefik.docker.network=coolify" healthcheck: test: - CMD @@ -42,6 +43,9 @@ services: condition: service_healthy redis: condition: service_healthy + networks: + - coolify + - default postgresql: image: 'postgis/postgis:16-3.4-alpine' @@ -85,11 +89,14 @@ services: labels: - "traefik.enable=true" - "traefik.http.routers.frontend.rule=Host(`launch.jumpstartscaling.com`)" - - "traefik.http.routers.frontend.entrypoints=websecure" + - "traefik.http.routers.frontend.entrypoints=https" - "traefik.http.routers.frontend.tls.certresolver=letsencrypt" - "traefik.http.services.frontend.loadbalancer.server.port=4321" depends_on: - directus + networks: + - coolify + - default volumes: directus-uploads: @@ -97,3 +104,8 @@ volumes: directus-templates: directus-postgresql-data: directus-redis-data: + + +networks: + coolify: + external: true diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 3ecac33..166cb4e 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -30,7 +30,7 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "react-flow-renderer": "^10.3.17", - "react-leaflet": "^5.0.0", + "react-leaflet": "^4.2.1", "sonner": "^2.0.7", "tailwind-merge": "^2.6.0", "tailwindcss": "^3.4.0", @@ -2236,13 +2236,13 @@ } }, "node_modules/@react-leaflet/core": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@react-leaflet/core/-/core-3.0.0.tgz", - "integrity": "sha512-3EWmekh4Nz+pGcr+xjf0KNyYfC3U2JjnkWsh0zcqaexYqmmB5ZhH37kz41JXGmKzpaMZCnPofBBm64i+YrEvGQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@react-leaflet/core/-/core-2.1.0.tgz", + "integrity": "sha512-Qk7Pfu8BSarKGqILj4x7bCSZ1pjuAPZ+qmRwH5S7mDS91VSbVVsJSrW4qA+GPrro8t69gFYVMWb1Zc4yFmPiVg==", "peerDependencies": { "leaflet": "^1.9.0", - "react": "^19.0.0", - "react-dom": "^19.0.0" + "react": "^18.0.0", + "react-dom": "^18.0.0" } }, "node_modules/@react-stately/flags": { @@ -3004,7 +3004,7 @@ "version": "20.19.26", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.26.tgz", "integrity": "sha512-0l6cjgF0XnihUpndDhk+nyD3exio3iKaYROSgvh/qSevPXax3L8p5DBRFjbvalnwatGgHEQn2R88y2fA3g4irg==", - "dev": true, + "devOptional": true, "dependencies": { "undici-types": "~6.21.0" } @@ -3012,14 +3012,12 @@ "node_modules/@types/prop-types": { "version": "15.7.15", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz", - "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==", - "dev": true + "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==" }, "node_modules/@types/react": { "version": "18.3.27", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.27.tgz", "integrity": "sha512-cisd7gxkzjBKU2GgdYrTdtQx1SORymWyaAFhaxQPK9bYO9ot3Y5OikQRvY0VYQtvwjeQnizCINJAenh/V7MK2w==", - "dev": true, "dependencies": { "@types/prop-types": "*", "csstype": "^3.2.2" @@ -3029,7 +3027,6 @@ "version": "18.3.7", "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.7.tgz", "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==", - "dev": true, "peerDependencies": { "@types/react": "^18.0.0" } @@ -6451,16 +6448,16 @@ "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==" }, "node_modules/react-leaflet": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/react-leaflet/-/react-leaflet-5.0.0.tgz", - "integrity": "sha512-CWbTpr5vcHw5bt9i4zSlPEVQdTVcML390TjeDG0cK59z1ylexpqC6M1PJFjV8jD7CF+ACBFsLIDs6DRMoLEofw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/react-leaflet/-/react-leaflet-4.2.1.tgz", + "integrity": "sha512-p9chkvhcKrWn/H/1FFeVSqLdReGwn2qmiobOQGO3BifX+/vV/39qhY8dGqbdcPh1e6jxh/QHriLXr7a4eLFK4Q==", "dependencies": { - "@react-leaflet/core": "^3.0.0" + "@react-leaflet/core": "^2.1.0" }, "peerDependencies": { "leaflet": "^1.9.0", - "react": "^19.0.0", - "react-dom": "^19.0.0" + "react": "^18.0.0", + "react-dom": "^18.0.0" } }, "node_modules/react-refresh": { @@ -7457,7 +7454,6 @@ "version": "5.9.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", - "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -7475,7 +7471,7 @@ "version": "6.21.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", - "dev": true + "devOptional": true }, "node_modules/unified": { "version": "11.0.5", diff --git a/frontend/package.json b/frontend/package.json index 34a56bf..7cbe993 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -32,7 +32,7 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "react-flow-renderer": "^10.3.17", - "react-leaflet": "^5.0.0", + "react-leaflet": "^4.2.1", "sonner": "^2.0.7", "tailwind-merge": "^2.6.0", "tailwindcss": "^3.4.0", @@ -47,4 +47,4 @@ "sharp": "^0.33.3", "typescript": "^5.4.0" } -} +} \ No newline at end of file diff --git a/server.env b/server.env new file mode 100644 index 0000000..eb8521d --- /dev/null +++ b/server.env @@ -0,0 +1,9 @@ +SERVICE_BASE64_64_KEY=randomkey123 +SERVICE_BASE64_64_SECRET=randomsecret123 +SERVICE_PASSWORD_ADMIN=admin123 +SERVICE_USER_POSTGRESQL=directus +SERVICE_PASSWORD_POSTGRESQL=dbpassword123 +DIRECTUS_ADMIN_TOKEN=adminToken123 +ADMIN_EMAIL=admin@example.com +PLATFORM_DOMAIN=launch.jumpstartscaling.com +POSTGRESQL_DATABASE=directus