chore(dev): streamline Makefile for hot-reload workflow (+ logs/rebuild targets); finalize health endpoints & vite prox

Author: commanderphu

Makefile

@@ -1,13 +1,12 @@
-# ===== Workmate Dev Makefile (clean) =====
+# ===== Workmate Dev Makefile =====
 # Usage:
 #   make help
-#   make up / down / restart / ps / logs
-#   make db / db-clean
-#   make be / fe / be-sh / fe-sh / psql
+#   make up / down / restart / ps
+#   make be-logs / fe-logs / be-restart / fe-restart
+#   make rebuild-ui / rebuild-be
 #   make migrate / makemigration MIG_MSG="add email" / alembic-current / alembic-history
+#   make test / health / ready / live
 #   make seed SEED_FILE="kit-staff/workmate_employees_basic.json"
-#   make test / fmt / ci / build-be
-#   make health
 
 SHELL := /bin/sh
 
@@ -23,86 +22,72 @@ ADMINER_SVC  ?= adminer
 
 SEED_FILE ?= kit-staff/workmate_employees_basic.json
 
-# Internal helper
+# Helper: run compose with profile + env file wired in
 CMD = ENV_FILE=$(ENV) $(COMPOSE) --profile $(PROFILE)
 
-# Current short git sha (host)
+# Git SHA (short) for ENV stamping (optional)
 SHA := $(shell git rev-parse --short HEAD 2>/dev/null || echo dev)
 
 .PHONY: help
-help: ## Show this help
+help:
 	@grep -E '^[a-zA-Z0-9_-]+:.*?##' $(MAKEFILE_LIST) | sed 's/:.*##/: /' | sort
 
 # ---- Metadata helpers ----
 .PHONY: sha
-sha: ## Set GIT_SHA=<short> inside $(ENV)
+sha: ## Set GIT_SHA in $(ENV) to current commit
 	@if [ -f "$(ENV)" ]; then \
-		if grep -q '^GIT_SHA=' "$(ENV)"; then \
-			sed -i 's/^GIT_SHA=.*/GIT_SHA=$(SHA)/' "$(ENV)"; \
-		else \
-			printf "\nGIT_SHA=$(SHA)\n" >> "$(ENV)"; \
-		fi; \
-	else \
-		printf "APP_VERSION=0.1.0\nGIT_SHA=$(SHA)\n" > "$(ENV)"; \
-	fi
-	@echo "GIT_SHA set to $(SHA) in $(ENV)"
-
-.PHONY: set-version
-set-version: ## Set APP_VERSION (use: make set-version VERSION=0.2.0)
-	@test -n "$(VERSION)" || (echo 'Bitte VERSION="x.y.z" setzen' && exit 1)
-	@if [ -f "$(ENV)" ]; then \
-		if grep -q '^APP_VERSION=' "$(ENV)"; then \
-			sed -i 's/^APP_VERSION=.*/APP_VERSION=$(VERSION)/' "$(ENV)"; \
-		else \
-			printf "\nAPP_VERSION=$(VERSION)\n" >> "$(ENV)"; \
-		fi; \
-	else \
-		printf "APP_VERSION=$(VERSION)\nGIT_SHA=$(SHA)\n" > "$(ENV)"; \
-	fi
-	@echo "APP_VERSION set to $(VERSION) in $(ENV)"
-
-# ---- Stack ----
+	  if grep -q '^GIT_SHA=' "$(ENV)"; then sed -i 's/^GIT_SHA=.*/GIT_SHA=$(SHA)/' "$(ENV)"; \
+	  else printf "\nGIT_SHA=$(SHA)\n" >> "$(ENV)"; fi; \
+	else printf "APP_VERSION=0.1.0\nGIT_SHA=$(SHA)\n" > "$(ENV)"; fi; \
+	echo "GIT_SHA=$(SHA)"
+
+# ---- Stack controls ----
 .PHONY: up
-up: sha ## Start all services (detached) after setting GIT_SHA
-	$(CMD) up -d --build
+up: sha ## Start stack (no rebuild)
+	$(CMD) up -d
 
 .PHONY: down
-down: ## Stop all services (keep volumes)
+down: ## Stop stack (keep volumes)
 	$(CMD) down
 
 .PHONY: restart
