WIP

backend/core/settings/base.py

@@ -165,7 +165,7 @@ CELERY_TASK_SERIALIZER = 'json'
 STATIC_URL = '/static/'
 
 # Direktorij gdje će 'collectstatic' skupljati sve statičke datoteke (za produkciju)
-STATIC_ROOT = BASE_DIR / '/app/staticfiles'
+# STATIC_ROOT = BASE_DIR / '/app/staticfiles'
 
 # (Opcionalno, ali preporučeno za ERP) Ako koristiš i medije (dokumente)
 MEDIA_URL = '/media/'
@@ -211,4 +211,4 @@ CACHES = {
         'BACKEND': 'django.core.cache.backends.redis.RedisCache',
         'LOCATION': 'redis://127.0.0.1:6379/1',
     }
-}
+}

backend/core/settings/production.py

@@ -16,9 +16,11 @@ DATABASES = {
 }
 
 # Sigurnosne postavke
-SECURE_SSL_REDIRECT = True
 SESSION_COOKIE_SECURE = True
 CSRF_COOKIE_SECURE = True
+SECURE_SSL_REDIRECT = True
+SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
+USE_X_FORWARDED_HOST = True
 
 # Produkcijski CORS (samo domena na kojoj vrti Astro)
 CORS_ALLOWED_ORIGINS = os.environ.get('CORS_ALLOWED_ORIGINS', '').split(',')
@@ -34,5 +36,7 @@ CSRF_TRUSTED_ORIGINS = [
 ]
 
 # Statika i Mediji
+STATIC_URL = '/static/'
 STATIC_ROOT = '/app/staticfiles'
-MEDIA_ROOT = '/app/media'
+MEDIA_URL = '/media/'
+MEDIA_ROOT = '/app/media'

docker-compose.dev.yml

@@ -5,7 +5,7 @@ services:
       context: ./backend
       dockerfile: Dockerfile
     command: python manage.py runserver 0.0.0.0:8000
-    user: "1000:1000"
+    user: "1001:1001"
     volumes:
       - ./backend:/app
       - media_volume:/app/media
@@ -29,12 +29,14 @@ services:
       - ./frontend:/app
       - /app/node_modules
     environment:
-      - PUBLIC_API_URL=${PUBLIC_API_URL}
       - NODE_ENV=development
       - PUBLIC_ALLOWED_HOSTS=serviseri-004.captain.mitteworkspace.cloud
       - PUBLIC_HMR_HOST=serviseri-004.captain.mitteworkspace.cloud
       - PUBLIC_HMR_PROTOCOL=ws
       - PUBLIC_HMR_CLIENT_PORT=4321
+      - PUBLIC_HMR_PROTOCOL=wss
+      - PUBLIC_HMR_CLIENT_PORT=443
+      - PUBLIC_API_URL=https://api-004.captain.mitteworkspace.cloud/api/
   
   flower:
     container_name: 004erpflower
@@ -52,4 +54,4 @@ services:
 
 volumes:
   media_volume:
-    external: true # Ako je definiran u glavnom file-u, ovo ga povezuje
+    external: true # Ako je definiran u glavnom file-u, ovo ga povezuje

frontend/astro.config.mjs

@@ -13,7 +13,7 @@ const envHosts = (process.env.PUBLIC_ALLOWED_HOSTS || '')
   .filter(Boolean);
 
 const allowedHosts = Array.from(
-  new Set(['localhost', '127.0.0.1', ...envHosts])
+  new Set(['localhost', '127.0.0.1', 'serviseri-004.captain.mitteworkspace.cloud', ...envHosts])
 );
 
 const hmrHost = process.env.PUBLIC_HMR_HOST || 'localhost';
@@ -70,4 +70,4 @@ export default defineConfig({
   },
 
   integrations: [preact()],
-});
+});