Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e66bcc7058 | |||
| 709190719f | |||
| df50ea8b4b | |||
| 654ec09ce1 | |||
| 345230a9fc | |||
| 1b77f5815e | |||
| 489419a7d4 | |||
| f815e64499 | |||
| e5606c64c5 | |||
| a08bdaa3b1 | |||
| 36a1ad0b84 | |||
| 80cb971308 | |||
| 6483453437 | |||
| 1221350ed6 | |||
| 620f7b3153 | |||
| cd465e0564 | |||
| 00c23bc066 | |||
| 5f67cc9140 |
@@ -2,9 +2,9 @@ FROM python:3.12-slim
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# Install system dependencies for asyncpg
|
||||
# Install system dependencies for asyncpg + git + docker-cli (MCP tools)
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
gcc libpq-dev && \
|
||||
gcc libpq-dev git docker.io curl && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
COPY requirements.txt .
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from typing import Optional
|
||||
from jose import JWTError, jwt
|
||||
from passlib.context import CryptContext
|
||||
import bcrypt
|
||||
from fastapi import Depends, HTTPException, status, Request
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select
|
||||
@@ -12,17 +12,16 @@ from app.models.admin_user import AdminUser
|
||||
|
||||
|
||||
settings = get_settings()
|
||||
pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
|
||||
|
||||
|
||||
def verify_password(plain_password: str, hashed_password: str) -> bool:
|
||||
"""Verify a plain password against a hash."""
|
||||
return pwd_context.verify(plain_password, hashed_password)
|
||||
return bcrypt.checkpw(plain_password.encode(), hashed_password.encode())
|
||||
|
||||
|
||||
def get_password_hash(password: str) -> str:
|
||||
"""Hash a password using bcrypt."""
|
||||
return pwd_context.hash(password)
|
||||
return bcrypt.hashpw(password.encode(), bcrypt.gensalt()).decode()
|
||||
|
||||
|
||||
def create_access_token(data: dict, expires_delta: timedelta | None = None) -> str:
|
||||
|
||||
@@ -9,8 +9,12 @@ from app.config import get_settings
|
||||
from app.database import engine, init_db, async_session
|
||||
from app.cache import cache
|
||||
from app.routers import equipment, health, admin, rental_requests, contact
|
||||
from app.models.admin_user import AdminUser
|
||||
from app.auth import get_password_hash
|
||||
from sqlalchemy import select
|
||||
from app.services.sync_service import SyncService
|
||||
from app.services.email_service import EmailService
|
||||
from app.mcp_server import get_mcp_app, mcp_session_manager
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
settings = get_settings()
|
||||
@@ -35,60 +39,56 @@ async def run_email_retry() -> None:
|
||||
logger.info("Email retry complete: %d emails sent", sent)
|
||||
|
||||
|
||||
async def seed_admin_user() -> None:
|
||||
"""Ensure the admin user from settings exists (create or update password)."""
|
||||
async with async_session() as db:
|
||||
result = await db.execute(
|
||||
select(AdminUser).where(AdminUser.username == settings.admin_username)
|
||||
)
|
||||
user = result.scalar_one_or_none()
|
||||
if not user:
|
||||
db.add(AdminUser(
|
||||
username=settings.admin_username,
|
||||
password_hash=get_password_hash(settings.admin_password),
|
||||
))
|
||||
logger.info("Seeded admin user %s", settings.admin_username)
|
||||
else:
|
||||
user.password_hash = get_password_hash(settings.admin_password)
|
||||
await db.commit()
|
||||
|
||||
|
||||
@asynccontextmanager
|
||||
async def lifespan(app: FastAPI):
|
||||
"""Application lifespan: init DB, start scheduler, connect cache."""
|
||||
# Create tables (for dev/testing; production uses Alembic)
|
||||
"""Application lifespan: init DB, seed admin, start scheduler, connect cache."""
|
||||
await init_db()
|
||||
|
||||
# Connect Redis cache
|
||||
await seed_admin_user()
|
||||
await cache.connect()
|
||||
|
||||
# Start APScheduler
|
||||
scheduler.add_job(
|
||||
run_equipment_sync,
|
||||
trigger="cron",
|
||||
hour="*/6",
|
||||
id="equipment_sync",
|
||||
replace_existing=True,
|
||||
)
|
||||
scheduler.add_job(
|
||||
run_email_retry,
|
||||
trigger="cron",
|
||||
minute="*/15",
|
||||
id="email_retry",
|
||||
replace_existing=True,
|
||||
)
|
||||
_mcp_cm = mcp_session_manager.run()
|
||||
await _mcp_cm.__aenter__()
|
||||
|
||||
scheduler.add_job(run_equipment_sync, trigger="cron", hour="*/6", id="equipment_sync", replace_existing=True)
|
||||
scheduler.add_job(run_email_retry, trigger="cron", minute="*/15", id="email_retry", replace_existing=True)
|
||||
scheduler.start()
|
||||
logger.info("APScheduler started with equipment_sync (every 6h) and email_retry (every 15min)")
|
||||
logger.info("APScheduler started")
|
||||
|
||||
yield
|
||||
|
||||
# Shutdown
|
||||
scheduler.shutdown(wait=False)
|
||||
await _mcp_cm.__aexit__(None, None, None)
|
||||
await cache.disconnect()
|
||||
await engine.dispose()
|
||||
|
||||
|
||||
app = FastAPI(
|
||||
title="HMS Licht & Ton API",
|
||||
version="1.0.0",
|
||||
lifespan=lifespan,
|
||||
)
|
||||
app = FastAPI(title="HMS Licht & Ton API", version="1.0.0", lifespan=lifespan)
|
||||
|
||||
# CORS
|
||||
origins = [o.strip() for o in settings.cors_origins.split(",") if o.strip()]
|
||||
app.add_middleware(
|
||||
CORSMiddleware,
|
||||
allow_origins=origins,
|
||||
allow_methods=["GET", "POST"],
|
||||
allow_headers=["*"],
|
||||
allow_credentials=True,
|
||||
)
|
||||
app.add_middleware(CORSMiddleware, allow_origins=origins, allow_methods=["GET", "POST"], allow_headers=["*"], allow_credentials=True)
|
||||
|
||||
# Routers
|
||||
app.include_router(equipment.router)
|
||||
app.include_router(health.router)
|
||||
app.include_router(admin.router)
|
||||
app.include_router(rental_requests.router)
|
||||
app.include_router(contact.router)
|
||||
|
||||
app.mount("/mcp", get_mcp_app())
|
||||
|
||||
@@ -0,0 +1,558 @@
|
||||
"""MCP Server for HMS CMS – provides resources and tools for AI agents.
|
||||
|
||||
Resources (read-only):
|
||||
- design-rules: HMS design system as JSON
|
||||
- page-structure: React pages and components map
|
||||
- sync-status: current Rentman sync status
|
||||
|
||||
Tools (execute):
|
||||
- trigger_sync: run Rentman equipment sync
|
||||
- get_sync_log: fetch sync history
|
||||
- set_rentman_token: update .env token + restart backend
|
||||
- read_file: read frontend source file
|
||||
- write_file: write frontend source file
|
||||
- create_page: create React page with design validation
|
||||
- deploy: rebuild + redeploy frontend container
|
||||
- git_commit: commit all changes
|
||||
- git_status: show working tree status
|
||||
"""
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
import asyncio
|
||||
import logging
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
from mcp.server.fastmcp import FastMCP
|
||||
|
||||
from app.database import async_session
|
||||
from app.services.sync_service import SyncService
|
||||
from app.config import get_settings
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
settings = get_settings()
|
||||
|
||||
# ---------------------------------------------------------------------------#
|
||||
# Paths (mapped via docker-compose volumes)
|
||||
# ---------------------------------------------------------------------------#
|
||||
REPO_ROOT = Path("/data/repo")
|
||||
FRONTEND_ROOT = REPO_ROOT / "frontend"
|
||||
FRONTEND_SRC = FRONTEND_ROOT / "src"
|
||||
ENV_FILE = REPO_ROOT / ".env"
|
||||
|
||||
# ---------------------------------------------------------------------------#
|
||||
# Static design rules (derived from frontend/src/index.css)
|
||||
# ---------------------------------------------------------------------------#
|
||||
DESIGN_RULES: dict[str, Any] = {
|
||||
"colors": {
|
||||
"accent": "#FA5C01",
|
||||
"bg": "#131313",
|
||||
"panel": "#1a1a1a",
|
||||
"surface": "#212121",
|
||||
"text": "#ffffff",
|
||||
"text_muted": "#d4d4d4",
|
||||
"border": "#444444a8",
|
||||
"secondary": "#656565",
|
||||
},
|
||||
"fonts": {"primary": "Inter", "weights": [400, 500, 600, 700, 800]},
|
||||
"components": {
|
||||
"hms-btn": "button class with variants: primary, secondary, ghost",
|
||||
"hms-card": "card container with border, bg, hover effect",
|
||||
"hms-badge": "badge with variants: primary, gray, success, error",
|
||||
"hms-input": "input field with focus state",
|
||||
"hms-chip": "filter chip with active state",
|
||||
"hms-skeleton": "loading skeleton with shimmer animation",
|
||||
"hms-speaker-grid": "responsive grid for equipment items",
|
||||
"hms-gallery": "responsive gallery grid",
|
||||
"hms-hero": "hero section with bg image and overlay",
|
||||
},
|
||||
"layout": {
|
||||
"max_width": "1280px",
|
||||
"header_height": "4rem",
|
||||
"radius": {"sm": 2, "md": 3, "lg": 4, "xl": 4, "full": 9999},
|
||||
},
|
||||
"rules": [
|
||||
"Use Inter font for all text",
|
||||
"Use #FA5C01 for all accent elements",
|
||||
"Use hms-* CSS classes, do not invent new ones",
|
||||
"All text in German",
|
||||
"Use CSS variables (var(--text), var(--bg), etc.) not hardcoded colors",
|
||||
"Use Tailwind utility classes for layout, hms-* classes for components",
|
||||
"Images: use object-cover, lazy loading",
|
||||
"Buttons: use hms-btn with variant classes",
|
||||
"Cards: use hms-card class",
|
||||
"Responsive: sm: breakpoint 640px, lg: breakpoint 1024px",
|
||||
],
|
||||
}
|
||||
|
||||
# Static page/component info (used when frontend source is not mounted)
|
||||
_STATIC_PAGES = [
|
||||
{"path": "/", "file": "src/pages/Index.tsx", "components": ["SpeakerIcon", "ServiceCard"]},
|
||||
{"path": "/mietkatalog", "file": "src/pages/Mietkatalog.tsx", "components": ["EquipmentCard", "LoadingSkeleton", "ErrorState", "EmptyState"]},
|
||||
{"path": "/mietkatalog/:id", "file": "src/pages/EquipmentDetail.tsx", "components": ["ErrorState"]},
|
||||
{"path": "/kontakt", "file": "src/pages/Kontakt.tsx", "components": []},
|
||||
{"path": "/referenzen", "file": "src/pages/Referenzen.tsx", "components": ["ErrorState", "EmptyState"]},
|
||||
{"path": "/warenkorb", "file": "src/pages/Warenkorb.tsx", "components": ["EmptyState"]},
|
||||
{"path": "/admin", "file": "src/pages/Admin.tsx", "components": ["Logo"]},
|
||||
{"path": "/agb", "file": "src/pages/AGB.tsx", "components": ["LegalContentPage"]},
|
||||
{"path": "/datenschutz", "file": "src/pages/Datenschutz.tsx", "components": ["LegalContentPage"]},
|
||||
{"path": "/impressum", "file": "src/pages/Impressum.tsx", "components": ["LegalContentPage"]},
|
||||
{"path": "/*", "file": "src/pages/ErrorPage.tsx", "components": ["Header", "Footer"]},
|
||||
]
|
||||
|
||||
_STATIC_COMPONENTS = [
|
||||
{"name": "Header", "file": "src/components/Header.tsx", "props": []},
|
||||
{"name": "Footer", "file": "src/components/Footer.tsx", "props": []},
|
||||
{"name": "Logo", "file": "src/components/Logo.tsx", "props": ["size"]},
|
||||
{"name": "EquipmentCard", "file": "src/components/EquipmentCard.tsx", "props": ["item", "onClick", "onAddToCart"]},
|
||||
{"name": "LoadingSkeleton", "file": "src/components/LoadingSkeleton.tsx", "props": ["count"]},
|
||||
{"name": "ErrorState", "file": "src/components/ErrorState.tsx", "props": ["title", "message", "onRetry"]},
|
||||
{"name": "EmptyState", "file": "src/components/EmptyState.tsx", "props": ["icon", "title", "message", "actionLabel", "onAction"]},
|
||||
{"name": "ServiceCard", "file": "src/components/ServiceCard.tsx", "props": ["icon", "title", "description"]},
|
||||
{"name": "SpeakerIcon", "file": "src/components/SpeakerIcon.tsx", "props": ["type"]},
|
||||
{"name": "LegalContentPage", "file": "src/components/LegalContentPage.tsx", "props": ["title", "content", "loading"]},
|
||||
{"name": "Layout", "file": "src/components/Layout.tsx", "props": []},
|
||||
]
|
||||
|
||||
# ---------------------------------------------------------------------------#
|
||||
# FastMCP server instance
|
||||
# ---------------------------------------------------------------------------#
|
||||
# streamable_http_path="/" so that when mounted at /mcp the endpoint is /mcp/
|
||||
# stateless_http=True: each request is independent (no session management)
|
||||
# Disable DNS rebinding protection for Docker deployment
|
||||
from mcp.server.transport_security import TransportSecuritySettings
|
||||
|
||||
mcp = FastMCP("hms-cms", streamable_http_path="/", stateless_http=True, transport_security=TransportSecuritySettings(enable_dns_rebinding_protection=False))
|
||||
|
||||
# ---------------------------------------------------------------------------#
|
||||
# Bearer token authentication wrapper
|
||||
# ---------------------------------------------------------------------------#
|
||||
_MCP_TOKEN = os.environ.get("MCP_AUTH_TOKEN", "")
|
||||
|
||||
|
||||
class MCPAuthMiddleware:
|
||||
"""ASGI middleware: validate Authorization: Bearer <token> for /mcp endpoint."""
|
||||
|
||||
def __init__(self, app):
|
||||
self.app = app
|
||||
|
||||
async def __call__(self, scope, receive, send):
|
||||
if scope["type"] != "http":
|
||||
return await self.app(scope, receive, send)
|
||||
|
||||
# If no token configured, allow all (dev mode)
|
||||
if not _MCP_TOKEN:
|
||||
return await self.app(scope, receive, send)
|
||||
|
||||
# Extract Authorization header
|
||||
headers = dict(scope.get("headers", []))
|
||||
auth_header = headers.get(b"authorization", b"").decode()
|
||||
|
||||
if auth_header.startswith("Bearer "):
|
||||
token = auth_header[7:]
|
||||
if token == _MCP_TOKEN:
|
||||
return await self.app(scope, receive, send)
|
||||
|
||||
# Reject
|
||||
await send({
|
||||
"type": "http.response.start",
|
||||
"status": 401,
|
||||
"headers": [[b"content-type", b"application/json"], [b"www-authenticate", b"Bearer"]],
|
||||
})
|
||||
await send({
|
||||
"type": "http.response.body",
|
||||
"body": b'{"error": "Unauthorized: invalid or missing Bearer token"}',
|
||||
})
|
||||
|
||||
|
||||
def get_mcp_app():
|
||||
"""Return the MCP ASGI app wrapped with auth middleware."""
|
||||
return MCPAuthMiddleware(_mcp_streamable_app)
|
||||
|
||||
|
||||
# Expose session manager for lifespan integration in main FastAPI app.
|
||||
# FastAPI mount() does not call sub-app lifespans, so we must
|
||||
# manually start/stop the session manager in the main app lifespan.
|
||||
# Call streamable_http_app() first to lazily initialize the session manager.
|
||||
_mcp_streamable_app = mcp.streamable_http_app()
|
||||
mcp_session_manager = mcp._session_manager
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------#
|
||||
# Resources (read-only)
|
||||
# ---------------------------------------------------------------------------#
|
||||
@mcp.resource("hms://design-rules")
|
||||
async def design_rules() -> str:
|
||||
"""Return the HMS design rules as structured JSON."""
|
||||
return json.dumps(DESIGN_RULES, indent=2, ensure_ascii=False)
|
||||
|
||||
|
||||
@mcp.resource("hms://page-structure")
|
||||
async def page_structure() -> str:
|
||||
"""List all React pages and their component usage."""
|
||||
pages = list(_STATIC_PAGES)
|
||||
components = list(_STATIC_COMPONENTS)
|
||||
|
||||
# Dynamic scan if frontend source is accessible
|
||||
if FRONTEND_SRC.exists():
|
||||
pages_dir = FRONTEND_SRC / "pages"
|
||||
comp_dir = FRONTEND_SRC / "components"
|
||||
|
||||
if pages_dir.exists():
|
||||
dyn_pages: list[dict] = []
|
||||
for f in sorted(pages_dir.glob("*.tsx")):
|
||||
content = f.read_text()
|
||||
imports = re.findall(r"import\s+(\w+)\s+from\s+['\"]\.\.?/", content)
|
||||
comp_imports = [imp for imp in imports if imp[0].isupper()]
|
||||
stem = f.stem
|
||||
if stem == "Index":
|
||||
path = "/"
|
||||
elif stem == "ErrorPage":
|
||||
path = "/*"
|
||||
elif stem == "EquipmentDetail":
|
||||
path = "/mietkatalog/:id"
|
||||
else:
|
||||
path = f"/{stem.lower()}"
|
||||
dyn_pages.append({
|
||||
"path": path,
|
||||
"file": f"src/pages/{f.name}",
|
||||
"components": comp_imports,
|
||||
})
|
||||
if dyn_pages:
|
||||
pages = dyn_pages
|
||||
|
||||
if comp_dir.exists():
|
||||
dyn_comps: list[dict] = []
|
||||
for f in sorted(comp_dir.glob("*.tsx")):
|
||||
content = f.read_text()
|
||||
props: list[str] = []
|
||||
# Match interface Props { ... } or interface XxxProps { ... }
|
||||
prop_match = re.search(r"interface\s+\w+\s*\{([^}]*)\}", content)
|
||||
if prop_match:
|
||||
props = re.findall(r"(\w+)\??\s*:", prop_match.group(1))
|
||||
dyn_comps.append({
|
||||
"name": f.stem,
|
||||
"file": f"src/components/{f.name}",
|
||||
"props": props,
|
||||
})
|
||||
if dyn_comps:
|
||||
components = dyn_comps
|
||||
|
||||
return json.dumps({"pages": pages, "components": components}, indent=2, ensure_ascii=False)
|
||||
|
||||
|
||||
@mcp.resource("hms://sync-status")
|
||||
async def sync_status() -> str:
|
||||
"""Return the current sync status (last sync, items, errors)."""
|
||||
try:
|
||||
async with async_session() as db:
|
||||
svc = SyncService(db)
|
||||
result = await svc.get_last_sync()
|
||||
return json.dumps(result, indent=2, default=str, ensure_ascii=False)
|
||||
except Exception as exc:
|
||||
return json.dumps({"error": str(exc)}, indent=2)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------#
|
||||
# Tools (execute)
|
||||
# ---------------------------------------------------------------------------#
|
||||
@mcp.tool()
|
||||
async def trigger_sync() -> str:
|
||||
"""Trigger a Rentman equipment sync (like POST /api/admin/sync)."""
|
||||
try:
|
||||
async with async_session() as db:
|
||||
svc = SyncService(db)
|
||||
result = await svc.run_sync()
|
||||
return json.dumps(result, indent=2)
|
||||
except Exception as exc:
|
||||
return json.dumps({"error": str(exc)}, indent=2)
|
||||
|
||||
|
||||
@mcp.tool()
|
||||
async def get_sync_log(page: int = 1, page_size: int = 20) -> str:
|
||||
"""Return the sync history log.
|
||||
|
||||
Args:
|
||||
page: Page number (1-based)
|
||||
page_size: Items per page (max 100)
|
||||
"""
|
||||
try:
|
||||
async with async_session() as db:
|
||||
svc = SyncService(db)
|
||||
result = await svc.get_sync_log_paginated(page=page, page_size=page_size)
|
||||
items = []
|
||||
for log in result["items"]:
|
||||
items.append({
|
||||
"id": log.id,
|
||||
"sync_type": log.sync_type,
|
||||
"status": log.status,
|
||||
"started_at": log.started_at.isoformat() if log.started_at else None,
|
||||
"completed_at": log.completed_at.isoformat() if log.completed_at else None,
|
||||
"items_processed": log.items_processed,
|
||||
"items_failed": log.items_failed,
|
||||
"error_message": log.error_message,
|
||||
})
|
||||
return json.dumps({
|
||||
"items": items,
|
||||
"total": result["total"],
|
||||
"page": result["page"],
|
||||
"page_size": result["page_size"],
|
||||
"total_pages": result["total_pages"],
|
||||
}, indent=2, default=str)
|
||||
except Exception as exc:
|
||||
return json.dumps({"error": str(exc)}, indent=2)
|
||||
|
||||
|
||||
@mcp.tool()
|
||||
async def set_rentman_token(token: str) -> str:
|
||||
"""Update the Rentman API Token in .env and restart the backend.
|
||||
|
||||
Args:
|
||||
token: New Rentman API token string
|
||||
"""
|
||||
try:
|
||||
if not ENV_FILE.exists():
|
||||
return json.dumps({"error": f".env file not found at {ENV_FILE}"})
|
||||
|
||||
content = ENV_FILE.read_text()
|
||||
|
||||
if "RENTMAN_API_TOKEN=" in content:
|
||||
content = re.sub(
|
||||
r"RENTMAN_API_TOKEN=.*",
|
||||
f"RENTMAN_API_TOKEN={token}",
|
||||
content,
|
||||
)
|
||||
else:
|
||||
content += f"\nRENTMAN_API_TOKEN={token}\n"
|
||||
|
||||
ENV_FILE.write_text(content)
|
||||
|
||||
# Restart backend with a short delay so the response can be sent first
|
||||
async def _restart() -> None:
|
||||
await asyncio.sleep(2)
|
||||
try:
|
||||
subprocess.run(
|
||||
["docker", "compose", "restart", "backend"],
|
||||
cwd=str(REPO_ROOT),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=60,
|
||||
)
|
||||
except Exception as exc:
|
||||
logger.error("Backend restart failed: %s", exc)
|
||||
|
||||
asyncio.create_task(_restart())
|
||||
|
||||
return json.dumps({
|
||||
"status": "success",
|
||||
"message": "Token updated. Backend restart initiated (2s delay).",
|
||||
})
|
||||
except Exception as exc:
|
||||
return json.dumps({"error": str(exc)}, indent=2)
|
||||
|
||||
|
||||
@mcp.tool()
|
||||
async def read_file(path: str) -> str:
|
||||
"""Read a file from the frontend source.
|
||||
|
||||
Args:
|
||||
path: Relative path to the file (relative to frontend/)
|
||||
"""
|
||||
try:
|
||||
full_path = FRONTEND_ROOT / path
|
||||
if not full_path.exists() or not full_path.is_file():
|
||||
return json.dumps({"error": f"File not found: {path}"})
|
||||
# Security: ensure path stays within frontend dir
|
||||
full_path = full_path.resolve()
|
||||
if not str(full_path).startswith(str(FRONTEND_ROOT.resolve())):
|
||||
return json.dumps({"error": "Path traversal blocked"})
|
||||
return full_path.read_text()
|
||||
except Exception as exc:
|
||||
return json.dumps({"error": str(exc)}, indent=2)
|
||||
|
||||
|
||||
@mcp.tool()
|
||||
async def write_file(path: str, content: str) -> str:
|
||||
"""Write a file in the frontend source.
|
||||
|
||||
Args:
|
||||
path: Relative path (relative to frontend/src/)
|
||||
content: File content to write
|
||||
"""
|
||||
try:
|
||||
full_path = (FRONTEND_SRC / path).resolve()
|
||||
if not str(full_path).startswith(str(FRONTEND_SRC.resolve())):
|
||||
return json.dumps({"error": "Path traversal blocked"})
|
||||
full_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
full_path.write_text(content)
|
||||
return json.dumps({
|
||||
"status": "success",
|
||||
"path": str(full_path),
|
||||
"bytes": len(content),
|
||||
})
|
||||
except Exception as exc:
|
||||
return json.dumps({"error": str(exc)}, indent=2)
|
||||
|
||||
|
||||
@mcp.tool()
|
||||
async def create_page(name: str, content: str) -> str:
|
||||
"""Create a new React page with design rule validation.
|
||||
|
||||
Args:
|
||||
name: Page name (e.g. 'UeberUns' creates src/pages/UeberUns.tsx)
|
||||
content: Full TSX content of the page
|
||||
"""
|
||||
try:
|
||||
issues: list[str] = []
|
||||
|
||||
# Validate: check for non-hms component classes
|
||||
custom_classes = re.findall(r'className="([^"]*)"', content)
|
||||
for cls_str in custom_classes:
|
||||
for word in cls_str.split():
|
||||
if word.startswith("btn") and not word.startswith("hms-btn"):
|
||||
issues.append(f"Found '{word}' – use 'hms-btn' instead")
|
||||
if word.startswith("card") and not word.startswith("hms-card"):
|
||||
issues.append(f"Found '{word}' – use 'hms-card' instead")
|
||||
if word.startswith("badge") and not word.startswith("hms-badge"):
|
||||
issues.append(f"Found '{word}' – use 'hms-badge' instead")
|
||||
|
||||
# Validate: hardcoded hex colors (excluding #FA5C01 accent)
|
||||
hex_colors = re.findall(r"#([0-9A-Fa-f]{6})\b", content)
|
||||
for hc in hex_colors:
|
||||
if hc.upper() not in ("FA5C01", "FFFFFF", "000000"):
|
||||
issues.append(f"Hardcoded color #{hc} – use CSS variable instead")
|
||||
|
||||
# Validate: non-Inter font-family
|
||||
font_match = re.search(r'font-family:\s*["\']?(?!Inter)["\']?', content)
|
||||
if font_match:
|
||||
issues.append("Non-Inter font detected – use Inter for all text")
|
||||
|
||||
# Write the file
|
||||
safe_name = re.sub(r"[^a-zA-Z0-9_-]", "", name)
|
||||
if not safe_name:
|
||||
return json.dumps({"error": "Invalid page name"})
|
||||
filename = f"{safe_name}.tsx"
|
||||
file_path = FRONTEND_SRC / "pages" / filename
|
||||
file_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
file_path.write_text(content)
|
||||
|
||||
return json.dumps({
|
||||
"status": "success",
|
||||
"file": f"src/pages/{filename}",
|
||||
"path": str(file_path),
|
||||
"validation": {
|
||||
"issues": issues,
|
||||
"passed": len(issues) == 0,
|
||||
},
|
||||
}, indent=2, ensure_ascii=False)
|
||||
except Exception as exc:
|
||||
return json.dumps({"error": str(exc)}, indent=2)
|
||||
|
||||
|
||||
@mcp.tool()
|
||||
async def deploy() -> str:
|
||||
"""Build and deploy the frontend.
|
||||
|
||||
Runs: docker compose build --no-cache frontend
|
||||
docker compose up -d --force-recreate frontend
|
||||
docker compose restart frontend
|
||||
"""
|
||||
try:
|
||||
commands = [
|
||||
["docker", "compose", "build", "--no-cache", "frontend"],
|
||||
["docker", "compose", "up", "-d", "--force-recreate", "frontend"],
|
||||
["docker", "compose", "restart", "frontend"],
|
||||
]
|
||||
results = []
|
||||
for cmd in commands:
|
||||
r = subprocess.run(
|
||||
cmd,
|
||||
cwd=str(REPO_ROOT),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=300,
|
||||
)
|
||||
results.append({
|
||||
"command": " ".join(cmd),
|
||||
"returncode": r.returncode,
|
||||
"stdout": r.stdout[-500:] if r.stdout else "",
|
||||
"stderr": r.stderr[-500:] if r.stderr else "",
|
||||
})
|
||||
if r.returncode != 0:
|
||||
return json.dumps({
|
||||
"status": "failed",
|
||||
"step": cmd[2],
|
||||
"results": results,
|
||||
}, indent=2)
|
||||
|
||||
return json.dumps({"status": "success", "results": results}, indent=2)
|
||||
except Exception as exc:
|
||||
return json.dumps({"error": str(exc)}, indent=2)
|
||||
|
||||
|
||||
@mcp.tool()
|
||||
async def git_commit(message: str) -> str:
|
||||
"""Commit all changes with a message.
|
||||
|
||||
Args:
|
||||
message: Git commit message
|
||||
"""
|
||||
try:
|
||||
r = subprocess.run(
|
||||
["git", "add", "-A"],
|
||||
cwd=str(REPO_ROOT),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=30,
|
||||
)
|
||||
if r.returncode != 0:
|
||||
return json.dumps({"error": "git add failed", "stderr": r.stderr})
|
||||
|
||||
r = subprocess.run(
|
||||
["git", "commit", "-m", message],
|
||||
cwd=str(REPO_ROOT),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=30,
|
||||
)
|
||||
if r.returncode != 0:
|
||||
if "nothing to commit" in r.stdout:
|
||||
return json.dumps({"status": "noop", "message": "Nothing to commit"})
|
||||
return json.dumps({"error": "git commit failed", "stderr": r.stderr})
|
||||
|
||||
return json.dumps({
|
||||
"status": "success",
|
||||
"message": message,
|
||||
"output": r.stdout.strip(),
|
||||
})
|
||||
except Exception as exc:
|
||||
return json.dumps({"error": str(exc)}, indent=2)
|
||||
|
||||
|
||||
@mcp.tool()
|
||||
async def git_status() -> str:
|
||||
"""Return the git working tree status."""
|
||||
try:
|
||||
r = subprocess.run(
|
||||
["git", "status", "--porcelain"],
|
||||
cwd=str(REPO_ROOT),
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=30,
|
||||
)
|
||||
if r.returncode != 0:
|
||||
return json.dumps({"error": r.stderr})
|
||||
|
||||
files = []
|
||||
for line in r.stdout.strip().split("\n"):
|
||||
if line:
|
||||
files.append({
|
||||
"status": line[:2].strip(),
|
||||
"file": line[3:].strip(),
|
||||
})
|
||||
|
||||
return json.dumps({"files": files, "clean": len(files) == 0}, indent=2)
|
||||
except Exception as exc:
|
||||
return json.dumps({"error": str(exc)}, indent=2)
|
||||
@@ -1,5 +1,5 @@
|
||||
"""Admin router: login, sync endpoints, sync log."""
|
||||
from fastapi import APIRouter, Depends, HTTPException, Response, Query, status
|
||||
from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, Response, Query, status
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from typing import Any
|
||||
@@ -10,7 +10,9 @@ from app.schemas.auth import LoginRequest, TokenResponse, AdminInfo
|
||||
from app.schemas.sync import SyncStatus, SyncLogEntry, SyncTriggerResponse
|
||||
from app.auth import verify_password, create_access_token, get_current_user
|
||||
from app.services.sync_service import SyncService
|
||||
from app.database import async_session
|
||||
from app.cache import cache
|
||||
from datetime import datetime
|
||||
|
||||
router = APIRouter(prefix="/api/admin", tags=["admin"])
|
||||
|
||||
@@ -54,13 +56,37 @@ async def get_me(user: AdminUser = Depends(get_current_user)) -> Any:
|
||||
|
||||
@router.post("/sync", response_model=SyncTriggerResponse)
|
||||
async def trigger_sync(
|
||||
background_tasks: BackgroundTasks,
|
||||
user: AdminUser = Depends(get_current_user),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
) -> Any:
|
||||
"""Trigger a manual equipment sync (admin only)."""
|
||||
sync_service = SyncService(db)
|
||||
result = await sync_service.run_sync()
|
||||
return SyncTriggerResponse(sync_id=result["sync_id"], status=result["status"])
|
||||
"""Trigger a manual equipment sync in the background (admin only).
|
||||
|
||||
Runs the sync via BackgroundTasks so the HTTP request returns immediately
|
||||
(a full sync of 700+ items incl. image downloads takes minutes and
|
||||
would otherwise hit proxy timeouts).
|
||||
Poll GET /api/admin/sync-status for progress.
|
||||
"""
|
||||
log_entry = SyncLog(sync_type="equipment", status="running", started_at=datetime.utcnow())
|
||||
db.add(log_entry)
|
||||
await db.commit()
|
||||
await db.refresh(log_entry)
|
||||
|
||||
async def _run_sync(sync_id: int) -> None:
|
||||
async with async_session() as sync_db:
|
||||
sync_service = SyncService(sync_db)
|
||||
try:
|
||||
await sync_service.run_sync(sync_log_id=sync_id)
|
||||
except Exception as exc: # noqa: BLE001
|
||||
log = await sync_db.get(SyncLog, sync_id)
|
||||
if log:
|
||||
log.status = "failed"
|
||||
log.error_message = str(exc)
|
||||
log.completed_at = datetime.utcnow()
|
||||
await sync_db.commit()
|
||||
|
||||
background_tasks.add_task(_run_sync, log_entry.id)
|
||||
return SyncTriggerResponse(sync_id=log_entry.id, status="running")
|
||||
|
||||
|
||||
@router.get("/sync-status", response_model=SyncStatus)
|
||||
|
||||
@@ -30,8 +30,8 @@ async def list_equipment(
|
||||
if cached:
|
||||
return cached
|
||||
|
||||
query = select(EquipmentCache)
|
||||
count_query = select(func.count(EquipmentCache.id))
|
||||
query = select(EquipmentCache).where(EquipmentCache.available == True) # noqa: E712
|
||||
count_query = select(func.count(EquipmentCache.id)).where(EquipmentCache.available == True) # noqa: E712
|
||||
|
||||
if search:
|
||||
query = query.where(EquipmentCache.name.ilike(f"%{search}%"))
|
||||
@@ -42,6 +42,10 @@ async def list_equipment(
|
||||
|
||||
if sort == "name_desc":
|
||||
query = query.order_by(EquipmentCache.name.desc())
|
||||
elif sort == "price_asc":
|
||||
query = query.order_by(EquipmentCache.rental_price.asc().nulls_last(), EquipmentCache.name.asc())
|
||||
elif sort == "price_desc":
|
||||
query = query.order_by(EquipmentCache.rental_price.desc().nulls_last(), EquipmentCache.name.asc())
|
||||
else:
|
||||
query = query.order_by(EquipmentCache.name.asc())
|
||||
|
||||
@@ -70,7 +74,9 @@ async def list_categories(db: AsyncSession = Depends(get_db)) -> Any:
|
||||
if cached:
|
||||
return cached
|
||||
result = await db.execute(
|
||||
select(EquipmentCache.category).distinct().where(EquipmentCache.category.isnot(None))
|
||||
select(EquipmentCache.category).distinct().where(
|
||||
EquipmentCache.category.isnot(None), EquipmentCache.available == True # noqa: E712
|
||||
)
|
||||
)
|
||||
categories = [row[0] for row in result.fetchall() if row[0]]
|
||||
await cache.set("equipment:categories", categories, ttl=3600)
|
||||
|
||||
@@ -50,6 +50,53 @@ class RentmanService:
|
||||
offset += limit
|
||||
return all_items
|
||||
|
||||
|
||||
async def get_all_folders(self) -> list[dict[str, Any]]:
|
||||
"""Paginate through all folders until data is empty."""
|
||||
all_folders: list[dict[str, Any]] = []
|
||||
offset = 0
|
||||
while True:
|
||||
url = f"{self._base_url}/folders"
|
||||
params = {"limit": 100, "offset": offset}
|
||||
async with httpx.AsyncClient(timeout=30.0) as client:
|
||||
resp = await client.get(url, headers=self._headers(), params=params)
|
||||
resp.raise_for_status()
|
||||
page = resp.json()
|
||||
data = page.get("data", [])
|
||||
if not data:
|
||||
break
|
||||
all_folders.extend(data)
|
||||
offset += 100
|
||||
return all_folders
|
||||
|
||||
async def get_folder_map(self) -> dict[str, dict[str, str]]:
|
||||
"""Build a map: folder path -> {category: top-level name, subcategory: folder name}.
|
||||
|
||||
Walks the parent chain so every folder resolves to its top-level ancestor.
|
||||
"""
|
||||
folders = await self.get_all_folders()
|
||||
by_path = {f"/folders/{f.get('id')}": f for f in folders}
|
||||
|
||||
def top_ancestor(folder: dict) -> dict:
|
||||
current = folder
|
||||
seen = set()
|
||||
while current.get("parent") and current["parent"] not in seen:
|
||||
seen.add(current["parent"])
|
||||
parent = by_path.get(current["parent"])
|
||||
if not parent:
|
||||
break
|
||||
current = parent
|
||||
return current
|
||||
|
||||
folder_map: dict[str, dict[str, str]] = {}
|
||||
for path, folder in by_path.items():
|
||||
ancestor = top_ancestor(folder)
|
||||
folder_map[path] = {
|
||||
"category": ancestor.get("name", ""),
|
||||
"subcategory": folder.get("name", ""),
|
||||
}
|
||||
return folder_map
|
||||
|
||||
async def get_file_url(self, file_id: str | int) -> str | None:
|
||||
"""Fetch the S3 URL for a file from Rentman.
|
||||
|
||||
@@ -71,41 +118,122 @@ class RentmanService:
|
||||
logger.warning("Failed to fetch file URL for file_id=%s: %s", file_id, exc)
|
||||
return None
|
||||
|
||||
async def transform_equipment(self, raw: dict[str, Any]) -> dict[str, Any]:
|
||||
# Well-known rental brands for extraction from equipment names
|
||||
KNOWN_BRANDS = [
|
||||
"d&b audiotechnik", "d&b", "L-Acoustics", "Shure", "Sennheiser", "Pioneer",
|
||||
"RCF", "Soundcraft", "Cameo", "Eurolite", "Globaltruss", "Klotz",
|
||||
"Martin", "JBL", "QSC", "Yamaha", "Behringer", "ROBE", "Chauvet",
|
||||
"PL-Audio", "Showtec", "American DJ", "ADJ", "GLP", "Wireless Solution",
|
||||
"Sennheiser", "AKG", "Rode", "Audix", "Palmer", "Neutrik", "Layher",
|
||||
]
|
||||
|
||||
@staticmethod
|
||||
def _strip_html(text: str) -> str:
|
||||
"""Remove HTML tags and normalize whitespace in description fields."""
|
||||
if not text:
|
||||
return ""
|
||||
text = re.sub(r"<br\s*/?>", "\n", text, flags=re.IGNORECASE)
|
||||
text = re.sub(r"</p>", "\n", text, flags=re.IGNORECASE)
|
||||
text = re.sub(r"<[^>]+>", "", text)
|
||||
text = text.replace(" ", " ").replace("&", "&")
|
||||
text = text.replace("<", "<").replace(">", ">").replace(""", '"')
|
||||
text = re.sub(r"[ \t]+", " ", text)
|
||||
text = re.sub(r"\n\s*\n+", "\n\n", text)
|
||||
return text.strip()
|
||||
|
||||
def _extract_brand(self, name: str) -> str:
|
||||
"""Extract a known brand from the equipment name, if present."""
|
||||
lowered = (name or "").lower()
|
||||
for brand in self.KNOWN_BRANDS:
|
||||
if lowered.startswith(brand.lower() + " ") or lowered.startswith(brand.lower() + "-"):
|
||||
return brand
|
||||
return ""
|
||||
|
||||
def _resolve_category(self, folder_path: str | None, folder_map: dict[str, dict[str, str]] | None) -> tuple[str, str]:
|
||||
"""Resolve (category, subcategory) from the Rentman folder path.
|
||||
|
||||
category = top-level folder name (e.g. "Tontechnik")
|
||||
subcategory = direct folder name (e.g. "Mikrofone")
|
||||
"""
|
||||
if not folder_path or not folder_map:
|
||||
return "", ""
|
||||
info = folder_map.get(folder_path)
|
||||
if not info:
|
||||
return "", ""
|
||||
return info.get("category", ""), info.get("subcategory", "")
|
||||
|
||||
def _build_specifications(self, raw: dict[str, Any]) -> dict[str, Any]:
|
||||
"""Collect physical specs from flat Rentman fields when set."""
|
||||
specs: dict[str, Any] = {}
|
||||
field_map = [
|
||||
("Leistung (W)", "power"),
|
||||
("Gewicht (kg)", "empty_weight"),
|
||||
("Hoehe (mm)", "height"),
|
||||
("Breite (mm)", "width"),
|
||||
("Laenge (mm)", "length"),
|
||||
("Volumen (m3)", "volume"),
|
||||
]
|
||||
for label, key in field_map:
|
||||
value = raw.get(key)
|
||||
if isinstance(value, (int, float)) and value > 0:
|
||||
specs[label] = value
|
||||
return specs
|
||||
|
||||
async def transform_equipment(
|
||||
self,
|
||||
raw: dict[str, Any],
|
||||
folder_map: dict[str, dict[str, str]] | None = None,
|
||||
) -> dict[str, Any]:
|
||||
"""Map a raw Rentman equipment object to equipment_cache schema.
|
||||
|
||||
Uses 'image' (singular) field which contains a relative path like '/files/3173'.
|
||||
Fetches the actual S3 URL via GET /files/{file_id}.
|
||||
Uses the real Rentman field names:
|
||||
- price -> rental_price (per day, shop price)
|
||||
- folder ("/folders/N") -> category/subcategory via folder_map
|
||||
- shop_description_long (fallbacks: shop_description_short,
|
||||
external_remark) -> description (HTML stripped)
|
||||
- code -> number (article number)
|
||||
- in_shop/in_archive -> availability for the public catalog
|
||||
"""
|
||||
image_path = raw.get("image")
|
||||
image_urls: list[str] = []
|
||||
|
||||
if image_path and isinstance(image_path, str):
|
||||
# Extract file_id from path like /files/3173
|
||||
match = re.search(r"/files/(\d+)", image_path)
|
||||
if match:
|
||||
file_id = match.group(1)
|
||||
s3_url = await self.get_file_url(file_id)
|
||||
if s3_url:
|
||||
image_urls = [s3_url]
|
||||
else:
|
||||
logger.debug("Could not extract file_id from image path: %s", image_path)
|
||||
|
||||
group = raw.get("equipment_group") or {}
|
||||
category = group.get("name", "") if isinstance(group, dict) else str(group or "")
|
||||
category, subcategory = self._resolve_category(raw.get("folder"), folder_map)
|
||||
|
||||
description = self._strip_html(
|
||||
raw.get("shop_description_long")
|
||||
or raw.get("shop_description_short")
|
||||
or raw.get("external_remark")
|
||||
or ""
|
||||
)
|
||||
|
||||
price = raw.get("price")
|
||||
try:
|
||||
price = float(price) if price is not None else None
|
||||
except (TypeError, ValueError):
|
||||
price = None
|
||||
|
||||
available = bool(raw.get("in_shop")) and not bool(raw.get("in_archive")) and not bool(raw.get("temporary"))
|
||||
|
||||
return {
|
||||
"rentman_id": str(raw.get("id", "")),
|
||||
"name": raw.get("name", ""),
|
||||
"number": raw.get("number") or raw.get("code", ""),
|
||||
"name": raw.get("name", "") or raw.get("displayname", ""),
|
||||
"number": raw.get("code", "") or raw.get("number", ""),
|
||||
"category": category,
|
||||
"subcategory": raw.get("subcategory", ""),
|
||||
"description": raw.get("description", ""),
|
||||
"specifications": raw.get("specifications", {}),
|
||||
"subcategory": subcategory,
|
||||
"description": description,
|
||||
"specifications": self._build_specifications(raw) or None,
|
||||
"images": image_urls,
|
||||
"rental_price": raw.get("rental_price"),
|
||||
"brand": raw.get("brand", ""),
|
||||
"available": raw.get("available", True),
|
||||
"rental_price": price,
|
||||
"brand": self._extract_brand(raw.get("name", "")),
|
||||
"available": available,
|
||||
"update_hash": raw.get("updateHash", ""),
|
||||
}
|
||||
|
||||
|
||||
@@ -23,10 +23,10 @@ class SyncService:
|
||||
self.db = db
|
||||
self.rentman = rentman or RentmanService()
|
||||
|
||||
async def run_sync(self) -> dict[str, Any]:
|
||||
async def run_sync(self, sync_log_id: int | None = None) -> dict[str, Any]:
|
||||
"""Execute an incremental equipment sync.
|
||||
|
||||
1. Create sync_log entry (status=running)
|
||||
1. Create sync_log entry (status=running) or reuse sync_log_id
|
||||
2. Paginate GET /equipment from Rentman
|
||||
3. Compare updateHash with DB, only process changed items
|
||||
4. Download images only for changed items
|
||||
@@ -35,12 +35,20 @@ class SyncService:
|
||||
7. Update sync_log (status=completed or failed)
|
||||
Returns dict with sync_id, items_processed, status.
|
||||
"""
|
||||
log_entry = SyncLog(
|
||||
sync_type="equipment",
|
||||
status="running",
|
||||
started_at=datetime.utcnow(),
|
||||
)
|
||||
self.db.add(log_entry)
|
||||
if sync_log_id is not None:
|
||||
log_entry = await self.db.get(SyncLog, sync_log_id)
|
||||
if not log_entry:
|
||||
log_entry = None
|
||||
if sync_log_id is None or log_entry is None:
|
||||
log_entry = SyncLog(
|
||||
sync_type="equipment",
|
||||
status="running",
|
||||
started_at=datetime.utcnow(),
|
||||
)
|
||||
self.db.add(log_entry)
|
||||
else:
|
||||
log_entry.status = "running"
|
||||
log_entry.started_at = datetime.utcnow()
|
||||
await self.db.commit()
|
||||
await self.db.refresh(log_entry)
|
||||
sync_id = log_entry.id
|
||||
@@ -53,8 +61,9 @@ class SyncService:
|
||||
# Ensure images directory exists
|
||||
os.makedirs(IMAGES_DIR, exist_ok=True)
|
||||
|
||||
# Fetch all equipment from Rentman
|
||||
# Fetch all equipment and folders from Rentman
|
||||
all_equipment = await self.rentman.get_all_equipment(limit=100)
|
||||
folder_map = await self.rentman.get_folder_map()
|
||||
|
||||
# Build set of rentman_ids from API for availability check
|
||||
api_rentman_ids = set()
|
||||
@@ -75,7 +84,7 @@ class SyncService:
|
||||
continue
|
||||
|
||||
try:
|
||||
transformed = await self.rentman.transform_equipment(raw_item)
|
||||
transformed = await self.rentman.transform_equipment(raw_item, folder_map=folder_map)
|
||||
await self._upsert_equipment(transformed)
|
||||
|
||||
# Download image if S3 URL available
|
||||
|
||||
@@ -16,3 +16,4 @@ pytest>=8.0.0
|
||||
pytest-asyncio>=0.23.0
|
||||
pytest-cov>=5.0.0
|
||||
httpx>=0.27.0
|
||||
mcp>=1.0.0,<2
|
||||
|
||||
@@ -35,15 +35,18 @@ async def test_sync_with_valid_token(client, seeded_admin, test_db):
|
||||
})
|
||||
token = login_resp.json()["access_token"]
|
||||
|
||||
# Mock sync service
|
||||
# Mock sync service (background task)
|
||||
with patch.object(SyncService, "run_sync", new_callable=AsyncMock) as mock_sync:
|
||||
mock_sync.return_value = {"sync_id": 42, "items_processed": 10, "items_failed": 0, "status": "completed"}
|
||||
mock_sync.return_value = {"sync_id": 1, "items_processed": 10, "items_failed": 0, "status": "completed"}
|
||||
resp = await client.post("/api/admin/sync", cookies={"hms_admin_token": token})
|
||||
|
||||
assert resp.status_code == 200
|
||||
data = resp.json()
|
||||
assert data["sync_id"] == 42
|
||||
assert data["status"] == "completed"
|
||||
# Background sync: request returns immediately with a running log entry
|
||||
assert data["sync_id"] == 1
|
||||
assert data["status"] == "running"
|
||||
# Background task executed by TestClient: run_sync was called once
|
||||
mock_sync.assert_awaited_once()
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
|
||||
@@ -10,31 +10,63 @@ from app.services.rentman_service import RentmanService
|
||||
|
||||
|
||||
def make_raw_equipment(rid: str, name: str, category: str = "Lautsprecher") -> dict:
|
||||
"""Raw equipment item using REAL Rentman API field names."""
|
||||
return {
|
||||
"id": rid,
|
||||
"name": name,
|
||||
"number": f"{name[:3].upper()}-001",
|
||||
"displayname": name,
|
||||
"code": f"{name[:3].upper()}-001",
|
||||
"equipment_group": {"name": category},
|
||||
"description": f"Description for {name}",
|
||||
"specifications": {"weight": 50, "power": 750},
|
||||
"images": [{"url": f"https://example.com/{rid}.jpg"}],
|
||||
"folder": f"/folders/{int(rid) % 5 + 1}",
|
||||
"shop_description_long": f"<p>Description for {name}</p>",
|
||||
"external_remark": "",
|
||||
"power": 750,
|
||||
"weight": 50,
|
||||
"empty_weight": 50,
|
||||
"image": f"/files/{rid}",
|
||||
"price": 150.00,
|
||||
"in_shop": True,
|
||||
"in_archive": False,
|
||||
"temporary": False,
|
||||
"updateHash": f"hash-{rid}",
|
||||
}
|
||||
|
||||
|
||||
def make_transformed(raw: dict, folder_map=None) -> dict:
|
||||
"""Transformed equipment dict as produced by the real Rentman mapping (no network)."""
|
||||
return {
|
||||
"rentman_id": str(raw["id"]),
|
||||
"name": raw["name"],
|
||||
"number": raw.get("code", ""),
|
||||
"category": "Tontechnik",
|
||||
"subcategory": "Mikrofone",
|
||||
"description": f"Description for {raw['name']}",
|
||||
"specifications": None,
|
||||
"images": [],
|
||||
"rental_price": 150.00,
|
||||
"brand": "L-Acoustics",
|
||||
"brand": "",
|
||||
"available": True,
|
||||
"update_hash": raw.get("updateHash", ""),
|
||||
}
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_transform_equipment():
|
||||
raw = make_raw_equipment("42", "K2 Line Array", "Lautsprecher")
|
||||
result = RentmanService.transform_equipment(raw)
|
||||
raw = make_raw_equipment("42", "Shure SM58 Mikrofon dynamisch")
|
||||
service = RentmanService.__new__(RentmanService) # no network on init path
|
||||
folder_map = {
|
||||
f"/folders/{42 % 5 + 1}": {"category": "Tontechnik", "subcategory": "Mikrofone"},
|
||||
}
|
||||
with patch.object(RentmanService, "get_file_url", new=AsyncMock(return_value="https://example.com/42.jpg")):
|
||||
result = await service.transform_equipment(raw, folder_map=folder_map)
|
||||
assert result["rentman_id"] == "42"
|
||||
assert result["name"] == "K2 Line Array"
|
||||
assert result["category"] == "Lautsprecher"
|
||||
assert result["images"] == ["https://example.com/42.jpg"]
|
||||
assert result["brand"] == "L-Acoustics"
|
||||
assert result["name"] == "Shure SM58 Mikrofon dynamisch"
|
||||
assert result["category"] == "Tontechnik"
|
||||
assert result["subcategory"] == "Mikrofone"
|
||||
assert result["rental_price"] == 150.00
|
||||
assert result["brand"] == "Shure"
|
||||
assert result["available"] is True
|
||||
assert result["description"] == "Description for Shure SM58 Mikrofon dynamisch"
|
||||
assert result["images"] == ["https://example.com/42.jpg"]
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
@@ -49,6 +81,8 @@ async def test_paginated_import(test_db):
|
||||
mock_rentman.get_all_equipment = AsyncMock(return_value=[
|
||||
*[make_raw_equipment(str(i), f"Item {i}") for i in range(250)]
|
||||
])
|
||||
mock_rentman.get_folder_map = AsyncMock(return_value={})
|
||||
mock_rentman.transform_equipment = AsyncMock(side_effect=make_transformed)
|
||||
|
||||
with patch("app.services.sync_service.cache") as mock_cache:
|
||||
mock_cache.delete_pattern = AsyncMock(return_value=0)
|
||||
@@ -83,6 +117,8 @@ async def test_sync_upsert_existing(test_db):
|
||||
mock_rentman.get_all_equipment = AsyncMock(return_value=[
|
||||
make_raw_equipment("100", "New Name", "Lautsprecher")
|
||||
])
|
||||
mock_rentman.get_folder_map = AsyncMock(return_value={})
|
||||
mock_rentman.transform_equipment = AsyncMock(side_effect=make_transformed)
|
||||
|
||||
with patch("app.services.sync_service.cache") as mock_cache:
|
||||
mock_cache.delete_pattern = AsyncMock(return_value=0)
|
||||
|
||||
@@ -1,37 +1,23 @@
|
||||
services:
|
||||
frontend:
|
||||
build: ./frontend
|
||||
ports:
|
||||
- "3000:3000"
|
||||
labels:
|
||||
- traefik.http.services.https-0-d9tyazu90ywaixl6l77wh7zd-frontend.loadbalancer.server.port=3000
|
||||
depends_on:
|
||||
backend:
|
||||
condition: service_healthy
|
||||
environment:
|
||||
- NUXT_PUBLIC_API_BASE=/api
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.middlewares.hms-gzip.compress=true"
|
||||
- "traefik.http.middlewares.hms-redirect.redirectscheme.scheme=https"
|
||||
- "traefik.http.routers.hms-http.entryPoints=http"
|
||||
- "traefik.http.routers.hms-http.middlewares=hms-redirect"
|
||||
- "traefik.http.routers.hms-http.rule=Host(`hms.media-on.de`) && PathPrefix(`/`)"
|
||||
- "traefik.http.routers.hms-https.entryPoints=https"
|
||||
- "traefik.http.routers.hms-https.middlewares=hms-gzip"
|
||||
- "traefik.http.routers.hms-https.rule=Host(`hms.media-on.de`) && PathPrefix(`/`)"
|
||||
- "traefik.http.routers.hms-https.tls=true"
|
||||
- "traefik.http.routers.hms-https.tls.certresolver=letsencrypt"
|
||||
- "traefik.http.services.hms.loadbalancer.server.port=3000"
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD", "node", "-e", "fetch('http://localhost:3000/').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))"]
|
||||
test:
|
||||
- CMD-SHELL
|
||||
- curl -sf http://localhost:3000/ || exit 1
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 15s
|
||||
networks:
|
||||
- hms-network
|
||||
- coolify
|
||||
|
||||
- hms-network
|
||||
- coolify
|
||||
backend:
|
||||
build: ./backend
|
||||
depends_on:
|
||||
@@ -40,68 +26,77 @@ services:
|
||||
redis:
|
||||
condition: service_healthy
|
||||
environment:
|
||||
- DATABASE_URL=${DATABASE_URL:-postgresql+asyncpg://hms:hms@postgres:5432/hms}
|
||||
- REDIS_URL=${REDIS_URL:-redis://redis:6379/0}
|
||||
- RENTMAN_API_TOKEN=${RENTMAN_API_TOKEN}
|
||||
- JWT_SECRET=${JWT_SECRET}
|
||||
- SMTP_HOST=${SMTP_HOST}
|
||||
- SMTP_PORT=${SMTP_PORT:-587}
|
||||
- SMTP_USER=${SMTP_USER}
|
||||
- SMTP_PASSWORD=${SMTP_PASSWORD}
|
||||
- SMTP_FROM=${SMTP_FROM:-info@hms-licht-ton.de}
|
||||
- CORS_ORIGINS=${CORS_ORIGINS:-https://hms.media-on.de,http://localhost:3000}
|
||||
- ADMIN_USERNAME=${ADMIN_USERNAME:-admin}
|
||||
- ADMIN_PASSWORD=${ADMIN_PASSWORD}
|
||||
- DATABASE_URL=${DATABASE_URL:-postgresql+asyncpg://hms:hms@postgres:5432/hms}
|
||||
- REDIS_URL=${REDIS_URL:-redis://redis:6379/0}
|
||||
- RENTMAN_API_TOKEN=${RENTMAN_API_TOKEN}
|
||||
- JWT_SECRET=${JWT_SECRET}
|
||||
- SMTP_HOST=${SMTP_HOST}
|
||||
- SMTP_PORT=${SMTP_PORT:-587}
|
||||
- SMTP_USER=${SMTP_USER}
|
||||
- SMTP_PASSWORD=${SMTP_PASSWORD}
|
||||
- SMTP_FROM=${SMTP_FROM:-info@hms-licht-ton.de}
|
||||
- CORS_ORIGINS=${CORS_ORIGINS:-https://hms.media-on.de,http://localhost:3000}
|
||||
- ADMIN_USERNAME=${ADMIN_USERNAME:-admin}
|
||||
- ADMIN_PASSWORD=${ADMIN_PASSWORD}
|
||||
- MCP_AUTH_TOKEN=${MCP_AUTH_TOKEN:-}
|
||||
volumes:
|
||||
- ./images:/data/images
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
- equipment_images:/data/images
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8000/api/health')"]
|
||||
test:
|
||||
- CMD
|
||||
- python
|
||||
- -c
|
||||
- import urllib.request; urllib.request.urlopen("http://localhost:8000/api/health")
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 10s
|
||||
networks:
|
||||
- hms-network
|
||||
|
||||
- hms-network
|
||||
postgres:
|
||||
image: postgres:16-alpine
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
environment:
|
||||
- POSTGRES_USER=hms
|
||||
- POSTGRES_PASSWORD=hms
|
||||
- POSTGRES_DB=hms
|
||||
- POSTGRES_USER=hms
|
||||
- POSTGRES_PASSWORD=hms
|
||||
- POSTGRES_DB=hms
|
||||
- POSTGRES_HOST_AUTH_METHOD=trust
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U hms -d hms"]
|
||||
test:
|
||||
- CMD-SHELL
|
||||
- pg_isready -U hms -d hms
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 5s
|
||||
networks:
|
||||
- hms-network
|
||||
|
||||
- hms-network
|
||||
redis:
|
||||
image: redis:7-alpine
|
||||
volumes:
|
||||
- redis_data:/data
|
||||
- redis_data:/data
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
test:
|
||||
- CMD
|
||||
- redis-cli
|
||||
- ping
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 5s
|
||||
networks:
|
||||
- hms-network
|
||||
|
||||
- hms-network
|
||||
networks:
|
||||
hms-network:
|
||||
driver: bridge
|
||||
coolify:
|
||||
external: true
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
redis_data:
|
||||
postgres_data: null
|
||||
redis_data: null
|
||||
equipment_images: null
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
services:
|
||||
frontend:
|
||||
build: ./frontend
|
||||
ports:
|
||||
- "3000:3000"
|
||||
depends_on:
|
||||
backend:
|
||||
condition: service_healthy
|
||||
environment:
|
||||
- NUXT_PUBLIC_API_BASE=/api
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.middlewares.hms-gzip.compress=true"
|
||||
- "traefik.http.middlewares.hms-redirect.redirectscheme.scheme=https"
|
||||
- "traefik.http.routers.hms-http.entryPoints=http"
|
||||
- "traefik.http.routers.hms-http.middlewares=hms-redirect"
|
||||
- "traefik.http.routers.hms-http.rule=Host(`hms.media-on.de`) && PathPrefix(`/`)"
|
||||
- "traefik.http.routers.hms-https.entryPoints=https"
|
||||
- "traefik.http.routers.hms-https.middlewares=hms-gzip"
|
||||
- "traefik.http.routers.hms-https.rule=Host(`hms.media-on.de`) && PathPrefix(`/`)"
|
||||
- "traefik.http.routers.hms-https.tls=true"
|
||||
- "traefik.http.routers.hms-https.tls.certresolver=letsencrypt"
|
||||
- "traefik.http.services.hms.loadbalancer.server.port=3000"
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD", "node", "-e", "fetch('http://localhost:3000/').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 15s
|
||||
networks:
|
||||
- hms-network
|
||||
- coolify
|
||||
|
||||
backend:
|
||||
build: ./backend
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
redis:
|
||||
condition: service_healthy
|
||||
environment:
|
||||
- DATABASE_URL=${DATABASE_URL:-postgresql+asyncpg://hms:hms@postgres:5432/hms}
|
||||
- REDIS_URL=${REDIS_URL:-redis://redis:6379/0}
|
||||
- RENTMAN_API_TOKEN=${RENTMAN_API_TOKEN}
|
||||
- JWT_SECRET=${JWT_SECRET}
|
||||
- SMTP_HOST=${SMTP_HOST}
|
||||
- SMTP_PORT=${SMTP_PORT:-587}
|
||||
- SMTP_USER=${SMTP_USER}
|
||||
- SMTP_PASSWORD=${SMTP_PASSWORD}
|
||||
- SMTP_FROM=${SMTP_FROM:-info@hms-licht-ton.de}
|
||||
- CORS_ORIGINS=${CORS_ORIGINS:-https://hms.media-on.de,http://localhost:3000}
|
||||
- ADMIN_USERNAME=${ADMIN_USERNAME:-admin}
|
||||
- ADMIN_PASSWORD=${ADMIN_PASSWORD}
|
||||
volumes:
|
||||
- ./images:/data/images
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8000/api/health')"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
start_period: 10s
|
||||
networks:
|
||||
- hms-network
|
||||
|
||||
postgres:
|
||||
image: postgres:16-alpine
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
environment:
|
||||
- POSTGRES_USER=hms
|
||||
- POSTGRES_PASSWORD=hms
|
||||
- POSTGRES_DB=hms
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U hms -d hms"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 5s
|
||||
networks:
|
||||
- hms-network
|
||||
|
||||
redis:
|
||||
image: redis:7-alpine
|
||||
volumes:
|
||||
- redis_data:/data
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 5s
|
||||
networks:
|
||||
- hms-network
|
||||
|
||||
networks:
|
||||
hms-network:
|
||||
driver: bridge
|
||||
coolify:
|
||||
external: true
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
redis_data:
|
||||
@@ -0,0 +1,12 @@
|
||||
node_modules
|
||||
.nuxt
|
||||
.output
|
||||
dist
|
||||
.git
|
||||
.gitignore
|
||||
*.md
|
||||
.env
|
||||
.env.*
|
||||
playwright-report
|
||||
test-results
|
||||
coverage
|
||||
@@ -0,0 +1,21 @@
|
||||
# --- Stage 1: Build ---
|
||||
FROM node:20 AS builder
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY package.json package-lock.json ./
|
||||
RUN npm ci
|
||||
|
||||
COPY . .
|
||||
RUN npm run build
|
||||
|
||||
# --- Stage 2: Production ---
|
||||
FROM node:20-slim AS production
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY --from=builder /app/.output ./.output
|
||||
|
||||
EXPOSE 3000
|
||||
|
||||
CMD ["node", ".output/server/index.mjs"]
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
:root {
|
||||
/* Brand Accent - used sparingly */
|
||||
--color-accent: #EC6925;
|
||||
--color-accent: #FA5C01;
|
||||
--color-accent-hover: #d4581a;
|
||||
--color-accent-light: rgba(236, 105, 37, 0.08);
|
||||
--color-accent-border: rgba(236, 105, 37, 0.25);
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
:root {
|
||||
/* Brand Accent - used sparingly */
|
||||
--color-accent: #EC6925;
|
||||
--color-accent: #FA5C01;
|
||||
--color-accent-hover: #d4581a;
|
||||
--color-accent-light: rgba(236, 105, 37, 0.08);
|
||||
--color-accent-border: rgba(236, 105, 37, 0.25);
|
||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 503 B After Width: | Height: | Size: 503 B |
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<svg class="hms-logo-svg" viewBox="0 0 200 200" :style="`height:${size}px;width:auto`" aria-label="HMS Licht & Ton Logo" role="img">
|
||||
<path fill="currentColor" d="M166.266,172.872h-37.687v-60.718H74.226v60.718H36.539V26.956h37.687v56.335h54.354V26.956h37.687V172.872z" />
|
||||
<rect x="23.598" y="15.343" fill="none" stroke="#EC6925" stroke-width="15.1525" stroke-miterlimit="10" width="155.612" height="168.874" />
|
||||
<rect x="23.598" y="15.343" fill="none" stroke="#FA5C01" stroke-width="15.1525" stroke-miterlimit="10" width="155.612" height="168.874" />
|
||||
</svg>
|
||||
</template>
|
||||
|
||||
@@ -3,6 +3,7 @@ import type { NuxtConfig } from "nuxt/schema";
|
||||
|
||||
export default defineNuxtConfig({
|
||||
devtools: { enabled: false },
|
||||
ssr: false,
|
||||
modules: ["@nuxtjs/tailwindcss", "@pinia/nuxt"],
|
||||
css: ["~/assets/css/main.css"],
|
||||
app: {
|
||||
@@ -59,6 +60,7 @@ export default defineNuxtConfig({
|
||||
},
|
||||
},
|
||||
routeRules: {
|
||||
"/": { ssr: false },
|
||||
"/mietkatalog": { ssr: true },
|
||||
"/mietkatalog/**": { ssr: true },
|
||||
"/warenkorb": { ssr: false },
|
||||
@@ -76,6 +78,7 @@ export default defineNuxtConfig({
|
||||
nitro: {
|
||||
compressPublicAssets: true,
|
||||
routeRules: {
|
||||
"/": { ssr: false },
|
||||
"/api/**": {
|
||||
proxy: "http://backend:8000/api/**",
|
||||
},
|
||||
@@ -0,0 +1,34 @@
|
||||
{
|
||||
"name": "hms-licht-ton-frontend",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"build": "nuxt build",
|
||||
"dev": "nuxt dev",
|
||||
"generate": "nuxt generate",
|
||||
"preview": "nuxt preview",
|
||||
"postinstall": "nuxt prepare",
|
||||
"typecheck": "nuxt typecheck",
|
||||
"lint": "eslint .",
|
||||
"test": "vitest run --reporter verbose",
|
||||
"test:e2e": "playwright test"
|
||||
},
|
||||
"dependencies": {
|
||||
"@pinia/nuxt": "^0.11.3",
|
||||
"nuxt": "^3.14.0",
|
||||
"pinia": "^3.0.4",
|
||||
"vue": "^3.5.0",
|
||||
"vue-router": "^4.4.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nuxt/test-utils": "^3.14.0",
|
||||
"@nuxtjs/tailwindcss": "^6.12.0",
|
||||
"@playwright/test": "^1.48.0",
|
||||
"@vue/test-utils": "^2.4.5",
|
||||
"happy-dom": "^15.0.0",
|
||||
"tailwindcss": "^3.4.0",
|
||||
"typescript": "^5.6.0",
|
||||
"vitest": "^3.2.0",
|
||||
"vue-tsc": "^2.1.0"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
<template>
|
||||
<div>
|
||||
<section class="py-20 sm:py-32" :style="{ background: 'var(--bg)' }">
|
||||
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||
<div class="max-w-2xl">
|
||||
<h1 class="text-4xl sm:text-5xl font-bold mb-6" style="color: var(--text)">
|
||||
Professionelle Technik<br><span style="color: var(--color-accent)">fuer Ihre Veranstaltung</span>
|
||||
</h1>
|
||||
<p class="text-lg mb-8" style="color: var(--text-muted)">
|
||||
HMS Licht & Ton - Veranstaltungstechnik aus Leipheim / Ellzee.
|
||||
</p>
|
||||
<NuxtLink to="/mietkatalog" class="hms-btn hms-btn-primary text-base px-8 py-4">Mietkatalog oeffnen</NuxtLink>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
</script>
|
||||
|
Before Width: | Height: | Size: 503 B After Width: | Height: | Size: 503 B |
@@ -0,0 +1,65 @@
|
||||
import type { Config } from "tailwindcss";
|
||||
|
||||
export default <Config>{
|
||||
content: [
|
||||
"./components/**/*.{vue,js,ts}",
|
||||
"./layouts/**/*.vue",
|
||||
"./pages/**/*.vue",
|
||||
"./app.vue",
|
||||
"./error.vue",
|
||||
],
|
||||
theme: {
|
||||
extend: {
|
||||
colors: {
|
||||
bg: "#131313",
|
||||
panel: "#1a1a1a",
|
||||
surface: "#212121",
|
||||
row: "#272727",
|
||||
card: "#2d2d2d",
|
||||
"border-default": "#444444a8",
|
||||
secondary: "#656565",
|
||||
primary: "#737a81",
|
||||
text: "#ffffff",
|
||||
"text-muted": "#d4d4d4",
|
||||
accent: {
|
||||
DEFAULT: "#FA5C01",
|
||||
hover: "#d4581a",
|
||||
light: "rgba(236, 105, 37, 0.08)",
|
||||
border: "rgba(236, 105, 37, 0.25)",
|
||||
dark: "#b8461a",
|
||||
},
|
||||
success: "#4ade80",
|
||||
"success-bg": "rgba(74, 222, 128, 0.08)",
|
||||
error: "#f87171",
|
||||
"error-bg": "rgba(248, 113, 113, 0.08)",
|
||||
warning: "#fbbf24",
|
||||
info: "#60a5fa",
|
||||
},
|
||||
borderRadius: {
|
||||
sm: "2px",
|
||||
md: "3px",
|
||||
lg: "4px",
|
||||
xl: "4px",
|
||||
full: "9999px",
|
||||
},
|
||||
fontFamily: {
|
||||
sans: ["Inter", "system-ui", "sans-serif"],
|
||||
},
|
||||
boxShadow: {
|
||||
sm: "0 1px 2px 0 rgb(0 0 0 / 0.3)",
|
||||
md: "0 4px 6px -1px rgb(0 0 0 / 0.4), 0 2px 4px -2px rgb(0 0 0 / 0.3)",
|
||||
lg: "0 10px 15px -3px rgb(0 0 0 / 0.4), 0 4px 6px -4px rgb(0 0 0 / 0.3)",
|
||||
xl: "0 20px 25px -5px rgb(0 0 0 / 0.5), 0 8px 10px -6px rgb(0 0 0 / 0.3)",
|
||||
},
|
||||
transitionDuration: {
|
||||
fast: "150ms",
|
||||
base: "250ms",
|
||||
slow: "400ms",
|
||||
},
|
||||
maxWidth: {
|
||||
"7xl": "1280px",
|
||||
},
|
||||
},
|
||||
},
|
||||
plugins: [],
|
||||
};
|
||||
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"extends": "./.nuxt/tsconfig.json"
|
||||
}
|
||||
@@ -1,12 +1,3 @@
|
||||
node_modules
|
||||
.nuxt
|
||||
.output
|
||||
dist
|
||||
.git
|
||||
.gitignore
|
||||
*.md
|
||||
.env
|
||||
.env.*
|
||||
playwright-report
|
||||
test-results
|
||||
coverage
|
||||
|
||||
@@ -1,21 +1,14 @@
|
||||
# --- Stage 1: Build ---
|
||||
FROM node:20 AS builder
|
||||
|
||||
# Stage 1: Build
|
||||
FROM node:20-alpine AS builder
|
||||
WORKDIR /app
|
||||
|
||||
COPY package.json package-lock.json ./
|
||||
RUN npm ci
|
||||
|
||||
COPY package.json package-lock.json* ./
|
||||
RUN npm ci || npm install
|
||||
COPY . .
|
||||
RUN npm run build
|
||||
|
||||
# --- Stage 2: Production ---
|
||||
FROM node:20-slim AS production
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY --from=builder /app/.output ./.output
|
||||
|
||||
# Stage 2: Serve with Nginx
|
||||
FROM nginx:alpine
|
||||
COPY --from=builder /app/dist /usr/share/nginx/html
|
||||
COPY nginx.conf /etc/nginx/conf.d/default.conf
|
||||
EXPOSE 3000
|
||||
|
||||
CMD ["node", ".output/server/index.mjs"]
|
||||
CMD ["nginx", "-g", "daemon off;"]
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<meta name="robots" content="noindex, nofollow, noarchive, nosnippet" />
|
||||
<meta name="theme-color" content="#131313" />
|
||||
<meta name="description" content="HMS Licht & Ton – Professionelle Veranstaltungstechnik aus Leipheim/Ellzee. Vermietung, Verkauf, Personal, Transport von Tontechnik und Lichttechnik." />
|
||||
<meta name="author" content="Hammerschmidt u. Mössle GbR" />
|
||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin="" />
|
||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700;800&display=swap" />
|
||||
<title>HMS Licht & Ton – Veranstaltungstechnik</title>
|
||||
<script type="application/ld+json">
|
||||
{
|
||||
"@context": "https://schema.org",
|
||||
"@type": "LocalBusiness",
|
||||
"name": "HMS Licht & Ton – Hammerschmidt u. Mössle GbR",
|
||||
"description": "Professionelle Veranstaltungstechnik aus Leipheim/Ellzee. Vermietung, Verkauf, Personal, Transport.",
|
||||
"address": {
|
||||
"@type": "PostalAddress",
|
||||
"streetAddress": "Grockelhofen 10",
|
||||
"addressLocality": "Leipheim",
|
||||
"postalCode": "89340",
|
||||
"addressCountry": "DE"
|
||||
},
|
||||
"telephone": "+498221204433",
|
||||
"email": "info@hms-licht-ton.de",
|
||||
"url": "https://hms.media-on.de",
|
||||
"areaServed": "Süddeutschland",
|
||||
"knowsAbout": ["Tontechnik", "Lichttechnik", "Rigging", "Veranstaltungstechnik"]
|
||||
}
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/main.tsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,39 @@
|
||||
server {
|
||||
listen 3000;
|
||||
server_name _;
|
||||
root /usr/share/nginx/html;
|
||||
index index index.html;
|
||||
|
||||
# Staging: keep out of search engines (remove when going live on official domain)
|
||||
add_header X-Robots-Tag "noindex, nofollow" always;
|
||||
|
||||
location /api/ {
|
||||
proxy_pass http://backend:8000/api/;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
|
||||
location /mcp {
|
||||
proxy_pass http://backend:8000/mcp;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
}
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ /index.html;
|
||||
}
|
||||
|
||||
location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
|
||||
expires 1y;
|
||||
add_header Cache-Control "public, immutable";
|
||||
add_header X-Robots-Tag "noindex, nofollow" always;
|
||||
}
|
||||
}
|
||||
@@ -1,34 +1,26 @@
|
||||
{
|
||||
"name": "hms-licht-ton-frontend",
|
||||
"name": "hms-licht-ton-frontend-react",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"build": "nuxt build",
|
||||
"dev": "nuxt dev",
|
||||
"generate": "nuxt generate",
|
||||
"preview": "nuxt preview",
|
||||
"postinstall": "nuxt prepare",
|
||||
"typecheck": "nuxt typecheck",
|
||||
"lint": "eslint .",
|
||||
"test": "vitest run --reporter verbose",
|
||||
"test:e2e": "playwright test"
|
||||
"dev": "vite",
|
||||
"build": "tsc && vite build",
|
||||
"preview": "vite preview",
|
||||
"typecheck": "tsc --noEmit"
|
||||
},
|
||||
"dependencies": {
|
||||
"@pinia/nuxt": "^0.11.3",
|
||||
"nuxt": "^3.14.0",
|
||||
"pinia": "^3.0.4",
|
||||
"vue": "^3.5.0",
|
||||
"vue-router": "^4.4.0"
|
||||
"react": "^18.3.0",
|
||||
"react-dom": "^18.3.0",
|
||||
"react-router-dom": "^6.26.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nuxt/test-utils": "^3.14.0",
|
||||
"@nuxtjs/tailwindcss": "^6.12.0",
|
||||
"@playwright/test": "^1.48.0",
|
||||
"@vue/test-utils": "^2.4.5",
|
||||
"happy-dom": "^15.0.0",
|
||||
"@types/react": "^18.3.0",
|
||||
"@types/react-dom": "^18.3.0",
|
||||
"@vitejs/plugin-react": "^4.3.0",
|
||||
"autoprefixer": "^10.4.0",
|
||||
"postcss": "^8.4.0",
|
||||
"tailwindcss": "^3.4.0",
|
||||
"typescript": "^5.6.0",
|
||||
"vitest": "^3.2.0",
|
||||
"vue-tsc": "^2.1.0"
|
||||
"vite": "^5.4.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,121 +0,0 @@
|
||||
<template>
|
||||
<div>
|
||||
<!-- Hero with background image -->
|
||||
<section class="hms-hero py-20 sm:py-32" aria-labelledby="hero-title">
|
||||
<div class="hms-hero-bg" style="background-image: url('https://images.unsplash.com/photo-1470229722913-7c0e2dbbafd3?w=1920&q=80')"></div>
|
||||
<div class="hms-hero-overlay"></div>
|
||||
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 relative z-10">
|
||||
<div class="max-w-2xl">
|
||||
<span class="hms-badge hms-badge-primary mb-4">Seit 2003 · Über 20 Jahre Veranstaltungstechnik</span>
|
||||
<h1 id="hero-title" class="text-4xl sm:text-5xl lg:text-6xl font-bold leading-tight mb-6" style="color: var(--text)">
|
||||
Professionelle Technik<br><span style="color: var(--color-accent)">für Ihre Veranstaltung</span>
|
||||
</h1>
|
||||
<p class="text-lg sm:text-xl mb-8 max-w-xl" style="color: var(--text-muted)">
|
||||
Von der Firmenevent-Beschallung bis zur Open-Air-Großproduktion: HMS Licht & Ton liefert Tontechnik, Lichttechnik, Rigging und Komplettlösungen aus Leipheim und Ellzee.
|
||||
</p>
|
||||
<div class="flex flex-col sm:flex-row gap-4">
|
||||
<button @click="navigate('/mietkatalog')" class="hms-btn hms-btn-primary text-base px-8 py-4">
|
||||
Mietkatalog öffnen
|
||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14 5l7 7m0 0l-7 7m7-7H3"/></svg>
|
||||
</button>
|
||||
<button @click="navigate('/kontakt')" class="hms-btn hms-btn-secondary text-base px-8 py-4">Beratung anfragen</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- Speaker Grid -->
|
||||
<section class="py-12 sm:py-16" :style="{ background: 'var(--bg)' }" aria-labelledby="speaker-title">
|
||||
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||
<div class="mb-8">
|
||||
<span class="text-sm font-semibold uppercase tracking-wider" style="color: var(--color-accent)">Equipment-Highlights</span>
|
||||
<h2 id="speaker-title" class="text-2xl sm:text-3xl font-bold mt-1" style="color: var(--text)">Lautsprecher & Strahler aus unserem Mietlager</h2>
|
||||
</div>
|
||||
<div class="hms-speaker-grid">
|
||||
<div v-for="sp in speakers" :key="sp.name" class="hms-speaker-item" @click="navigate('/mietkatalog')" role="button" tabindex="0" @keydown.enter="navigate('/mietkatalog')">
|
||||
<SpeakerIcon :type="sp.type" />
|
||||
<div class="hms-speaker-name">{{ sp.name }}</div>
|
||||
<div class="hms-speaker-type">{{ sp.category }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- Über uns -->
|
||||
<section class="py-16 sm:py-20" :style="{ background: 'var(--panel)' }" aria-labelledby="about-title">
|
||||
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||
<div class="grid lg:grid-cols-2 gap-12 items-center">
|
||||
<div>
|
||||
<span class="text-sm font-semibold uppercase tracking-wider mb-2" style="color: var(--color-accent)">Unternehmen</span>
|
||||
<h2 id="about-title" class="text-3xl sm:text-4xl font-bold mb-6" style="color: var(--text)">Ihr Technik-Partner mit Erfahrung</h2>
|
||||
<p class="leading-relaxed mb-4" style="color: var(--text-muted)">Die <strong style="color: var(--text)">Hammerschmidt u. Mössle GbR</strong> ist seit 2003 Ihr zuverlässiger Partner für Veranstaltungstechnik in der Region Leipheim / Ellzee und im gesamten süddeutschen Raum.</p>
|
||||
<p class="leading-relaxed mb-4" style="color: var(--text-muted)">Mit einem Mietlager von über 1.000 Geräten, einer eigenen Werkstatt und erfahrenem Personal realisieren wir Veranstaltungen jeder Größenordnung.</p>
|
||||
<div class="grid grid-cols-3 gap-4 mt-8">
|
||||
<div class="text-center"><div class="text-3xl font-bold" style="color: var(--color-accent)">20+</div><div class="text-sm" style="color: var(--secondary)">Jahre Erfahrung</div></div>
|
||||
<div class="text-center"><div class="text-3xl font-bold" style="color: var(--color-accent)">1.000+</div><div class="text-sm" style="color: var(--secondary)">Geräte im Lager</div></div>
|
||||
<div class="text-center"><div class="text-3xl font-bold" style="color: var(--color-accent)">2</div><div class="text-sm" style="color: var(--secondary)">Standorte</div></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="relative">
|
||||
<div class="aspect-[4/3] rounded-lg overflow-hidden shadow-xl">
|
||||
<img src="https://images.unsplash.com/photo-1493225457124-a3eb161ffa5f?w=800&q=80" alt="Veranstaltungstechnik Setup" loading="lazy" class="w-full h-full object-cover" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- Leistungen -->
|
||||
<section class="py-16 sm:py-20" :style="{ background: 'var(--bg)' }" aria-labelledby="services-title">
|
||||
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||
<div class="text-center mb-12">
|
||||
<span class="text-sm font-semibold uppercase tracking-wider mb-2" style="color: var(--color-accent)">Leistungen</span>
|
||||
<h2 id="services-title" class="text-3xl sm:text-4xl font-bold" style="color: var(--text)">Von der Vermietung bis zur Komplettbetreuung</h2>
|
||||
</div>
|
||||
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6">
|
||||
<ServiceCard v-for="s in services" :key="s.title" :icon="s.icon" :title="s.title" :description="s.description" />
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- CTA -->
|
||||
<section class="py-16 sm:py-20" :style="{ background: 'var(--panel)' }" aria-labelledby="rental-title">
|
||||
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
|
||||
<div class="rounded-lg p-8 sm:p-12 lg:p-16 text-center" style="background: var(--bg); border: 1px solid var(--border)">
|
||||
<h2 id="rental-title" class="text-3xl sm:text-4xl font-bold mb-4" style="color: var(--text)">Online-Mietkatalog</h2>
|
||||
<p class="max-w-2xl mx-auto mb-8" style="color: var(--text-muted)">Durchsuchen Sie unser Equipment-Sortiment und stellen Sie Ihre Mietanfrage direkt online zusammen.</p>
|
||||
<button @click="navigate('/mietkatalog')" class="hms-btn hms-btn-primary text-base px-8 py-4">
|
||||
Katalog durchsuchen
|
||||
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14 5l7 7m0 0l-7 7m7-7H3"/></svg>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
const services = [
|
||||
{ icon: '🔊', title: 'Vermietung', description: 'Lautsprecher, Mischpulte, Lichtanlagen, Rigging und Komplett-Setups aus unserem 1.000+ Geräte umfassenden Mietlager in Ellzee. Geprüftes Equipment, sofort einsatzbereit.' },
|
||||
{ icon: '🛒', title: 'Verkauf', description: 'Neu- und Gebrauchtgeräte führender Hersteller mit Beratung, Inbetriebnahme und Service. Wir liefern nicht nur – wir konfigurieren Ihre Anlage einsatzfertig.' },
|
||||
{ icon: '👷', title: 'Personal', description: 'Qualifizierte Tontechniker, Lichttechniker und Rigger für Aufbau, Betrieb und Abbau. Mit TÜV-geprüfter Ausbildung und umfangreicher Praxiserfahrung.' },
|
||||
{ icon: '🚚', title: 'Transport', description: 'Eigene Transportfahrzeuge für sichere An- und Ablieferung. Inklusive Verladekonzept, Positionierung und Rückholung – kundengerecht terminiert.' },
|
||||
{ icon: '📦', title: 'Lagerung', description: 'Klimatisierte und trockene Lagerung für Equipment und Veranstaltungsbestände. Mit Bestandsmanagement und regelmäßiger Funktionsprüfung.' },
|
||||
{ icon: '🔧', title: 'Werkstatt', description: 'Herstellerübergreifende Reparatur und Wartung in unserer eigenen Werkstatt. Regelmäßige DGUV-Prüfungen und Kalibrierung für Ihren sicheren Betrieb.' },
|
||||
{ icon: '⚡', title: 'Installation', description: 'Festinstallationen in Schaufenstern, Lokalen und Veranstaltungsstätten. Von der Planung über die Elektroinstallation bis zur Abnahme – alles aus einer Hand.' },
|
||||
{ icon: '📅', title: 'Booking', description: 'Vermittlung von Künstlern und Technik-Personal für Ihre Veranstaltung. Mit unserem branchenweiten Netzwerk finden wir die passenden Professionals für Ihr Event.' }
|
||||
]
|
||||
const speakers = [
|
||||
{ type: 'linearray', name: 'L-Acoustics K2', category: 'Line Array' },
|
||||
{ type: 'subwoofer', name: 'L-Acoustics KS28', category: 'Subwoofer' },
|
||||
{ type: 'pointsource', name: 'd&b T10', category: 'Point Source' },
|
||||
{ type: 'column', name: 'd&b KSL8', category: 'Column Array' },
|
||||
{ type: 'monitor', name: 'd&b M4', category: 'Monitor' },
|
||||
{ type: 'movinghead', name: 'Robe Pointe', category: 'Moving Head' }
|
||||
]
|
||||
|
||||
function navigate(route: string) {
|
||||
navigateTo(route)
|
||||
if (import.meta.client) window.scrollTo(0, 0)
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,6 @@
|
||||
export default {
|
||||
plugins: {
|
||||
tailwindcss: {},
|
||||
autoprefixer: {},
|
||||
},
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200">
|
||||
<path fill="#ffffff" d="M166.266,172.872h-37.687v-60.718H74.226v60.718H36.539V26.956h37.687v56.335h54.354V26.956h37.687V172.872z" />
|
||||
<rect x="23.598" y="15.343" fill="none" stroke="#FA5C01" stroke-width="15.1525" stroke-miterlimit="10" width="155.612" height="168.874" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 346 B |
|
After Width: | Height: | Size: 634 KiB |
|
After Width: | Height: | Size: 312 KiB |
|
After Width: | Height: | Size: 56 KiB |
|
After Width: | Height: | Size: 608 KiB |
|
After Width: | Height: | Size: 205 KiB |
|
After Width: | Height: | Size: 566 KiB |
|
After Width: | Height: | Size: 153 KiB |
|
After Width: | Height: | Size: 300 KiB |
|
After Width: | Height: | Size: 541 KiB |
@@ -0,0 +1,2 @@
|
||||
User-agent: *
|
||||
Disallow: /
|
||||
@@ -0,0 +1,33 @@
|
||||
import { Routes, Route } from 'react-router-dom';
|
||||
import Layout from './components/Layout';
|
||||
import Index from './pages/Index';
|
||||
import Mietkatalog from './pages/Mietkatalog';
|
||||
import EquipmentDetail from './pages/EquipmentDetail';
|
||||
import Kontakt from './pages/Kontakt';
|
||||
import Warenkorb from './pages/Warenkorb';
|
||||
import Admin from './pages/Admin';
|
||||
import Referenzen from './pages/Referenzen';
|
||||
import Impressum from './pages/Impressum';
|
||||
import Datenschutz from './pages/Datenschutz';
|
||||
import AGB from './pages/AGB';
|
||||
import ErrorPage from './pages/ErrorPage';
|
||||
|
||||
export default function App() {
|
||||
return (
|
||||
<Routes>
|
||||
<Route element={<Layout />}>
|
||||
<Route path="/" element={<Index />} />
|
||||
<Route path="/mietkatalog" element={<Mietkatalog />} />
|
||||
<Route path="/mietkatalog/:id" element={<EquipmentDetail />} />
|
||||
<Route path="/kontakt" element={<Kontakt />} />
|
||||
<Route path="/warenkorb" element={<Warenkorb />} />
|
||||
<Route path="/admin" element={<Admin />} />
|
||||
<Route path="/referenzen" element={<Referenzen />} />
|
||||
<Route path="/impressum" element={<Impressum />} />
|
||||
<Route path="/datenschutz" element={<Datenschutz />} />
|
||||
<Route path="/agb-vermietung" element={<AGB />} />
|
||||
<Route path="*" element={<ErrorPage />} />
|
||||
</Route>
|
||||
</Routes>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
import { apiPost } from './client';
|
||||
|
||||
export async function adminLogin(username: string, password: string): Promise<{ token: string }> {
|
||||
return apiPost<{ token: string }>('/admin/login', { username, password });
|
||||
}
|
||||
|
||||
export async function adminSync(token: string): Promise<{ status: string; message: string }> {
|
||||
return apiPost<{ status: string; message: string }>('/admin/sync', undefined, token);
|
||||
}
|
||||