-restart: ## Restart all services
-	$(CMD) down && $(CMD) up -d --build
+restart: ## Restart backend+ui
+	$(CMD) restart $(BACKEND_SVC) $(FRONTEND_SVC)
 
 .PHONY: ps
-ps: ## Show service status
+ps: ## Show container status
 	$(CMD) ps
 
-.PHONY: logs
-logs: ## Tail logs (use SVC=<name>, default=$(BACKEND_SVC))
-	$(CMD) logs -f $${SVC:-$(BACKEND_SVC)} --tail=100
+# ---- Logs / restarts ----
+.PHONY: be-logs
+be-logs: ## Tail backend logs
+	$(CMD) logs -f $(BACKEND_SVC)
+
+.PHONY: fe-logs
+fe-logs: ## Tail frontend logs
+	$(CMD) logs -f $(FRONTEND_SVC)
 
-# ---- Partial starts ----
-.PHONY: db
-db: ## Start DB + Adminer only
-	$(CMD) up -d $(DB_SVC) $(ADMINER_SVC)
+.PHONY: be-restart
+be-restart: ## Restart backend only
+	$(CMD) restart $(BACKEND_SVC)
 
-.PHONY: db-clean
-db-clean: ## ⚠️ Stop stack & remove volumes (fresh DB)
-	$(CMD) down -v
+.PHONY: fe-restart
+fe-restart: ## Restart frontend only
+	$(CMD) restart $(FRONTEND_SVC)
 
-.PHONY: be
-be: ## Run backend in foreground (debug)
-	$(CMD) up $(BACKEND_SVC)
+# ---- Rebuilds (only when Dockerfile/locks changed) ----
+.PHONY: rebuild-ui
+rebuild-ui: ## Rebuild UI image only
+	$(CMD) up -d --build $(FRONTEND_SVC)
 
-.PHONY: fe
-fe: ## Run frontend in foreground
-	$(CMD) up $(FRONTEND_SVC)
+.PHONY: rebuild-be
+rebuild-be: ## Rebuild backend image only
+	$(CMD) up -d --build $(BACKEND_SVC)
 
-# ---- Alembic ----
+# ---- Alembic & DB helpers ----
 .PHONY: migrate
 migrate: ## alembic upgrade head
-	$(CMD) run --rm $(BACKEND_SVC) alembic upgrade head
+	$(CMD) exec $(BACKEND_SVC) alembic upgrade head
 
 .PHONY: makemigration
 makemigration: ## autogen migration (MIG_MSG="message")
@@ -117,52 +102,24 @@ alembic-current: ## show current revision
 alembic-history: ## show history (verbose)
 	$(CMD) exec $(BACKEND_SVC) alembic history --verbose
 
-# ---- Seeds & DB tools ----
 .PHONY: seed
-seed: ## seed DB (SEED_FILE overrideable)
+seed: ## seed DB (override with SEED_FILE=...)
 	$(CMD) exec $(BACKEND_SVC) python kit-staff/seed_kit_team.py --file $(SEED_FILE)
 
-.PHONY: psql
-psql: ## open psql in DB container (uses POSTGRES_* env in container)
-	$(CMD) exec -e PGPASSWORD=$$POSTGRES_PASSWORD $(DB_SVC) \
-	sh -lc 'psql -h localhost -U "$$POSTGRES_USER" -d "$$POSTGRES_DB"'
+# ---- Health shortcuts ----
+.PHONY: health
+health: ## GET /api/health (via host)
+	@curl -s http://localhost:8000/api/health | jq .
 
-# ---- Shells ----
-.PHONY: be-sh
-be-sh: ## shell into backend
-	$(CMD) exec $(BACKEND_SVC) sh
+.PHONY: ready
+ready: ## GET /api/ready (status code)
+	@curl -s -o /dev/null -w "%{http_code}\n" http://localhost:8000/api/ready
 
-.PHONY: fe-sh
-fe-sh: ## shell into frontend
-	$(CMD) exec $(FRONTEND_SVC) sh
+.PHONY: live
+live: ## GET /api/live
+	@curl -s http://localhost:8000/api/live | jq .
 
