From: Giorgio Ravera Date: Sun, 31 May 2026 13:07:40 +0000 (+0200) Subject: Minor fixes to routes X-Git-Url: http://git.giorgioravera.it/?a=commitdiff_plain;h=cf2560ce3924babc296415f2338dd8a7f8d4ee1f;p=network-manager.git Minor fixes to routes --- diff --git a/backend/app.py b/backend/app.py index f85da84..7ea0569 100644 --- a/backend/app.py +++ b/backend/app.py @@ -165,39 +165,39 @@ async def session_middleware(request: Request, call_next): # FRONTEND Handlers # ------------------------------------------------------------------------------ # Homepage -def home(request: Request): +def home_page(request: Request): return FileResponse(settings.FRONTEND_PATH / "index.html") # Homepage JS -def js_home(request: Request): +def home_js(request: Request): return FileResponse(settings.FRONTEND_PATH / "js/index.js") # Modals -def modals(request: Request): +def modals_page(request: Request): return FileResponse(settings.FRONTEND_PATH / "modals.html") # CSS variables -def css_variables(request: Request): +def variables_css(request: Request): return FileResponse(settings.FRONTEND_PATH / "css/variables.css") # CSS Layout -def css_layout(request: Request): +def layout_css(request: Request): return FileResponse(settings.FRONTEND_PATH / "css/layout.css") # JS Common -def js_common(request: Request): +def common_js(request: Request): return FileResponse(settings.FRONTEND_PATH / "js/common.js") # JS API -def js_api(request: Request): +def api_js(request: Request): return FileResponse(settings.FRONTEND_PATH / "js/api.js") # JS Services -def js_services(request: Request): +def services_js(request: Request): return FileResponse(settings.FRONTEND_PATH / "js/services.js") # favicon -def favicon(request: Request): +def favicon_ico(request: Request): return FileResponse(settings.FRONTEND_PATH / "favicon.ico") # ------------------------------------------------------------------------------ diff --git a/backend/routes/about.py b/backend/routes/about.py index 10031f8..2f5fd02 100644 --- a/backend/routes/about.py +++ b/backend/routes/about.py @@ -4,9 +4,8 @@ from fastapi import APIRouter from datetime import datetime, timezone -# Import Settings & Config +# Import Settings from backend.settings.settings import settings -from backend.db.settings import get_config # Create Router router = APIRouter() diff --git a/backend/routes/aliases.py b/backend/routes/aliases.py index 797243e..7569aba 100644 --- a/backend/routes/aliases.py +++ b/backend/routes/aliases.py @@ -31,12 +31,12 @@ router = APIRouter() # --------------------------------------------------------- # Aliass page @router.get("/aliases") -def aliases(request: Request): +def aliases_page(request: Request): return FileResponse(settings.FRONTEND_PATH / "aliases.html") # Serve aliases.js @router.get("/js/aliases.js") -def js_aliases(): +def aliases_js(): return FileResponse(settings.FRONTEND_PATH / "js/aliases.js") # --------------------------------------------------------- @@ -55,7 +55,7 @@ def api_get_aliases(request: Request): raise except Exception as err: - logger.exception("Error getting list alias %s", str(err).strip()) + logger.exception("Error getting list aliases %s", str(err).strip()) raise HTTPException( status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail={ @@ -100,7 +100,7 @@ def api_get_alias(request: Request, alias_id: int): raise except Exception as err: - logger.exception("Error adding alias %s: %s", alias_id, str(err).strip()) + logger.exception("Error getting alias %s: %s", alias_id, str(err).strip()) took_ms = (time.monotonic_ns() - start_ns) / 1_000_000 raise HTTPException( status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, diff --git a/backend/routes/devices.py b/backend/routes/devices.py index 1fc42d0..fae6442 100644 --- a/backend/routes/devices.py +++ b/backend/routes/devices.py @@ -30,12 +30,12 @@ router = APIRouter() # --------------------------------------------------------- # Devices page @router.get("/devices") -def devices(request: Request): +def devices_page(request: Request): return FileResponse(settings.FRONTEND_PATH / "devices.html") # Serve devices.js @router.get("/js/devices.js") -def js_devices(): +def devices_js(): return FileResponse(settings.FRONTEND_PATH / "js/devices.js") # --------------------------------------------------------- diff --git a/backend/routes/dhcp.py b/backend/routes/dhcp.py index 8a8a791..9cdf71a 100644 --- a/backend/routes/dhcp.py +++ b/backend/routes/dhcp.py @@ -26,12 +26,12 @@ router = APIRouter() # --------------------------------------------------------- # Leases page @router.get("/leases") -def leases(request: Request): +def leases_page(request: Request): return FileResponse(settings.FRONTEND_PATH / "leases.html") # Serve leases.js @router.get("/js/leases.js") -def js_leases(): +def leases_js(): return FileResponse(settings.FRONTEND_PATH / "js/leases.js") # --------------------------------------------------------- @@ -176,7 +176,7 @@ def api_get_lease(request: Request, lease_id: int): }, }, ) - return lease or [] + return lease except FileNotFoundError as err: took_ms = (time.monotonic_ns() - start_ns) / 1_000_000 diff --git a/backend/routes/hosts.py b/backend/routes/hosts.py index 6137bcd..26f383a 100644 --- a/backend/routes/hosts.py +++ b/backend/routes/hosts.py @@ -31,12 +31,12 @@ router = APIRouter() # --------------------------------------------------------- # Hosts page @router.get("/hosts") -def hosts(request: Request): +def hosts_page(request: Request): return FileResponse(settings.FRONTEND_PATH / "hosts.html") # Serve hosts.js @router.get("/js/hosts.js") -def js_hosts(): +def hosts_js(): return FileResponse(settings.FRONTEND_PATH / "js/hosts.js") # --------------------------------------------------------- @@ -56,7 +56,7 @@ def api_get_hosts(request: Request): raise except Exception as err: - logger.exception("Error getting list host %s", str(err).strip()) + logger.exception("Error getting list hosts %s", str(err).strip()) raise HTTPException( status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail={ @@ -95,13 +95,13 @@ def api_get_host(request: Request, host_id: int): }, }, ) - return host or [] + return host except HTTPException: raise except Exception as err: - logger.exception("Error adding host %s: %s", host_id, str(err).strip()) + logger.exception("Error getting host %s: %s", host_id, str(err).strip()) took_ms = (time.monotonic_ns() - start_ns) / 1_000_000 raise HTTPException( status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, diff --git a/backend/routes/login.py b/backend/routes/login.py index 8152ea0..b57cfe9 100644 --- a/backend/routes/login.py +++ b/backend/routes/login.py @@ -48,12 +48,12 @@ def login_page(request: Request): # Serve login.js @router.get("/js/login.js") -def css_login(): +def login_js(): return FileResponse(settings.FRONTEND_PATH / "js/login.js") # Serve session.js @router.get("/js/session.js") -def css_login(): +def session_js(): return FileResponse(settings.FRONTEND_PATH / "js/session.js") # ---------------------------------------------------------