chore(v2): restructure monorepo to src/ layout with uv
Aligns the repo with the python-project-spec-design.md template chosen for V2.0.0. Big move, no logic changes. The 3 pre-existing test failures (test_recipes::test_update_recipe, test_recipes:: test_recipe_versioning, test_tasks::test_reorder_tasks, plus the client test_save_measurement_proxy) survive unchanged. Layout changes - server/ -> src/backend/ - server/middleware/ -> src/backend/api/middleware/ - server/routers/ -> src/backend/api/routers/ - server/models/ -> src/backend/models/orm/ - server/schemas/ -> src/backend/models/api/ - server/uploads/ -> uploads/ (project root, mounted volume) - server/tests/ -> src/backend/tests/ - client/ -> src/frontend/flask_app/ (Flask kept; React deroga is documented in CLAUDE.md, justified by tablet UX, USB caliper/barcode workflow and Fabric.js integration) Tooling - pyproject.toml: monorepo with [project] core deps and optional-dependencies server / client / dev. Replaces both server/requirements.txt and client/requirements.txt. - uv.lock + .python-version (3.11) committed for reproducible builds. - Dockerfile (root, backend) and Dockerfile.frontend rewritten to use uv sync --frozen --no-dev --extra server|client; legacy Dockerfiles preserved as Dockerfile.legacy for reference but excluded from build context via .dockerignore. - docker-compose.dev.yml + docker-compose.yml: build context now ".", dockerfile pointing to the root files. Code adjustments forced by the move - Every "from config|database|models|schemas|services|routers|middleware import ..." rewritten to its src.backend.* equivalent (50+ files including indented inline imports inside test bodies). - src/backend/migrations/env.py: insert project root into sys.path so alembic can resolve src.backend.* imports regardless of cwd. - src/backend/config.py: env_file ../../.env (was ../.env), upload_path resolves project root via parents[2]. - src/backend/tests/conftest.py + tests: import ... from src.backend.* instead of bare names; old per-directory pytest.ini files removed in favor of root pyproject.toml [tool.pytest.ini_options]. - .gitignore: uploads/ at root, src/frontend/flask_app/static/css/ tailwind.css path; .dockerignore tightened. - CLAUDE.md: rewrote sections "Layout del repository", "Comandi di Sviluppo", "Database & Migrations", "Test", "i18n", and all path references throughout the architecture sections. Verified - uv lock resolves 77 packages; uv sync --extra server --extra client --extra dev installs cleanly. - uv run pytest: 171 passed, 4 pre-existing failures. - uv run alembic -c src/backend/migrations/alembic.ini check loads config and metadata (errors only on the absent local MySQL). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,200 @@
|
||||
"""Admin blueprint - user management."""
|
||||
from flask import Blueprint, flash, jsonify, redirect, render_template, request, session, url_for
|
||||
from flask_babel import gettext as _
|
||||
|
||||
from blueprints.auth import login_required
|
||||
from services.api_client import api_client
|
||||
|
||||
admin_bp = Blueprint("admin", __name__, url_prefix="/admin")
|
||||
|
||||
|
||||
def admin_required(f):
|
||||
"""Decorator to require admin privileges."""
|
||||
from functools import wraps
|
||||
@wraps(f)
|
||||
def decorated(*args, **kwargs):
|
||||
user = session.get("user", {})
|
||||
if not user.get("is_admin"):
|
||||
flash(_("Accesso non autorizzato"), "error")
|
||||
return redirect(url_for("measure.select_recipe"))
|
||||
return f(*args, **kwargs)
|
||||
return decorated
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# PAGINE (GET)
|
||||
# ============================================================================
|
||||
|
||||
@admin_bp.route("/users")
|
||||
@login_required
|
||||
@admin_required
|
||||
def user_list():
|
||||
"""User management page."""
|
||||
resp = api_client.get("/api/users")
|
||||
|
||||
if isinstance(resp, dict) and resp.get("error"):
|
||||
flash(_("Errore nel caricamento degli utenti: %(error)s", error=resp.get("detail", "")), "error")
|
||||
users = []
|
||||
elif isinstance(resp, list):
|
||||
users = resp
|
||||
else:
|
||||
users = []
|
||||
|
||||
return render_template("admin/users.html", users=users)
|
||||
|
||||
|
||||
@admin_bp.route("/stations")
|
||||
@login_required
|
||||
@admin_required
|
||||
def station_list():
|
||||
"""Station management page."""
|
||||
resp = api_client.get("/api/stations")
|
||||
if isinstance(resp, dict) and resp.get("error"):
|
||||
flash(_("Errore nel caricamento delle stazioni: %(error)s", error=resp.get("detail", "")), "error")
|
||||
stations = []
|
||||
elif isinstance(resp, list):
|
||||
stations = resp
|
||||
else:
|
||||
stations = []
|
||||
|
||||
recipes_resp = api_client.get("/api/recipes")
|
||||
if isinstance(recipes_resp, list):
|
||||
all_recipes = recipes_resp
|
||||
elif isinstance(recipes_resp, dict) and isinstance(recipes_resp.get("items"), list):
|
||||
all_recipes = recipes_resp["items"]
|
||||
else:
|
||||
all_recipes = []
|
||||
|
||||
return render_template("admin/stations.html", stations=stations, all_recipes=all_recipes)
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# API PROXY AJAX (JSON)
|
||||
# ============================================================================
|
||||
|
||||
@admin_bp.route("/api/users", methods=["POST"])
|
||||
@login_required
|
||||
@admin_required
|
||||
def api_create_user():
|
||||
"""Proxy: Create new user."""
|
||||
data = request.get_json(silent=True) or {}
|
||||
resp = api_client.post("/api/users", data=data)
|
||||
|
||||
if isinstance(resp, dict) and resp.get("error"):
|
||||
return jsonify(resp), resp.get("status_code", 500)
|
||||
|
||||
return jsonify(resp), 201
|
||||
|
||||
|
||||
@admin_bp.route("/api/users/<int:user_id>", methods=["PUT"])
|
||||
@login_required
|
||||
@admin_required
|
||||
def api_update_user(user_id: int):
|
||||
"""Proxy: Update user."""
|
||||
data = request.get_json(silent=True) or {}
|
||||
resp = api_client.put(f"/api/users/{user_id}", data=data)
|
||||
|
||||
if isinstance(resp, dict) and resp.get("error"):
|
||||
return jsonify(resp), resp.get("status_code", 500)
|
||||
|
||||
return jsonify(resp), 200
|
||||
|
||||
|
||||
@admin_bp.route("/api/users/<int:user_id>/password", methods=["PUT"])
|
||||
@login_required
|
||||
@admin_required
|
||||
def api_change_password(user_id: int):
|
||||
"""Proxy: Change user password."""
|
||||
data = request.get_json(silent=True) or {}
|
||||
resp = api_client.put(f"/api/users/{user_id}/password", data=data)
|
||||
|
||||
if isinstance(resp, dict) and resp.get("error"):
|
||||
return jsonify(resp), resp.get("status_code", 500)
|
||||
|
||||
return jsonify(resp), 200
|
||||
|
||||
|
||||
@admin_bp.route("/api/users/<int:user_id>/toggle-active", methods=["POST"])
|
||||
@login_required
|
||||
@admin_required
|
||||
def api_toggle_active(user_id: int):
|
||||
"""Proxy: Toggle user active status."""
|
||||
data = request.get_json(silent=True) or {}
|
||||
active = data.get("active", True)
|
||||
resp = api_client.put(f"/api/users/{user_id}", data={"active": active})
|
||||
|
||||
if isinstance(resp, dict) and resp.get("error"):
|
||||
return jsonify(resp), resp.get("status_code", 500)
|
||||
|
||||
return jsonify(resp), 200
|
||||
|
||||
|
||||
# --- Stations ---
|
||||
|
||||
@admin_bp.route("/api/stations", methods=["POST"])
|
||||
@login_required
|
||||
@admin_required
|
||||
def api_create_station():
|
||||
"""Proxy: Create a new station."""
|
||||
data = request.get_json(silent=True) or {}
|
||||
resp = api_client.post("/api/stations", data=data)
|
||||
if isinstance(resp, dict) and resp.get("error"):
|
||||
return jsonify(resp), resp.get("status_code", 500)
|
||||
return jsonify(resp), 201
|
||||
|
||||
|
||||
@admin_bp.route("/api/stations/<int:station_id>", methods=["PUT"])
|
||||
@login_required
|
||||
@admin_required
|
||||
def api_update_station(station_id: int):
|
||||
"""Proxy: Update a station."""
|
||||
data = request.get_json(silent=True) or {}
|
||||
resp = api_client.put(f"/api/stations/{station_id}", data=data)
|
||||
if isinstance(resp, dict) and resp.get("error"):
|
||||
return jsonify(resp), resp.get("status_code", 500)
|
||||
return jsonify(resp), 200
|
||||
|
||||
|
||||
@admin_bp.route("/api/stations/<int:station_id>", methods=["DELETE"])
|
||||
@login_required
|
||||
@admin_required
|
||||
def api_delete_station(station_id: int):
|
||||
"""Proxy: Delete a station."""
|
||||
resp = api_client.delete(f"/api/stations/{station_id}")
|
||||
if isinstance(resp, dict) and resp.get("error"):
|
||||
return jsonify(resp), resp.get("status_code", 500)
|
||||
return jsonify({"deleted": True}), 200
|
||||
|
||||
|
||||
@admin_bp.route("/api/stations/<int:station_id>/recipes", methods=["GET"])
|
||||
@login_required
|
||||
@admin_required
|
||||
def api_list_station_recipes(station_id: int):
|
||||
"""Proxy: List recipes assigned to a station."""
|
||||
resp = api_client.get(f"/api/stations/{station_id}/recipes")
|
||||
if isinstance(resp, dict) and resp.get("error"):
|
||||
return jsonify(resp), resp.get("status_code", 500)
|
||||
return jsonify(resp), 200
|
||||
|
||||
|
||||
@admin_bp.route("/api/stations/<int:station_id>/recipes", methods=["POST"])
|
||||
@login_required
|
||||
@admin_required
|
||||
def api_assign_recipe(station_id: int):
|
||||
"""Proxy: Assign a recipe to a station."""
|
||||
data = request.get_json(silent=True) or {}
|
||||
resp = api_client.post(f"/api/stations/{station_id}/recipes", data=data)
|
||||
if isinstance(resp, dict) and resp.get("error"):
|
||||
return jsonify(resp), resp.get("status_code", 500)
|
||||
return jsonify(resp), 201
|
||||
|
||||
|
||||
@admin_bp.route("/api/stations/<int:station_id>/recipes/<int:recipe_id>", methods=["DELETE"])
|
||||
@login_required
|
||||
@admin_required
|
||||
def api_unassign_recipe(station_id: int, recipe_id: int):
|
||||
"""Proxy: Remove a recipe assignment from a station."""
|
||||
resp = api_client.delete(f"/api/stations/{station_id}/recipes/{recipe_id}")
|
||||
if isinstance(resp, dict) and resp.get("error"):
|
||||
return jsonify(resp), resp.get("status_code", 500)
|
||||
return jsonify({"deleted": True}), 200
|
||||
Reference in New Issue
Block a user