-# ---- Tests & Format ----
+# ---- Tests ----
 .PHONY: test
-test: ## run pytest in backend (if installed)
+test: ## run pytest in backend container
 	$(CMD) exec $(BACKEND_SVC) pytest -q || true
-
-.PHONY: fmt
-fmt: ## run black/isort/ruff if available
-	$(CMD) exec $(BACKEND_SVC) sh -lc 'black app || true; isort app || true; ruff check app --fix || true'
-
-# ---- Local CI mimic & build ----
-.PHONY: ci
-ci: ## DB -> migrate -> pytest (quick local CI)
-	$(CMD) up -d $(DB_SVC)
-	sleep 3
-	$(CMD) exec $(BACKEND_SVC) alembic upgrade head
-	$(CMD) exec $(BACKEND_SVC) pytest -q || true
-
-.PHONY: build-be
-build-be: ## build backend dev image
-	docker build -f backend/Dockerfile.dev -t workmate/backend:dev ./backend
-
-# ---- Convenience ----
-.PHONY: health live ready
-health:
-	@curl -s http://localhost:8000/api/health | jq .
-live:
-	@curl -s http://localhost:8000/api/live | jq .
-ready:
-	@curl -s -o /dev/null -w "%{http_code}\n" http://localhost:8000/api/ready
-

docker-compose.yml

@@ -1,12 +1,11 @@
-
-
 name: kit_workmate
 
 networks:
   kit_net:
 
 volumes:
   pg_data:
+  ui_node_modules:   # named volume für node_modules im Container
 
 services:
   db:
@@ -44,15 +43,15 @@ services:
     ports:
       - "${BACKEND_PORT:-8000}:8000"
     volumes:
-      - ./backend:/app
+      - ./backend:/app               # Bind-Mount für Hot-Reload
     command: >
       sh -c "alembic upgrade head &&
-             uvicorn app.main:app --host 0.0.0.0 --port 8000 --reload"
+             uvicorn app.main:app --host 0.0.0.0 --port 8000 --reload --reload-dir /app"
     networks:
       - kit_net
     profiles: ["dev"]
     healthcheck:
-      test: ["CMD", "curl","-fsS","http://localhost:8000/api/ready"]
+      test: ["CMD", "curl", "-fsS", "http://localhost:8000/api/ready"]
       interval: 20s
       timeout: 3s
       retries: 5
@@ -61,18 +60,22 @@ services:
   ui:
     build:
       context: ./ui
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.dev     # ← sicherstellen, dass dein UI-Dockerfile.dev corepack/pnpm o. npm enthält
     container_name: kit_ui
     environment:
-      VITE_API_BASE: ${VITE_API_BASE:-http://localhost:8000}
+      # Nur den Basis-Pfad ans UI geben, den Proxy macht Vite (target=backend:8000)
+      - VITE_API_BASE=/api
+      # File-watcher zuverlässig machen
+      - CHOKIDAR_USEPOLLING=1
     ports:
       - "${FRONTEND_PORT:-5173}:5173"
     volumes:
-      - ./ui:/usr/src/app
-      - /usr/src/app/node_modules
-    command: ["npm", "run", "dev", "--", "--host"]
+      - ./ui:/app                    # ← gleich wie WORKDIR im UI-Dockerfile
+      - ui_node_modules:/app/node_modules
+    command: ["pnpm", "dev", "--host", "0.0.0.0", "--port", "5173"]
     depends_on:
-      - backend
+      backend:
+        condition: service_healthy   # warte bis API bereit ist
     networks:
       - kit_net
     profiles: ["dev"]

ui/.dockerignore

@@ -1,2 +1,4 @@
+#  ui/.dockerignore
+
 node_modules
 dist

ui/Dockerfile ui/Dockerfile.devui/Dockerfile renamed to ui/Dockerfile.dev

@@ -36,7 +36,7 @@ onMounted(async () => {
         'text-white/60': status === 'loading',
       }"
     >
-      {{ status }}
+      {{ status }} - Backend | DB Status
     </span>
   </div>
 </template>

ui/src/components/HealthDot.vue

@@ -1,3 +1,5 @@
+// ui/vite.config.ts
+
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
 import { fileURLToPath, URL } from 'node:url'