composer merge

composer.lock

@@ -565,11 +565,19 @@
         },
         {
             "name": "boboko/core",
+<<<<<<< HEAD
             "version": "0.5.3",
             "source": {
                 "type": "git",
                 "url": "https://code.radical-elements.com/boboko/core.git",
                 "reference": "09844ec2b5e26792722031b9dc2faa49205f6778"
+=======
+            "version": "0.5.4",
+            "source": {
+                "type": "git",
+                "url": "https://code.radical-elements.com/boboko/core.git",
+                "reference": "ef9e9daab0aed2f65d5db40a838d9047ba02dd68"
+>>>>>>> elv
             },
             "require": {
                 "laravel/framework": "^12.0",
@@ -610,7 +618,7 @@
                 }
             },
             "description": "Core module — authentication and shared panel behaviour",
-            "time": "2026-08-26T11:29:29+00:00"
+            "time": "2026-08-26T15:34:26+00:00"
         },
         {
             "name": "brick/math",

docker-compose.dev.yml

@@ -148,10 +148,10 @@ services:
     working_dir: /app
     command: npm run dev
     ports:
-      - "${VITE_PORT:-5173}:5173"
+      - "${VITE_PORT:-5174}:${VITE_PORT:-5174}"
     environment:
       - NODE_ENV=development
-      - VITE_PORT=${VITE_PORT:-5173}
+      - VITE_PORT=${VITE_PORT:-5174}
     volumes:
       - .:/app
       - /app/node_modules

vite.config.js

@@ -17,7 +17,7 @@ export default defineConfig({
     ],
     server: {
         host: "0.0.0.0",
-        port: 5174,
+        port: process.env.VITE_PORT || 5174,
         strictPort: true,
         cors: true,
         hmr: {