Minor fixes to routes

diff --git a/backend/app.py b/backend/app.py
index f85da846d7656468524bb4724a343c7f59d013d3..7ea056916fa01422fa4fefc918d73a8caf2f8f7d 100644 (file)
--- 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 10031f85908ec871ba874b544de6c9f7fcf85e03..2f5fd02d9649fc9976cc307cd338d1512c084df2 100644 (file)
--- 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 797243ed25d5da27f823c54e98210e547c791317..7569aba084c65a08896f57093104e95d088e919c 100644 (file)
--- 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 1fc42d05ef1746117066ca05fa948185ad297cd5..fae6442d73bb94fa7afed77f056489143722eda0 100644 (file)
--- 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 8a8a7916bc6b4ac7fb91dc1faee030604d1ba90f..9cdf71a5b1eca7caea228e5c81a01d46e63bcb82 100644 (file)
--- 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 6137bcde8f5460eaebadbd4ae34473072dae03e6..26f383ab7ee583c41be2024ae742e414c219a7bf 100644 (file)
--- 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 8152ea03870d85043b38e08d7bdeb35f6ab147de..b57cfe95691e27b33d8031ca7f54d76f5d54e127 100644 (file)
--- 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")
 
 # ---------------------------------------------------------