merge(dev): Re-apply changes after conflict resolution

docker-compose.dev.yml

@@ -1,25 +1,6 @@
-services:
-  extrudex-db:
-    image: postgres:16-alpine
-    container_name: extrudex-db
-    environment:
-      POSTGRES_USER: extrudex
-      POSTGRES_PASSWORD: changeme
-      POSTGRES_DB: extrudex
-    ports:
-      - "5433:5432"
-    volumes:
-      - extrudex-db-data:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U extrudex"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 10s
-    restart: unless-stopped
-    networks:
-      - extrudex-network
+version: '3.8'
 
+services:
   extrudex-api:
     build:
       context: ./backend
@@ -30,14 +11,6 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://+:8080
-      - EXTRUDEX_DB_HOST=extrudex-db
-      - EXTRUDEX_DB_PORT=5432
-      - EXTRUDEX_DB_NAME=extrudex
-      - EXTRUDEX_DB_USER=extrudex
-      - EXTRUDEX_DB_PASSWORD=changeme
-    depends_on:
-      extrudex-db:
-        condition: service_healthy
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
@@ -48,11 +21,11 @@ services:
     networks:
       - extrudex-network
 
-  extrudex-web:
+  control-center-web:
     build:
-      context: ./frontend
+      context: ../Control-Center/frontend
       dockerfile: Dockerfile
-    container_name: extrudex-web
+    container_name: control-center-web
     ports:
       - "5081:80"
     depends_on:
@@ -62,9 +35,6 @@ services:
     networks:
       - extrudex-network
 
-volumes:
-  extrudex-db-data:
-
 networks:
   extrudex-network:
     driver: bridge